zeroc-ice 3.7.11 → 3.8.1

data/dist/lib/IceGrid/Session.rb

@@ -1,32 +1,24 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `Session.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'Session.ice'.</auto-generated>
 
 require 'Ice'
+require_relative 'Exception.rb'
 require 'Glacier2/Session.rb'
-require 'IceGrid/Exception.rb'
 
 module ::IceGrid
+    if not defined?(::IceGrid::T_RegistryPrx)
+        T_RegistryPrx = Ice::__declareProxy('::IceGrid::Registry')
+    end
 
-    if not defined?(::IceGrid::Session_Mixin)
+    if not defined?(::IceGrid::T_SessionPrx)
+        T_SessionPrx = Ice::__declareProxy('::IceGrid::Session')
+    end
 
-        module ::IceGrid::Session_Mixin
-        end
+    if not defined?(::IceGrid::SessionPrx)
         module SessionPrx_mixin
             include ::Glacier2::SessionPrx_mixin
-
             def keepAlive(context=nil)
                 SessionPrx_mixin::OP_keepAlive.invoke(self, [], context)
             end
@@ -48,24 +40,17 @@ module ::IceGrid
             end
         end
 
-        class SessionPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class SessionPrx < Ice::ObjectPrx
             include SessionPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_SessionPrx)
-            T_Session = ::Ice::__declareClass('::IceGrid::Session')
-            T_SessionPrx = ::Ice::__declareProxy('::IceGrid::Session')
-        end
-
-        T_Session.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_SessionPrx.defineProxy(SessionPrx, nil, [::Glacier2::T_SessionPrx])
 
-        SessionPrx_mixin::OP_keepAlive = ::Ice::__defineOperation('keepAlive', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [], [], nil, [])
-        SessionPrx_mixin::OP_allocateObjectById = ::Ice::__defineOperation('allocateObjectById', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, nil, [[::Ice::T_Identity, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [::IceGrid::T_ObjectNotRegisteredException, ::IceGrid::T_AllocationException])
-        SessionPrx_mixin::OP_allocateObjectByType = ::Ice::__defineOperation('allocateObjectByType', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, true, nil, [[::Ice::T_string, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [::IceGrid::T_AllocationException])
-        SessionPrx_mixin::OP_releaseObject = ::Ice::__defineOperation('releaseObject', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_Identity, false, 0]], [], nil, [::IceGrid::T_ObjectNotRegisteredException, ::IceGrid::T_AllocationException])
-        SessionPrx_mixin::OP_setAllocationTimeout = ::Ice::__defineOperation('setAllocationTimeout', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_int, false, 0]], [], nil, [])
+        SessionPrx_mixin::OP_keepAlive = Ice::__defineOperation('keepAlive', 'keepAlive', Ice::OperationMode::Idempotent, nil, [], [], nil, [])
+        SessionPrx_mixin::OP_keepAlive.deprecate("As of Ice 3.8, there is no need to call this operation, and its implementation does nothing.")
+        SessionPrx_mixin::OP_allocateObjectById = Ice::__defineOperation('allocateObjectById', 'allocateObjectById', Ice::OperationMode::Normal, nil, [[::Ice::T_Identity, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::IceGrid::T_ObjectNotRegisteredException, ::IceGrid::T_AllocationException])
+        SessionPrx_mixin::OP_allocateObjectByType = Ice::__defineOperation('allocateObjectByType', 'allocateObjectByType', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::IceGrid::T_AllocationException])
+        SessionPrx_mixin::OP_releaseObject = Ice::__defineOperation('releaseObject', 'releaseObject', Ice::OperationMode::Normal, nil, [[::Ice::T_Identity, false, 0]], [], nil, [::IceGrid::T_ObjectNotRegisteredException, ::IceGrid::T_AllocationException])
+        SessionPrx_mixin::OP_setAllocationTimeout = Ice::__defineOperation('setAllocationTimeout', 'setAllocationTimeout', Ice::OperationMode::Idempotent, nil, [[Ice::T_int, false, 0]], [], nil, [])
     end
 end

data/dist/lib/IceGrid/UserAccountMapper.rb

@@ -1,61 +1,38 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `UserAccountMapper.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'UserAccountMapper.ice'.</auto-generated>
 
 require 'Ice'
 
 module ::IceGrid
-
     if not defined?(::IceGrid::UserAccountNotFoundException)
         class UserAccountNotFoundException < Ice::UserException
-            def initialize
-            end
-
             def to_s
                 '::IceGrid::UserAccountNotFoundException'
             end
         end
 
-        T_UserAccountNotFoundException = ::Ice::__defineException('::IceGrid::UserAccountNotFoundException', UserAccountNotFoundException, false, nil, [])
+        T_UserAccountNotFoundException = Ice::__defineException('::IceGrid::UserAccountNotFoundException', UserAccountNotFoundException, nil, [])
     end
 
-    if not defined?(::IceGrid::UserAccountMapper_Mixin)
+    if not defined?(::IceGrid::T_UserAccountMapperPrx)
+        T_UserAccountMapperPrx = Ice::__declareProxy('::IceGrid::UserAccountMapper')
+    end
 
-        module ::IceGrid::UserAccountMapper_Mixin
-        end
+    if not defined?(::IceGrid::UserAccountMapperPrx)
         module UserAccountMapperPrx_mixin
-
             def getUserAccount(user, context=nil)
                 UserAccountMapperPrx_mixin::OP_getUserAccount.invoke(self, [user], context)
             end
         end
 
-        class UserAccountMapperPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class UserAccountMapperPrx < Ice::ObjectPrx
             include UserAccountMapperPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_UserAccountMapperPrx)
-            T_UserAccountMapper = ::Ice::__declareClass('::IceGrid::UserAccountMapper')
-            T_UserAccountMapperPrx = ::Ice::__declareProxy('::IceGrid::UserAccountMapper')
-        end
-
-        T_UserAccountMapper.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_UserAccountMapperPrx.defineProxy(UserAccountMapperPrx, nil, [])
 
-        UserAccountMapperPrx_mixin::OP_getUserAccount = ::Ice::__defineOperation('getUserAccount', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_string, false, 0]], [], [::Ice::T_string, false, 0], [::IceGrid::T_UserAccountNotFoundException])
+        UserAccountMapperPrx_mixin::OP_getUserAccount = Ice::__defineOperation('getUserAccount', 'getUserAccount', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [Ice::T_string, false, 0], [::IceGrid::T_UserAccountNotFoundException])
     end
 end

data/dist/lib/IceGrid.rb

@@ -1,9 +1,9 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
+# Copyright (c) ZeroC, Inc.
 
 require 'IceGrid/Admin.rb'
 require 'IceGrid/Descriptor.rb'
+require 'IceGrid/Exception.rb'
 require 'IceGrid/FileParser.rb'
 require 'IceGrid/Registry.rb'
+require 'IceGrid/Session.rb'
 require 'IceGrid/UserAccountMapper.rb'

data/dist/lib/IceStorm/IceStorm.rb

@@ -1,34 +1,20 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `IceStorm.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'IceStorm.ice'.</auto-generated>
 
 require 'Ice'
 require 'Ice/Identity.rb'
-require 'Ice/SliceChecksumDict.rb'
-require 'IceStorm/Metrics.rb'
+require_relative 'Metrics.rb'
 
 module ::IceStorm
-
-    if not defined?(::IceStorm::T_Topic)
-        T_Topic = ::Ice::__declareClass('::IceStorm::Topic')
-        T_TopicPrx = ::Ice::__declareProxy('::IceStorm::Topic')
+    if not defined?(::IceStorm::T_TopicPrx)
+        T_TopicPrx = Ice::__declareProxy('::IceStorm::Topic')
     end
 
     if not defined?(::IceStorm::LinkInfo)
         class LinkInfo
-            include ::Ice::Inspect_mixin
+            include Ice::Inspect_mixin
             def initialize(theTopic=nil, name='', cost=0)
                 @theTopic = theTopic
                 @name = name
@@ -58,27 +44,23 @@ module ::IceStorm
             attr_accessor :theTopic, :name, :cost
         end
 
-        T_LinkInfo = ::Ice::__defineStruct('::IceStorm::LinkInfo', LinkInfo, [
+        T_LinkInfo = Ice::__defineStruct('::IceStorm::LinkInfo', LinkInfo, [
             ["theTopic", ::IceStorm::T_TopicPrx],
-            ["name", ::Ice::T_string],
-            ["cost", ::Ice::T_int]
+            ["name", Ice::T_string],
+            ["cost", Ice::T_int]
         ])
     end
 
     if not defined?(::IceStorm::T_LinkInfoSeq)
-        T_LinkInfoSeq = ::Ice::__defineSequence('::IceStorm::LinkInfoSeq', ::IceStorm::T_LinkInfo)
+        T_LinkInfoSeq = Ice::__defineSequence('::IceStorm::LinkInfoSeq', ::IceStorm::T_LinkInfo)
     end
 
     if not defined?(::IceStorm::T_QoS)
-        T_QoS = ::Ice::__defineDictionary('::IceStorm::QoS', ::Ice::T_string, ::Ice::T_string)
+        T_QoS = Ice::__defineDictionary('::IceStorm::QoS', Ice::T_string, Ice::T_string)
     end
 
     if not defined?(::IceStorm::LinkExists)
         class LinkExists < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceStorm::LinkExists'
             end
@@ -86,15 +68,11 @@ module ::IceStorm
             attr_accessor :name
         end
 
-        T_LinkExists = ::Ice::__defineException('::IceStorm::LinkExists', LinkExists, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_LinkExists = Ice::__defineException('::IceStorm::LinkExists', LinkExists, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceStorm::NoSuchLink)
         class NoSuchLink < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceStorm::NoSuchLink'
             end
@@ -102,44 +80,21 @@ module ::IceStorm
             attr_accessor :name
         end
 
-        T_NoSuchLink = ::Ice::__defineException('::IceStorm::NoSuchLink', NoSuchLink, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_NoSuchLink = Ice::__defineException('::IceStorm::NoSuchLink', NoSuchLink, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceStorm::AlreadySubscribed)
         class AlreadySubscribed < Ice::UserException
-            def initialize
-            end
-
             def to_s
                 '::IceStorm::AlreadySubscribed'
             end
         end
 
-        T_AlreadySubscribed = ::Ice::__defineException('::IceStorm::AlreadySubscribed', AlreadySubscribed, false, nil, [])
-    end
-
-    if not defined?(::IceStorm::InvalidSubscriber)
-        class InvalidSubscriber < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
-            def to_s
-                '::IceStorm::InvalidSubscriber'
-            end
-
-            attr_accessor :reason
-        end
-
-        T_InvalidSubscriber = ::Ice::__defineException('::IceStorm::InvalidSubscriber', InvalidSubscriber, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_AlreadySubscribed = Ice::__defineException('::IceStorm::AlreadySubscribed', AlreadySubscribed, nil, [])
     end
 
     if not defined?(::IceStorm::BadQoS)
         class BadQoS < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
             def to_s
                 '::IceStorm::BadQoS'
             end
@@ -147,15 +102,11 @@ module ::IceStorm
             attr_accessor :reason
         end
 
-        T_BadQoS = ::Ice::__defineException('::IceStorm::BadQoS', BadQoS, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_BadQoS = Ice::__defineException('::IceStorm::BadQoS', BadQoS, nil, [["reason", Ice::T_string, false, 0]])
     end
 
-    if not defined?(::IceStorm::Topic_Mixin)
-
-        module ::IceStorm::Topic_Mixin
-        end
+    if not defined?(::IceStorm::TopicPrx)
         module TopicPrx_mixin
-
             def getName(context=nil)
                 TopicPrx_mixin::OP_getName.invoke(self, [], context)
             end
@@ -197,42 +148,30 @@ module ::IceStorm
             end
         end
 
-        class TopicPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class TopicPrx < Ice::ObjectPrx
             include TopicPrx_mixin
         end
 
-        if not defined?(::IceStorm::T_TopicPrx)
-            T_Topic = ::Ice::__declareClass('::IceStorm::Topic')
-            T_TopicPrx = ::Ice::__declareProxy('::IceStorm::Topic')
-        end
-
-        T_Topic.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_TopicPrx.defineProxy(TopicPrx, nil, [])
 
-        TopicPrx_mixin::OP_getName = ::Ice::__defineOperation('getName', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_string, false, 0], [])
-        TopicPrx_mixin::OP_getPublisher = ::Ice::__defineOperation('getPublisher', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_ObjectPrx, false, 0], [])
-        TopicPrx_mixin::OP_getNonReplicatedPublisher = ::Ice::__defineOperation('getNonReplicatedPublisher', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_ObjectPrx, false, 0], [])
-        TopicPrx_mixin::OP_subscribeAndGetPublisher = ::Ice::__defineOperation('subscribeAndGetPublisher', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::IceStorm::T_QoS, false, 0], [::Ice::T_ObjectPrx, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [::IceStorm::T_AlreadySubscribed, ::IceStorm::T_InvalidSubscriber, ::IceStorm::T_BadQoS])
-        TopicPrx_mixin::OP_unsubscribe = ::Ice::__defineOperation('unsubscribe', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_ObjectPrx, false, 0]], [], nil, [])
-        TopicPrx_mixin::OP_link = ::Ice::__defineOperation('link', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::IceStorm::T_TopicPrx, false, 0], [::Ice::T_int, false, 0]], [], nil, [::IceStorm::T_LinkExists])
-        TopicPrx_mixin::OP_unlink = ::Ice::__defineOperation('unlink', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::IceStorm::T_TopicPrx, false, 0]], [], nil, [::IceStorm::T_NoSuchLink])
-        TopicPrx_mixin::OP_getLinkInfoSeq = ::Ice::__defineOperation('getLinkInfoSeq', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::IceStorm::T_LinkInfoSeq, false, 0], [])
-        TopicPrx_mixin::OP_getSubscribers = ::Ice::__defineOperation('getSubscribers', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [], [], [::Ice::T_IdentitySeq, false, 0], [])
-        TopicPrx_mixin::OP_destroy = ::Ice::__defineOperation('destroy', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [], [], nil, [])
+        TopicPrx_mixin::OP_getName = Ice::__defineOperation('getName', 'getName', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_string, false, 0], [])
+        TopicPrx_mixin::OP_getPublisher = Ice::__defineOperation('getPublisher', 'getPublisher', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_ObjectPrx, false, 0], [])
+        TopicPrx_mixin::OP_getNonReplicatedPublisher = Ice::__defineOperation('getNonReplicatedPublisher', 'getNonReplicatedPublisher', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_ObjectPrx, false, 0], [])
+        TopicPrx_mixin::OP_subscribeAndGetPublisher = Ice::__defineOperation('subscribeAndGetPublisher', 'subscribeAndGetPublisher', Ice::OperationMode::Normal, nil, [[::IceStorm::T_QoS, false, 0], [Ice::T_ObjectPrx, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::IceStorm::T_AlreadySubscribed, ::IceStorm::T_BadQoS])
+        TopicPrx_mixin::OP_unsubscribe = Ice::__defineOperation('unsubscribe', 'unsubscribe', Ice::OperationMode::Idempotent, nil, [[Ice::T_ObjectPrx, false, 0]], [], nil, [])
+        TopicPrx_mixin::OP_link = Ice::__defineOperation('link', 'link', Ice::OperationMode::Normal, nil, [[::IceStorm::T_TopicPrx, false, 0], [Ice::T_int, false, 0]], [], nil, [::IceStorm::T_LinkExists])
+        TopicPrx_mixin::OP_unlink = Ice::__defineOperation('unlink', 'unlink', Ice::OperationMode::Normal, nil, [[::IceStorm::T_TopicPrx, false, 0]], [], nil, [::IceStorm::T_NoSuchLink])
+        TopicPrx_mixin::OP_getLinkInfoSeq = Ice::__defineOperation('getLinkInfoSeq', 'getLinkInfoSeq', Ice::OperationMode::Idempotent, nil, [], [], [::IceStorm::T_LinkInfoSeq, false, 0], [])
+        TopicPrx_mixin::OP_getSubscribers = Ice::__defineOperation('getSubscribers', 'getSubscribers', Ice::OperationMode::Normal, nil, [], [], [::Ice::T_IdentitySeq, false, 0], [])
+        TopicPrx_mixin::OP_destroy = Ice::__defineOperation('destroy', 'destroy', Ice::OperationMode::Normal, nil, [], [], nil, [])
     end
 
     if not defined?(::IceStorm::T_TopicDict)
-        T_TopicDict = ::Ice::__defineDictionary('::IceStorm::TopicDict', ::Ice::T_string, ::IceStorm::T_TopicPrx)
+        T_TopicDict = Ice::__defineDictionary('::IceStorm::TopicDict', Ice::T_string, ::IceStorm::T_TopicPrx)
     end
 
     if not defined?(::IceStorm::TopicExists)
         class TopicExists < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceStorm::TopicExists'
             end
@@ -240,15 +179,11 @@ module ::IceStorm
             attr_accessor :name
         end
 
-        T_TopicExists = ::Ice::__defineException('::IceStorm::TopicExists', TopicExists, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_TopicExists = Ice::__defineException('::IceStorm::TopicExists', TopicExists, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceStorm::NoSuchTopic)
         class NoSuchTopic < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceStorm::NoSuchTopic'
             end
@@ -256,15 +191,15 @@ module ::IceStorm
             attr_accessor :name
         end
 
-        T_NoSuchTopic = ::Ice::__defineException('::IceStorm::NoSuchTopic', NoSuchTopic, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_NoSuchTopic = Ice::__defineException('::IceStorm::NoSuchTopic', NoSuchTopic, nil, [["name", Ice::T_string, false, 0]])
     end
 
-    if not defined?(::IceStorm::TopicManager_Mixin)
+    if not defined?(::IceStorm::T_TopicManagerPrx)
+        T_TopicManagerPrx = Ice::__declareProxy('::IceStorm::TopicManager')
+    end
 
-        module ::IceStorm::TopicManager_Mixin
-        end
+    if not defined?(::IceStorm::TopicManagerPrx)
         module TopicManagerPrx_mixin
-
             def create(name, context=nil)
                 TopicManagerPrx_mixin::OP_create.invoke(self, [name], context)
             end
@@ -273,60 +208,44 @@ module ::IceStorm
                 TopicManagerPrx_mixin::OP_retrieve.invoke(self, [name], context)
             end
 
-            def retrieveAll(context=nil)
-                TopicManagerPrx_mixin::OP_retrieveAll.invoke(self, [], context)
+            def createOrRetrieve(name, context=nil)
+                TopicManagerPrx_mixin::OP_createOrRetrieve.invoke(self, [name], context)
             end
 
-            def getSliceChecksums(context=nil)
-                TopicManagerPrx_mixin::OP_getSliceChecksums.invoke(self, [], context)
+            def retrieveAll(context=nil)
+                TopicManagerPrx_mixin::OP_retrieveAll.invoke(self, [], context)
             end
         end
 
-        class TopicManagerPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class TopicManagerPrx < Ice::ObjectPrx
             include TopicManagerPrx_mixin
         end
 
-        if not defined?(::IceStorm::T_TopicManagerPrx)
-            T_TopicManager = ::Ice::__declareClass('::IceStorm::TopicManager')
-            T_TopicManagerPrx = ::Ice::__declareProxy('::IceStorm::TopicManager')
-        end
-
-        T_TopicManager.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_TopicManagerPrx.defineProxy(TopicManagerPrx, nil, [])
 
-        TopicManagerPrx_mixin::OP_create = ::Ice::__defineOperation('create', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_string, false, 0]], [], [::IceStorm::T_TopicPrx, false, 0], [::IceStorm::T_TopicExists])
-        TopicManagerPrx_mixin::OP_retrieve = ::Ice::__defineOperation('retrieve', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [[::Ice::T_string, false, 0]], [], [::IceStorm::T_TopicPrx, false, 0], [::IceStorm::T_NoSuchTopic])
-        TopicManagerPrx_mixin::OP_retrieveAll = ::Ice::__defineOperation('retrieveAll', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::IceStorm::T_TopicDict, false, 0], [])
-        TopicManagerPrx_mixin::OP_getSliceChecksums = ::Ice::__defineOperation('getSliceChecksums', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_SliceChecksumDict, false, 0], [])
+        TopicManagerPrx_mixin::OP_create = Ice::__defineOperation('create', 'create', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [::IceStorm::T_TopicPrx, false, 0], [::IceStorm::T_TopicExists])
+        TopicManagerPrx_mixin::OP_retrieve = Ice::__defineOperation('retrieve', 'retrieve', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0]], [], [::IceStorm::T_TopicPrx, false, 0], [::IceStorm::T_NoSuchTopic])
+        TopicManagerPrx_mixin::OP_createOrRetrieve = Ice::__defineOperation('createOrRetrieve', 'createOrRetrieve', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [::IceStorm::T_TopicPrx, false, 0], [])
+        TopicManagerPrx_mixin::OP_retrieveAll = Ice::__defineOperation('retrieveAll', 'retrieveAll', Ice::OperationMode::Idempotent, nil, [], [], [::IceStorm::T_TopicDict, false, 0], [])
     end
 
-    if not defined?(::IceStorm::Finder_Mixin)
+    if not defined?(::IceStorm::T_FinderPrx)
+        T_FinderPrx = Ice::__declareProxy('::IceStorm::Finder')
+    end
 
-        module ::IceStorm::Finder_Mixin
-        end
+    if not defined?(::IceStorm::FinderPrx)
         module FinderPrx_mixin
-
             def getTopicManager(context=nil)
                 FinderPrx_mixin::OP_getTopicManager.invoke(self, [], context)
             end
         end
 
-        class FinderPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class FinderPrx < Ice::ObjectPrx
             include FinderPrx_mixin
         end
 
-        if not defined?(::IceStorm::T_FinderPrx)
-            T_Finder = ::Ice::__declareClass('::IceStorm::Finder')
-            T_FinderPrx = ::Ice::__declareProxy('::IceStorm::Finder')
-        end
-
-        T_Finder.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_FinderPrx.defineProxy(FinderPrx, nil, [])
 
-        FinderPrx_mixin::OP_getTopicManager = ::Ice::__defineOperation('getTopicManager', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [], [], [::IceStorm::T_TopicManagerPrx, false, 0], [])
+        FinderPrx_mixin::OP_getTopicManager = Ice::__defineOperation('getTopicManager', 'getTopicManager', Ice::OperationMode::Normal, nil, [], [], [::IceStorm::T_TopicManagerPrx, false, 0], [])
     end
 end

data/dist/lib/IceStorm/Metrics.rb

@@ -1,28 +1,17 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `Metrics.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
 
 require 'Ice'
 require 'Ice/Metrics.rb'
 
 module ::IceMX
+    if not defined?(::IceMX::T_TopicMetrics)
+        T_TopicMetrics = Ice::__declareClass('::IceMX::TopicMetrics')
+    end
 
-    if not defined?(::IceMX::TopicMetrics_Mixin)
-
-        module ::IceMX::TopicMetrics_Mixin
-        end
+    if not defined?(::IceMX::TopicMetrics)
         class TopicMetrics < ::IceMX::Metrics
 
             def initialize(id='', total=0, current=0, totalLifetime=0, failures=0, published=0, forwarded=0)
@@ -34,20 +23,17 @@ module ::IceMX
             attr_accessor :published, :forwarded
         end
 
-        if not defined?(::IceMX::T_TopicMetrics)
-            T_TopicMetrics = ::Ice::__declareClass('::IceMX::TopicMetrics')
-        end
-
-        T_TopicMetrics.defineClass(TopicMetrics, -1, false, false, ::IceMX::T_Metrics, [
-            ['published', ::Ice::T_long, false, 0],
-            ['forwarded', ::Ice::T_long, false, 0]
+        T_TopicMetrics.defineClass(TopicMetrics, -1, false, ::IceMX::T_Metrics, [
+            ['published', Ice::T_long, false, 0],
+            ['forwarded', Ice::T_long, false, 0]
         ])
     end
 
-    if not defined?(::IceMX::SubscriberMetrics_Mixin)
+    if not defined?(::IceMX::T_SubscriberMetrics)
+        T_SubscriberMetrics = Ice::__declareClass('::IceMX::SubscriberMetrics')
+    end
 
-        module ::IceMX::SubscriberMetrics_Mixin
-        end
+    if not defined?(::IceMX::SubscriberMetrics)
         class SubscriberMetrics < ::IceMX::Metrics
 
             def initialize(id='', total=0, current=0, totalLifetime=0, failures=0, queued=0, outstanding=0, delivered=0)
@@ -60,14 +46,10 @@ module ::IceMX
             attr_accessor :queued, :outstanding, :delivered
         end
 
-        if not defined?(::IceMX::T_SubscriberMetrics)
-            T_SubscriberMetrics = ::Ice::__declareClass('::IceMX::SubscriberMetrics')
-        end
-
-        T_SubscriberMetrics.defineClass(SubscriberMetrics, -1, false, false, ::IceMX::T_Metrics, [
-            ['queued', ::Ice::T_int, false, 0],
-            ['outstanding', ::Ice::T_int, false, 0],
-            ['delivered', ::Ice::T_long, false, 0]
+        T_SubscriberMetrics.defineClass(SubscriberMetrics, -1, false, ::IceMX::T_Metrics, [
+            ['queued', Ice::T_int, false, 0],
+            ['outstanding', Ice::T_int, false, 0],
+            ['delivered', Ice::T_long, false, 0]
         ])
     end
 end

data/dist/lib/IceStorm.rb

@@ -1,6 +1,4 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
+# Copyright (c) ZeroC, Inc.
 
-require 'IceStorm/IceStorm'
-require 'IceStorm/Metrics'
+require 'IceStorm/IceStorm.rb'
+require 'IceStorm/Metrics.rb'

data/extconf.rb

@@ -27,16 +27,15 @@ end
 $INCFLAGS << ' -Idist/ice/cpp/include'
 $INCFLAGS << ' -Idist/ice/cpp/include/generated'
 $INCFLAGS << ' -Idist/ice/cpp/src'
-$INCFLAGS << ' -Idist/IceRuby'
 
 $CPPFLAGS << ' -w'
 
 if RUBY_PLATFORM =~ /darwin/
     $LOCAL_LIBS << ' -lbz2 -framework Security -framework CoreFoundation'
-    $CXXFLAGS << ' -std=c++14'
+    $CXXFLAGS << ' -std=c++20'
 elsif RUBY_PLATFORM =~ /linux/
     $LOCAL_LIBS << ' -lssl -lcrypto -lbz2 -lrt'
-    $CXXFLAGS << ' -std=c++14'
+    $CXXFLAGS << ' -std=c++17'
 end
 
 # Setup the object and source files.
@@ -49,7 +48,7 @@ Dir["*.cpp"].each do |f|
     $srcs << f
 end
 
-$excluded = ['DLLMain.cpp', 'Main.cpp']
+$excluded = ['DLLMain.cpp', 'Main.cpp', 'AddDefaultPluginFactories_min.cpp']
 
 def filter(f)
     # Filter sources for each platform.
@@ -57,14 +56,13 @@ def filter(f)
         return false
     end
 
-    # SChannel is Windows-only (case-insensitive check)
-    if f.downcase.include?("schannel")
+    if f.include?("Schannel")
         return false
     end
-    if RUBY_PLATFORM =~ /darwin/ and f.downcase.include?("openssl")
+    if RUBY_PLATFORM =~ /darwin/ and f.include?("OpenSSL")
         return false
     end
-    if !(RUBY_PLATFORM =~ /darwin/) and f.downcase.include?("securetransport")
+    if !(RUBY_PLATFORM =~ /darwin/) and f.include?("SecureTransport")
          return false
     end
     return true

data/ice.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'zeroc-ice'
-  spec.version     = '3.7.11'
+  spec.version     = '3.8.1'
   spec.summary     = "ZeroC Ice for Ruby"
   spec.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven
@@ -17,7 +17,7 @@ install a full Ice distribution if you want to use other Ice language
 mappings, or Ice services such as IceGrid, IceStorm and Glacier2.
 
 We provide extensive online documentation for Ice, the Ruby extension,
-and the other Ice language mappings and services.
+and the other Ice language mappings and servicespec.
 
 Join us on our user forums if you have questions about Ice.
 eos
@@ -26,7 +26,7 @@ eos
   spec.files       = ['ice.gemspec'] +
                      Dir['dist/lib/**/*.rb'] +
                      Dir['dist/ice/**/*.*'] +
-                     Dir['dist/IceRuby/*.*'] +
+                     Dir['dist/IceRuby/*.*']
                      Dir['scripts/*']
   spec.homepage    = 'https://zeroc.com'
   spec.license     = 'GPL-2.0-only'