zeroc-ice-x86-mingw 3.6b1 → 3.6.0

data/slice/Ice/BuiltinSequences.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -40,7 +41,7 @@ sequence<string> StringSeq;
 
 /** A sequence of objects. **/
 sequence<Object> ObjectSeq;
-    
+
 /** A sequence of object proxies. **/
 sequence<Object*> ObjectProxySeq;
 

data/slice/Ice/Communicator.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/InstrumentationF.ice>
@@ -32,6 +32,7 @@
  * additional functionality that supports high scalability.
  *
  **/
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -152,9 +153,8 @@ local interface Communicator
      **/
     ["cpp:const"] string proxyToString(Object* obj);
 
-
     /**
-     * 
+     *
      * Convert a set of proxy properties into a proxy. The "base"
      * name supplied in the <tt>property</tt> argument refers to a
      * property containing a stringified proxy, such as
@@ -172,13 +172,13 @@ local interface Communicator
     ["cpp:const"] Object* propertyToProxy(string property);
 
     /**
-     * 
+     *
      * Convert a proxy to a set of proxy properties.
      *
      * @param proxy The proxy.
      *
      * @param property The base property name.
-     * 
+     *
      * @return The property set.
      *
      **/
@@ -244,7 +244,7 @@ local interface Communicator
      *
      * <p>Calling this operation with an empty name will result in a
      * UUID being generated for the name.
-     * 
+     *
      * @param name The object adapter name.
      *
      * @param endpoints The endpoints for the object adapter.
@@ -262,7 +262,7 @@ local interface Communicator
      *
      * Create a new object adapter with a router. This operation
      * creates a routed object adapter.</p>
-     * 
+     *
      * <p>Calling this operation with an empty name will result in a
      * UUID being generated for the name.
      *
@@ -277,12 +277,12 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithRouter(string name, Router* rtr);
+    ObjectAdapter createObjectAdapterWithRouter(string name, ["objc:param:router"] Router* rtr);
 
     /**
      *
-     * <p>Add an object factory to this communicator. Installing a 
-     * factory with an id for which a factory is already registered 
+     * <p>Add an object factory to this communicator. Installing a
+     * factory with an id for which a factory is already registered
      * throws {@link AlreadyRegisteredException}.</p>
      *
      * <p>When unmarshaling an Ice object, the Ice run time reads the
@@ -328,7 +328,7 @@ local interface Communicator
      * @see ObjectFactory
      *
      **/
-    void addObjectFactory(ObjectFactory factory, string id);
+    void addObjectFactory(ObjectFactory factory, ["objc:param:sliceId"] string id);
 
     /**
      *
@@ -346,7 +346,6 @@ local interface Communicator
      **/
     ["cpp:const"] ObjectFactory findObjectFactory(string id);
 
-
     /**
      * Get the implicit context associated with this communicator.
      *
@@ -467,13 +466,13 @@ local interface Communicator
     /**
      *
      * Flush any pending batch requests for this communicator.
-     * This causes all batch requests that were sent via proxies
-     * obtained via this communicator to be sent to the server.
+     * This means all batch requests invoked on fixed proxies
+     * for all connections associated with the communicator.
+     * Any errors that occur while flushing a connection are ignored.
      *
      **/
     ["async"] void flushBatchRequests();
 
-
     /**
      *
      * Add the Admin object with all its facets to the provided object adapter.
@@ -499,15 +498,15 @@ local interface Communicator
      *
      * Get a proxy to the main facet of the Admin object.
      *
-     * getAdmin also creates the Admin object and creates and activates the Ice.Admin object 
-     * adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of the Admin 
-     * object created by getAdmin is <value of Ice.Admin.InstanceName>/admin, or <UUID>/admin 
+     * getAdmin also creates the Admin object and creates and activates the Ice.Admin object
+     * adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of the Admin
+     * object created by getAdmin is <value of Ice.Admin.InstanceName>/admin, or <UUID>/admin
      * when Ice.Admin.InstanceName is not set.
      *
      * <p>If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
      * initialization, after initialization of all plugins.</p>
 
-     * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no 
+     * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no
      * Admin object is configured.
      *
      * @see #createAdmin
@@ -517,7 +516,7 @@ local interface Communicator
     /**
      *
      * Add a new facet to the Admin object.
-     * Adding a servant with a facet that is already registered 
+     * Adding a servant with a facet that is already registered
      * throws {@link AlreadyRegisteredException}.
      *
      * @param servant The servant that implements the new Admin facet.
@@ -529,7 +528,7 @@ local interface Communicator
     /**
      *
      * Remove the following facet to the Admin object.
-     * Removing a facet that was not previously registered throws 
+     * Removing a facet that was not previously registered throws
      * {@link NotRegisteredException}.
      *
      * @param facet The name of the Admin facet.
@@ -548,7 +547,7 @@ local interface Communicator
      *
      **/
     Object findAdminFacet(string facet);
-   
+
     /**
      *
      * Returns a map of all facets of the Admin object.
@@ -560,8 +559,6 @@ local interface Communicator
      *
      **/
     FacetMap findAllAdminFacets();
-
 };
 
 };
-

data/slice/Ice/CommunicatorF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Connection.ice

@@ -1,7 +1,7 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -10,19 +10,19 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
 #include <Ice/Endpoint.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
 /**
  *
- * Base class providing access to the connection details.
- *
+ * Base class providing access to the connection details. *
  **/
 local class ConnectionInfo
 {
@@ -47,6 +47,20 @@ local class ConnectionInfo
      *
      **/
     string connectionId;
+
+    /**
+     *
+     * The connection buffer receive size.
+     *
+     **/
+    int rcvSize;
+
+    /**
+     *
+     * The connection buffer send size.
+     *
+     **/
+    int sndSize;
 };
 
 local interface Connection;
@@ -86,7 +100,7 @@ local enum ACMClose
     CloseOnInvocationAndIdle,
     CloseOnIdleForceful
 };
-    
+
 local enum ACMHeartbeat
 {
     HeartbeatOff,
@@ -186,9 +200,9 @@ local interface Connection
 
     /**
      *
-     * Flush any pending batch requests for this connection. This
-     * causes all batch requests that were sent via proxies that use
-     * this connection to be sent to the server.
+     * Flush any pending batch requests for this connection.
+     * This means all batch requests invoked on fixed proxies
+     * associated with the connection.
      *
      **/
     ["async"] void flushBatchRequests();
@@ -215,7 +229,7 @@ local interface Connection
      * @param heartbeat The hertbeat condition
      *
      **/
-    ["java:optional"] 
+    ["java:optional"]
     void setACM(optional(1) int timeout, optional(2) ACMClose close, optional(3) ACMHeartbeat heartbeat);
 
     /**
@@ -265,6 +279,17 @@ local interface Connection
      *
      **/
     ["cpp:const"] ConnectionInfo getInfo();
+
+
+    /**
+     *
+     * Set the connectiion buffer receive/send size.
+     *
+     * @rcvSize The connection receive buffer size.
+     * @sndSize The connection send buffer size.
+     *
+     **/
+    void setBufferSize(int rcvSize, int sndSize);
 };
 
 /**
@@ -310,14 +335,17 @@ local class UDPConnectionInfo extends IPConnectionInfo
     int mcastPort = -1;
 };
 
+dictionary<string, string> HeaderDict;
+
 /**
  *
  * Provides access to the connection details of a WebSocket connection
  *
  **/
-local class WSConnectionInfo extends IPConnectionInfo
+local class WSConnectionInfo extends TCPConnectionInfo
 {
+    /** The headers from the HTTP upgrade request. */
+    HeaderDict headers;
 };
 
 };
-

data/slice/Ice/ConnectionF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/Current.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,13 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -96,7 +97,7 @@ local struct Current
      *
      **/
     ObjectAdapter adapter;
-    
+
     /**
      *
      * Information about the connection over which the current method

data/slice/Ice/Endpoint.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -13,8 +13,9 @@
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/EndpointF.ice>
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -25,6 +26,13 @@ module Ice
  **/
 const short TCPEndpointType = 1;
 
+/**
+ *
+ * Uniquely identifies SSL endpoints.
+ *
+ **/
+const short SSLEndpointType = 2;
+
 /**
  *
  * Uniquely identifies UDP endpoints.
@@ -188,7 +196,7 @@ local class UDPEndpointInfo extends IPEndpointInfo
  * Provides access to a WebSocket endpoint information.
  *
  **/
-local class WSEndpointInfo extends IPEndpointInfo
+local class WSEndpointInfo extends TCPEndpointInfo
 {
     /**
      *

data/slice/Ice/EndpointF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -9,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {