zeroc-ice 3.6.2 → 3.6.3

data/lib/IceGrid/Query.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IceGrid/Registry.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IceGrid/Session.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IceGrid/UserAccountMapper.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IcePatch2/FileInfo.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IcePatch2/FileServer.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IceStorm/IceStorm.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/IceStorm/Metrics.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/slice/Glacier2/PermissionsVerifier.ice

@@ -23,9 +23,6 @@ module Glacier2
  * This exception is raised if a client is denied the ability to create
  * a session with the router.
  *
- * @see Router#createSession
- * @see Router#createSessionFromSecureConnection
- *
  **/
 ["preserve-slice"]
 exception PermissionDeniedException

data/slice/Glacier2/Session.ice

@@ -22,13 +22,7 @@ module Glacier2
 
 /**
  *
- * This exception is raised if an attempt to create a new session
- * failed.
- *
- * @see Router#createSession
- * @see Router#createSessionFromSecureConnection
- * @see SessionManager#create
- * @see SSLSessionManager#create
+ * This exception is raised if an attempt to create a new session failed.
  *
  **/
 ["preserve-slice"]
@@ -55,8 +49,7 @@ interface Session
 {
     /**
      *
-     * Destroy the session. This is called automatically when the
-     * {@link Router} is destroyed.
+     * Destroy the session. This is called automatically when the router is destroyed.
      *
      **/
     void destroy();

data/slice/Ice/Communicator.ice

@@ -239,7 +239,7 @@ local interface Communicator
      *
      * Create a new object adapter with endpoints. This operation sets
      * the property <tt><em>name</em>.Endpoints</tt>,
-     * and then calls {@link createObjectAdapter}. It is provided as a
+     * and then calls {@link #createObjectAdapter}. It is provided as a
      * convenience function.</p>
      *
      * <p>Calling this operation with an empty name will result in a
@@ -440,8 +440,8 @@ local interface Communicator
      *
      * <p class="Note"> You can also set a locator for an individual proxy
      * by calling the operation <tt>ice_locator</tt> on the proxy, or for an
-     * object adapter by calling the operation {@link setLocator} on the
-     * object adapter.
+     * object adapter by calling the operation {@link ObjectAdapter#setLocator}
+     * on the object adapter.
      *
      * @param loc The default locator to use for this communicator.
      *

data/slice/Ice/ImplicitContext.ice

@@ -22,8 +22,8 @@ module Ice
  *
  * An interface to associate implict contexts with communicators.
  *
- * When you make a remote invocation without an explicit {@link Context} parameter,
- * Ice uses the per-proxy {@link Context} (if any) combined with the <tt>ImplicitContext</tt>
+ * When you make a remote invocation without an explicit context parameter,
+ * Ice uses the per-proxy context (if any) combined with the <tt>ImplicitContext</tt>
  * associated with the communicator.</p>
  * <p>Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
  * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
@@ -31,10 +31,9 @@ module Ice
  * <dt><tt>None</tt> (default)</dt>
  * <dd>No implicit context at all.</dd>
  * <dt><tt>PerThread</tt></dt>
- * <dd>The implementation maintains a {@link Context} per thread.</dd>
+ * <dd>The implementation maintains a context per thread.</dd>
  * <dt><tt>Shared</tt></dt>
- * <dd>The implementation maintains a single {@link Context} shared 
- * by all threads.</dd>
+ * <dd>The implementation maintains a single context shared by all threads.</dd>
  * </dl><p>
  *  
  * <tt>ImplicitContext</tt> also provides a number of operations to create, update or retrieve

data/slice/Ice/Instrumentation.ice

@@ -41,7 +41,7 @@ local interface Observer
      *
      * This method is called when the instrumented object is created
      * or when the observer is attached to an existing object.
-     * 
+     *
      **/
     void attach();
 
@@ -62,13 +62,13 @@ local interface Observer
      **/
     void failed(string exceptionName);
 };
- 
+
 /**
  *
  * The thread state enumeration keeps track of the different possible
  * states of Ice threads.
  *
- **/ 
+ **/
 local enum ThreadState
 {
     /**
@@ -91,7 +91,7 @@ local enum ThreadState
      *
      * The thread is calling user code (servant implementation, AMI
      * callbacks). This state is only for threads from an Ice thread
-     * pool. 
+     * pool.
      *
      **/
     ThreadStateInUseForUser,
@@ -110,7 +110,7 @@ local enum ThreadState
  * The thread observer interface to instrument Ice threads. This can
  * be threads from the Ice thread pool or utility threads used by the
  * Ice core.
- * 
+ *
  **/
 local interface ThreadObserver extends Observer
 {
@@ -122,7 +122,7 @@ local interface ThreadObserver extends Observer
      *
      * @param newState The new thread state.
      *
-     **/ 
+     **/
     void stateChanged(ThreadState oldState, ThreadState newState);
 };
 
@@ -130,14 +130,14 @@ local interface ThreadObserver extends Observer
  *
  * The state of an Ice connection.
  *
- **/ 
+ **/
 local enum ConnectionState
 {
     /**
      *
      * The connection is being validated.
      *
-     **/ 
+     **/
     ConnectionStateValidating,
 
     /**
@@ -146,7 +146,7 @@ local enum ConnectionState
      *
      **/
     ConnectionStateHolding,
-    
+
     /**
      *
      * The connection is active and can send and receive messages.
@@ -175,7 +175,7 @@ local enum ConnectionState
 /**
  *
  * The connection observer interface to instrument Ice connections.
- * 
+ *
  **/
 local interface ConnectionObserver extends Observer
 {
@@ -184,7 +184,7 @@ local interface ConnectionObserver extends Observer
      * Notification of sent bytes over the connection.
      *
      * @param num The number of bytes sent.
-     * 
+     *
      **/
     void sentBytes(int num);
 
@@ -193,7 +193,7 @@ local interface ConnectionObserver extends Observer
      * Notification of received bytes over the connection.
      *
      * @param num The number of bytes received.
-     * 
+     *
      **/
     void receivedBytes(int num);
 };
@@ -217,7 +217,7 @@ local interface DispatchObserver extends Observer
      * Reply notification.
      *
      * @param size The size of the reply.
-     * 
+     *
      **/
     void reply(int size);
 };
@@ -246,7 +246,7 @@ local interface ChildInvocationObserver extends Observer
  * The remote observer to instrument invocations that are sent over
  * the wire.
  *
- **/ 
+ **/
 local interface RemoteObserver extends ChildInvocationObserver
 {
 };
@@ -256,7 +256,7 @@ local interface RemoteObserver extends ChildInvocationObserver
  * The collocated observer to instrument invocations that are
  * collocated.
  *
- **/ 
+ **/
 local interface CollocatedObserver extends ChildInvocationObserver
 {
 };
@@ -344,7 +344,7 @@ local interface ObserverUpdater
      * for each connection {@link CommunicatorObserver#getConnectionObserver}
      * is called. The implementation of getConnectionObserver has the
      * possibility to return an updated observer if necessary.
-     * 
+     *
      **/
     void updateConnectionObservers();
 
@@ -357,7 +357,7 @@ local interface ObserverUpdater
      * each thread {@link CommunicatorObserver#getThreadObserver} is
      * called. The implementation of getThreadObserver has the
      * possibility to return an updated observer if necessary.
-     * 
+     *
      **/
     void updateThreadObservers();
 };
@@ -394,7 +394,7 @@ local interface CommunicatorObserver
      *
      * This method should return an observer for the given endpoint
      * information. The Ice run-time calls this method to resolve an
-     * endpoint and obtain the list of connectors. 
+     * endpoint and obtain the list of connectors.
      *
      * For IP endpoints, this typically involves doing a DNS lookup to
      * obtain the IP addresses associated with the DNS name.
@@ -407,11 +407,11 @@ local interface CommunicatorObserver
     Observer getEndpointLookupObserver(Endpoint endpt);
 
     /**
-     * 
+     *
      * This method should return a connection observer for the given
      * connection. The Ice run-time calls this method for each new
      * connection and for all the Ice communicator connections when
-     * {@link ObserverUpdater#updateConnections} is called.
+     * {@link ObserverUpdater#updateConnectionObservers} is called.
      *
      * @param c The connection information.
      *
@@ -428,11 +428,11 @@ local interface CommunicatorObserver
     ConnectionObserver getConnectionObserver(ConnectionInfo c, Endpoint e, ConnectionState s, ConnectionObserver o);
 
     /**
-     * 
+     *
      * This method should return a thread observer for the given
      * thread. The Ice run-time calls this method for each new thread
      * and for all the Ice communicator threads when
-     * {@link ObserverUpdater#updateThreads} is called.
+     * {@link ObserverUpdater#updateThreadObservers} is called.
      *
      * @param parent The parent of the thread.
      *
@@ -449,7 +449,7 @@ local interface CommunicatorObserver
     ThreadObserver getThreadObserver(string parent, string id, ThreadState s, ThreadObserver o);
 
     /**
-     * 
+     *
      * This method should return an invocation observer for the given
      * invocation. The Ice run-time calls this method for each new
      * invocation on a proxy.
@@ -466,7 +466,7 @@ local interface CommunicatorObserver
     InvocationObserver getInvocationObserver(Object* prx, string operation, Context ctx);
 
     /**
-     * 
+     *
      * This method should return a dispatch observer for the given
      * dispatch. The Ice run-time calls this method each time it
      * receives an incoming invocation to be dispatched for an Ice
@@ -480,7 +480,7 @@ local interface CommunicatorObserver
      * @return The dispatch observer to instrument the dispatch.
      *
      **/
-    DispatchObserver getDispatchObserver(Current c, int size); 
+    DispatchObserver getDispatchObserver(Current c, int size);
 
     /**
      *
@@ -496,6 +496,6 @@ local interface CommunicatorObserver
 };
 
 };
-    
+
 };
 

data/slice/Ice/LocalException.ice

@@ -915,7 +915,7 @@ local exception NoObjectFactoryException extends MarshalException
  * This can happen if client and server are compiled with mismatched Slice
  * definitions or if a class of the wrong type is passed as a parameter
  * or return value using dynamic invocation. This exception can also be
- * raised if {@link IceStorm} is used to send Slice class instances and
+ * raised if IceStorm is used to send Slice class instances and
  * an operation is subscribed to the wrong topic.
  *
  **/

data/slice/Ice/Locator.ice

@@ -84,7 +84,9 @@ interface Locator
 {
     /**
      *
-     * Find an object by identity and return its proxy.
+     * Find an object by identity and return a proxy that contains
+     * the adapter ID or endpoints which can be used to access the
+     * object.
      *
      * @param id The identity.
      *
@@ -99,8 +101,8 @@ interface Locator
 
     /**
      *
-     * Find an adapter by id and return its proxy (a dummy direct
-     * proxy created by the adapter).
+     * Find an adapter by id and return a proxy that contains
+     * its endpoints.
      *
      * @param id The adapter id.
      *

data/slice/Ice/Metrics.ice

@@ -269,7 +269,7 @@ class ThreadMetrics extends Metrics
      *
      * The number of threads which are currently performing other
      * activities. These are all other that are not counted with
-     * {@link inUseForUser} or {@link inUseForIO}, such as DNS
+     * {@link #inUseForUser} or {@link #inUseForIO}, such as DNS
      * lookups, garbage collection).
      *
      **/

data/slice/Ice/ObjectFactory.ice

@@ -23,8 +23,6 @@ module Ice
  * must be implemented by the application writer, and registered
  * with the communicator.
  *
- * @see Freeze
- *
  **/
 local interface ObjectFactory
 {

data/slice/Ice/RemoteLogger.ice

@@ -26,30 +26,30 @@ module Ice
 enum LogMessageType
 {
     /**
-     * 
+     *
      * The {@link Logger} received a print message.
-     * 
+     *
      **/
     PrintMessage,
 
     /**
-     * 
+     *
      * The {@link Logger} received a trace message.
-     * 
+     *
      **/
     TraceMessage,
 
     /**
-     * 
+     *
      * The {@link Logger} received a warning message.
-     * 
+     *
      **/
     WarningMessage,
 
     /**
-     * 
+     *
      * The {@link Logger} received an error message.
-     * 
+     *
      **/
     ErrorMessage
 };
@@ -71,32 +71,32 @@ sequence<LogMessageType> LogMessageTypeSeq;
 struct LogMessage
 {
     /**
-     * 
+     *
      * The type of message sent to the {@link Logger}.
-     * 
+     *
      **/
     LogMessageType type;
-    
+
     /**
-     * 
+     *
      * The date and time when the {@link Logger} received this message, expressed
      * as the number of microseconds since the Unix Epoch (00:00:00 UTC on 1 January 1970)
-     * 
+     *
      **/
     long timestamp;
 
     /**
-     * 
-     * For a message of type trace, the trace category of this log message; 
+     *
+     * For a message of type trace, the trace category of this log message;
      * otherwise, the empty string.
-     * 
+     *
      **/
     string traceCategory;
 
      /**
-     * 
+     *
      * The log message itself.
-     * 
+     *
      **/
     string message;
 };
@@ -123,24 +123,24 @@ interface RemoteLogger
     /**
      *
      * init is called by {@link LoggerAdmin#attachRemoteLogger} when a
-     * RemoteLogger proxy is attached. 
+     * RemoteLogger proxy is attached.
      *
      * @param prefix The prefix of the associated local {@link Logger}
-     * 
+     *
      * @param logMessages Old log messages generated before "now".
      *
      * @see LoggerAdmin#attachRemoteLogger
      *
      *
      **/
-    void init(string prefix, LogMessageSeq logMessages); 
+    void init(string prefix, LogMessageSeq logMessages);
+
 
-    
     /**
      *
      * Log a {@link LogMessage}. Note that log may be called by {@link LoggerAdmin}
      * before {@link #init}.
-     * 
+     *
      * @param message The message to log.
      *
      * @see Logger
@@ -163,7 +163,7 @@ exception RemoteLoggerAlreadyAttachedException
 
 /**
  *
- * The interface of the admin object that allows an Ice application the attach its 
+ * The interface of the admin object that allows an Ice application the attach its
  * {@link RemoteLogger} to the {@link Logger} of this admin object's Ice communicator.
  *
  **/
@@ -171,8 +171,8 @@ interface LoggerAdmin
 {
     /**
      *
-     * attachRemoteLogger is called to attach a {@link RemoteLogger} object to 
-     * the local {@link Logger}. 
+     * attachRemoteLogger is called to attach a {@link RemoteLogger} object to
+     * the local {@link Logger}.
      * attachRemoteLogger calls init on the provided {@link RemoteLogger} proxy.
      *
      * @param prx A proxy to the remote logger.
@@ -182,9 +182,9 @@ interface LoggerAdmin
      *
      * @param traceCategories The categories of traces that the remote logger wishes to receive.
      * This parameter is ignored if messageTypes is not empty and does not include trace.
-     * An empty list means no filtering (send all trace categories). 
+     * An empty list means no filtering (send all trace categories).
      *
-     * @param messageMax The maximum number of log messages (of all types) to be provided 
+     * @param messageMax The maximum number of log messages (of all types) to be provided
      * to {@link RemoteLogger#init}. A negative value requests all messages available.
      *
      * @throws RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
@@ -192,7 +192,7 @@ interface LoggerAdmin
      *
      **/
     void attachRemoteLogger(RemoteLogger* prx, LogMessageTypeSeq messageTypes, StringSeq traceCategories,
-                            int messageMax) 
+                            int messageMax)
         throws RemoteLoggerAlreadyAttachedException;
 
     /**
@@ -211,14 +211,14 @@ interface LoggerAdmin
      *
      * getLog retrieves log messages recently logged.
      *
-     * @param messageTypes The list of message types that the caller wishes to receive. 
+     * @param messageTypes The list of message types that the caller wishes to receive.
      * An empty list means no filtering (send all message types).
      *
      * @param traceCategories The categories of traces that caller wish to receive.
      * This parameter is ignored if messageTypes is not empty and does not include trace.
-     * An empty list means no filtering (send all trace categories). 
+     * An empty list means no filtering (send all trace categories).
      *
-     * @param messageMax The maximum number of log messages (of all types) to be returned. 
+     * @param messageMax The maximum number of log messages (of all types) to be returned.
      * A negative value requests all messages available.
      *
      * @param prefix The prefix of the associated local {@link Logger}.