summaryrefslogtreecommitdiff
path: root/slice/IceGrid
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-04-23 14:33:12 -0400
committerJoe George <joe@zeroc.com>2015-04-23 14:35:45 -0400
commit8a1b65e8f91a442be280b5ba53cc76937b5f16b3 (patch)
treedb2462a40b516641ae0dd70facf3e51fc44e2041 /slice/IceGrid
parentMake js use npm ice-gulp-builder package (diff)
downloadice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.tar.bz2
ice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.tar.xz
ice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.zip
ICE-6466 - Replace --icejs metadata js:ice-build
Diffstat (limited to 'slice/IceGrid')
-rw-r--r--slice/IceGrid/Admin.ice94
-rw-r--r--slice/IceGrid/Descriptor.ice2
-rw-r--r--slice/IceGrid/Exception.ice8
-rw-r--r--slice/IceGrid/FileParser.ice4
-rw-r--r--slice/IceGrid/Locator.ice4
-rw-r--r--slice/IceGrid/Observer.ice52
-rw-r--r--slice/IceGrid/Query.ice2
-rw-r--r--slice/IceGrid/Registry.ice4
-rw-r--r--slice/IceGrid/Session.ice14
-rw-r--r--slice/IceGrid/UserAccountMapper.ice4
10 files changed, 94 insertions, 94 deletions
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index 42c11385002..9c2a794218b 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Ice/Identity.ice>
@@ -62,7 +62,7 @@ enum ServerState
*
**/
Active,
-
+
/**
*
* The server is being deactivated.
@@ -102,14 +102,14 @@ struct ObjectInfo
{
/**
*
- * The proxy of the object.
+ * The proxy of the object.
*
**/
Object* proxy;
- /**
+ /**
*
- * The type of the object.
+ * The type of the object.
*
**/
string type;
@@ -130,7 +130,7 @@ sequence<ObjectInfo> ObjectInfoSeq;
["cpp:comparable"]
struct AdapterInfo
{
- /**
+ /**
*
* The id of the adapter.
*
@@ -139,12 +139,12 @@ struct AdapterInfo
/**
*
- * A dummy direct proxy that contains the adapter endpoints.
+ * A dummy direct proxy that contains the adapter endpoints.
*
**/
Object* proxy;
- /**
+ /**
*
* The replica group id of the object adapter, or empty if the
* adapter doesn't belong to a replica group.
@@ -169,7 +169,7 @@ struct ServerInfo
{
/**
*
- * The server application.
+ * The server application.
*
**/
string application;
@@ -180,7 +180,7 @@ struct ServerInfo
*
**/
string uuid;
-
+
/**
*
* The application revision.
@@ -188,16 +188,16 @@ struct ServerInfo
**/
int revision;
- /**
+ /**
*
- * The server node.
+ * The server node.
*
**/
string node;
-
+
/**
*
- * The server descriptor.
+ * The server descriptor.
*
**/
ServerDescriptor descriptor;
@@ -242,7 +242,7 @@ struct NodeInfo
/**
*
* The operation system release level (as defined in uname()).
- *
+ *
**/
string release;
@@ -258,7 +258,7 @@ struct NodeInfo
* The machine hardware type (as defined in uname()).
*
**/
- string machine;
+ string machine;
/**
*
@@ -268,7 +268,7 @@ struct NodeInfo
*
**/
int nProcessors;
-
+
/**
*
* The path to the node data directory.
@@ -336,7 +336,7 @@ struct ApplicationInfo
/** The creation time. */
long createTime;
-
+
/** The user who created the application. */
string createUser;
@@ -345,7 +345,7 @@ struct ApplicationInfo
/** The user who updated the application. */
string updateUser;
-
+
/** The application revision number. */
int revision;
@@ -523,12 +523,12 @@ interface Admin
* node.
*
* @param application The application name.
- *
+ *
* @param node The name of the node where the server will be
* deployed.
*
* @param desc The descriptor of the server instance to deploy.
- *
+ *
* @throws AccessDeniedException Raised if the session doesn't
* hold the exclusive lock or if another session is holding the
* lock.
@@ -617,7 +617,7 @@ interface Admin
* @param id The server id.
*
* @return The server state.
- *
+ *
* @throws ServerNotExistException Raised if the server doesn't exist.
*
* @throws NodeUnreachableException Raised if the node could not be
@@ -629,7 +629,7 @@ interface Admin
**/
["nonmutating", "cpp:const"] idempotent ServerState getServerState(string id)
throws ServerNotExistException, NodeUnreachableException, DeploymentException;
-
+
/**
*
* Get a server's system process id. The process id is operating
@@ -638,7 +638,7 @@ interface Admin
* @param id The server id.
*
* @return The server's process id.
- *
+ *
* @throws ServerNotExistException Raised if the server doesn't exist.
*
* @throws NodeUnreachableException Raised if the node could not be
@@ -660,7 +660,7 @@ interface Admin
* @return The category for server admin objects.
*
**/
- ["cpp:const"]
+ ["cpp:const"]
idempotent string getServerAdminCategory();
/**
@@ -680,7 +680,7 @@ interface Admin
* deployed on the node.
*
**/
- ["cpp:const"]
+ ["cpp:const"]
idempotent Object* getServerAdmin(string id)
throws ServerNotExistException, NodeUnreachableException, DeploymentException;
@@ -719,7 +719,7 @@ interface Admin
*
* @throws NodeUnreachableException Raised if the node could not
* be reached.
- *
+ *
* @throws DeploymentException Raised if the server couldn't be
* deployed on the node.
*
@@ -812,7 +812,7 @@ interface Admin
* @throws DeploymentException Raised if the server couldn't be
* deployed on the node.
*
- * @throws BadSignalException Raised if the signal is not recognized
+ * @throws BadSignalException Raised if the signal is not recognized
* by the target server.
*
**/
@@ -942,7 +942,7 @@ interface Admin
* deployment descriptor.
*
**/
- void removeObject(Ice::Identity id)
+ void removeObject(Ice::Identity id)
throws ObjectNotRegisteredException, DeploymentException;
/**
@@ -986,7 +986,7 @@ interface Admin
*
**/
["nonmutating", "cpp:const"] idempotent ObjectInfoSeq getAllObjectInfos(string expr);
-
+
/**
*
* Ping an IceGrid node to see if it is active.
@@ -994,7 +994,7 @@ interface Admin
* @param name The node name.
*
* @return true if the node ping succeeded, false otherwise.
- *
+ *
* @throws NodeNotExistException Raised if the node doesn't exist.
*
**/
@@ -1008,7 +1008,7 @@ interface Admin
* @param name The node name.
*
* @return The node load information.
- *
+ *
* @throws NodeNotExistException Raised if the node doesn't exist.
*
* @throws NodeUnreachableException Raised if the node could not be
@@ -1025,7 +1025,7 @@ interface Admin
* @param name The node name.
*
* @return The node information.
- *
+ *
* @throws NodeNotExistException Raised if the node doesn't exist.
*
* @throws NodeUnreachableException Raised if the node could not be
@@ -1056,7 +1056,7 @@ interface Admin
/**
*
* Get the number of physical processor sockets for the machine
- * running the node with the given name.
+ * running the node with the given name.
*
* Note that this method will return 1 on operating systems where
* this can't be automatically determined and where the
@@ -1067,20 +1067,20 @@ interface Admin
*
* @return The number of processor sockets or 1 if the number of
* sockets can't determined.
- *
+ *
* @throws NodeNotExistException Raised if the node doesn't exist.
*
* @throws NodeUnreachableException Raised if the node could not be
* reached.
*
- **/
+ **/
["nonmutating", "cpp:const"] idempotent int getNodeProcessorSocketCount(string name)
throws NodeNotExistException, NodeUnreachableException;
-
+
/**
*
* Shutdown an IceGrid node.
- *
+ *
* @param name The node name.
*
* @throws NodeNotExistException Raised if the node doesn't exist.
@@ -1125,7 +1125,7 @@ interface Admin
* @param name The registry name.
*
* @return true if the registry ping succeeded, false otherwise.
- *
+ *
* @throws RegistryNotExistException Raised if the registry doesn't exist.
*
**/
@@ -1139,7 +1139,7 @@ interface Admin
* @param name The registry name.
*
* @return The registry information.
- *
+ *
* @throws RegistryNotExistException Raised if the registry doesn't exist.
*
* @throws RegistryUnreachableException Raised if the registry could not be
@@ -1148,7 +1148,7 @@ interface Admin
**/
["cpp:const"] idempotent RegistryInfo getRegistryInfo(string name)
throws RegistryNotExistException, RegistryUnreachableException;
-
+
/**
*
* Get a proxy to the IceGrid registry's admin object.
@@ -1160,13 +1160,13 @@ interface Admin
* @throws RegistryNotExistException Raised if the registry doesn't exist.
*
**/
- ["cpp:const"] idempotent Object* getRegistryAdmin(string name)
+ ["cpp:const"] idempotent Object* getRegistryAdmin(string name)
throws RegistryNotExistException;
/**
*
* Shutdown an IceGrid registry.
- *
+ *
* @param name The registry name.
*
* @throws RegistryNotExistException Raised if the registry doesn't exist.
@@ -1218,7 +1218,7 @@ interface FileIterator
* @param size Specifies the maximum number of bytes to be
* received. The server will ensure that the returned message
* doesn't exceed the given size.
- *
+ *
* @param lines The lines read from the file. If there was nothing to
* read from the file since the last call to read, an empty
* sequence is returned. The last line of the sequence is always
@@ -1254,7 +1254,7 @@ interface ObjectObserver;
* 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.
- *
+ *
* @see Registry
* @see Glacier2.SessionManager
*
@@ -1351,7 +1351,7 @@ interface AdminSession extends Glacier2::Session
* Acquires an exclusive lock to start updating the registry applications.
*
* @return The current serial.
- *
+ *
* @throws AccessDeniedException Raised if the exclusive lock can't be
* acquired. This might happen if the lock is currently acquired by
* another session.
@@ -1359,7 +1359,7 @@ interface AdminSession extends Glacier2::Session
**/
int startUpdate()
throws AccessDeniedException;
-
+
/**
*
* Finish updating the registry and release the exclusive lock.
diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
index 9c3f35b1825..fa3d3688e90 100644
--- a/slice/IceGrid/Descriptor.ice
+++ b/slice/IceGrid/Descriptor.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Ice/Identity.ice>
diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
index 98413934a50..d2f6b51a162 100644
--- a/slice/IceGrid/Exception.ice
+++ b/slice/IceGrid/Exception.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Ice/Identity.ice>
@@ -62,7 +62,7 @@ exception ServerStartException
*
**/
string id;
-
+
/**
*
* The reason for the failure.
@@ -259,9 +259,9 @@ exception RegistryUnreachableException
exception BadSignalException
{
/**
- *
+ *
* The details of the unknown signal.
- *
+ *
**/
string reason;
};
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index 3572b0c1e94..e2705b882fa 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <IceGrid/Admin.ice>
@@ -28,7 +28,7 @@ exception ParseException
/** The reason for the failure. */
string reason;
};
-
+
/**
*
* <tt>icegridadmin</tt> provides a {@link FileParser}
diff --git a/slice/IceGrid/Locator.ice b/slice/IceGrid/Locator.ice
index 03b3d2328c3..c960e3b5ab0 100644
--- a/slice/IceGrid/Locator.ice
+++ b/slice/IceGrid/Locator.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Ice/Locator.ice>
@@ -28,7 +28,7 @@ interface Query;
*
* @see Query
* @see Registry
- *
+ *
**/
interface Locator extends Ice::Locator
{
diff --git a/slice/IceGrid/Observer.ice b/slice/IceGrid/Observer.ice
index ad96b7f6aae..63afd4d0078 100644
--- a/slice/IceGrid/Observer.ice
+++ b/slice/IceGrid/Observer.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Glacier2/Session.ice>
@@ -28,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.
@@ -60,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.
*
@@ -134,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
{
@@ -152,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.
*
**/
@@ -162,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.
*
**/
@@ -174,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);
@@ -184,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);
};
@@ -198,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
{
@@ -218,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);
@@ -237,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);
};
@@ -374,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.
*
**/
@@ -384,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.
*
**/
diff --git a/slice/IceGrid/Query.ice b/slice/IceGrid/Query.ice
index 97c293cd671..73704f77cfc 100644
--- a/slice/IceGrid/Query.ice
+++ b/slice/IceGrid/Query.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Ice/Identity.ice>
diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice
index 1ea91ea27ad..a980ed12f89 100644
--- a/slice/IceGrid/Registry.ice
+++ b/slice/IceGrid/Registry.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <IceGrid/Exception.ice>
@@ -27,7 +27,7 @@ module IceGrid
*
* @see Session
* @see AdminSession
- *
+ *
**/
interface Registry
{
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index 585f46f5165..f5d0e81e5a3 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
#include <Glacier2/Session.ice>
@@ -28,7 +28,7 @@ module IceGrid
*
* @see Registry
* @see Glacier2.SessionManager
- *
+ *
**/
interface Session extends Glacier2::Session
{
@@ -47,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.
@@ -64,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
@@ -85,7 +85,7 @@ interface Session extends Glacier2::Session
**/
["amd"] Object* allocateObjectByType(string type)
throws AllocationException;
-
+
/**
*
* Release an object.
@@ -105,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.
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index a7923407b1a..7ba8cb2f079 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -9,7 +9,7 @@
#pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
[["cpp:include:IceGrid/Config.h"]]
["objc:prefix:ICEGRID"]
@@ -49,7 +49,7 @@ interface UserAccountMapper
*
* @throws UserAccountNotFoundException Raised if no user account
* is found for the given user.
- *
+ *
**/
string getUserAccount(string user)
throws UserAccountNotFoundException;