zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/Locator.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,11 +9,14 @@
 
 #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/ProcessF.ice>
+#include <Ice/Process.ice>
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -26,7 +29,7 @@ module Ice
  **/
 exception AdapterNotFoundException
 {
-};
+}
 
 /**
  *
@@ -36,7 +39,7 @@ exception AdapterNotFoundException
  **/
 exception InvalidReplicaGroupIdException
 {
-};
+}
 
 /**
  *
@@ -46,7 +49,7 @@ exception InvalidReplicaGroupIdException
  **/
 exception AdapterAlreadyActiveException
 {
-};
+}
 
 /**
  *
@@ -55,7 +58,7 @@ exception AdapterAlreadyActiveException
  **/
 exception ObjectNotFoundException
 {
-};
+}
 
 /**
  *
@@ -64,7 +67,7 @@ exception ObjectNotFoundException
  **/
 exception ServerNotFoundException
 {
-};
+}
 
 interface LocatorRegistry;
 
@@ -92,11 +95,11 @@ interface Locator
      *
      * @return The proxy, or null if the object is not active.
      *
-     * @throws Ice.ObjectNotFoundException Raised if the object cannot
+     * @throws ObjectNotFoundException Raised if the object cannot
      * be found.
      *
      **/
-    ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Identity id)
+    ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Ice::Identity id)
         throws ObjectNotFoundException;
 
     /**
@@ -108,7 +111,7 @@ interface Locator
      *
      * @return The adapter proxy, or null if the adapter is not active.
      *
-     * @throws Ice.AdapterNotFoundException Raised if the adapter cannot be
+     * @throws AdapterNotFoundException Raised if the adapter cannot be
      * found.
      *
      **/
@@ -123,7 +126,7 @@ interface Locator
      *
      **/
     ["nonmutating", "cpp:const"] idempotent LocatorRegistry* getRegistry();
-};
+}
 
 /**
  *
@@ -202,7 +205,7 @@ interface LocatorRegistry
      **/
     ["amd"] idempotent void setServerProcessProxy(string id, Process* proxy)
         throws ServerNotFoundException;
-};
+}
 
 /**
  *
@@ -224,8 +227,6 @@ interface LocatorFinder
      *
      **/
     Locator* getLocator();
-};
-
-};
-
+}
 
+}

data/slice/Ice/LocatorF.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
@@ -18,5 +22,4 @@ module Ice
 interface Locator;
 interface LocatorRegistry;
 
-};
-
+}

data/slice/Ice/Logger.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
@@ -29,7 +33,6 @@ local interface Logger
      * any decorations such as executable name or time stamp.
      *
      * @param message The message to log.
-     *
      **/
     void print(string message);
 
@@ -65,7 +68,7 @@ local interface Logger
      *
      **/
     void error(string message);
-    
+
     /**
      *
      * Returns this logger's prefix.
@@ -84,7 +87,6 @@ local interface Logger
      *
      */
     Logger cloneWithPrefix(string prefix);
-};
-
-};
+}
 
+}

data/slice/Ice/LoggerF.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 Logger;
 
-};
-
+}

data/slice/Ice/Metrics.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,7 @@
 
 #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/BuiltinSequences.ice>
 
@@ -20,6 +20,10 @@
  * metrics from Ice applications.
  *
  **/
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEMX"]
 module IceMX
 {
@@ -74,7 +78,7 @@ class Metrics
      *
      **/
     int failures = 0;
-};
+}
 
 /**
  *
@@ -98,7 +102,7 @@ struct MetricsFailures
      *
      **/
     StringIntDict failures;
-};
+}
 
 /**
  *
@@ -132,7 +136,7 @@ dictionary<string, MetricsMap> MetricsView;
  **/
 exception UnknownMetricsView
 {
-};
+}
 
 /**
  *
@@ -239,7 +243,7 @@ interface MetricsAdmin
      **/
     MetricsFailures getMetricsFailures(string view, string map, string id)
         throws UnknownMetricsView;
-};
+}
 
 /**
  *
@@ -274,7 +278,7 @@ class ThreadMetrics extends Metrics
      *
      **/
     int inUseForOther = 0;
-};
+}
 
 /**
  *
@@ -305,7 +309,7 @@ class DispatchMetrics extends Metrics
      *
      **/
     long replySize = 0;
-};
+}
 
 /**
  *
@@ -333,7 +337,7 @@ class ChildInvocationMetrics extends Metrics
      *
      **/
     long replySize = 0;
-};
+}
 
 /**
  *
@@ -343,7 +347,7 @@ class ChildInvocationMetrics extends Metrics
  **/
 class CollocatedMetrics extends ChildInvocationMetrics
 {
-};
+}
 
 /**
  *
@@ -354,7 +358,7 @@ class CollocatedMetrics extends ChildInvocationMetrics
  **/
 class RemoteMetrics extends ChildInvocationMetrics
 {
-};
+}
 
 /**
  *
@@ -395,7 +399,7 @@ class InvocationMetrics extends Metrics
      *
      **/
     MetricsMap collocated;
-};
+}
 
 /**
  *
@@ -418,6 +422,6 @@ class ConnectionMetrics extends Metrics
      *
      **/
     long sentBytes = 0;
-};
+}
 
-};
+}

data/slice/Ice/ObjectAdapter.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,15 +9,19 @@
 
 #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/CommunicatorF.ice>
 #include <Ice/ServantLocatorF.ice>
-#include <Ice/LocatorF.ice>
+#include <Ice/Locator.ice>
 #include <Ice/Identity.ice>
 #include <Ice/FacetMap.ice>
 #include <Ice/Endpoint.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -106,7 +110,7 @@ local interface ObjectAdapter
      * requests through its endpoints. Object adapters that have been
      * deactivated must not be reactivated again, and cannot be used
      * otherwise. Attempts to use a deactivated object adapter raise
-     * {@link ObjectAdapterDeactivatedException}; however, attempts to
+     * {@link ObjectAdapterDeactivatedException} however, attempts to
      * {@link #deactivate} an already deactivated object adapter are
      * ignored and do nothing. Once deactivated, it is possible to
      * destroy the adapter to clean up resources and then create and
@@ -165,7 +169,7 @@ local interface ObjectAdapter
      * @see Communicator#destroy
      *
      **/
-    void destroy();
+    ["cpp:noexcept"] void destroy();
 
     /**
      *
@@ -635,6 +639,17 @@ local interface ObjectAdapter
      **/
     ["cpp:const"] Locator* getLocator();
 
+    /**
+     *
+     * Get the set of endpoints configured with this object adapter.
+     *
+     * @return The set of endpoints.
+     *
+     * @see Endpoint
+     *
+     **/
+    ["cpp:const"] EndpointSeq getEndpoints();
+
     /**
      * Refresh the set of published endpoints. The run time re-reads
      * the PublishedEndpoints property if it is set and re-reads the
@@ -648,27 +663,29 @@ local interface ObjectAdapter
 
     /**
      *
-     * Get the set of endpoints configured with this object adapter.
+     * Get the set of endpoints that proxies created by this object
+     * adapter will contain.
      *
-     * @return The set of endpoints.
+     * @return The set of published endpoints.
      *
+     * @see #refreshPublishedEndpoints
      * @see Endpoint
      *
      **/
-    ["cpp:const"] EndpointSeq getEndpoints();
+    ["cpp:const"] EndpointSeq getPublishedEndpoints();
 
     /**
      *
-     * Get the set of endpoints that proxies created by this object
+     * Set of the endpoints that proxies created by this object
      * adapter will contain.
      *
-     * @return The set of published endpoints.
+     * @param newEndpoints The new set of endpoints that the object adapter will embed in proxies.
      *
      * @see #refreshPublishedEndpoints
      * @see Endpoint
      *
      **/
-    ["cpp:const"] EndpointSeq getPublishedEndpoints();
-};
+    void setPublishedEndpoints(EndpointSeq newEndpoints);
+}
 
-};
+}

data/slice/Ice/ObjectAdapterF.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", "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"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -17,5 +21,4 @@ module Ice
 
 local interface ObjectAdapter;
 
-};
-
+}