zeroc-ice 3.6.5 → 3.7.0

data/slice/IceIAP/EndpointInfo.ice

@@ -0,0 +1,64 @@
+// **********************************************************************
+//
+// Copyright (c) 2017-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.
+//
+// **********************************************************************
+
+#pragma once
+
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
+
+#include <Ice/Endpoint.ice>
+
+/**
+ *
+ * IceIAP provides a secure transport for Ice.
+ *
+ **/
+["objc:prefix:ICEIAP"]
+module IceIAP
+{
+
+/**
+ *
+ * Provides access to an IAP endpoint information.
+ *
+ **/
+local class EndpointInfo extends Ice::EndpointInfo
+{
+    /**
+     *
+     * The accessory manufacturer or empty to not match against
+     * a manufacturer.
+     *
+     **/
+    string manufacturer;
+
+    /**
+     *
+     * The accessory model number or empty to not match against
+     * a model number.
+     *
+     **/
+    string modelNumber;
+
+    /**
+     *
+     * The accessory name or empty to not match against
+     * the accessory name.
+     *
+     **/
+    string name;
+
+    /**
+     *
+     * The protocol supported by the accessory.
+     *
+     **/
+    string protocol;
+}
+
+}

data/slice/IceLocatorDiscovery/IceLocatorDiscovery.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.
@@ -8,10 +8,14 @@
 // **********************************************************************
 
 #pragma once
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "python:pkgdir:IceLocatorDiscovery"]]
 
 #include <Ice/Locator.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 /**
  * IceLocatorDiscovery is an Ice plug-in that enables the discovery of IceGrid and custom locators via
  * UDP multicast.
@@ -25,7 +29,6 @@ module IceLocatorDiscovery
  * are searching for Ice locators. Ice locator implementations invoke
  * on this interface to provide their locator proxy.
  *
- * @see Ice.Locator
  * @see Lookup
  *
  **/
@@ -40,7 +43,7 @@ interface LookupReply
      *
      **/
     void foundLocator(Ice::Locator* prx);
-};
+}
 
 /**
  *
@@ -52,7 +55,6 @@ interface LookupReply
  * object accessible through UDP multicast. Clients typically make a
  * multicast findLocator request to find the locator proxy.
  *
- * @see Ice.Locator
  * @see LookupReply
  *
  **/
@@ -70,6 +72,6 @@ interface Lookup
      *
      **/
     idempotent void findLocator(string instanceName, LookupReply* reply);
-};
+}
 
-};
+}

data/slice/IcePatch2/FileInfo.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,11 +9,15 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEPATCH2"]
 module IcePatch2
 {
@@ -36,7 +40,7 @@ struct FileInfo
 
     /** The executable flag. */
     bool executable;
-};
+}
 
 /**
  *
@@ -45,7 +49,6 @@ struct FileInfo
  **/
 sequence<FileInfo> FileInfoSeq;
 
-
 /**
  *
  * Basic information about a single file.
@@ -64,7 +67,7 @@ struct LargeFileInfo
 
     /** The executable flag. */
     bool executable;
-};
+}
 
 /**
  *
@@ -73,6 +76,4 @@ struct LargeFileInfo
  **/
 sequence<LargeFileInfo> LargeFileInfoSeq;
 
-};
-
-
+}

data/slice/IcePatch2/FileServer.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,11 +9,15 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <IcePatch2/FileInfo.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 /**
  *
  * IcePatch can be used to update file hierarchies in a simple and
@@ -35,12 +39,12 @@ sequence<Ice::ByteSeq> ByteSeqSeq;
 
 /**
  *
- * A <tt>partition</tt> argument for was not in the range 0-255.
+ * A <tt>partition</tt> argument was not in the range 0-255.
  *
  **/
 exception PartitionOutOfRangeException
 {
-};
+}
 
 /**
  *
@@ -55,7 +59,7 @@ exception FileAccessException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -65,7 +69,7 @@ exception FileAccessException
  **/
 exception FileSizeRangeException extends FileAccessException
 {
-};
+}
 
 /**
  *
@@ -77,7 +81,7 @@ interface FileServer
     /**
      *
      * Return file information for the specified partition.
-     * 
+     *
      * <p class="Deprecated"> This operation is deprecated and only present for
      * compatibility with old Ice clients (older than version 3.6).
      *
@@ -92,7 +96,7 @@ interface FileServer
     ["deprecate:getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.",
      "nonmutating", "cpp:const"] idempotent FileInfoSeq getFileInfoSeq(int partition)
         throws PartitionOutOfRangeException, FileSizeRangeException;
-        
+
     /**
      *
      * Returns file information for the specified partition.
@@ -152,10 +156,10 @@ interface FileServer
      *
      **/
     ["deprecate:getFileCompressed() is deprecated, use getLargeFileCompressed() instead.",
-     "amd", "nonmutating", "cpp:const", "cpp:array"] 
+     "amd", "nonmutating", "cpp:const", "cpp:array"]
     idempotent Ice::ByteSeq getFileCompressed(string path, int pos, int num)
         throws FileAccessException, FileSizeRangeException;
-        
+
     /**
      *
      * Read the specified file. This operation may only return fewer bytes than requested
@@ -173,9 +177,9 @@ interface FileServer
      * @throws FileAccessException If an error occurred while trying to read the file.
      *
      **/
-    ["amd", "nonmutating", "cpp:const", "cpp:array"] 
+    ["amd", "nonmutating", "cpp:const", "cpp:array"]
     idempotent Ice::ByteSeq getLargeFileCompressed(string path, long pos, int num)
         throws FileAccessException;
-};
+}
 
-};
+}

data/slice/IceSSL/ConnectionInfo.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,16 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
+
+[["cpp:include:IceSSL/Plugin.h"]]
 
 #include <Ice/Connection.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICESSL"]
 module IceSSL
 {
@@ -22,28 +28,19 @@ module IceSSL
  * Provides access to the connection details of an SSL connection
  *
  **/
-local class ConnectionInfo extends Ice::IPConnectionInfo
+local class ConnectionInfo extends Ice::ConnectionInfo
 {
     /** The negotiated cipher suite. */
     string cipher;
 
     /** The certificate chain. */
+    ["cpp:type:std::vector<CertificatePtr>",
+     "java:type:java.security.cert.Certificate[]",
+     "cs:type:System.Security.Cryptography.X509Certificates.X509Certificate2[]"]
     Ice::StringSeq certs;
 
     /** The certificate chain verification status. */
     bool verified;
-};
-
-/**
- *
- * Provides access to the connection details of a secure WebSocket connection
- *
- **/
-local class WSSConnectionInfo extends ConnectionInfo
-{
-    /** The headers from the HTTP upgrade request. */
-    Ice::HeaderDict headers;
-};
-
-};
+}
 
+}

data/slice/IceSSL/ConnectionInfoF.ice

@@ -0,0 +1,24 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#pragma once
+
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
+["objc:prefix:ICESSL"]
+module IceSSL
+{
+
+local class ConnectionInfo;
+
+}

data/slice/IceSSL/EndpointInfo.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,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build", "python:pkgdir:IceSSL"]]
 
 #include <Ice/Endpoint.ice>
 
@@ -18,42 +18,21 @@
  * IceSSL provides a secure transport for Ice.
  *
  **/
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICESSL"]
 module IceSSL
 {
 
-/**
- *
- * Uniquely identifies SSL endpoints.
- *
- **/
-#ifndef __SLICE2OBJC__ // In Objective-C, Ice::SSLEndpointType is already mapped to ICESSLEndpointType
-const short EndpointType = Ice::SSLEndpointType;
-#endif
-
 /**
  *
  * Provides access to an SSL endpoint information.
  *
  **/
-local class EndpointInfo extends Ice::IPEndpointInfo
+local class EndpointInfo extends Ice::EndpointInfo
 {
-};
-
-/**
- *
- * Provides access to a secure WebSocket endpoint information.
- *
- **/
-local class WSSEndpointInfo extends EndpointInfo
-{
-    /**
-     *
-     * The URI configured with the endpoint.
-     *
-     **/
-    string resource;
-};
-
-};
+}
 
+}

data/slice/IceStorm/IceStorm.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,7 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build", "python:pkgdir:IceStorm"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -17,6 +17,10 @@
 
 #include <IceStorm/Metrics.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 /**
  *
  * A messaging service with support for federation. In contrast to
@@ -58,7 +62,7 @@ struct LinkInfo
      *
      **/
     int cost;
-};
+}
 
 /**
  *
@@ -90,7 +94,7 @@ exception LinkExists
      *
      */
     string name;
-};
+}
 
 /**
  *
@@ -106,7 +110,7 @@ exception NoSuchLink
      *
      */
     string name;
-};
+}
 
 /**
  *
@@ -116,7 +120,7 @@ exception NoSuchLink
  **/
 exception AlreadySubscribed
 {
-};
+}
 
 /**
  *
@@ -132,7 +136,7 @@ exception InvalidSubscriber
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -148,7 +152,7 @@ exception BadQoS
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -174,7 +178,7 @@ interface Topic
     /**
      *
      * Get a proxy to a publisher object for this topic. To publish
-     * data to a topic, the publisher calls getPublisher and then
+     * data to a topic, the publisher calls {@link Topic#getPublisher} and then
      * casts to the topic type. An unchecked cast must be used on this
      * proxy. If a replicated IceStorm deployment is used this call
      * may return a replicated proxy.
@@ -188,7 +192,7 @@ interface Topic
      *
      * Get a non-replicated proxy to a publisher object for this
      * topic. To publish data to a topic, the publisher calls
-     * getPublisher and then casts to the topic type. An unchecked
+     * {@link Topic#getPublisher} and then casts to the topic type. An unchecked
      * cast must be used on this proxy.
      *
      * @return A proxy to publish data on this topic.
@@ -283,7 +287,7 @@ interface Topic
      *
      **/
     void destroy();
-};
+}
 
 /**
  *
@@ -306,7 +310,7 @@ exception TopicExists
      *
      */
     string name;
-};
+}
 
 /**
  *
@@ -322,7 +326,7 @@ exception NoSuchTopic
      *
      */
     string name;
-};
+}
 
 /**
  *
@@ -335,7 +339,8 @@ interface TopicManager
 {
     /**
      *
-     * Create a new topic. The topic name must be unique.
+     * Create a new topic. The topic name must be unique, otherwise
+     * {@link TopicExists} is raised.
      *
      * @param name The name of the topic.
      *
@@ -377,7 +382,7 @@ interface TopicManager
      *
      **/
     ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums();
-};
+}
 
 /**
  *
@@ -398,7 +403,6 @@ interface Finder
      *
      **/
     TopicManager* getTopicManager();
-};
-
-};
+}
 
+}