zeroc-ice 3.6.5 → 3.7.0

data/slice/IceGrid/Descriptor.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,12 +9,21 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+
+#ifndef ICE_BUILDING_ICEGRIDDB
+[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
+#endif
+
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -46,7 +55,7 @@ struct PropertyDescriptor
      *
      **/
     string value;
-};
+}
 
 /**
  *
@@ -76,7 +85,7 @@ struct PropertySetDescriptor
      *
      **/
     PropertyDescriptorSeq properties;
-};
+}
 
 /**
  *
@@ -114,7 +123,7 @@ struct ObjectDescriptor
      *
      **/
     string proxyOptions;
-};
+}
 
 /**
  *
@@ -198,7 +207,7 @@ struct AdapterDescriptor
      *
      **/
     ObjectDescriptorSeq allocatables;
-};
+}
 
 /**
  *
@@ -245,7 +254,7 @@ struct DbEnvDescriptor
      *
      **/
     PropertyDescriptorSeq properties;
-};
+}
 
 /**
  *
@@ -295,7 +304,7 @@ class CommunicatorDescriptor
      *
      **/
     string description;
-};
+}
 
 /**
  *
@@ -311,7 +320,7 @@ struct DistributionDescriptor
 
     /** The source directories. */
     ["java:type:java.util.LinkedList<String>"] Ice::StringSeq directories;
-};
+}
 
 /**
  *
@@ -418,7 +427,7 @@ class ServerDescriptor extends CommunicatorDescriptor
      *
      **/
     string user;
-};
+}
 
 /**
  *
@@ -447,7 +456,7 @@ class ServiceDescriptor extends CommunicatorDescriptor
      *
      **/
     string entry;
-};
+}
 
 /**
  *
@@ -492,7 +501,7 @@ struct ServerInstanceDescriptor
      *
      **/
     PropertySetDescriptorDict servicePropertySets;
-};
+}
 
 /**
  *
@@ -529,7 +538,7 @@ struct TemplateDescriptor
      *
      **/
     StringStringDict parameterDefaults;
-};
+}
 
 /**
  *
@@ -573,7 +582,7 @@ struct ServiceInstanceDescriptor
      *
      **/
     PropertySetDescriptor propertySet;
-};
+}
 
 /**
  *
@@ -596,7 +605,7 @@ class IceBoxDescriptor extends ServerDescriptor
      *
      **/
     ServiceInstanceDescriptorSeq services;
-};
+}
 
 /**
  *
@@ -646,7 +655,7 @@ struct NodeDescriptor
      *
      **/
     PropertySetDescriptorDict propertySets;
-};
+}
 
 /**
  *
@@ -669,7 +678,7 @@ class LoadBalancingPolicy
      *
      **/
     string nReplicas;
-};
+}
 
 /**
  *
@@ -678,7 +687,7 @@ class LoadBalancingPolicy
  **/
 class RandomLoadBalancingPolicy extends LoadBalancingPolicy
 {
-};
+}
 
 /**
  *
@@ -687,7 +696,7 @@ class RandomLoadBalancingPolicy extends LoadBalancingPolicy
  **/
 class OrderedLoadBalancingPolicy extends LoadBalancingPolicy
 {
-};
+}
 
 /**
  *
@@ -696,7 +705,7 @@ class OrderedLoadBalancingPolicy extends LoadBalancingPolicy
  **/
 class RoundRobinLoadBalancingPolicy extends LoadBalancingPolicy
 {
-};
+}
 
 /**
  *
@@ -714,7 +723,7 @@ class AdaptiveLoadBalancingPolicy extends LoadBalancingPolicy
      *
      **/
     string loadSample;
-};
+}
 
 /**
  *
@@ -764,7 +773,7 @@ struct ReplicaGroupDescriptor
      *
      **/
     string filter;
-};
+}
 
 /**
  *
@@ -842,7 +851,7 @@ struct ApplicationDescriptor
      *
      **/
     PropertySetDescriptorDict propertySets;
-};
+}
 
 /**
  *
@@ -860,7 +869,7 @@ class BoxedString
 {
     /** The value of the boxed string. */
     string value;
-};
+}
 
 /**
  *
@@ -941,7 +950,7 @@ struct NodeUpdateDescriptor
      *
      **/
     BoxedString loadFactor;
-};
+}
 
 /**
  *
@@ -959,7 +968,7 @@ class BoxedDistributionDescriptor
 {
     /** The value of the boxed distribution descriptor. */
     DistributionDescriptor value;
-};
+}
 
 /**
  *
@@ -1074,7 +1083,6 @@ struct ApplicationUpdateDescriptor
      *
      **/
     Ice::StringSeq removeNodes;
-};
-
-};
+}
 
+}

data/slice/IceGrid/Exception.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,12 +9,21 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build", "python:pkgdir:IceGrid"]]
+
+#ifndef ICE_BUILDING_ICEGRIDDB
+[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
+#endif
+
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 
+#ifndef __SLICE2JAVA_COMPAT__
+[["java:package:com.zeroc"]]
+#endif
+
 ["objc:prefix:ICEGRID"]
 module IceGrid
 {
@@ -32,7 +41,7 @@ exception ApplicationNotExistException
      *
      **/
     string name;
-};
+}
 
 /**
  *
@@ -47,7 +56,7 @@ exception ServerNotExistException
      *
      */
     string id;
-};
+}
 
 /**
  *
@@ -69,7 +78,7 @@ exception ServerStartException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -91,7 +100,7 @@ exception ServerStopException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -106,7 +115,7 @@ exception AdapterNotExistException
      *
      **/
     string id;
-};
+}
 
 /**
  *
@@ -121,7 +130,7 @@ exception ObjectExistsException
      *
      **/
     Ice::Identity id;
-};
+}
 
 /**
  *
@@ -136,7 +145,7 @@ exception ObjectNotRegisteredException
      *
      **/
     Ice::Identity id;
-};
+}
 
 /**
  *
@@ -151,7 +160,7 @@ exception NodeNotExistException
      *
      **/
     string name;
-};
+}
 
 /**
  *
@@ -166,7 +175,7 @@ exception RegistryNotExistException
      *
      **/
     string name;
-};
+}
 
 /**
  *
@@ -181,7 +190,7 @@ exception DeploymentException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -203,7 +212,7 @@ exception NodeUnreachableException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -225,8 +234,7 @@ exception ServerUnreachableException
      *
      **/
     string reason;
-};
-
+}
 
 /**
  *
@@ -248,7 +256,7 @@ exception RegistryUnreachableException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -264,7 +272,7 @@ exception BadSignalException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -279,7 +287,7 @@ exception PatchException
      *
      **/
     Ice::StringSeq reasons;
-};
+}
 
 /**
  *
@@ -295,7 +303,7 @@ exception AccessDeniedException
      *
      **/
     string lockUserId;
-};
+}
 
 /**
  *
@@ -310,7 +318,7 @@ exception AllocationException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -320,7 +328,7 @@ exception AllocationException
  **/
 exception AllocationTimeoutException extends AllocationException
 {
-};
+}
 
 /**
  *
@@ -336,7 +344,7 @@ exception PermissionDeniedException
      *
      **/
     string reason;
-};
+}
 
 /**
  *
@@ -355,7 +363,7 @@ exception ObserverAlreadyRegisteredException
      *
      **/
     Ice::Identity id;
-};
+}
 
 /**
  *
@@ -377,8 +385,6 @@ exception FileNotAvailableException
      *
      **/
     string reason;
-};
-
-
-};
+}
 
+}