zeroc-ice 3.6b1 → 3.6.0

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
 {
 

data/slice/Ice/EndpointTypes.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.
@@ -10,8 +10,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/FacetMap.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/Identity.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/ImplicitContext.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,11 +9,12 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 

data/slice/Ice/ImplicitContextF.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/Instrumentation.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,12 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
 #include <Ice/Current.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -24,6 +25,7 @@ module Ice
  * Ice core internal components (threads, connections, etc).
  *
  **/
+["objc:prefix:ICEINSTRUMENTATION"]
 module Instrumentation
 {
 

data/slice/Ice/InstrumentationF.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,11 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 
+["objc:prefix:ICEINSTRUMENTATION"]
 module Instrumentation
 {
 

data/slice/Ice/LocalException.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,12 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -99,7 +100,7 @@ local exception AlreadyRegisteredException
  * registered with the Ice run time or Ice locator.
  *
  * This exception is raised if an attempt is made to remove a servant,
- * servant locator, facet, object factory, plug-in, object adapter, 
+ * servant locator, facet, object factory, plug-in, object adapter,
  * object, or user exception factory that is not currently registered.
  *
  * It's also raised if the Ice locator can't find an object or object
@@ -113,7 +114,7 @@ local exception NotRegisteredException
     /**
      *
      * The kind of object that could not be removed: "servant",
-     * "servant locator", "object factory", "plug-in", 
+     * "servant locator", "object factory", "plug-in",
      * "object adapter", "object", or "user exception factory".
      *
      **/
@@ -178,13 +179,13 @@ local exception UnknownException
 {
     /**
      *
-     * This field is set to the textual representation of the unknown 
+     * This field is set to the textual representation of the unknown
      * exception if available.
      *
      **/
     string unknown;
 };
-    
+
 /**
  *
  * This exception is raised if an operation call on a server raises a
@@ -257,7 +258,7 @@ local exception CommunicatorDestroyedException
 local exception ObjectAdapterDeactivatedException
 {
     /**
-     * 
+     *
      * Name of the adapter.
      *
      **/
@@ -292,7 +293,7 @@ local exception ObjectAdapterIdInUseException
 local exception NoEndpointException
 {
     /**
-     * 
+     *
      * The stringified proxy for which no suitable endpoint is
      * available.
      *
@@ -507,6 +508,24 @@ local exception SocketException extends SyscallException
 {
 };
 
+/**
+ *
+ * This exception indicates CFNetwork errors.
+ *
+ **/
+#ifdef ICE_USE_CFSTREAM
+["cpp:ice_print"]
+local exception CFNetworkException extends SocketException
+{
+    /**
+     *
+     * The domain of the error.
+     *
+     **/
+    string domain;
+};
+#endif
+
 /**
  *
  * This exception indicates file errors.
@@ -989,7 +1008,7 @@ local exception SecurityException
 };
 
 /**
- * 
+ *
  * This exception indicates that an attempt has been made to
  * change the connection properties of a fixed proxy.
  *
@@ -1000,7 +1019,7 @@ local exception FixedProxyException
 };
 
 /**
- * 
+ *
  * Indicates that the response to a request has already been sent;
  * re-dispatching such a request is not possible.
  *