zeroc-ice 3.6.5 → 3.7.0

data/slice/IceGrid/FileParser.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", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Admin.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -27,7 +31,7 @@ exception ParseException
 {
     /** The reason for the failure. */
     string reason;
-};
+}
 
 /**
  *
@@ -56,7 +60,6 @@ interface FileParser
 
     idempotent ApplicationDescriptor parse(string xmlFile, Admin* adminProxy)
         throws ParseException;
-};
-
-};
+}
 
+}

data/slice/IceGrid/PluginFacade.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"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -17,6 +17,10 @@
 
 #include <IceGrid/Admin.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -51,7 +55,7 @@ local interface ReplicaGroupFilter
      *
      **/
     Ice::StringSeq filter(string replicaGroupId, Ice::StringSeq adapterIds, Ice::Connection con, Ice::Context ctx);
-};
+}
 
 /**
  *
@@ -84,8 +88,7 @@ local interface TypeFilter
      *
      **/
     Ice::ObjectProxySeq filter(string type, Ice::ObjectProxySeq proxies, Ice::Connection con, Ice::Context ctx);
-};
-
+}
 
 /**
  *
@@ -258,8 +261,7 @@ local interface RegistryPluginFacade
      *
      * @return The property value.
      *
-     * @throws AdapterNotExistException Raised if the adapter doesn't
-     * exist.
+     * @throws AdapterNotExistException Raised if the adapter doesn't exist.
      *
      **/
     ["nonmutating", "cpp:const"] idempotent string getPropertyForAdapter(string adapterId, string name)
@@ -315,6 +317,6 @@ local interface RegistryPluginFacade
      *
      **/
     bool removeTypeFilter(string type, TypeFilter filter);
-};
+}
 
-};
+}

data/slice/IceGrid/Registry.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,17 +9,121 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Session.ice>
 #include <IceGrid/Admin.ice>
+#include <Ice/Locator.ice>
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
+/**
+ *
+ * Determines which load sampling interval to use.
+ *
+ **/
+enum LoadSample
+{
+    /**
+     * Sample every minute.
+     **/
+    LoadSample1,
+
+    /**
+     * Sample every five minutes.
+     **/
+    LoadSample5,
+
+    /**
+     * Sample every fifteen minutes.
+     **/
+    LoadSample15
+}
+
+/**
+ *
+ * The IceGrid query interface. This interface is accessible to
+ * Ice clients who wish to look up well-known objects.
+ *
+ **/
+interface Query
+{
+    /**
+     *
+     * Find a well-known object by identity.
+     *
+     * @param id The identity.
+     *
+     * @return The proxy or null if no such object has been found.
+     *
+     **/
+    ["nonmutating", "cpp:const"] idempotent Object* findObjectById(Ice::Identity id);
+
+    /**
+     *
+     * Find a well-known object by type. If there are several objects
+     * registered for the given type, the object is randomly
+     * selected.
+     *
+     * @param type The object type.
+     *
+     * @return The proxy or null, if no such object has been found.
+     *
+     **/
+    ["nonmutating", "cpp:const"] idempotent Object* findObjectByType(string type);
+
+    /**
+     *
+     * Find a well-known object by type on the least-loaded node. If
+     * the registry does not know which node hosts the object
+     * (for example, because the object was registered with a direct proxy), the
+     * registry assumes the object is hosted on a node that has a load
+     * average of 1.0.
+     *
+     * @param type The object type.
+     *
+     * @param sample The sampling interval.
+     *
+     * @return The proxy or null, if no such object has been found.
+     *
+     **/
+    ["nonmutating", "cpp:const"] idempotent Object* findObjectByTypeOnLeastLoadedNode(string type, LoadSample sample);
+
+    /**
+     *
+     * Find all the well-known objects with the given type.
+     *
+     * @param type The object type.
+     *
+     * @return The proxies or an empty sequence, if no such objects
+     * have been found.
+     *
+     **/
+    ["nonmutating", "cpp:const"] idempotent Ice::ObjectProxySeq findAllObjectsByType(string type);
+
+    /**
+     *
+     * Find all the object replicas associated with the given
+     * proxy. If the given proxy is not an indirect proxy from a
+     * replica group, an empty sequence is returned.
+     *
+     * @param proxy The object proxy.
+     *
+     * @return The proxies of each object replica or an empty sequence,
+     * if the given proxy is not from a replica group.
+     *
+     **/
+    ["cpp:const"] idempotent Ice::ObjectProxySeq findAllReplicas(Object* proxy);
+}
+
 /**
  *
  * The IceGrid registry allows clients create sessions
@@ -35,9 +139,6 @@ interface Registry
      *
      * Create a client session.
      *
-     * @see Session
-     * @see Glacier2.PermissionsVerifier
-     *
      * @return A proxy for the newly created session.
      *
      * @param userId The user id.
@@ -56,9 +157,6 @@ interface Registry
      *
      * Create an administrative session.
      *
-     * @see Session
-     * @see Glacier2.PermissionsVerifier
-     *
      * @return A proxy for the newly created session.
      *
      * @param userId The user id.
@@ -77,9 +175,6 @@ interface Registry
      *
      * Create a client session from a secure connection.
      *
-     * @see Session
-     * @see Glacier2.SSLPermissionsVerifier
-     *
      * @return A proxy for the newly created session.
      *
      * @throws PermissionDeniedException Raised if the password for
@@ -94,9 +189,6 @@ interface Registry
      *
      * Create an administrative session from a secure connection.
      *
-     * @see Session
-     * @see Glacier2.SSLPermissionsVerifier
-     *
      * @return A proxy for the newly created session.
      *
      * @throws PermissionDeniedException Raised if the password for
@@ -133,7 +225,38 @@ interface Registry
      *
      **/
     ["nonmutating", "cpp:const"] idempotent int getACMTimeout();
-};
+}
 
-};
+/**
+ *
+ * The IceGrid locator interface provides access to the {@link Query}
+ * and {@link Registry} object of the IceGrid registry.
+ *
+ * @see Query
+ * @see Registry
+ *
+ **/
+interface Locator extends Ice::Locator
+{
+    /**
+     *
+     * Get the proxy of the registry object hosted by this IceGrid
+     * registry.
+     *
+     * @return The proxy of the registry object.
+     *
+     **/
+    ["cpp:const"] idempotent Registry* getLocalRegistry();
+
+    /**
+     *
+     * Get the proxy of the query object hosted by this IceGrid
+     * registry.
+     *
+     * @return The proxy of the query object.
+     *
+     **/
+    ["cpp:const"] idempotent Query* getLocalQuery();
+}
 
+}

data/slice/IceGrid/Session.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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
 #include <IceGrid/Exception.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -22,12 +26,11 @@ module IceGrid
 /**
  *
  * A session object is used by IceGrid clients to allocate and
- * release objects. Client sessions are either created with the
- * {@link Registry} object or the registry client {@link Glacier2.SessionManager}
+ * release objects. Client sessions are created either via the
+ * {@link Registry} object or via the registry client <tt>SessionManager</tt>
  * object.
  *
  * @see Registry
- * @see Glacier2.SessionManager
  *
  **/
 interface Session extends Glacier2::Session
@@ -113,7 +116,6 @@ interface Session extends Glacier2::Session
      *
      **/
     idempotent void setAllocationTimeout(int timeout);
-};
-
-};
+}
 
+}

data/slice/IceGrid/UserAccountMapper.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,9 +9,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -24,7 +28,7 @@ module IceGrid
  **/
 exception UserAccountNotFoundException
 {
-};
+}
 
 /**
  *
@@ -53,7 +57,6 @@ interface UserAccountMapper
      **/
     string getUserAccount(string user)
         throws UserAccountNotFoundException;
-};
-
-};
+}
 
+}

data/slice/IceIAP/ConnectionInfo.ice

@@ -0,0 +1,70 @@
+// **********************************************************************
+//
+// 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:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
+
+#include <Ice/Connection.ice>
+
+["objc:prefix:ICEIAP"]
+module IceIAP
+{
+
+/**
+ *
+ * Provides access to the connection details of an IAP connection
+ *
+ **/
+local class ConnectionInfo extends Ice::ConnectionInfo
+{
+    /**
+     *
+     * The accessory name.
+     *
+     **/
+    string name;
+
+    /**
+     *
+     * The accessory manufacturer.
+     *
+     **/
+    string manufacturer;
+
+    /**
+     *
+     * The accessory model number.
+     *
+     **/
+    string modelNumber;
+
+    /**
+     *
+     * The accessory firmare revision.
+     *
+     **/
+    string firmwareRevision;
+
+    /**
+     *
+     * The accessory hardware revision.
+     *
+     **/
+    string hardwareRevision;
+
+    /**
+     *
+     * The protocol used by the accessory.
+     *
+     **/
+    string protocol;
+}
+
+}