zeroc-ice 3.6.5 → 3.7.0

data/lib/IceStorm/Metrics.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# 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.
 #
 # **********************************************************************
 #
-# Ice version 3.6.5
+# Ice version 3.7.0
 #
 # <auto-generated>
 #
@@ -22,96 +22,38 @@
 require 'Ice'
 require 'Ice/Metrics.rb'
 
-module ::IceMX
+module IceMX
 
-    if not defined?(::IceMX::TopicMetrics_mixin)
-        module TopicMetrics_mixin
-            include ::IceMX::Metrics_mixin
+    if not defined?(::IceMX::TopicMetrics_Mixin)
 
-            def ice_ids(current=nil)
-                ['::Ice::Object', '::IceMX::Metrics', '::IceMX::TopicMetrics']
-            end
-
-            def ice_id(current=nil)
-                '::IceMX::TopicMetrics'
-            end
-
-            def inspect
-                ::Ice::__stringify(self, T_TopicMetrics)
-            end
-
-            attr_accessor :published, :forwarded
+        module ::IceMX::TopicMetrics_Mixin
         end
         class TopicMetrics < ::IceMX::Metrics
-            include TopicMetrics_mixin
-            
-            def TopicMetrics.ice_staticId()
-                '::IceMX::TopicMetrics'
-            end
 
             def initialize(id='', total=0, current=0, totalLifetime=0, failures=0, published=0, forwarded=0)
                 super(id, total, current, totalLifetime, failures)
                 @published = published
                 @forwarded = forwarded
             end
-        end
-        module TopicMetricsPrx_mixin
-            include ::IceMX::MetricsPrx_mixin
-        end
-        class TopicMetricsPrx < ::Ice::ObjectPrx
-            include TopicMetricsPrx_mixin
-
-            def TopicMetricsPrx.checkedCast(proxy, facetOrCtx=nil, _ctx=nil)
-                ice_checkedCast(proxy, '::IceMX::TopicMetrics', facetOrCtx, _ctx)
-            end
 
-            def TopicMetricsPrx.uncheckedCast(proxy, facet=nil)
-                ice_uncheckedCast(proxy, facet)
-            end
-            def TopicMetricsPrx.ice_staticId()
-                '::IceMX::TopicMetrics'
-            end
+            attr_accessor :published, :forwarded
         end
 
         if not defined?(::IceMX::T_TopicMetrics)
             T_TopicMetrics = ::Ice::__declareClass('::IceMX::TopicMetrics')
-            T_TopicMetricsPrx = ::Ice::__declareProxy('::IceMX::TopicMetrics')
         end
 
-        T_TopicMetrics.defineClass(TopicMetrics, -1, false, false, ::IceMX::T_Metrics, [], [
+        T_TopicMetrics.defineClass(TopicMetrics, -1, false, false, ::IceMX::T_Metrics, [
             ['published', ::Ice::T_long, false, 0],
             ['forwarded', ::Ice::T_long, false, 0]
         ])
-        TopicMetrics_mixin::ICE_TYPE = T_TopicMetrics
-
-        T_TopicMetricsPrx.defineProxy(TopicMetricsPrx, T_TopicMetrics)
-        TopicMetricsPrx::ICE_TYPE = T_TopicMetricsPrx
     end
 
-    if not defined?(::IceMX::SubscriberMetrics_mixin)
-        module SubscriberMetrics_mixin
-            include ::IceMX::Metrics_mixin
+    if not defined?(::IceMX::SubscriberMetrics_Mixin)
 
-            def ice_ids(current=nil)
-                ['::Ice::Object', '::IceMX::Metrics', '::IceMX::SubscriberMetrics']
-            end
-
-            def ice_id(current=nil)
-                '::IceMX::SubscriberMetrics'
-            end
-
-            def inspect
-                ::Ice::__stringify(self, T_SubscriberMetrics)
-            end
-
-            attr_accessor :queued, :outstanding, :delivered
+        module ::IceMX::SubscriberMetrics_Mixin
         end
         class SubscriberMetrics < ::IceMX::Metrics
-            include SubscriberMetrics_mixin
-            
-            def SubscriberMetrics.ice_staticId()
-                '::IceMX::SubscriberMetrics'
-            end
 
             def initialize(id='', total=0, current=0, totalLifetime=0, failures=0, queued=0, outstanding=0, delivered=0)
                 super(id, total, current, totalLifetime, failures)
@@ -119,38 +61,18 @@ module ::IceMX
                 @outstanding = outstanding
                 @delivered = delivered
             end
-        end
-        module SubscriberMetricsPrx_mixin
-            include ::IceMX::MetricsPrx_mixin
-        end
-        class SubscriberMetricsPrx < ::Ice::ObjectPrx
-            include SubscriberMetricsPrx_mixin
-
-            def SubscriberMetricsPrx.checkedCast(proxy, facetOrCtx=nil, _ctx=nil)
-                ice_checkedCast(proxy, '::IceMX::SubscriberMetrics', facetOrCtx, _ctx)
-            end
 
-            def SubscriberMetricsPrx.uncheckedCast(proxy, facet=nil)
-                ice_uncheckedCast(proxy, facet)
-            end
-            def SubscriberMetricsPrx.ice_staticId()
-                '::IceMX::SubscriberMetrics'
-            end
+            attr_accessor :queued, :outstanding, :delivered
         end
 
         if not defined?(::IceMX::T_SubscriberMetrics)
             T_SubscriberMetrics = ::Ice::__declareClass('::IceMX::SubscriberMetrics')
-            T_SubscriberMetricsPrx = ::Ice::__declareProxy('::IceMX::SubscriberMetrics')
         end
 
-        T_SubscriberMetrics.defineClass(SubscriberMetrics, -1, false, false, ::IceMX::T_Metrics, [], [
+        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]
         ])
-        SubscriberMetrics_mixin::ICE_TYPE = T_SubscriberMetrics
-
-        T_SubscriberMetricsPrx.defineProxy(SubscriberMetricsPrx, T_SubscriberMetrics)
-        SubscriberMetricsPrx::ICE_TYPE = T_SubscriberMetricsPrx
     end
 end

data/slice/Glacier2/Metrics.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", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Metrics.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEMX"]
 module IceMX
 {
@@ -73,6 +77,6 @@ class SessionMetrics extends Metrics
      *
      **/
     int overriddenServer = 0;
-};
+}
 
-};
+}

data/slice/Glacier2/PermissionsVerifier.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", "js:ice-build"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Glacier2/SSLInfo.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:GLACIER2"]
 module Glacier2
 {
@@ -33,7 +37,7 @@ exception PermissionDeniedException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -65,7 +69,7 @@ interface PermissionsVerifier
     ["nonmutating", "cpp:const", "format:sliced"]
     idempotent bool checkPermissions(string userId, string password, out string reason)
         throws PermissionDeniedException;
-};
+}
 
 /**
  *
@@ -97,7 +101,6 @@ interface SSLPermissionsVerifier
     ["nonmutating", "cpp:const", "format:sliced"]
     idempotent bool authorize(SSLInfo info, out string reason)
         throws PermissionDeniedException;
-};
-
-};
+}
 
+}

data/slice/Glacier2/PermissionsVerifierF.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"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:GLACIER2"]
 module Glacier2
@@ -18,5 +22,4 @@ module Glacier2
 interface PermissionsVerifier;
 interface SSLPermissionsVerifier;
 
-};
-
+}

data/slice/Glacier2/Router.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,13 +9,17 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Router.ice>
 #include <Glacier2/Session.ice>
 #include <Glacier2/PermissionsVerifier.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 /**
  *
  * Glacier2 is a firewall solution for Ice. Glacier2 authenticates
@@ -38,12 +42,11 @@ module Glacier2
  **/
 exception SessionNotExistException
 {
-};
+}
 
 /**
  *
- * The Glacier2 specialization of the {@link Ice.Router}
- * interface.
+ * The Glacier2 specialization of the <tt>Ice::Router</tt> interface.
  *
  **/
 interface Router extends Ice::Router
@@ -173,7 +176,6 @@ interface Router extends Ice::Router
      *
      **/
     ["nonmutating", "cpp:const"] idempotent int getACMTimeout();
-};
-
-};
+}
 
+}

data/slice/Glacier2/RouterF.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"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
+
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
 
 ["objc:prefix:GLACIER2"]
 module Glacier2
@@ -17,5 +21,4 @@ module Glacier2
 
 interface Router;
 
-};
-
+}

data/slice/Glacier2/SSLInfo.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", "js:ice-build"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:GLACIER2"]
 module Glacier2
 {
@@ -45,7 +49,6 @@ struct SSLInfo
 
     /** The certificate chain. */
     Ice::StringSeq certs;
-};
-
-};
+}
 
+}

data/slice/Glacier2/Session.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,13 +9,17 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build", "python:pkgdir:Glacier2"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 #include <Glacier2/SSLInfo.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:GLACIER2"]
 module Glacier2
 {
@@ -34,12 +38,11 @@ exception CannotCreateSessionException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
- * A client-visible session object, which is tied to the lifecycle of
- * a {@link Router}.
+ * A client-visible session object, which is tied to the lifecycle of a {@link Router}.
  *
  * @see Router
  * @see SessionManager
@@ -53,7 +56,7 @@ interface Session
      *
      **/
     void destroy();
-};
+}
 
 /**
  *
@@ -96,7 +99,7 @@ interface StringSet
      *
      **/
     idempotent Ice::StringSeq get();
-};
+}
 
 /**
  *
@@ -138,7 +141,7 @@ interface IdentitySet
      *
      **/
     idempotent Ice::IdentitySeq get();
-};
+}
 
 /**
  *
@@ -195,7 +198,7 @@ interface SessionControl
      *
      **/
     void destroy();
-};
+}
 
 /**
  *
@@ -228,7 +231,7 @@ interface SessionManager
     ["format:sliced"]
     Session* create(string userId, SessionControl* control)
         throws CannotCreateSessionException;
-};
+}
 
 /**
  *
@@ -261,7 +264,6 @@ interface SSLSessionManager
     ["format:sliced"]
     Session* create(SSLInfo info, SessionControl* control)
         throws CannotCreateSessionException;
-};
-
-};
+}
 
+}