zeroc-ice 3.6b1 → 3.6.0

data/slice/Freeze/Evictor.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"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ServantLocator.ice>

data/slice/Freeze/EvictorF.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"]]
 
 module Freeze
 {

data/slice/Freeze/EvictorStorage.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"]]
 
 #include <Ice/Identity.ice>
 

data/slice/Freeze/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,7 +9,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 module Freeze
 {

data/slice/Freeze/Transaction.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"]]
 
 module Freeze
 {

data/slice/Freeze/TransactionalEvictor.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"]]
 
 #include <Freeze/Evictor.ice>
 

data/slice/Glacier2/Metrics.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:Glacier2/Config.h"]]
 
 #include <Ice/Metrics.ice>
 
+["objc:prefix:ICEMX"]
 module IceMX
 {
 
@@ -37,14 +38,14 @@ class SessionMetrics extends Metrics
      *
      **/
     int forwardedServer = 0;
- 
+
     /**
      *
      * The size of the routing table.
-     * 
+     *
      **/
     int routingTableSize = 0;
- 
+
     /**
      *
      * Number of client requests queued.
@@ -58,7 +59,7 @@ class SessionMetrics extends Metrics
      *
      **/
     int queuedServer = 0;
- 
+
     /**
      *
      * Number of client requests overridden.

data/slice/Glacier2/PermissionsVerifier.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:Glacier2/Config.h"]]
 
 #include <Glacier2/SSLInfo.ice>
 
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
@@ -96,7 +97,7 @@ interface SSLPermissionsVerifier
      * @see SSLInfo
      *
      **/
-    ["nonmutating", "cpp:const", "format:sliced"] 
+    ["nonmutating", "cpp:const", "format:sliced"]
     idempotent bool authorize(SSLInfo info, out string reason)
         throws PermissionDeniedException;
 };

data/slice/Glacier2/PermissionsVerifierF.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,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 

data/slice/Glacier2/Router.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:Glacier2/Config.h"]]
 
 #include <Ice/Router.ice>
@@ -24,6 +24,7 @@
  * security solution that is both non-intrusive and easy to configure.
  *
  **/
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
@@ -52,7 +53,7 @@ interface Router extends Ice::Router
      * This category must be used in the identities of all of the client's
      * callback objects. This is necessary in order for the router to
      * forward callback requests to the intended client. If the Glacier2
-     * server endpoints are not set, the returned category is an empty 
+     * server endpoints are not set, the returned category is an empty
      * string.
      *
      * @return The category.

data/slice/Glacier2/RouterF.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,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 

data/slice/Glacier2/SSLInfo.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:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 

data/slice/Glacier2/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,13 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 #include <Glacier2/SSLInfo.ice>
 
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
@@ -65,7 +66,7 @@ interface Session
  *
  * An object for managing the set of identity constraints for specific
  * parts of object identity on a
- * {@link Session}. 
+ * {@link Session}.
  *
  * @see Session
  * @see SessionControl
@@ -98,7 +99,7 @@ interface StringSet
      * Returns a sequence of strings describing the constraints in this
      * set.
      *
-     * @return The sequence of strings for this set. 
+     * @return The sequence of strings for this set.
      *
      **/
     idempotent Ice::StringSeq get();
@@ -107,7 +108,7 @@ interface StringSet
 /**
  *
  * An object for managing the set of object identity constraints on a
- * {@link Session}. 
+ * {@link Session}.
  *
  * @see Session
  * @see SessionControl
@@ -140,7 +141,7 @@ interface IdentitySet
      * Returns a sequence of identities describing the constraints in this
      * set.
      *
-     * @return The sequence of Ice identities for this set. 
+     * @return The sequence of Ice identities for this set.
      *
      **/
     idempotent Ice::IdentitySeq get();
@@ -159,7 +160,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable categories
-     * for object identities for this session. 
+     * for object identities for this session.
      *
      * @return A StringSet object.
      *
@@ -169,7 +170,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable adapter identities
-     * for objects for this session. 
+     * for objects for this session.
      *
      * @return A StringSet object.
      *
@@ -179,7 +180,7 @@ interface SessionControl
     /**
      *
      * Access the object that manages the allowable object identities
-     * for this session. 
+     * for this session.
      *
      * @return An IdentitySet object.
      *
@@ -194,7 +195,7 @@ interface SessionControl
      *
      **/
     idempotent int getSessionTimeout();
-    
+
     /**
      *
      * Destroy the associated session.
@@ -264,7 +265,7 @@ interface SSLSessionManager
      * cannot be created.
      *
      **/
-    ["format:sliced"] 
+    ["format:sliced"]
     Session* create(SSLInfo info, SessionControl* control)
         throws CannotCreateSessionException;
 };

data/slice/Ice/BuiltinSequences.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,8 +9,9 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -40,7 +41,7 @@ sequence<string> StringSeq;
 
 /** A sequence of objects. **/
 sequence<Object> ObjectSeq;
-    
+
 /** A sequence of object proxies. **/
 sequence<Object*> ObjectProxySeq;
 

data/slice/Ice/Communicator.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"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/InstrumentationF.ice>
@@ -32,6 +32,7 @@
  * additional functionality that supports high scalability.
  *
  **/
+["objc:prefix:ICE"]
 module Ice
 {
 
@@ -152,9 +153,8 @@ local interface Communicator
      **/
     ["cpp:const"] string proxyToString(Object* obj);
 
-
     /**
-     * 
+     *
      * Convert a set of proxy properties into a proxy. The "base"
      * name supplied in the <tt>property</tt> argument refers to a
      * property containing a stringified proxy, such as
@@ -172,13 +172,13 @@ local interface Communicator
     ["cpp:const"] Object* propertyToProxy(string property);
 
     /**
-     * 
+     *
      * Convert a proxy to a set of proxy properties.
      *
      * @param proxy The proxy.
      *
      * @param property The base property name.
-     * 
+     *
      * @return The property set.
      *
      **/
@@ -244,7 +244,7 @@ local interface Communicator
      *
      * <p>Calling this operation with an empty name will result in a
      * UUID being generated for the name.
-     * 
+     *
      * @param name The object adapter name.
      *
      * @param endpoints The endpoints for the object adapter.
@@ -262,7 +262,7 @@ local interface Communicator
      *
      * Create a new object adapter with a router. This operation
      * creates a routed object adapter.</p>
-     * 
+     *
      * <p>Calling this operation with an empty name will result in a
      * UUID being generated for the name.
      *
@@ -277,12 +277,12 @@ local interface Communicator
      * @see Properties
      *
      **/
-    ObjectAdapter createObjectAdapterWithRouter(string name, Router* rtr);
+    ObjectAdapter createObjectAdapterWithRouter(string name, ["objc:param:router"] Router* rtr);
 
     /**
      *
-     * <p>Add an object factory to this communicator. Installing a 
-     * factory with an id for which a factory is already registered 
+     * <p>Add an object factory to this communicator. Installing a
+     * factory with an id for which a factory is already registered
      * throws {@link AlreadyRegisteredException}.</p>
      *
      * <p>When unmarshaling an Ice object, the Ice run time reads the
@@ -328,7 +328,7 @@ local interface Communicator
      * @see ObjectFactory
      *
      **/
-    void addObjectFactory(ObjectFactory factory, string id);
+    void addObjectFactory(ObjectFactory factory, ["objc:param:sliceId"] string id);
 
     /**
      *
@@ -346,7 +346,6 @@ local interface Communicator
      **/
     ["cpp:const"] ObjectFactory findObjectFactory(string id);
 
-
     /**
      * Get the implicit context associated with this communicator.
      *
@@ -467,13 +466,13 @@ local interface Communicator
     /**
      *
      * Flush any pending batch requests for this communicator.
-     * This causes all batch requests that were sent via proxies
-     * obtained via this communicator to be sent to the server.
+     * This means all batch requests invoked on fixed proxies
+     * for all connections associated with the communicator.
+     * Any errors that occur while flushing a connection are ignored.
      *
      **/
     ["async"] void flushBatchRequests();
 
-
     /**
      *
      * Add the Admin object with all its facets to the provided object adapter.
@@ -499,15 +498,15 @@ local interface Communicator
      *
      * Get a proxy to the main facet of the Admin object.
      *
-     * getAdmin also creates the Admin object and creates and activates the Ice.Admin object 
-     * adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of the Admin 
-     * object created by getAdmin is <value of Ice.Admin.InstanceName>/admin, or <UUID>/admin 
+     * getAdmin also creates the Admin object and creates and activates the Ice.Admin object
+     * adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of the Admin
+     * object created by getAdmin is <value of Ice.Admin.InstanceName>/admin, or <UUID>/admin
      * when Ice.Admin.InstanceName is not set.
      *
      * <p>If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
      * initialization, after initialization of all plugins.</p>
 
-     * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no 
+     * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no
      * Admin object is configured.
      *
      * @see #createAdmin
@@ -517,7 +516,7 @@ local interface Communicator
     /**
      *
      * Add a new facet to the Admin object.
-     * Adding a servant with a facet that is already registered 
+     * Adding a servant with a facet that is already registered
      * throws {@link AlreadyRegisteredException}.
      *
      * @param servant The servant that implements the new Admin facet.
@@ -529,7 +528,7 @@ local interface Communicator
     /**
      *
      * Remove the following facet to the Admin object.
-     * Removing a facet that was not previously registered throws 
+     * Removing a facet that was not previously registered throws
      * {@link NotRegisteredException}.
      *
      * @param facet The name of the Admin facet.
@@ -548,7 +547,7 @@ local interface Communicator
      *
      **/
     Object findAdminFacet(string facet);
-   
+
     /**
      *
      * Returns a map of all facets of the Admin object.
@@ -560,8 +559,6 @@ local interface Communicator
      *
      **/
     FacetMap findAllAdminFacets();
-
 };
 
 };
-