zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/Router.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,10 +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/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -34,10 +38,16 @@ interface Router
      * If a null proxy is returned, the client will forward requests
      * to the router's endpoints.
      *
+     * @param hasRoutingTable Indicates whether or not the router supports a routing
+     * table. If it is supported, the Ice runtime will call addProxies to populate the
+     * routing table. This out parameter is only supported starting with Ice 3.7.
+     * The Ice runtime assumes the router has a routing table if the optional is not
+     * set.
+     *
      * @return The router's client proxy.
      *
      **/
-    ["nonmutating", "cpp:const"] idempotent Object* getClientProxy();
+    ["nonmutating", "cpp:const"] idempotent Object* getClientProxy(out optional(1) bool hasRoutingTable);
 
     /**
      *
@@ -59,7 +69,7 @@ interface Router
      *
      **/
     idempotent ObjectProxySeq addProxies(ObjectProxySeq proxies);
-};
+}
 
 /**
  *
@@ -81,7 +91,6 @@ interface RouterFinder
      *
      **/
     Router* getRouter();
-};
-
-};
+}
 
+}

data/slice/Ice/RouterF.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
 
 interface Router;
 
-};
-
+}

data/slice/Ice/ServantLocator.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,15 @@
 
 #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/ObjectAdapterF.ice>
 #include <Ice/Current.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -42,12 +46,12 @@ local interface ServantLocator
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
-     * UnknownUserException.
+     * {@link UnknownUserException}.
      *
      * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
      * call <tt>finished</tt>.
      *
-     * If you call <tt>locate</tt> from your own code, you
+     * <p class="Note">If you call <tt>locate</tt> from your own code, you
      * must also call <tt>finished</tt> when you have finished using the
      * servant, provided that <tt>locate</tt> returned a non-null servant;
      * otherwise, you will get undefined behavior if you use
@@ -69,7 +73,7 @@ local interface ServantLocator
      * @see #finished
      *
      **/
-    ["UserException"] Object locate(Current curr, out LocalObject cookie);
+    ["java:UserException"] Object locate(Current curr, out LocalObject cookie);
 
     /**
      *
@@ -82,7 +86,7 @@ local interface ServantLocator
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
-     * UnknownUserException.
+     * {@link UnknownUserException}.
      *
      * If both the operation and <tt>finished</tt> throw an exception, the
      * exception thrown by <tt>finished</tt> is marshaled back to the client.
@@ -102,7 +106,7 @@ local interface ServantLocator
      * @see #locate
      *
      **/
-    ["UserException"] void finished(Current curr, Object servant, LocalObject cookie);
+    ["java:UserException"] void finished(Current curr, Object servant, LocalObject cookie);
 
     /**
      *
@@ -118,7 +122,6 @@ local interface ServantLocator
      *
      **/
     void deactivate(string category);
-};
-
-};
+}
 
+}

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

data/slice/Ice/SliceChecksumDict.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
@@ -22,5 +26,4 @@ module Ice
  **/
 dictionary<string, string> SliceChecksumDict;
 
-};
-
+}

data/slice/Ice/ValueFactory.ice

@@ -0,0 +1,127 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#pragma once
+
+[["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
+{
+
+/**
+ *
+ * A factory for values. Value factories are used in several
+ * places, such as when Ice receives a class instance and
+ * when Freeze restores a persistent value. Value factories
+ * must be implemented by the application writer and registered
+ * with the communicator.
+ *
+ **/
+["delegate", "php:internal"]
+local interface ValueFactory
+{
+    /**
+     *
+     * Create a new value for a given value type. The type is the
+     * absolute Slice type id, i.e., the id relative to the
+     * unnamed top-level Slice module. For example, the absolute
+     * Slice type id for an interface <tt>Bar</tt> in the module
+     * <tt>Foo</tt> is <tt>::Foo::Bar</tt>.
+     *
+     * <p class="Note">The leading "<tt>::</tt>" is required.
+     *
+     * @param type The value type.
+     *
+     * @return The value created for the given type, or nil if the
+     * factory is unable to create the value.
+     *
+     **/
+    Value create(string type);
+}
+
+/**
+ *
+ * A value factory manager maintains a collection of value factories.
+ * An application can supply a custom implementation during communicator
+ * initialization, otherwise Ice provides a default implementation.
+ *
+ * @see ValueFactory
+ *
+ **/
+["php:internal"]
+local interface ValueFactoryManager
+{
+    /**
+     *
+     * <p>Add a value factory. Attempting to add a
+     * factory with an id for which a factory is already registered
+     * throws {@link AlreadyRegisteredException}.</p>
+     *
+     * <p>When unmarshaling an Ice value, the Ice run time reads the
+     * most-derived type id off the wire and attempts to create an
+     * instance of the type using a factory. If no instance is created,
+     * either because no factory was found, or because all factories
+     * returned nil, the behavior of the Ice run time depends on the
+     * format with which the value was marshaled:</p>
+     *
+     * <p>If the value uses the "sliced" format, Ice ascends the class
+     * hierarchy until it finds a type that is recognized by a factory,
+     * or it reaches the least-derived type. If no factory is found that
+     * can create an instance, the run time throws
+     * {@link NoValueFactoryException}.</p>
+     *
+     * <p>If the value uses the "compact" format, Ice immediately raises
+     * {@link NoValueFactoryException}.</p>
+     *
+     * <p>The following order is used to locate a factory for a type:</p>
+     *
+     * <ol>
+     *
+     * <li>The Ice run-time looks for a factory registered
+     * specifically for the type.</li>
+     *
+     * <li>If no instance has been created, the Ice run-time looks
+     * for the default factory, which is registered with an empty type id.
+     * </li>
+     *
+     * <li>If no instance has been created by any of the preceding
+     * steps, the Ice run-time looks for a factory that may have been
+     * statically generated by the language mapping for non-abstract classes.
+     * </li>
+     *
+     * </ol>
+     *
+     * @param factory The factory to add.
+     *
+     * @param id The type id for which the factory can create instances, or
+     * an empty string for the default factory.
+     *
+     **/
+    void add(ValueFactory factory, ["objc:param:sliceId"] string id);
+
+    /**
+     *
+     * Find an value factory registered with this communicator.
+     *
+     * @param id The type id for which the factory can create instances,
+     * or an empty string for the default factory.
+     *
+     * @return The value factory, or null if no value factory was
+     * found for the given id.
+     *
+     **/
+    ["cpp:const"] ValueFactory find(string id);
+}
+
+}

data/slice/Ice/Version.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
@@ -24,7 +28,7 @@ struct ProtocolVersion
 {
     byte major;
     byte minor;
-};
+}
 
 /**
  *
@@ -35,6 +39,6 @@ struct EncodingVersion
 {
     byte major;
     byte minor;
-};
+}
 
-};
+}

data/slice/IceBT/ConnectionInfo.ice

@@ -0,0 +1,53 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#pragma once
+
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+
+#include <Ice/Connection.ice>
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
+["objc:prefix:ICEBT"]
+module IceBT
+{
+
+/**
+ *
+ * Provides access to the details of a Bluetooth connection.
+ *
+ **/
+local class ConnectionInfo extends Ice::ConnectionInfo
+{
+    /** The local Bluetooth address. */
+    string localAddress = "";
+
+    /** The local RFCOMM channel. */
+    int localChannel = -1;
+
+    /** The remote Bluetooth address. */
+    string remoteAddress = "";
+
+    /** The remote RFCOMM channel. */
+    int remoteChannel = -1;
+
+    /** The UUID of the service being offered (in a server) or targeted (in a client). */
+    string uuid = "";
+
+    /** The connection buffer receive size. **/
+    int rcvSize = 0;
+
+    /** The connection buffer send size. **/
+    int sndSize = 0;
+}
+
+}

data/slice/IceBT/EndpointInfo.ice

@@ -0,0 +1,51 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#pragma once
+
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceBT"]]
+
+#include <Ice/Endpoint.ice>
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
+/**
+ *
+ * IceBT provides a Bluetooth transport for Ice.
+ *
+ **/
+["objc:prefix:ICEBT"]
+module IceBT
+{
+
+/**
+ *
+ * Provides access to Bluetooth endpoint information.
+ *
+ **/
+local class EndpointInfo extends Ice::EndpointInfo
+{
+    /**
+     *
+     * The address configured with the endpoint.
+     *
+     **/
+    string addr;
+
+    /**
+     *
+     * The UUID configured with the endpoint.
+     *
+     **/
+    string uuid;
+}
+
+}