zeroc-ice 3.7.11 → 3.8.1

data/dist/lib/IceGrid/Exception.rb

@@ -1,31 +1,14 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `Exception.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'Exception.ice'.</auto-generated>
 
 require 'Ice'
 require 'Ice/Identity.rb'
-require 'Ice/BuiltinSequences.rb'
 
 module ::IceGrid
-
     if not defined?(::IceGrid::ApplicationNotExistException)
         class ApplicationNotExistException < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceGrid::ApplicationNotExistException'
             end
@@ -33,15 +16,11 @@ module ::IceGrid
             attr_accessor :name
         end
 
-        T_ApplicationNotExistException = ::Ice::__defineException('::IceGrid::ApplicationNotExistException', ApplicationNotExistException, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_ApplicationNotExistException = Ice::__defineException('::IceGrid::ApplicationNotExistException', ApplicationNotExistException, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::ServerNotExistException)
         class ServerNotExistException < Ice::UserException
-            def initialize(id='')
-                @id = id
-            end
-
             def to_s
                 '::IceGrid::ServerNotExistException'
             end
@@ -49,16 +28,11 @@ module ::IceGrid
             attr_accessor :id
         end
 
-        T_ServerNotExistException = ::Ice::__defineException('::IceGrid::ServerNotExistException', ServerNotExistException, false, nil, [["id", ::Ice::T_string, false, 0]])
+        T_ServerNotExistException = Ice::__defineException('::IceGrid::ServerNotExistException', ServerNotExistException, nil, [["id", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::ServerStartException)
         class ServerStartException < Ice::UserException
-            def initialize(id='', reason='')
-                @id = id
-                @reason = reason
-            end
-
             def to_s
                 '::IceGrid::ServerStartException'
             end
@@ -66,19 +40,14 @@ module ::IceGrid
             attr_accessor :id, :reason
         end
 
-        T_ServerStartException = ::Ice::__defineException('::IceGrid::ServerStartException', ServerStartException, false, nil, [
-            ["id", ::Ice::T_string, false, 0],
-            ["reason", ::Ice::T_string, false, 0]
+        T_ServerStartException = Ice::__defineException('::IceGrid::ServerStartException', ServerStartException, nil, [
+            ["id", Ice::T_string, false, 0],
+            ["reason", Ice::T_string, false, 0]
         ])
     end
 
     if not defined?(::IceGrid::ServerStopException)
         class ServerStopException < Ice::UserException
-            def initialize(id='', reason='')
-                @id = id
-                @reason = reason
-            end
-
             def to_s
                 '::IceGrid::ServerStopException'
             end
@@ -86,18 +55,14 @@ module ::IceGrid
             attr_accessor :id, :reason
         end
 
-        T_ServerStopException = ::Ice::__defineException('::IceGrid::ServerStopException', ServerStopException, false, nil, [
-            ["id", ::Ice::T_string, false, 0],
-            ["reason", ::Ice::T_string, false, 0]
+        T_ServerStopException = Ice::__defineException('::IceGrid::ServerStopException', ServerStopException, nil, [
+            ["id", Ice::T_string, false, 0],
+            ["reason", Ice::T_string, false, 0]
         ])
     end
 
     if not defined?(::IceGrid::AdapterNotExistException)
         class AdapterNotExistException < Ice::UserException
-            def initialize(id='')
-                @id = id
-            end
-
             def to_s
                 '::IceGrid::AdapterNotExistException'
             end
@@ -105,47 +70,11 @@ module ::IceGrid
             attr_accessor :id
         end
 
-        T_AdapterNotExistException = ::Ice::__defineException('::IceGrid::AdapterNotExistException', AdapterNotExistException, false, nil, [["id", ::Ice::T_string, false, 0]])
-    end
-
-    if not defined?(::IceGrid::ObjectExistsException)
-        class ObjectExistsException < Ice::UserException
-            def initialize(id=::Ice::Identity.new)
-                @id = id
-            end
-
-            def to_s
-                '::IceGrid::ObjectExistsException'
-            end
-
-            attr_accessor :id
-        end
-
-        T_ObjectExistsException = ::Ice::__defineException('::IceGrid::ObjectExistsException', ObjectExistsException, false, nil, [["id", ::Ice::T_Identity, false, 0]])
-    end
-
-    if not defined?(::IceGrid::ObjectNotRegisteredException)
-        class ObjectNotRegisteredException < Ice::UserException
-            def initialize(id=::Ice::Identity.new)
-                @id = id
-            end
-
-            def to_s
-                '::IceGrid::ObjectNotRegisteredException'
-            end
-
-            attr_accessor :id
-        end
-
-        T_ObjectNotRegisteredException = ::Ice::__defineException('::IceGrid::ObjectNotRegisteredException', ObjectNotRegisteredException, false, nil, [["id", ::Ice::T_Identity, false, 0]])
+        T_AdapterNotExistException = Ice::__defineException('::IceGrid::AdapterNotExistException', AdapterNotExistException, nil, [["id", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::NodeNotExistException)
         class NodeNotExistException < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceGrid::NodeNotExistException'
             end
@@ -153,15 +82,11 @@ module ::IceGrid
             attr_accessor :name
         end
 
-        T_NodeNotExistException = ::Ice::__defineException('::IceGrid::NodeNotExistException', NodeNotExistException, false, nil, [["name", ::Ice::T_string, false, 0]])
+        T_NodeNotExistException = Ice::__defineException('::IceGrid::NodeNotExistException', NodeNotExistException, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::RegistryNotExistException)
         class RegistryNotExistException < Ice::UserException
-            def initialize(name='')
-                @name = name
-            end
-
             def to_s
                 '::IceGrid::RegistryNotExistException'
             end
@@ -169,139 +94,11 @@ module ::IceGrid
             attr_accessor :name
         end
 
-        T_RegistryNotExistException = ::Ice::__defineException('::IceGrid::RegistryNotExistException', RegistryNotExistException, false, nil, [["name", ::Ice::T_string, false, 0]])
-    end
-
-    if not defined?(::IceGrid::DeploymentException)
-        class DeploymentException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::DeploymentException'
-            end
-
-            attr_accessor :reason
-        end
-
-        T_DeploymentException = ::Ice::__defineException('::IceGrid::DeploymentException', DeploymentException, false, nil, [["reason", ::Ice::T_string, false, 0]])
-    end
-
-    if not defined?(::IceGrid::NodeUnreachableException)
-        class NodeUnreachableException < Ice::UserException
-            def initialize(name='', reason='')
-                @name = name
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::NodeUnreachableException'
-            end
-
-            attr_accessor :name, :reason
-        end
-
-        T_NodeUnreachableException = ::Ice::__defineException('::IceGrid::NodeUnreachableException', NodeUnreachableException, false, nil, [
-            ["name", ::Ice::T_string, false, 0],
-            ["reason", ::Ice::T_string, false, 0]
-        ])
-    end
-
-    if not defined?(::IceGrid::ServerUnreachableException)
-        class ServerUnreachableException < Ice::UserException
-            def initialize(name='', reason='')
-                @name = name
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::ServerUnreachableException'
-            end
-
-            attr_accessor :name, :reason
-        end
-
-        T_ServerUnreachableException = ::Ice::__defineException('::IceGrid::ServerUnreachableException', ServerUnreachableException, false, nil, [
-            ["name", ::Ice::T_string, false, 0],
-            ["reason", ::Ice::T_string, false, 0]
-        ])
-    end
-
-    if not defined?(::IceGrid::RegistryUnreachableException)
-        class RegistryUnreachableException < Ice::UserException
-            def initialize(name='', reason='')
-                @name = name
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::RegistryUnreachableException'
-            end
-
-            attr_accessor :name, :reason
-        end
-
-        T_RegistryUnreachableException = ::Ice::__defineException('::IceGrid::RegistryUnreachableException', RegistryUnreachableException, false, nil, [
-            ["name", ::Ice::T_string, false, 0],
-            ["reason", ::Ice::T_string, false, 0]
-        ])
-    end
-
-    if not defined?(::IceGrid::BadSignalException)
-        class BadSignalException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::BadSignalException'
-            end
-
-            attr_accessor :reason
-        end
-
-        T_BadSignalException = ::Ice::__defineException('::IceGrid::BadSignalException', BadSignalException, false, nil, [["reason", ::Ice::T_string, false, 0]])
-    end
-
-    if not defined?(::IceGrid::PatchException)
-        class PatchException < Ice::UserException
-            def initialize(reasons=nil)
-                @reasons = reasons
-            end
-
-            def to_s
-                '::IceGrid::PatchException'
-            end
-
-            attr_accessor :reasons
-        end
-
-        T_PatchException = ::Ice::__defineException('::IceGrid::PatchException', PatchException, false, nil, [["reasons", ::Ice::T_StringSeq, false, 0]])
-    end
-
-    if not defined?(::IceGrid::AccessDeniedException)
-        class AccessDeniedException < Ice::UserException
-            def initialize(lockUserId='')
-                @lockUserId = lockUserId
-            end
-
-            def to_s
-                '::IceGrid::AccessDeniedException'
-            end
-
-            attr_accessor :lockUserId
-        end
-
-        T_AccessDeniedException = ::Ice::__defineException('::IceGrid::AccessDeniedException', AccessDeniedException, false, nil, [["lockUserId", ::Ice::T_string, false, 0]])
+        T_RegistryNotExistException = Ice::__defineException('::IceGrid::RegistryNotExistException', RegistryNotExistException, nil, [["name", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::AllocationException)
         class AllocationException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
             def to_s
                 '::IceGrid::AllocationException'
             end
@@ -309,68 +106,40 @@ module ::IceGrid
             attr_accessor :reason
         end
 
-        T_AllocationException = ::Ice::__defineException('::IceGrid::AllocationException', AllocationException, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_AllocationException = Ice::__defineException('::IceGrid::AllocationException', AllocationException, nil, [["reason", Ice::T_string, false, 0]])
     end
 
     if not defined?(::IceGrid::AllocationTimeoutException)
         class AllocationTimeoutException < ::IceGrid::AllocationException
-            def initialize(reason='')
-                super(reason)
-            end
-
             def to_s
                 '::IceGrid::AllocationTimeoutException'
             end
         end
 
-        T_AllocationTimeoutException = ::Ice::__defineException('::IceGrid::AllocationTimeoutException', AllocationTimeoutException, false, ::IceGrid::T_AllocationException, [])
-    end
-
-    if not defined?(::IceGrid::PermissionDeniedException)
-        class PermissionDeniedException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
-            def to_s
-                '::IceGrid::PermissionDeniedException'
-            end
-
-            attr_accessor :reason
-        end
-
-        T_PermissionDeniedException = ::Ice::__defineException('::IceGrid::PermissionDeniedException', PermissionDeniedException, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_AllocationTimeoutException = Ice::__defineException('::IceGrid::AllocationTimeoutException', AllocationTimeoutException, ::IceGrid::T_AllocationException, [])
     end
 
-    if not defined?(::IceGrid::ObserverAlreadyRegisteredException)
-        class ObserverAlreadyRegisteredException < Ice::UserException
-            def initialize(id=::Ice::Identity.new)
-                @id = id
-            end
-
+    if not defined?(::IceGrid::ObjectExistsException)
+        class ObjectExistsException < Ice::UserException
             def to_s
-                '::IceGrid::ObserverAlreadyRegisteredException'
+                '::IceGrid::ObjectExistsException'
             end
 
             attr_accessor :id
         end
 
-        T_ObserverAlreadyRegisteredException = ::Ice::__defineException('::IceGrid::ObserverAlreadyRegisteredException', ObserverAlreadyRegisteredException, false, nil, [["id", ::Ice::T_Identity, false, 0]])
+        T_ObjectExistsException = Ice::__defineException('::IceGrid::ObjectExistsException', ObjectExistsException, nil, [["id", ::Ice::T_Identity, false, 0]])
     end
 
-    if not defined?(::IceGrid::FileNotAvailableException)
-        class FileNotAvailableException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
+    if not defined?(::IceGrid::ObjectNotRegisteredException)
+        class ObjectNotRegisteredException < Ice::UserException
             def to_s
-                '::IceGrid::FileNotAvailableException'
+                '::IceGrid::ObjectNotRegisteredException'
             end
 
-            attr_accessor :reason
+            attr_accessor :id
         end
 
-        T_FileNotAvailableException = ::Ice::__defineException('::IceGrid::FileNotAvailableException', FileNotAvailableException, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_ObjectNotRegisteredException = Ice::__defineException('::IceGrid::ObjectNotRegisteredException', ObjectNotRegisteredException, nil, [["id", ::Ice::T_Identity, false, 0]])
     end
 end

data/dist/lib/IceGrid/FileParser.rb

@@ -1,30 +1,14 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `FileParser.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'FileParser.ice'.</auto-generated>
 
 require 'Ice'
-require 'IceGrid/Admin.rb'
+require_relative 'Admin.rb'
 
 module ::IceGrid
-
     if not defined?(::IceGrid::ParseException)
         class ParseException < Ice::UserException
-            def initialize(reason='')
-                @reason = reason
-            end
-
             def to_s
                 '::IceGrid::ParseException'
             end
@@ -32,34 +16,26 @@ module ::IceGrid
             attr_accessor :reason
         end
 
-        T_ParseException = ::Ice::__defineException('::IceGrid::ParseException', ParseException, false, nil, [["reason", ::Ice::T_string, false, 0]])
+        T_ParseException = Ice::__defineException('::IceGrid::ParseException', ParseException, nil, [["reason", Ice::T_string, false, 0]])
     end
 
-    if not defined?(::IceGrid::FileParser_Mixin)
+    if not defined?(::IceGrid::T_FileParserPrx)
+        T_FileParserPrx = Ice::__declareProxy('::IceGrid::FileParser')
+    end
 
-        module ::IceGrid::FileParser_Mixin
-        end
+    if not defined?(::IceGrid::FileParserPrx)
         module FileParserPrx_mixin
-
             def parse(xmlFile, adminProxy, context=nil)
                 FileParserPrx_mixin::OP_parse.invoke(self, [xmlFile, adminProxy], context)
             end
         end
 
-        class FileParserPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class FileParserPrx < Ice::ObjectPrx
             include FileParserPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_FileParserPrx)
-            T_FileParser = ::Ice::__declareClass('::IceGrid::FileParser')
-            T_FileParserPrx = ::Ice::__declareProxy('::IceGrid::FileParser')
-        end
-
-        T_FileParser.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_FileParserPrx.defineProxy(FileParserPrx, nil, [])
 
-        FileParserPrx_mixin::OP_parse = ::Ice::__defineOperation('parse', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_string, false, 0], [::IceGrid::T_AdminPrx, false, 0]], [], [::IceGrid::T_ApplicationDescriptor, false, 0], [::IceGrid::T_ParseException])
+        FileParserPrx_mixin::OP_parse = Ice::__defineOperation('parse', 'parse', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [::IceGrid::T_AdminPrx, false, 0]], [], [::IceGrid::T_ApplicationDescriptor, false, 0], [::IceGrid::T_ParseException])
     end
 end

data/dist/lib/IceGrid/Registry.rb

@@ -1,27 +1,14 @@
-# encoding: utf-8
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-#
-# Ice version 3.7.11
-#
-# <auto-generated>
-#
-# Generated from file `Registry.ice'
-#
-# Warning: do not edit this file.
-#
-# </auto-generated>
-#
+# Copyright (c) ZeroC, Inc.
+
+# slice2rb version 3.8.1
+# <auto-generated>Generated from Slice file 'Registry.ice'.</auto-generated>
 
 require 'Ice'
-require 'IceGrid/Exception.rb'
-require 'IceGrid/Session.rb'
-require 'IceGrid/Admin.rb'
+require_relative 'Admin.rb'
 require 'Ice/Locator.rb'
+require_relative 'Session.rb'
 
 module ::IceGrid
-
     if not defined?(::IceGrid::LoadSample)
         class LoadSample
             include Comparable
@@ -69,15 +56,15 @@ module ::IceGrid
             private_class_method :new
         end
 
-        T_LoadSample = ::Ice::__defineEnum('::IceGrid::LoadSample', LoadSample, LoadSample::_enumerators)
+        T_LoadSample = Ice::__defineEnum('::IceGrid::LoadSample', LoadSample, LoadSample::_enumerators)
     end
 
-    if not defined?(::IceGrid::Query_Mixin)
+    if not defined?(::IceGrid::T_QueryPrx)
+        T_QueryPrx = Ice::__declareProxy('::IceGrid::Query')
+    end
 
-        module ::IceGrid::Query_Mixin
-        end
+    if not defined?(::IceGrid::QueryPrx)
         module QueryPrx_mixin
-
             def findObjectById(id, context=nil)
                 QueryPrx_mixin::OP_findObjectById.invoke(self, [id], context)
             end
@@ -99,33 +86,25 @@ module ::IceGrid
             end
         end
 
-        class QueryPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class QueryPrx < Ice::ObjectPrx
             include QueryPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_QueryPrx)
-            T_Query = ::Ice::__declareClass('::IceGrid::Query')
-            T_QueryPrx = ::Ice::__declareProxy('::IceGrid::Query')
-        end
-
-        T_Query.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_QueryPrx.defineProxy(QueryPrx, nil, [])
 
-        QueryPrx_mixin::OP_findObjectById = ::Ice::__defineOperation('findObjectById', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [[::Ice::T_Identity, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [])
-        QueryPrx_mixin::OP_findObjectByType = ::Ice::__defineOperation('findObjectByType', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [[::Ice::T_string, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [])
-        QueryPrx_mixin::OP_findObjectByTypeOnLeastLoadedNode = ::Ice::__defineOperation('findObjectByTypeOnLeastLoadedNode', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [[::Ice::T_string, false, 0], [::IceGrid::T_LoadSample, false, 0]], [], [::Ice::T_ObjectPrx, false, 0], [])
-        QueryPrx_mixin::OP_findAllObjectsByType = ::Ice::__defineOperation('findAllObjectsByType', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [[::Ice::T_string, false, 0]], [], [::Ice::T_ObjectProxySeq, false, 0], [])
-        QueryPrx_mixin::OP_findAllReplicas = ::Ice::__defineOperation('findAllReplicas', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [[::Ice::T_ObjectPrx, false, 0]], [], [::Ice::T_ObjectProxySeq, false, 0], [])
+        QueryPrx_mixin::OP_findObjectById = Ice::__defineOperation('findObjectById', 'findObjectById', Ice::OperationMode::Idempotent, nil, [[::Ice::T_Identity, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [])
+        QueryPrx_mixin::OP_findObjectByType = Ice::__defineOperation('findObjectByType', 'findObjectByType', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [])
+        QueryPrx_mixin::OP_findObjectByTypeOnLeastLoadedNode = Ice::__defineOperation('findObjectByTypeOnLeastLoadedNode', 'findObjectByTypeOnLeastLoadedNode', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [::IceGrid::T_LoadSample, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [])
+        QueryPrx_mixin::OP_findAllObjectsByType = Ice::__defineOperation('findAllObjectsByType', 'findAllObjectsByType', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0]], [], [::Ice::T_ObjectProxySeq, false, 0], [])
+        QueryPrx_mixin::OP_findAllReplicas = Ice::__defineOperation('findAllReplicas', 'findAllReplicas', Ice::OperationMode::Idempotent, nil, [[Ice::T_ObjectPrx, false, 0]], [], [::Ice::T_ObjectProxySeq, false, 0], [])
     end
 
-    if not defined?(::IceGrid::Registry_Mixin)
+    if not defined?(::IceGrid::T_RegistryPrx)
+        T_RegistryPrx = Ice::__declareProxy('::IceGrid::Registry')
+    end
 
-        module ::IceGrid::Registry_Mixin
-        end
+    if not defined?(::IceGrid::RegistryPrx)
         module RegistryPrx_mixin
-
             def createSession(userId, password, context=nil)
                 RegistryPrx_mixin::OP_createSession.invoke(self, [userId, password], context)
             end
@@ -145,41 +124,29 @@ module ::IceGrid
             def getSessionTimeout(context=nil)
                 RegistryPrx_mixin::OP_getSessionTimeout.invoke(self, [], context)
             end
-
-            def getACMTimeout(context=nil)
-                RegistryPrx_mixin::OP_getACMTimeout.invoke(self, [], context)
-            end
         end
 
-        class RegistryPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class RegistryPrx < Ice::ObjectPrx
             include RegistryPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_RegistryPrx)
-            T_Registry = ::Ice::__declareClass('::IceGrid::Registry')
-            T_RegistryPrx = ::Ice::__declareProxy('::IceGrid::Registry')
-        end
-
-        T_Registry.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_RegistryPrx.defineProxy(RegistryPrx, nil, [])
 
-        RegistryPrx_mixin::OP_createSession = ::Ice::__defineOperation('createSession', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_string, false, 0], [::Ice::T_string, false, 0]], [], [::IceGrid::T_SessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
-        RegistryPrx_mixin::OP_createAdminSession = ::Ice::__defineOperation('createAdminSession', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [[::Ice::T_string, false, 0], [::Ice::T_string, false, 0]], [], [::IceGrid::T_AdminSessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
-        RegistryPrx_mixin::OP_createSessionFromSecureConnection = ::Ice::__defineOperation('createSessionFromSecureConnection', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [], [], [::IceGrid::T_SessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
-        RegistryPrx_mixin::OP_createAdminSessionFromSecureConnection = ::Ice::__defineOperation('createAdminSessionFromSecureConnection', ::Ice::OperationMode::Normal, ::Ice::OperationMode::Normal, false, nil, [], [], [::IceGrid::T_AdminSessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
-        RegistryPrx_mixin::OP_getSessionTimeout = ::Ice::__defineOperation('getSessionTimeout', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_int, false, 0], [])
-        RegistryPrx_mixin::OP_getACMTimeout = ::Ice::__defineOperation('getACMTimeout', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Nonmutating, false, nil, [], [], [::Ice::T_int, false, 0], [])
+        RegistryPrx_mixin::OP_createSession = Ice::__defineOperation('createSession', 'createSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceGrid::T_SessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
+        RegistryPrx_mixin::OP_createAdminSession = Ice::__defineOperation('createAdminSession', 'createAdminSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceGrid::T_AdminSessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
+        RegistryPrx_mixin::OP_createSessionFromSecureConnection = Ice::__defineOperation('createSessionFromSecureConnection', 'createSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::IceGrid::T_SessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
+        RegistryPrx_mixin::OP_createAdminSessionFromSecureConnection = Ice::__defineOperation('createAdminSessionFromSecureConnection', 'createAdminSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::IceGrid::T_AdminSessionPrx, false, 0], [::IceGrid::T_PermissionDeniedException])
+        RegistryPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [])
+        RegistryPrx_mixin::OP_getSessionTimeout.deprecate("")
     end
 
-    if not defined?(::IceGrid::Locator_Mixin)
+    if not defined?(::IceGrid::T_LocatorPrx)
+        T_LocatorPrx = Ice::__declareProxy('::IceGrid::Locator')
+    end
 
-        module ::IceGrid::Locator_Mixin
-        end
+    if not defined?(::IceGrid::LocatorPrx)
         module LocatorPrx_mixin
             include ::Ice::LocatorPrx_mixin
-
             def getLocalRegistry(context=nil)
                 LocatorPrx_mixin::OP_getLocalRegistry.invoke(self, [], context)
             end
@@ -189,21 +156,13 @@ module ::IceGrid
             end
         end
 
-        class LocatorPrx < ::Ice::ObjectPrx
-            include ::Ice::Proxy_mixin
+        class LocatorPrx < Ice::ObjectPrx
             include LocatorPrx_mixin
         end
 
-        if not defined?(::IceGrid::T_LocatorPrx)
-            T_Locator = ::Ice::__declareClass('::IceGrid::Locator')
-            T_LocatorPrx = ::Ice::__declareProxy('::IceGrid::Locator')
-        end
-
-        T_Locator.defineClass(::Ice::Value, -1, false, true, nil, [])
-
         T_LocatorPrx.defineProxy(LocatorPrx, nil, [::Ice::T_LocatorPrx])
 
-        LocatorPrx_mixin::OP_getLocalRegistry = ::Ice::__defineOperation('getLocalRegistry', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [], [], [::IceGrid::T_RegistryPrx, false, 0], [])
-        LocatorPrx_mixin::OP_getLocalQuery = ::Ice::__defineOperation('getLocalQuery', ::Ice::OperationMode::Idempotent, ::Ice::OperationMode::Idempotent, false, nil, [], [], [::IceGrid::T_QueryPrx, false, 0], [])
+        LocatorPrx_mixin::OP_getLocalRegistry = Ice::__defineOperation('getLocalRegistry', 'getLocalRegistry', Ice::OperationMode::Idempotent, nil, [], [], [::IceGrid::T_RegistryPrx, false, 0], [])
+        LocatorPrx_mixin::OP_getLocalQuery = Ice::__defineOperation('getLocalQuery', 'getLocalQuery', Ice::OperationMode::Idempotent, nil, [], [], [::IceGrid::T_QueryPrx, false, 0], [])
     end
 end