zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/ImplicitContextF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -17,5 +21,4 @@ module Ice
 
 local interface ImplicitContext;
 
-};
-
+}

data/slice/Ice/Instrumentation.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,16 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
 #include <Ice/Current.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -61,7 +65,7 @@ local interface Observer
      *
      **/
     void failed(string exceptionName);
-};
+}
 
 /**
  *
@@ -103,7 +107,7 @@ local enum ThreadState
      *
      **/
     ThreadStateInUseForOther,
-};
+}
 
 /**
  *
@@ -124,7 +128,7 @@ local interface ThreadObserver extends Observer
      *
      **/
     void stateChanged(ThreadState oldState, ThreadState newState);
-};
+}
 
 /**
  *
@@ -169,8 +173,7 @@ local enum ConnectionState
      *
      **/
     ConnectionStateClosed
-};
-
+}
 
 /**
  *
@@ -196,7 +199,7 @@ local interface ConnectionObserver extends Observer
      *
      **/
     void receivedBytes(int num);
-};
+}
 
 /**
  *
@@ -220,7 +223,7 @@ local interface DispatchObserver extends Observer
      *
      **/
     void reply(int size);
-};
+}
 
 /**
  *
@@ -238,8 +241,7 @@ local interface ChildInvocationObserver extends Observer
      *
      **/
     void reply(int size);
-};
-
+}
 
 /**
  *
@@ -249,7 +251,7 @@ local interface ChildInvocationObserver extends Observer
  **/
 local interface RemoteObserver extends ChildInvocationObserver
 {
-};
+}
 
 /**
  *
@@ -259,7 +261,7 @@ local interface RemoteObserver extends ChildInvocationObserver
  **/
 local interface CollocatedObserver extends ChildInvocationObserver
 {
-};
+}
 
 /**
  *
@@ -316,7 +318,7 @@ local interface InvocationObserver extends Observer
      *
      **/
     CollocatedObserver getCollocatedObserver(ObjectAdapter adapter, int requestId, int size);
-};
+}
 
 /**
  *
@@ -360,7 +362,7 @@ local interface ObserverUpdater
      *
      **/
     void updateThreadObservers();
-};
+}
 
 /**
  *
@@ -493,9 +495,8 @@ local interface CommunicatorObserver
      *
      **/
     void setObserverUpdater(ObserverUpdater updater);
-};
-
-};
+}
 
-};
+}
 
+}

data/slice/Ice/InstrumentationF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -22,7 +26,6 @@ module Instrumentation
 local interface Observer;
 local interface CommunicatorObserver;
 
-};
-
-};
+}
 
+}

data/slice/Ice/LocalException.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,16 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -33,7 +37,7 @@ local exception InitializationException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -50,7 +54,7 @@ local exception PluginInitializationException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -61,7 +65,7 @@ local exception PluginInitializationException
 ["cpp:ice_print", "deprecate:This exception is no longer used by the Ice run time"]
 local exception CollocationOptimizationException
 {
-};
+}
 
 /**
  *
@@ -69,7 +73,7 @@ local exception CollocationOptimizationException
  * the Ice run time.
  *
  * This exception is raised if an attempt is made to register a
- * servant, servant locator, facet, object factory, plug-in, object
+ * servant, servant locator, facet, value factory, plug-in, object
  * adapter, object, or user exception factory more than once for the
  * same ID.
  *
@@ -80,7 +84,7 @@ local exception AlreadyRegisteredException
     /**
      *
      * The kind of object that is registered already: "servant",
-     * "servant locator", "object factory", "plug-in",
+     * "servant locator", "value factory", "plug-in",
      * "object adapter", "object", or "user exception factory".
      *
      **/
@@ -92,7 +96,7 @@ local exception AlreadyRegisteredException
      *
      **/
     string id;
-};
+}
 
 /**
  *
@@ -100,7 +104,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, value 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
@@ -114,7 +118,7 @@ local exception NotRegisteredException
     /**
      *
      * The kind of object that could not be removed: "servant",
-     * "servant locator", "object factory", "plug-in",
+     * "servant locator", "value factory", "plug-in",
      * "object adapter", "object", or "user exception factory".
      *
      **/
@@ -126,7 +130,7 @@ local exception NotRegisteredException
      *
      **/
     string id;
-};
+}
 
 /**
  *
@@ -147,7 +151,7 @@ local exception TwowayOnlyException
      *
      **/
     string operation;
-};
+}
 
 /**
  *
@@ -163,7 +167,7 @@ local exception TwowayOnlyException
 ["cpp:ice_print"]
 local exception CloneNotImplementedException
 {
-};
+}
 
 /**
  *
@@ -184,7 +188,7 @@ local exception UnknownException
      *
      **/
     string unknown;
-};
+}
 
 /**
  *
@@ -200,7 +204,7 @@ local exception UnknownException
 ["cpp:ice_print"]
 local exception UnknownLocalException extends UnknownException
 {
-};
+}
 
 /**
  *
@@ -220,7 +224,7 @@ local exception UnknownLocalException extends UnknownException
 ["cpp:ice_print"]
 local exception UnknownUserException extends UnknownException
 {
-};
+}
 
 /**
  *
@@ -231,7 +235,7 @@ local exception UnknownUserException extends UnknownException
 ["cpp:ice_print"]
 local exception VersionMismatchException
 {
-};
+}
 
 /**
  *
@@ -243,7 +247,7 @@ local exception VersionMismatchException
 ["cpp:ice_print"]
 local exception CommunicatorDestroyedException
 {
-};
+}
 
 /**
  *
@@ -263,7 +267,7 @@ local exception ObjectAdapterDeactivatedException
      *
      **/
     string name;
-};
+}
 
 /**
  *
@@ -282,7 +286,7 @@ local exception ObjectAdapterIdInUseException
      *
      **/
     string id;
-};
+}
 
 /**
  *
@@ -299,7 +303,7 @@ local exception NoEndpointException
      *
      **/
     string proxy;
-};
+}
 
 /**
  *
@@ -316,7 +320,7 @@ local exception EndpointParseException
      *
      **/
     string str;
-};
+}
 
 /**
  *
@@ -333,7 +337,7 @@ local exception EndpointSelectionTypeParseException
      *
      **/
     string str;
-};
+}
 
 /**
  *
@@ -350,7 +354,7 @@ local exception VersionParseException
      *
      **/
     string str;
-};
+}
 
 /**
  *
@@ -367,7 +371,7 @@ local exception IdentityParseException
      *
      **/
     string str;
-};
+}
 
 /**
  *
@@ -384,7 +388,7 @@ local exception ProxyParseException
      *
      **/
     string str;
-};
+}
 
 /**
  *
@@ -400,7 +404,7 @@ local exception IllegalIdentityException
      *
      **/
     Identity id;
-};
+}
 
 /**
  *
@@ -417,8 +421,7 @@ local exception IllegalServantException
      *
      **/
     string reason;
-};
-
+}
 
 /**
  *
@@ -439,7 +442,7 @@ local exception RequestFailedException
 
     /** The operation name of the request. */
     string operation;
-};
+}
 
 /**
  *
@@ -450,7 +453,7 @@ local exception RequestFailedException
 ["cpp:ice_print"]
 local exception ObjectNotExistException extends RequestFailedException
 {
-};
+}
 
 /**
  *
@@ -461,7 +464,7 @@ local exception ObjectNotExistException extends RequestFailedException
 ["cpp:ice_print"]
 local exception FacetNotExistException extends RequestFailedException
 {
-};
+}
 
 /**
  *
@@ -473,7 +476,7 @@ local exception FacetNotExistException extends RequestFailedException
 ["cpp:ice_print"]
 local exception OperationNotExistException extends RequestFailedException
 {
-};
+}
 
 /**
  *
@@ -496,7 +499,7 @@ local exception SyscallException
      *
      **/
     int error = 0; // Don't use errno, as errno is usually a macro.
-};
+}
 
 /**
  *
@@ -506,14 +509,13 @@ local exception SyscallException
 ["cpp:ice_print"]
 local exception SocketException extends SyscallException
 {
-};
+}
 
 /**
  *
  * This exception indicates CFNetwork errors.
  *
  **/
-#ifdef ICE_USE_CFSTREAM
 ["cpp:ice_print"]
 local exception CFNetworkException extends SocketException
 {
@@ -523,8 +525,7 @@ local exception CFNetworkException extends SocketException
      *
      **/
     string domain;
-};
-#endif
+}
 
 /**
  *
@@ -536,7 +537,7 @@ local exception FileException extends SyscallException
 {
     /** The path of the file responsible for the error. */
     string path;
-};
+}
 
 /**
  *
@@ -546,7 +547,7 @@ local exception FileException extends SyscallException
 ["cpp:ice_print"]
 local exception ConnectFailedException extends SocketException
 {
-};
+}
 
 /**
  *
@@ -557,7 +558,7 @@ local exception ConnectFailedException extends SocketException
 ["cpp:ice_print"]
 local exception ConnectionRefusedException extends ConnectFailedException
 {
-};
+}
 
 /**
  *
@@ -567,7 +568,7 @@ local exception ConnectionRefusedException extends ConnectFailedException
 ["cpp:ice_print"]
 local exception ConnectionLostException extends SocketException
 {
-};
+}
 
 /**
  *
@@ -594,7 +595,7 @@ local exception DNSException
      *
      **/
     string host;
-};
+}
 
 /**
  *
@@ -604,7 +605,7 @@ local exception DNSException
 ["cpp:ice_print"]
 local exception OperationInterruptedException
 {
-};
+}
 
 /**
  *
@@ -614,7 +615,7 @@ local exception OperationInterruptedException
 ["cpp:ice_print"]
 local exception TimeoutException
 {
-};
+}
 
 /**
  *
@@ -624,7 +625,7 @@ local exception TimeoutException
 ["cpp:ice_print"]
 local exception ConnectTimeoutException extends TimeoutException
 {
-};
+}
 
 /**
  *
@@ -634,7 +635,7 @@ local exception ConnectTimeoutException extends TimeoutException
 ["cpp:ice_print"]
 local exception CloseTimeoutException extends TimeoutException
 {
-};
+}
 
 /**
  *
@@ -645,7 +646,7 @@ local exception CloseTimeoutException extends TimeoutException
 ["cpp:ice_print"]
 local exception ConnectionTimeoutException extends TimeoutException
 {
-};
+}
 
 /**
  *
@@ -656,7 +657,7 @@ local exception ConnectionTimeoutException extends TimeoutException
 ["cpp:ice_print"]
 local exception InvocationTimeoutException extends TimeoutException
 {
-};
+}
 
 /**
  *
@@ -667,7 +668,7 @@ local exception InvocationTimeoutException extends TimeoutException
 ["cpp:ice_print"]
 local exception InvocationCanceledException
 {
-};
+}
 
 /**
  *
@@ -684,7 +685,7 @@ local exception ProtocolException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -701,7 +702,7 @@ local exception BadMagicException extends ProtocolException
      *
      **/
     ByteSeq badMagic;
-};
+}
 
 /**
  *
@@ -724,7 +725,7 @@ local exception UnsupportedProtocolException extends ProtocolException
      *
      **/
     ProtocolVersion supported;
-};
+}
 
 /**
  *
@@ -747,7 +748,7 @@ local exception UnsupportedEncodingException extends ProtocolException
      *
      **/
     EncodingVersion supported;
-};
+}
 
 /**
  *
@@ -757,7 +758,7 @@ local exception UnsupportedEncodingException extends ProtocolException
 ["cpp:ice_print"]
 local exception UnknownMessageException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -768,7 +769,7 @@ local exception UnknownMessageException extends ProtocolException
 ["cpp:ice_print"]
 local exception ConnectionNotValidatedException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -779,7 +780,7 @@ local exception ConnectionNotValidatedException extends ProtocolException
 ["cpp:ice_print"]
 local exception UnknownRequestIdException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -789,7 +790,7 @@ local exception UnknownRequestIdException extends ProtocolException
 ["cpp:ice_print"]
 local exception UnknownReplyStatusException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -806,20 +807,22 @@ local exception UnknownReplyStatusException extends ProtocolException
 ["cpp:ice_print"]
 local exception CloseConnectionException extends ProtocolException
 {
-};
+}
 
 /**
  *
  * This exception is raised by an operation call if the application
- * forcefully closes the connection {@link Connection#close}.
+ * closes the connection locally using {@link Connection#close}.
  *
  * @see Connection#close
  *
  **/
 ["cpp:ice_print"]
-local exception ForcedCloseConnectionException extends ProtocolException
+local exception ConnectionManuallyClosedException
 {
-};
+    /** True if the connection was closed gracefully, false otherwise. **/
+    bool graceful;
+}
 
 /**
  *
@@ -830,7 +833,7 @@ local exception ForcedCloseConnectionException extends ProtocolException
 ["cpp:ice_print"]
 local exception IllegalMessageSizeException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -840,7 +843,7 @@ local exception IllegalMessageSizeException extends ProtocolException
 ["cpp:ice_print"]
 local exception CompressionException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -853,7 +856,7 @@ local exception CompressionException extends ProtocolException
 ["cpp:ice_print"]
 local exception DatagramLimitException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -863,7 +866,7 @@ local exception DatagramLimitException extends ProtocolException
 ["cpp:ice_print"]
 local exception MarshalException extends ProtocolException
 {
-};
+}
 
 /**
  *
@@ -873,7 +876,7 @@ local exception MarshalException extends ProtocolException
 ["cpp:ice_print"]
 local exception ProxyUnmarshalException extends MarshalException
 {
-};
+}
 
 /**
  *
@@ -883,20 +886,21 @@ local exception ProxyUnmarshalException extends MarshalException
 ["cpp:ice_print"]
 local exception UnmarshalOutOfBoundsException extends MarshalException
 {
-};
+}
 
 /**
  *
- * This exception is raised if no suitable object factory was found during
+ * This exception is raised if no suitable value factory was found during
  * unmarshaling of a Slice class instance.
  *
- * @see ObjectFactory
- * @see Communicator#addObjectFactory
- * @see Communicator#findObjectFactory
+ * @see ValueFactory
+ * @see Communicator#getValueFactoryManager
+ * @see ValueFactoryManager#add
+ * @see ValueFactoryManager#find
  *
  **/
 ["cpp:ice_print"]
-local exception NoObjectFactoryException extends MarshalException
+local exception NoValueFactoryException extends MarshalException
 {
     /**
      *
@@ -905,7 +909,7 @@ local exception NoObjectFactoryException extends MarshalException
      *
      **/
     string type;
-};
+}
 
 /**
  *
@@ -934,7 +938,7 @@ local exception UnexpectedObjectException extends MarshalException
      *
      **/
     string expectedType;
-};
+}
 
 /**
  *
@@ -946,7 +950,7 @@ local exception UnexpectedObjectException extends MarshalException
 ["cpp:ice_print"]
 local exception MemoryLimitException extends MarshalException
 {
-};
+}
 
 /**
  *
@@ -957,8 +961,7 @@ local exception MemoryLimitException extends MarshalException
 ["cpp:ice_print"]
 local exception StringConversionException extends MarshalException
 {
-};
-
+}
 
 /**
  *
@@ -968,7 +971,7 @@ local exception StringConversionException extends MarshalException
 ["cpp:ice_print"]
 local exception EncapsulationException extends MarshalException
 {
-};
+}
 
 /**
  *
@@ -986,8 +989,7 @@ local exception FeatureNotSupportedException
      *
      **/
     string unsupportedFeature;
-};
-
+}
 
 /**
  *
@@ -1004,7 +1006,7 @@ local exception SecurityException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -1015,7 +1017,7 @@ local exception SecurityException
 ["cpp:ice_print"]
 local exception FixedProxyException
 {
-};
+}
 
 /**
  *
@@ -1026,8 +1028,6 @@ local exception FixedProxyException
 ["cpp:ice_print"]
 local exception ResponseSentException
 {
-};
-
-
-};
+}
 
+}