diff options
author | Joe George <joe@zeroc.com> | 2015-04-23 14:33:12 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2015-04-23 14:35:45 -0400 |
commit | 8a1b65e8f91a442be280b5ba53cc76937b5f16b3 (patch) | |
tree | db2462a40b516641ae0dd70facf3e51fc44e2041 /slice/Ice | |
parent | Make js use npm ice-gulp-builder package (diff) | |
download | ice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.tar.bz2 ice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.tar.xz ice-8a1b65e8f91a442be280b5ba53cc76937b5f16b3.zip |
ICE-6466 - Replace --icejs metadata js:ice-build
Diffstat (limited to 'slice/Ice')
-rw-r--r-- | slice/Ice/BuiltinSequences.ice | 4 | ||||
-rw-r--r-- | slice/Ice/Connection.ice | 2 | ||||
-rw-r--r-- | slice/Ice/ConnectionF.ice | 2 | ||||
-rw-r--r-- | slice/Ice/Current.ice | 4 | ||||
-rw-r--r-- | slice/Ice/Endpoint.ice | 2 | ||||
-rw-r--r-- | slice/Ice/EndpointF.ice | 2 | ||||
-rw-r--r-- | slice/Ice/EndpointTypes.ice | 2 | ||||
-rw-r--r-- | slice/Ice/Identity.ice | 2 | ||||
-rw-r--r-- | slice/Ice/LocalException.ice | 18 | ||||
-rw-r--r-- | slice/Ice/Locator.ice | 4 | ||||
-rw-r--r-- | slice/Ice/Metrics.ice | 26 | ||||
-rw-r--r-- | slice/Ice/ObjectAdapterF.ice | 2 | ||||
-rw-r--r-- | slice/Ice/Process.ice | 2 | ||||
-rw-r--r-- | slice/Ice/ProcessF.ice | 2 | ||||
-rw-r--r-- | slice/Ice/PropertiesAdmin.ice | 2 | ||||
-rw-r--r-- | slice/Ice/Router.ice | 2 | ||||
-rw-r--r-- | slice/Ice/SliceChecksumDict.ice | 2 | ||||
-rw-r--r-- | slice/Ice/Version.ice | 2 |
18 files changed, 41 insertions, 41 deletions
diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice index a2a08cea140..37d8a14e88c 100644 --- a/slice/Ice/BuiltinSequences.ice +++ b/slice/Ice/BuiltinSequences.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"]] ["objc:prefix:ICE"] module Ice @@ -41,7 +41,7 @@ sequence<string> StringSeq; /** A sequence of objects. **/ sequence<Object> ObjectSeq; - + /** A sequence of object proxies. **/ sequence<Object*> ObjectProxySeq; diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice index d08275a966f..bc8db075af4 100644 --- a/slice/Ice/Connection.ice +++ b/slice/Ice/Connection.ice @@ -10,7 +10,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] #include <Ice/ObjectAdapterF.ice> #include <Ice/Identity.ice> diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice index 9efb4ac85e1..890aeba9e09 100644 --- a/slice/Ice/ConnectionF.ice +++ b/slice/Ice/ConnectionF.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice index b360fc10e7b..3a9f146a782 100644 --- a/slice/Ice/Current.ice +++ b/slice/Ice/Current.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"]] #include <Ice/ObjectAdapterF.ice> #include <Ice/ConnectionF.ice> @@ -97,7 +97,7 @@ local struct Current * **/ ObjectAdapter adapter; - + /** * * Information about the connection over which the current method diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice index 3cd23807984..4796b97b6f5 100644 --- a/slice/Ice/Endpoint.ice +++ b/slice/Ice/Endpoint.ice @@ -13,7 +13,7 @@ #include <Ice/BuiltinSequences.ice> #include <Ice/EndpointF.ice> -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice index e3d34d34429..d0449e02fd7 100644 --- a/slice/Ice/EndpointF.ice +++ b/slice/Ice/EndpointF.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice index c989a99fae9..909d5e19097 100644 --- a/slice/Ice/EndpointTypes.ice +++ b/slice/Ice/EndpointTypes.ice @@ -10,7 +10,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice index cf2f0b9b9bd..e2db9111194 100644 --- a/slice/Ice/Identity.ice +++ b/slice/Ice/Identity.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice index ad0fb29236b..1677ffee949 100644 --- a/slice/Ice/LocalException.ice +++ b/slice/Ice/LocalException.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"]] #include <Ice/Identity.ice> #include <Ice/Version.ice> @@ -100,7 +100,7 @@ local exception AlreadyRegisteredException * registered with the Ice run time or Ice locator. * * This exception is raised if an attempt is made to remove a servant, - * servant locator, facet, object factory, plug-in, object adapter, + * servant locator, facet, object factory, plug-in, object adapter, * object, or user exception factory that is not currently registered. * * It's also raised if the Ice locator can't find an object or object @@ -114,7 +114,7 @@ local exception NotRegisteredException /** * * The kind of object that could not be removed: "servant", - * "servant locator", "object factory", "plug-in", + * "servant locator", "object factory", "plug-in", * "object adapter", "object", or "user exception factory". * **/ @@ -179,13 +179,13 @@ local exception UnknownException { /** * - * This field is set to the textual representation of the unknown + * This field is set to the textual representation of the unknown * exception if available. * **/ string unknown; }; - + /** * * This exception is raised if an operation call on a server raises a @@ -258,7 +258,7 @@ local exception CommunicatorDestroyedException local exception ObjectAdapterDeactivatedException { /** - * + * * Name of the adapter. * **/ @@ -293,7 +293,7 @@ local exception ObjectAdapterIdInUseException local exception NoEndpointException { /** - * + * * The stringified proxy for which no suitable endpoint is * available. * @@ -1008,7 +1008,7 @@ local exception SecurityException }; /** - * + * * This exception indicates that an attempt has been made to * change the connection properties of a fixed proxy. * @@ -1019,7 +1019,7 @@ local exception FixedProxyException }; /** - * + * * Indicates that the response to a request has already been sent; * re-dispatching such a request is not possible. * diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice index 169e9bb87e0..d4bf3a5f6e0 100644 --- a/slice/Ice/Locator.ice +++ b/slice/Ice/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"]] #include <Ice/Identity.ice> @@ -105,7 +105,7 @@ interface Locator * @param id The adapter id. * * @return The adapter proxy, or null if the adapter is not active. - * + * * @throws AdapterNotFoundException Raised if the adapter cannot be * found. * diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index d099b212e1b..82b8f239be1 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.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"]] #include <Ice/BuiltinSequences.ice> @@ -18,7 +18,7 @@ * The Ice Management eXtension facility. It provides the {@link * IceMX#MetricsAdmin} interface for management clients to retrieve * metrics from Ice applications. - * + * **/ ["objc:prefix:ICEMX"] module IceMX @@ -36,7 +36,7 @@ dictionary<string, int> StringIntDict; * The base class for metrics. A metrics object represents a * collection of measurements associated to a given a system. * - **/ + **/ class Metrics { /** @@ -45,14 +45,14 @@ class Metrics * **/ string id; - + /** * * The total number of objects that were observed by this metrics. * **/ long total = 0; - + /** * * The current number of objects observed by this metrics. @@ -128,7 +128,7 @@ dictionary<string, MetricsMap> MetricsView; /** * * Raised if a metrics view cannot be found. - * + * **/ exception UnknownMetricsView { @@ -141,7 +141,7 @@ exception UnknownMetricsView * that enabled the Ice administrative facility and configured some * metrics views. * - **/ + **/ ["format:sliced"] interface MetricsAdmin { @@ -161,7 +161,7 @@ interface MetricsAdmin * Enables a metrics view. * * @param name The metrics view name. - * + * * @throws UnknownMetricsView Raised if the metrics view cannot be * found. * @@ -174,7 +174,7 @@ interface MetricsAdmin * Disable a metrics view. * * @param name The metrics view name. - * + * * @throws UnknownMetricsView Raised if the metrics view cannot be * found. * @@ -264,7 +264,7 @@ class ThreadMetrics extends Metrics * **/ int inUseForUser = 0; - + /** * * The number of threads which are currently performing other @@ -279,7 +279,7 @@ class ThreadMetrics extends Metrics /** * * Provides information on servant dispatch. - * + * **/ class DispatchMetrics extends Metrics { @@ -330,7 +330,7 @@ class ChildInvocationMetrics extends Metrics * * The size of the invocation reply. This corresponds to the size * of the marshalled output and return parameters. - * + * **/ long replySize = 0; }; @@ -407,7 +407,7 @@ class ConnectionMetrics extends Metrics { /** * - * The number of bytes received by the connection. + * The number of bytes received by the connection. * **/ long receivedBytes = 0; diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice index aa5a6a1b354..eeaa91f7f5b 100644 --- a/slice/Ice/ObjectAdapterF.ice +++ b/slice/Ice/ObjectAdapterF.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice index 08073d39fc2..be1b766cb75 100644 --- a/slice/Ice/Process.ice +++ b/slice/Ice/Process.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice index b824ab321ec..8be94362d81 100644 --- a/slice/Ice/ProcessF.ice +++ b/slice/Ice/ProcessF.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice index 6b8fe6932d9..b8bc97b7639 100644 --- a/slice/Ice/PropertiesAdmin.ice +++ b/slice/Ice/PropertiesAdmin.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"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice index 44c7957402e..26725c125ed 100644 --- a/slice/Ice/Router.ice +++ b/slice/Ice/Router.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"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice index bb4ee67c3e6..db67867b306 100644 --- a/slice/Ice/SliceChecksumDict.ice +++ b/slice/Ice/SliceChecksumDict.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"]] ["objc:prefix:ICE"] module Ice diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice index 7291cc43d78..147887976ac 100644 --- a/slice/Ice/Version.ice +++ b/slice/Ice/Version.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"]] ["objc:prefix:ICE"] module Ice |