zeroc-ice 3.6.5 → 3.7.0

data/slice/Ice/ObjectFactory.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -17,13 +21,13 @@ module Ice
 
 /**
  *
- * A factory for objects. Object factories are used in several
- * places, for example, when receiving "objects by value" and
- * when Freeze restores a persistent object. Object factories
- * must be implemented by the application writer, and registered
+ * A factory for objects. Object factories are used when receiving "objects by value".
+ * An object factory must be implemented by the application writer and registered
  * with the communicator.
  *
  **/
+
+["deprecate:ObjectFactory has been deprecated, use ValueFactory instead.", "php:internal"]
 local interface ObjectFactory
 {
     /**
@@ -32,9 +36,9 @@ local interface ObjectFactory
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
      * Slice type id for interfaces of type <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * <tt>Foo</tt> is <tt>::Foo::Bar</tt>.
      *
-     * The leading "<tt>::</tt>" is required.
+     * <p class="Note">The leading "<tt>::</tt>" is required.
      *
      * @param type The object type.
      *
@@ -42,7 +46,7 @@ local interface ObjectFactory
      * factory is unable to create the object.
      *
      **/
-    Object create(string type);
+    Value create(string type);
 
     /**
      *
@@ -53,7 +57,6 @@ local interface ObjectFactory
      *
      **/
     void destroy();
-};
-
-};
+}
 
+}

data/slice/Ice/Plugin.ice

@@ -1,7 +1,7 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -10,11 +10,15 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -44,7 +48,7 @@ local interface Plugin
      *
      **/
     void destroy();
-};
+}
 
 /**
  *
@@ -112,7 +116,6 @@ local interface PluginManager
      *
      **/
     void destroy();
-};
-
-};
+}
 
+}

data/slice/Ice/PluginF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,14 +9,17 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
 {
-    
+
 local interface Plugin;
 local interface PluginManager;
 
-};
-
+}

data/slice/Ice/Process.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -20,7 +24,7 @@ module Ice
  * An administrative interface for process management. Managed servers must
  * implement this interface.
  *
- * A servant implementing this interface is a potential target
+ * <p class="Note">A servant implementing this interface is a potential target
  * for denial-of-service attacks, therefore proper security precautions
  * should be taken. For example, the servant can use a UUID to make its
  * identity harder to guess, and be registered in an object adapter with
@@ -48,7 +52,6 @@ interface Process
      *
      **/
     void writeMessage(string message, int fd);
-};
-
-};
+}
 
+}

data/slice/Ice/ProcessF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -17,5 +21,4 @@ module Ice
 
 interface Process;
 
-};
-
+}

data/slice/Ice/Properties.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,10 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
 
 #include <Ice/PropertiesAdmin.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -25,6 +29,7 @@ module Ice
  * <em>application-name</em>\[.<em>category</em>\[.<em>sub-category</em>]].<em>name</em>.
  *
  **/
+["php:internal"]
 local interface Properties
 {
     /**
@@ -56,7 +61,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    string getPropertyWithDefault(string key, string value);
+    string getPropertyWithDefault(string key, string \value);
 
     /**
      *
@@ -88,15 +93,14 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    int getPropertyAsIntWithDefault(string key, int value);
-
+    int getPropertyAsIntWithDefault(string key, int \value);
 
      /**
      *
      * Get a property as a list of strings. The strings must be
      * separated by whitespace or comma. If the property is not set,
      * an empty list is returned. The strings in the list can contain
-     * whitespace and commas if they are enclosed in single or double 
+     * whitespace and commas if they are enclosed in single or double
      * quotes. If quotes are mismatched, an empty list is returned.
      * Within single quotes or double quotes, you can escape the
      * quote in question with \, e.g. O'Reilly can be written as
@@ -116,7 +120,7 @@ local interface Properties
      * Get a property as a list of strings.  The strings must be
      * separated by whitespace or comma. If the property is not set,
      * the default list is returned. The strings in the list can contain
-     * whitespace and commas if they are enclosed in single or double 
+     * whitespace and commas if they are enclosed in single or double
      * quotes. If quotes are mismatched, the default list is returned.
      * Within single quotes or double quotes, you can escape the
      * quote in question with \, e.g. O'Reilly can be written as
@@ -132,7 +136,7 @@ local interface Properties
      * @see #setProperty
      *
      **/
-    StringSeq getPropertyAsListWithDefault(string key, StringSeq value);
+    StringSeq getPropertyAsListWithDefault(string key, StringSeq \value);
 
     /**
      *
@@ -158,7 +162,7 @@ local interface Properties
      * @see #getProperty
      *
      **/
-    void setProperty(string key, string value);
+    void setProperty(string key, string \value);
 
     /**
      *
@@ -223,7 +227,6 @@ local interface Properties
      *
      **/
     Properties clone();
-};
-
-};
+}
 
+}

data/slice/Ice/PropertiesAdmin.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,10 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -70,7 +74,7 @@ interface PropertiesAdmin
      * retained with their original values.
      *
      **/
-    ["amd"] void setProperties(PropertyDict newProperties);
-};
+    void setProperties(PropertyDict newProperties);
+}
 
-};
+}

data/slice/Ice/PropertiesF.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:ICE"]
 module Ice
@@ -18,5 +22,4 @@ module Ice
 local interface Properties;
 interface PropertiesAdmin;
 
-};
-
+}

data/slice/Ice/RemoteLogger.ice

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -11,9 +11,13 @@
 
 #include <Ice/BuiltinSequences.ice>
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build", "python:pkgdir:Ice"]]
 [["cpp:include:list"]]
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICE"]
 module Ice
 {
@@ -52,8 +56,7 @@ enum LogMessageType
      *
      **/
     ErrorMessage
-};
-
+}
 
 /**
  *
@@ -62,7 +65,6 @@ enum LogMessageType
  **/
 sequence<LogMessageType> LogMessageTypeSeq;
 
-
 /**
  *
  * A complete log message.
@@ -99,8 +101,7 @@ struct LogMessage
      *
      **/
     string message;
-};
-
+}
 
 /**
  *
@@ -110,7 +111,6 @@ struct LogMessage
 ["cpp:type:std::list<LogMessage>"]
 sequence<LogMessage> LogMessageSeq;
 
-
 /**
  *
  * The Ice remote logger interface. An application can implement a
@@ -122,34 +122,42 @@ interface RemoteLogger
 {
     /**
      *
-     * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
+     * init is called by {@link LoggerAdmin#attachRemoteLogger} when a
+     * RemoteLogger proxy is attached.
      *
-     * @param prefix The prefix of the associated local Logger.
+     * @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);
 
     /**
      *
-     * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
+     * Log a {@link LogMessage}. Note that log may be called by {@link LoggerAdmin}
+     * before {@link RemoteLogger#init}.
      *
      * @param message The message to log.
      *
+     * @see Logger
+     *
      **/
     void log(LogMessage message);
-};
-
+}
 
 /**
  *
- * Thrown when the provided RemoteLogger was previously attached to a LoggerAdmin.
+ * An exception thrown by {@link LoggerAdmin#attachRemoteLogger} to report
+ * that the provided {@link RemoteLogger} was previously attached to this
+ * {@link LoggerAdmin}.
  *
  **/
 exception RemoteLoggerAlreadyAttachedException
 {
-};
+}
 
 /**
  *
@@ -161,8 +169,9 @@ interface LoggerAdmin
 {
     /**
      *
-     * Attaches a RemoteLogger object to the local logger.
-     * attachRemoteLogger calls init on the provided RemoteLogger proxy.
+     * 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.
      *
@@ -174,7 +183,7 @@ interface LoggerAdmin
      * An empty list means no filtering (send all trace categories).
      *
      * @param messageMax The maximum number of log messages (of all types) to be provided
-     * to init. A negative value requests all messages available.
+     * to {@link RemoteLogger#init}. A negative value requests all messages available.
      *
      * @throws RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
      * attached to this admin object.
@@ -186,7 +195,8 @@ interface LoggerAdmin
 
     /**
      *
-     * Detaches a RemoteLogger object from the local logger.
+     * detachRemoteLogger is called to detach a {@link RemoteLogger} object from
+     * the local {@link Logger}.
      *
      * @param prx A proxy to the remote logger.
      *
@@ -197,7 +207,7 @@ interface LoggerAdmin
 
     /**
      *
-     * Retrieves log messages recently logged.
+     * getLog retrieves log messages recently logged.
      *
      * @param messageTypes The list of message types that the caller wishes to receive.
      * An empty list means no filtering (send all message types).
@@ -209,13 +219,12 @@ interface LoggerAdmin
      * @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 logger.
+     * @param prefix The prefix of the associated local {@link Logger}.
      *
      * @return The Log messages.
      *
      **/
     LogMessageSeq getLog(LogMessageTypeSeq messageTypes, StringSeq traceCategories, int messageMax, out string prefix);
-};
-
-};
+}
 
+}