zeroc-ice 3.6b1 → 3.6.0

data/slice/IceGrid/Descriptor.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 

data/slice/IceGrid/Exception.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -61,7 +62,7 @@ exception ServerStartException
      *
      **/
     string id;
-    
+
     /**
      *
      * The reason for the failure.
@@ -258,9 +259,9 @@ exception RegistryUnreachableException
 exception BadSignalException
 {
     /**
-     * 
+     *
      * The details of the unknown signal.
-     * 
+     *
      **/
     string reason;
 };

data/slice/IceGrid/FileParser.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,12 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Admin.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -27,7 +28,7 @@ exception ParseException
     /** The reason for the failure. */
     string reason;
 };
-    
+
 /**
  *
  * <tt>icegridadmin</tt> provides a {@link FileParser}

data/slice/IceGrid/Locator.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,12 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Locator.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -27,7 +28,7 @@ interface Query;
  *
  * @see Query
  * @see Registry
- * 
+ *
  **/
 interface Locator extends Ice::Locator
 {

data/slice/IceGrid/Observer.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
@@ -17,6 +17,7 @@
 #include <IceGrid/Descriptor.ice>
 #include <IceGrid/Admin.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -27,27 +28,27 @@ module IceGrid
  **/
 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.
@@ -59,18 +60,18 @@ struct ServerDynamicInfo
 /**
  *
  * 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.
      *
@@ -133,7 +134,7 @@ sequence<NodeDynamicInfo> NodeDynamicInfoSeq;
  * The node observer interface. Observers should implement this
  * interface to receive information about the state of the IceGrid
  * nodes.
- * 
+ *
  **/
 interface NodeObserver
 {
@@ -151,7 +152,7 @@ interface NodeObserver
      *
      * The <tt>nodeUp</tt> operation is called to notify an observer that a node
      * came up.
-     * 
+     *
      * @param node The node state.
      *
      **/
@@ -161,7 +162,7 @@ interface NodeObserver
      *
      * The <tt>nodeDown</tt> operation is called to notify an observer that a node
      * went down.
-     * 
+     *
      * @param name The node name.
      *
      **/
@@ -173,9 +174,9 @@ interface NodeObserver
      * 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);
 
@@ -183,11 +184,11 @@ interface NodeObserver
      *
      * 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);
 };
@@ -197,7 +198,7 @@ interface NodeObserver
  * The database observer interface. Observers should implement this
  * interface to receive information about the state of the IceGrid
  * registry database.
- * 
+ *
  **/
 interface ApplicationObserver
 {
@@ -217,14 +218,14 @@ interface ApplicationObserver
     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);
 
@@ -236,19 +237,19 @@ interface ApplicationObserver
      * @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);
 };
@@ -373,7 +374,7 @@ interface RegistryObserver
      *
      * The <tt>nodeUp</tt> operation is called to notify an observer that a node
      * came up.
-     * 
+     *
      * @param node The node state.
      *
      **/
@@ -383,7 +384,7 @@ interface RegistryObserver
      *
      * The <tt>nodeDown</tt> operation is called to notify an observer that a node
      * went down.
-     * 
+     *
      * @param name The node name.
      *
      **/

data/slice/IceGrid/PluginFacade.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -17,6 +17,7 @@
 
 #include <IceGrid/Admin.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 

data/slice/IceGrid/Query.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -24,6 +24,7 @@
  * heterogeneous computer network.
  *
  **/
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 

data/slice/IceGrid/Registry.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Exception.ice>
 #include <IceGrid/Session.ice>
 #include <IceGrid/Admin.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -26,7 +27,7 @@ module IceGrid
  *
  * @see Session
  * @see AdminSession
- * 
+ *
  **/
 interface Registry
 {

data/slice/IceGrid/Session.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,13 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
 #include <IceGrid/Exception.ice>
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -27,7 +28,7 @@ module IceGrid
  *
  * @see Registry
  * @see Glacier2.SessionManager
- * 
+ *
  **/
 interface Session extends Glacier2::Session
 {
@@ -46,7 +47,7 @@ interface Session extends Glacier2::Session
      * Allocate an object. Depending on the allocation timeout, this
      * operation might hang until the object is available or until the
      * timeout is reached.
-     * 
+     *
      * @param id The identity of the object to allocate.
      *
      * @return The proxy of the allocated object.
@@ -63,7 +64,7 @@ interface Session extends Glacier2::Session
      **/
     ["amd"] Object* allocateObjectById(Ice::Identity id)
         throws ObjectNotRegisteredException, AllocationException;
-    
+
     /**
      *
      * Allocate an object with the given type. Depending on the
@@ -84,7 +85,7 @@ interface Session extends Glacier2::Session
      **/
     ["amd"] Object* allocateObjectByType(string type)
         throws AllocationException;
-    
+
     /**
      *
      * Release an object.
@@ -104,11 +105,11 @@ interface Session extends Glacier2::Session
      **/
     void releaseObject(Ice::Identity id)
         throws ObjectNotRegisteredException, AllocationException;
-    
+
     /**
      *
      * Set the allocation timeout. If no objects are available for an
-     * allocation request, the request will hang for the duration of 
+     * allocation request, the request will hang for the duration of
      * this timeout.
      *
      * @param timeout The timeout in milliseconds.