zeroc-ice-x86-mingw 3.6b1 → 3.6.0

data/slice/IceGrid/UserAccountMapper.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,9 +9,10 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
@@ -48,7 +49,7 @@ interface UserAccountMapper
      *
      * @throws UserAccountNotFoundException Raised if no user account
      * is found for the given user.
-     * 
+     *
      **/
     string getUserAccount(string user)
         throws UserAccountNotFoundException;

data/slice/{IceGrid/Discovery.ice → IceLocatorDiscovery/IceLocatorDiscovery.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.
@@ -8,20 +8,18 @@
 // **********************************************************************
 
 #pragma once
-
-[["cpp:header-ext:h"]]
-[["cpp:include:IceGrid/Config.h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/Locator.ice>
 
-module IceGrid
+module IceLocatorDiscovery
 {
 
 /**
  *
- * The IceGrid lookup reply interface provides must be implemented by
- * clients which are searching for IceGrid locators. IceGrid
- * registries invoke on this interface to provide their locator proxy.
+ * The Ice lookup reply interface must be implemented by clients which
+ * are searching for Ice locators. Ice locator implementations invoke
+ * on this interface to provide their locator proxy.
  *
  * @see Locator
  * @see Lookup
@@ -42,12 +40,12 @@ interface LookupReply
 
 /**
  *
- * The IceGrid lookup interface is implemented by IceGrid registries
- * and can be used by clients to find available IceGrid locators on
- * the network. 
+ * The Ice lookup interface is implemented by Ice locator
+ * implementations and can be used by clients to find available Ice
+ * locators on the network.
  * 
- * IceGrid registries provide a well-known `IceGrid/Lookup' object
- * accessible through UDP multicast. Clients typically make a
+ * Ice locator implementations provide a well-known `Ice/LocatorLookup' 
+ * object accessible through UDP multicast. Clients typically make a 
  * multicast findLocator request to find the locator proxy.
  *
  * @see Locator
@@ -60,7 +58,7 @@ interface Lookup
      *
      * Find a locator proxy with the given instance name.
      *
-     * @param instanceName Restrict the search to IceGrid registries
+     * @param instanceName Restrict the search to Ice registries
      * configured with the given instance name. If empty, all the
      * available registries will reply.
      *

data/slice/IcePatch2/FileInfo.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"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+["objc:prefix:ICEPATCH2"]
 module IcePatch2
 {
 
@@ -44,6 +45,34 @@ struct FileInfo
  **/
 sequence<FileInfo> FileInfoSeq;
 
+
+/**
+ *
+ * Basic information about a single file.
+ *
+ **/
+struct LargeFileInfo
+{
+    /** The pathname. **/
+    string path;
+
+    /** The SHA-1 checksum of the file. **/
+    Ice::ByteSeq checksum;
+
+    /** The size of the compressed file in number of bytes. **/
+    long size;
+
+    /** The executable flag. */
+    bool executable;
+};
+
+/**
+ *
+ * A sequence with information about many files.
+ *
+ **/
+sequence<LargeFileInfo> LargeFileInfoSeq;
+
 };
 
 

data/slice/IcePatch2/FileServer.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"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <IcePatch2/FileInfo.ice>
@@ -21,6 +21,7 @@
  * compressed before download.
  *
  **/
+["objc:prefix:ICEPATCH2"]
 module IcePatch2
 {
 
@@ -58,6 +59,19 @@ exception FileAccessException
     string reason;
 };
 
+/**
+ *
+ * This exception is raised if {@link FileServer#getFileCompressed} or
+ * {@link FileServer#getFileInfoSeq} try to operate in files with size
+ * large than 2.1 GB, these operations does not support working with
+ * large files instead {@link FileServer#getLargeFileCompressed} and 
+ * {@link FileServer#getLargeFileInfoSeq} must be used.
+ *
+ **/
+exception FileSizeRangeException extends FileAccessException
+{
+};
+
 /**
  *
  * The interface that provides access to files.
@@ -69,6 +83,10 @@ interface FileServer
      *
      * Return the {@link FileInfoSeq} for the specified partition. If the
      * partion number is out of range, the operation throws
+     * 
+     * <p class="Deprecated"> This operation is deprecated, and only keep for
+     * compativility with old Ice clients (older than version 3.6).
+     *
      * {@link PartitionOutOfRangException}.
      *
      * @param partition The partition number in the range 0-255.
@@ -77,7 +95,23 @@ interface FileServer
      * files in the specified partition.
      *
      **/
-    ["nonmutating", "cpp:const"] idempotent FileInfoSeq getFileInfoSeq(int partition)
+    ["deprecate:getFileInfoSeq() is deprecated, use getLargeFileInfoSeq() instead.",
+     "nonmutating", "cpp:const"] idempotent FileInfoSeq getFileInfoSeq(int partition)
+        throws PartitionOutOfRangeException, FileSizeRangeException;
+        
+    /**
+     *
+     * Return the {@link FileInfoSeq} for the specified partition. If the
+     * partion number is out of range, the operation throws
+     * {@link PartitionOutOfRangException}.
+     *
+     * @param partition The partition number in the range 0-255.
+     *
+     * @return A sequence containing the {@link FileInfo} structures for
+     * files in the specified partition.
+     *
+     **/
+    ["nonmutating", "cpp:const"] idempotent LargeFileInfoSeq getLargeFileInfoSeq(int partition)
         throws PartitionOutOfRangeException;
 
     /**
@@ -110,6 +144,9 @@ interface FileServer
      * return fewer bytes than requested in case there was an
      * end-of-file condition.
      *
+     * <p class="Deprecated"> This operation is deprecated, and only keep for
+     * compativility with old Ice clients (older than version 3.6).
+     *
      * @param path The pathname (relative to the data directory) for
      * the file to be read.
      *
@@ -120,10 +157,31 @@ interface FileServer
      * @return A sequence containing the compressed file contents.
      *
      **/
-    ["amd", "nonmutating", "cpp:const", "cpp:array"] 
+    ["deprecate:getFileCompressed() is deprecated, use getLargeFileCompressed() instead.",
+     "amd", "nonmutating", "cpp:const", "cpp:array"] 
     idempotent Ice::ByteSeq getFileCompressed(string path, int pos, int num)
+        throws FileAccessException, FileSizeRangeException;
+        
+    /**
+     *
+     * Read the specified file. If the read operation fails, the
+     * operation throws {@link FileAccessException}. This operation may only
+     * return fewer bytes than requested in case there was an
+     * end-of-file condition.
+     *
+     * @param path The pathname (relative to the data directory) for
+     * the file to be read.
+     *
+     * @param pos The file offset at which to begin reading.
+     *
+     * @param num The number of bytes to be read.
+     *
+     * @return A sequence containing the compressed file contents.
+     *
+     **/
+    ["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-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,10 +9,11 @@
 
 #pragma once
 
-[["cpp:header-ext:h"]]
+[["cpp:header-ext:h", "objc:header-dir:objc"]]
 
 #include <Ice/Connection.ice>
 
+["objc:prefix:ICESSL"]
 module IceSSL
 {
 
@@ -28,6 +29,20 @@ local class ConnectionInfo extends Ice::IPConnectionInfo
 
     /** The certificate chain. */
     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/EndpointInfo.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"]]
 
 #include <Ice/Endpoint.ice>
 
@@ -18,6 +18,7 @@
  * IceSSL provides a secure transport for Ice.
  *
  **/
+["objc:prefix:ICESSL"]
 module IceSSL
 {
 
@@ -26,7 +27,9 @@ module IceSSL
  * Uniquely identifies SSL endpoints.
  *
  **/
-const short EndpointType = 2;
+#ifndef __SLICE2OBJC__ // In Objective-C, Ice::SSLEndpointType is already mapped to ICESSLEndpointType
+const short EndpointType = Ice::SSLEndpointType;
+#endif
 
 /**
  *
@@ -37,5 +40,20 @@ local class EndpointInfo extends Ice::IPEndpointInfo
 {
 };
 
+/**
+ *
+ * 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-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:IceStorm/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -25,6 +25,7 @@
  * easy as invoking a method on an interface.
  *
  **/
+["objc:prefix:ICESTORM"]
 module IceStorm
 {
 

data/slice/IceStorm/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:IceStorm/Config.h"]]
 
 #include <Ice/Metrics.ice>
 
+["objc:prefix:ICEMX"]
 module IceMX
 {
 
@@ -58,7 +59,7 @@ class SubscriberMetrics extends Metrics
      * Number of outstanding events.
      *
      **/
-    int outstanding = 0; 
+    int outstanding = 0;
 
     /**
      *

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeroc-ice-x86-mingw
 version: !ruby/object:Gem::Version
-  version: 3.6b1
+  version: 3.6.0
 platform: ruby
 authors:
 - ZeroC, Inc.
@@ -33,8 +33,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- BZIP2_LICENSE
 - ICE_LICENSE
 - LICENSE
+- MCPP_LICENSE
 - bin/slice2rb
 - ice-x86-mingw.gemspec
 - lib/Glacier2.rb
@@ -162,7 +164,6 @@ files:
 - slice/IceDiscovery/IceDiscovery.ice
 - slice/IceGrid/Admin.ice
 - slice/IceGrid/Descriptor.ice
-- slice/IceGrid/Discovery.ice
 - slice/IceGrid/Exception.ice
 - slice/IceGrid/FileParser.ice
 - slice/IceGrid/Locator.ice
@@ -172,13 +173,14 @@ files:
 - slice/IceGrid/Registry.ice
 - slice/IceGrid/Session.ice
 - slice/IceGrid/UserAccountMapper.ice
+- slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
 - slice/IcePatch2/FileInfo.ice
 - slice/IcePatch2/FileServer.ice
 - slice/IceSSL/ConnectionInfo.ice
 - slice/IceSSL/EndpointInfo.ice
 - slice/IceStorm/IceStorm.ice
 - slice/IceStorm/Metrics.ice
-homepage: https://www.zeroc.com
+homepage: https://zeroc.com
 licenses:
 - GPL v2 with exceptions
 metadata: {}
@@ -195,12 +197,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ZeroC Ice for Ruby