zeroc-ice 3.6.5 → 3.7.0

data/slice/IceBT/Types.ice

@@ -0,0 +1,39 @@
+// **********************************************************************
+//
+// 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"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
+/**
+ *
+ * IceBT provides a Bluetooth transport for Ice.
+ *
+ **/
+["objc:prefix:ICEBT"]
+module IceBT
+{
+
+/**
+ *
+ * Indicates a failure in the Bluetooth plug-in.
+ *
+ **/
+["cpp:ice_print"]
+local exception BluetoothException
+{
+    /** Provides more information about the failure. */
+    string reason;
+}
+
+}

data/slice/IceBox/IceBox.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:ICEBOX_API", "objc:header-dir:objc", "python:pkgdir:IceBox"]]
 [["cpp:include:IceBox/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -17,6 +17,10 @@
 #include <Ice/PropertiesF.ice>
 #include <Ice/SliceChecksumDict.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 /**
  *
  * IceBox is an application server specifically for Ice
@@ -45,8 +49,7 @@ local exception FailureException
      *
      **/
     string reason;
-};
-
+}
 
 /**
  *
@@ -56,7 +59,7 @@ local exception FailureException
  **/
 exception AlreadyStartedException
 {
-};
+}
 
 /**
  *
@@ -66,7 +69,7 @@ exception AlreadyStartedException
  **/
 exception AlreadyStoppedException
 {
-};
+}
 
 /**
  *
@@ -76,7 +79,7 @@ exception AlreadyStoppedException
  **/
 exception NoSuchServiceException
 {
-};
+}
 
 /**
  *
@@ -92,7 +95,7 @@ local interface Service
      * also be used by other services, depending on the service
      * configuration.
      *
-     * The {@link ServiceManager} owns this communicator, and is
+     * <p class="Note">The {@link ServiceManager} owns this communicator, and is
      * responsible for destroying it.
      *
      * @param name The service's name, as determined by the
@@ -103,7 +106,7 @@ local interface Service
      * @param args The service arguments that were not converted into
      * properties.
      *
-     * @throws FailureException Raised if start failed.
+     * @throws FailureException Raised if {@link #start} failed.
      *
      **/
     void start(string name, Ice::Communicator communicator, Ice::StringSeq args);
@@ -114,8 +117,7 @@ local interface Service
      *
      **/
     void stop();
-};
-
+}
 
 /**
  *
@@ -129,8 +131,7 @@ interface ServiceObserver
 {
     void servicesStarted(Ice::StringSeq services);
     void servicesStopped(Ice::StringSeq services);
-};
-
+}
 
 /**
  *
@@ -155,9 +156,9 @@ interface ServiceManager
      * Start an individual service.
      *
      * @param service The service name.
+     *
      * @throws AlreadyStartedException If the service is already running.
      * @throws NoSuchServiceException If no service could be found with the given name.
-     *
      **/
     void startService(string service)
         throws AlreadyStartedException, NoSuchServiceException;
@@ -167,14 +168,13 @@ interface ServiceManager
      * Stop an individual service.
      *
      * @param service The service name.
+     *
      * @throws AlreadyStoppedException If the service is already stopped.
      * @throws NoSuchServiceException If no service could be found with the given name.
-     *
      **/
     void stopService(string service)
         throws AlreadyStoppedException, NoSuchServiceException;
 
-
     /**
      *
      * Registers a new observer with the ServiceManager.
@@ -184,14 +184,13 @@ interface ServiceManager
      **/
     void addObserver(ServiceObserver* observer);
 
-
     /**
      *
-     * Shut down all services. This causes stop to be invoked on all configured services.
+     * Shut down all services. This causes {@link Service#stop} to be
+     * invoked on all configured services.
      *
      **/
     void shutdown();
-};
-
-};
+}
 
+}

data/slice/IceDiscovery/IceDiscovery.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.
@@ -8,10 +8,14 @@
 // **********************************************************************
 
 #pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "python:pkgdir:IceDiscovery"]]
 
 #include <Ice/Identity.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 module IceDiscovery
 {
 
@@ -20,13 +24,13 @@ interface LookupReply
     void foundObjectById(Ice::Identity id, Object* prx);
 
     void foundAdapterById(string id, Object* prx, bool isReplicaGroup);
-};
+}
 
 interface Lookup
 {
     idempotent void findObjectById(string domainId, Ice::Identity id, LookupReply* reply);
 
     idempotent void findAdapterById(string domainId, string id, LookupReply* reply);
-};
+}
 
-};
+}

data/slice/IceGrid/Admin.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:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build", "python:pkgdir:IceGrid"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -20,6 +20,10 @@
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Descriptor.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -83,7 +87,7 @@ enum ServerState
      *
      **/
     Destroyed
-};
+}
 
 /**
  *
@@ -113,7 +117,7 @@ struct ObjectInfo
      *
      **/
     string type;
-};
+}
 
 /**
  *
@@ -151,7 +155,7 @@ struct AdapterInfo
      *
      **/
     string replicaGroupId;
-};
+}
 
 /**
  *
@@ -208,7 +212,7 @@ struct ServerInfo
      *
      **/
     string sessionId;
-};
+}
 
 /**
  *
@@ -275,7 +279,7 @@ struct NodeInfo
      *
      **/
     string dataDir;
-};
+}
 
 /**
  *
@@ -298,7 +302,7 @@ struct RegistryInfo
      *
      **/
     string hostname;
-};
+}
 
 /**
  *
@@ -322,7 +326,7 @@ struct LoadInfo
 
     /** The load average over the past 15 minutes. */
     float avg15;
-};
+}
 
 /**
  *
@@ -351,7 +355,7 @@ struct ApplicationInfo
 
     /** The application descriptor */
     ApplicationDescriptor descriptor;
-};
+}
 
 /**
  *
@@ -378,7 +382,7 @@ struct ApplicationUpdateInfo
 
     /** The update descriptor. */
     ApplicationUpdateDescriptor descriptor;
-};
+}
 
 /**
  *
@@ -450,7 +454,6 @@ interface Admin
     void updateApplication(ApplicationUpdateDescriptor descriptor)
         throws AccessDeniedException, DeploymentException, ApplicationNotExistException;
 
-
     /**
      *
      * Synchronize a deployed application with the given application
@@ -688,7 +691,6 @@ interface Admin
     idempotent Object* getServerAdmin(string id)
         throws ServerNotExistException, NodeUnreachableException, DeploymentException;
 
-
     /**
      *
      * Enable or disable a server. A disabled server can't be started
@@ -859,7 +861,6 @@ interface Admin
      * Remove the adapter with the given id.
      *
      * @param id The adapter id.
-     *
      * @throws AdapterNotExistException Raised if the adapter doesn't
      * exist.
      *
@@ -1046,7 +1047,6 @@ interface Admin
     ["nonmutating", "cpp:const"] idempotent NodeInfo getNodeInfo(string name)
         throws NodeNotExistException, NodeUnreachableException;
 
-
     /**
      *
      * Get a proxy to the IceGrid node's admin object.
@@ -1213,7 +1213,7 @@ interface Admin
      *
      **/
     ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums();
-};
+}
 
 /**
  *
@@ -1251,23 +1251,386 @@ interface FileIterator
      *
      **/
     void destroy();
-};
+}
+
+/**
+ *
+ * Dynamic information about the state of a server.
+ *
+ **/
+struct ServerDynamicInfo
+{
+    /**
+     *
+     * The id of the server.
+     *
+     **/
+    string id;
+
+    /**
+     *
+     * The state of the server.
+     *
+     **/
+    ServerState state;
+
+    /**
+     *
+     * The process id of the server.
+     *
+     **/
+    int pid;
+
+    /**
+     *
+     * Indicates whether the server is enabled.
+     *
+     **/
+    bool enabled;
+}
+
+/**
+ *
+ * A sequence of server dynamic information structures.
+ *
+ **/
+["java:type:java.util.LinkedList<ServerDynamicInfo>"] sequence<ServerDynamicInfo> ServerDynamicInfoSeq;
+
+/**
+ *
+ * Dynamic information about the state of an adapter.
+ *
+ **/
+struct AdapterDynamicInfo
+{
+    /**
+     *
+     * The id of the adapter.
+     *
+     **/
+    string id;
+
+    /**
+     *
+     * The direct proxy containing the adapter endpoints.
+     *
+     **/
+    Object* proxy;
+}
+
+/**
+ *
+ * A sequence of adapter dynamic information structures.
+ *
+ **/
+["java:type:java.util.LinkedList<AdapterDynamicInfo>"] sequence<AdapterDynamicInfo> AdapterDynamicInfoSeq;
+
+/**
+ *
+ * Dynamic information about the state of a node.
+ *
+ **/
+struct NodeDynamicInfo
+{
+    /**
+     *
+     * Some static information about the node.
+     *
+     **/
+    NodeInfo info;
+
+    /**
+     *
+     * The dynamic information of the servers deployed on this node.
+     *
+     **/
+    ServerDynamicInfoSeq servers;
+
+    /**
+     *
+     * The dynamic information of the adapters deployed on this node.
+     *
+     **/
+    AdapterDynamicInfoSeq adapters;
+}
+
+/**
+ *
+ * This interface allows applications to monitor changes the state
+ * of the registry.
+ *
+ **/
+interface RegistryObserver
+{
+    /**
+     *
+     * The <tt>registryInit</tt> operation is called after registration of
+     * an observer to indicate the state of the registries.
+     *
+     * @param registries The current state of the registries.
+     *
+     **/
+    void registryInit(RegistryInfoSeq registries);
+
+    /**
+     *
+     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * came up.
+     *
+     * @param node The node state.
+     *
+     **/
+    void registryUp(RegistryInfo node);
+
+    /**
+     *
+     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * went down.
+     *
+     * @param name The node name.
+     *
+     **/
+    void registryDown(string name);
+}
+
+/**
+ *
+ * A sequence of node dynamic information structures.
+ *
+ **/
+sequence<NodeDynamicInfo> NodeDynamicInfoSeq;
+
+/**
+ *
+ * The node observer interface. Observers should implement this
+ * interface to receive information about the state of the IceGrid
+ * nodes.
+ *
+ **/
+interface NodeObserver
+{
+    /**
+     *
+     * The <tt>nodeInit</tt> operation indicates the current state
+     * of nodes. It is called after the registration of an observer.
+     *
+     * @param nodes The current state of the nodes.
+     *
+     **/
+    void nodeInit(NodeDynamicInfoSeq nodes);
 
-interface RegistryObserver;
-interface NodeObserver;
-interface ApplicationObserver;
-interface AdapterObserver;
-interface ObjectObserver;
+    /**
+     *
+     * The <tt>nodeUp</tt> operation is called to notify an observer that a node
+     * came up.
+     *
+     * @param node The node state.
+     *
+     **/
+    void nodeUp(NodeDynamicInfo node);
+
+    /**
+     *
+     * The <tt>nodeDown</tt> operation is called to notify an observer that a node
+     * went down.
+     *
+     * @param name The node name.
+     *
+     **/
+    void nodeDown(string name);
+
+    /**
+     *
+     * The <tt>updateServer</tt> operation is called to notify an observer that
+     * the state of a server changed.
+     *
+     * @param node The node hosting the server.
+     *
+     * @param updatedInfo The new server state.
+     *
+     **/
+    void updateServer(string node, ServerDynamicInfo updatedInfo);
+
+    /**
+     *
+     * The <tt>updateAdapter</tt> operation is called to notify an observer that
+     * the state of an adapter changed.
+     *
+     * @param node The node hosting the adapter.
+     *
+     * @param updatedInfo The new adapter state.
+     *
+     **/
+     void updateAdapter(string node, AdapterDynamicInfo updatedInfo);
+}
+
+/**
+ *
+ * The database observer interface. Observers should implement this
+ * interface to receive information about the state of the IceGrid
+ * registry database.
+ *
+ **/
+interface ApplicationObserver
+{
+    /**
+     *
+     * <tt>applicationInit</tt> is called after the registration
+     * of an observer to indicate the state of the registry.
+     *
+     * @param serial The current serial number of the registry
+     * database. This serial number allows observers to make sure that
+     * their internal state is synchronized with the registry.
+     *
+     * @param applications The applications currently registered with
+     * the registry.
+     *
+     **/
+    void applicationInit(int serial, ApplicationInfoSeq applications);
+
+    /**
+     *
+     * The <tt>applicationAdded</tt> operation is called to notify an observer
+     * that an application was added.
+     *
+     * @param serial The new serial number of the registry database.
+     *
+     * @param desc The descriptor of the new application.
+     *
+     **/
+    void applicationAdded(int serial, ApplicationInfo desc);
+
+    /**
+     *
+     * The <tt>applicationRemoved</tt> operation is called to notify an observer
+     * that an application was removed.
+     *
+     * @param serial The new serial number of the registry database.
+     *
+     * @param name The name of the application that was removed.
+     *
+     **/
+    void applicationRemoved(int serial, string name);
+
+    /**
+     *
+     * The <tt>applicationUpdated</tt> operation is called to notify an observer
+     * that an application was updated.
+     *
+     * @param serial The new serial number of the registry database.
+     *
+     * @param desc The descriptor of the update.
+     *
+     **/
+    void applicationUpdated(int serial, ApplicationUpdateInfo desc);
+}
+
+/**
+ *
+ * This interface allows applications to monitor the state of object
+ * adapters that are registered with IceGrid.
+ *
+ **/
+interface AdapterObserver
+{
+    /**
+     *
+     * <tt>adapterInit</tt> is called after registration of
+     * an observer to indicate the state of the registry.
+     *
+     * @param adpts The adapters that were dynamically registered
+     * with the registry (not through the deployment mechanism).
+     *
+     **/
+    void adapterInit(AdapterInfoSeq adpts);
+
+    /**
+     *
+     * The <tt>adapterAdded</tt> operation is called to notify an observer when
+     * a dynamically-registered adapter was added.
+     *
+     * @param info The details of the new adapter.
+     **/
+    void adapterAdded(AdapterInfo info);
+
+    /**
+     *
+     * The adapterUpdated operation is called to notify an observer when
+     * a dynamically-registered adapter was updated.
+     *
+     * @param info The details of the updated adapter.
+     *
+     **/
+    void adapterUpdated(AdapterInfo info);
+
+    /**
+     *
+     * The adapterRemoved operation is called to notify an observer when
+     * a dynamically-registered adapter was removed.
+     *
+     * @param id The ID of the removed adapter.
+     *
+     **/
+    void adapterRemoved(string id);
+}
+
+/**
+ *
+ * This interface allows applications to monitor IceGrid well-known objects.
+ *
+ **/
+interface ObjectObserver
+{
+    /**
+     *
+     * <tt>objectInit</tt> is called after the registration of
+     * an observer to indicate the state of the registry.
+     *
+     * @param objects The objects registered with the {@link Admin}
+     * interface (not through the deployment mechanism).
+     *
+     **/
+    void objectInit(ObjectInfoSeq objects);
+
+    /**
+     *
+     * The <tt>objectAdded</tt> operation is called to notify an observer when an
+     * object was added to the {@link Admin} interface.
+     *
+     * @param info The details of the added object.
+     *
+     **/
+    void objectAdded(ObjectInfo info);
+
+    /**
+     *
+     * <tt>objectUpdated</tt> is called to notify an observer when
+     * an object registered with the {@link Admin} interface was updated.
+     *
+     * @param info The details of the updated object.
+     *
+     **/
+    void objectUpdated(ObjectInfo info);
+
+    /**
+     *
+     * <tt>objectRemoved</tt> is called to notify an observer when
+     * an object registered with the {@link Admin} interface was removed.
+     *
+     * @param id The identity of the removed object.
+     *
+     **/
+    void objectRemoved(Ice::Identity id);
+}
 
 /**
  *
  * Used by administrative clients to view,
  * update, and receive observer updates from the IceGrid
- * registry. Admin sessions are created either with the {@link Registry}
- * object or the registry admin {@link Glacier2.SessionManager} object.
+ * registry. Admin sessions are created either via the {@link Registry}
+ * object or via the registry admin <tt>SessionManager</tt> object.
  *
  * @see Registry
- * @see Glacier2.SessionManager
  *
  **/
 interface AdminSession extends Glacier2::Session
@@ -1292,7 +1655,6 @@ interface AdminSession extends Glacier2::Session
      **/
     ["nonmutating", "cpp:const"] idempotent Admin* getAdmin();
 
-
     /**
      *
      * Get a "template" proxy for admin callback objects.
@@ -1306,7 +1668,6 @@ interface AdminSession extends Glacier2::Session
      **/
     ["cpp:const"] idempotent Object* getAdminCallbackTemplate();
 
-
     /**
      *
      * Set the observer proxies that receive
@@ -1584,7 +1945,6 @@ interface AdminSession extends Glacier2::Session
     FileIterator * openRegistryStdOut(string name, int count)
         throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException;
 
-};
-
-};
+}
 
+}