zeroc-ice 3.8.1 → 3.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/dist/IceRuby/Communicator.cpp +26 -9
- data/dist/IceRuby/Config.h +0 -12
- data/dist/IceRuby/Connection.cpp +18 -9
- data/dist/IceRuby/DefaultSliceLoader.h +1 -1
- data/dist/IceRuby/Endpoint.cpp +21 -8
- data/dist/IceRuby/Operation.cpp +29 -11
- data/dist/IceRuby/Properties.cpp +3 -4
- data/dist/IceRuby/Proxy.cpp +11 -19
- data/dist/IceRuby/RubySliceLoader.cpp +1 -1
- data/dist/IceRuby/RubySliceLoader.h +6 -0
- data/dist/IceRuby/Types.cpp +162 -138
- data/dist/IceRuby/Types.h +68 -28
- data/dist/IceRuby/Util.cpp +14 -78
- data/dist/IceRuby/Util.h +7 -17
- data/dist/ice/cpp/include/Ice/Communicator.h +31 -8
- data/dist/ice/cpp/include/Ice/Config.h +2 -2
- data/dist/ice/cpp/include/Ice/Connection.h +24 -8
- data/dist/ice/cpp/include/Ice/CtrlCHandler.h +1 -1
- data/dist/ice/cpp/include/Ice/Demangle.h +1 -1
- data/dist/ice/cpp/include/Ice/Endpoint.h +4 -4
- data/dist/ice/cpp/include/Ice/Initialize.h +4 -4
- data/dist/ice/cpp/include/Ice/InputStream.h +5 -5
- data/dist/ice/cpp/include/Ice/Instrumentation.h +13 -7
- data/dist/ice/cpp/include/Ice/LocalExceptions.h +26 -5
- data/dist/ice/cpp/include/Ice/Logger.h +7 -0
- data/dist/ice/cpp/include/Ice/LoggerUtil.h +1 -1
- data/dist/ice/cpp/include/Ice/Object.h +10 -8
- data/dist/ice/cpp/include/Ice/ObjectAdapter.h +1 -1
- data/dist/ice/cpp/include/Ice/OutgoingAsync.h +5 -2
- data/dist/ice/cpp/include/Ice/OutgoingResponse.h +2 -1
- data/dist/ice/cpp/include/Ice/OutputStream.h +14 -11
- data/dist/ice/cpp/include/Ice/PluginFactory.h +1 -1
- data/dist/ice/cpp/include/Ice/Properties.h +3 -3
- data/dist/ice/cpp/include/Ice/Proxy.h +192 -50
- data/dist/ice/cpp/include/Ice/SSL/ClientAuthenticationOptions.h +3 -3
- data/dist/ice/cpp/include/Ice/SSL/EndpointInfo.h +1 -1
- data/dist/ice/cpp/include/Ice/SSL/ServerAuthenticationOptions.h +5 -5
- data/dist/ice/cpp/include/Ice/ServantLocator.h +1 -1
- data/dist/ice/cpp/include/Ice/Service.h +2 -5
- data/dist/ice/cpp/include/Ice/SliceLoader.h +1 -1
- data/dist/ice/cpp/include/Ice/SlicedData.h +5 -3
- data/dist/ice/cpp/include/Ice/StreamHelpers.h +1 -1
- data/dist/ice/cpp/include/Ice/StreamableTraits.h +2 -2
- data/dist/ice/cpp/include/Ice/StringConverter.h +2 -3
- data/dist/ice/cpp/include/Ice/StringUtil.h +2 -7
- data/dist/ice/cpp/include/Ice/UUID.h +1 -0
- data/dist/ice/cpp/include/Ice/Value.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Context.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Locator.h +57 -23
- data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h +38 -11
- data/dist/ice/cpp/include/generated/Ice/Metrics.h +99 -44
- data/dist/ice/cpp/include/generated/Ice/OperationMode.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Process.h +34 -8
- data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h +42 -11
- data/dist/ice/cpp/include/generated/Ice/PropertyDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h +93 -40
- data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h +8 -4
- data/dist/ice/cpp/include/generated/Ice/Router.h +55 -19
- data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/dist/ice/cpp/include/generated/IceDiscovery/Lookup.h +66 -14
- data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h +34 -8
- data/dist/ice/cpp/src/Ice/AddDefaultPluginFactories_all.cpp +1 -1
- data/dist/ice/cpp/src/Ice/Base64.cpp +47 -137
- data/dist/ice/cpp/src/Ice/Base64.h +2 -2
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.cpp +28 -13
- data/dist/ice/cpp/src/Ice/BatchRequestQueue.h +5 -1
- data/dist/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +6 -4
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/Communicator.cpp +4 -3
- data/dist/ice/cpp/src/Ice/CommunicatorFlushBatchAsync.cpp +8 -0
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.cpp +5 -15
- data/dist/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/ConnectionFactory.cpp +6 -8
- data/dist/ice/cpp/src/Ice/ConnectionFactory.h +0 -3
- data/dist/ice/cpp/src/Ice/ConnectionI.cpp +121 -108
- data/dist/ice/cpp/src/Ice/ConnectionI.h +12 -9
- data/dist/ice/cpp/src/Ice/ConsoleUtil.cpp +1 -1
- data/dist/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -14
- data/dist/ice/cpp/src/Ice/EndpointI.h +1 -1
- data/dist/ice/cpp/src/Ice/FileUtil.cpp +15 -79
- data/dist/ice/cpp/src/Ice/FileUtil.h +0 -3
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.cpp +1 -1
- data/dist/ice/cpp/src/Ice/FixedRequestHandler.h +1 -1
- data/dist/ice/cpp/src/Ice/HttpParser.h +0 -2
- data/dist/ice/cpp/src/Ice/IPEndpointI.cpp +4 -0
- data/dist/ice/cpp/src/Ice/IdleTimeoutTransceiverDecorator.cpp +6 -3
- data/dist/ice/cpp/src/Ice/IncomingRequest.cpp +2 -4
- data/dist/ice/cpp/src/Ice/InputStream.cpp +50 -33
- data/dist/ice/cpp/src/Ice/Instance.cpp +73 -50
- data/dist/ice/cpp/src/Ice/Instance.h +1 -6
- data/dist/ice/cpp/src/Ice/LocalExceptions.cpp +7 -1
- data/dist/ice/cpp/src/Ice/LocatorInfo.cpp +2 -2
- data/dist/ice/cpp/src/Ice/LoggerAdminI.cpp +13 -18
- data/dist/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/LoggerI.h +2 -2
- data/dist/ice/cpp/src/Ice/MetricsAdminI.h +6 -1
- data/dist/ice/cpp/src/Ice/MetricsObserverI.h +22 -18
- data/dist/ice/cpp/src/Ice/NativePropertiesAdmin.cpp +5 -2
- data/dist/ice/cpp/src/Ice/Network.cpp +168 -103
- data/dist/ice/cpp/src/Ice/Network.h +12 -7
- data/dist/ice/cpp/src/Ice/NetworkProxy.cpp +17 -6
- data/dist/ice/cpp/src/Ice/NetworkProxy.h +2 -1
- data/dist/ice/cpp/src/Ice/Object.cpp +1 -1
- data/dist/ice/cpp/src/Ice/ObjectAdapterI.cpp +56 -19
- data/dist/ice/cpp/src/Ice/OpaqueEndpointI.cpp +10 -10
- data/dist/ice/cpp/src/Ice/Options.cpp +7 -2
- data/dist/ice/cpp/src/Ice/OutgoingAsync.cpp +2 -2
- data/dist/ice/cpp/src/Ice/OutgoingResponse.cpp +127 -127
- data/dist/ice/cpp/src/Ice/OutgoingResponseInternal.h +21 -0
- data/dist/ice/cpp/src/Ice/OutputStream.cpp +50 -65
- data/dist/ice/cpp/src/Ice/PluginManagerI.cpp +7 -1
- data/dist/ice/cpp/src/Ice/Properties.cpp +26 -16
- data/dist/ice/cpp/src/Ice/PropertyNames.cpp +2 -1
- data/dist/ice/cpp/src/Ice/PropertyUtil.cpp +1 -1
- data/dist/ice/cpp/src/Ice/ProtocolInstance.cpp +0 -11
- data/dist/ice/cpp/src/Ice/ProtocolInstance.h +1 -2
- data/dist/ice/cpp/src/Ice/Proxy.cpp +9 -1
- data/dist/ice/cpp/src/Ice/ProxyAsync.cpp +110 -13
- data/dist/ice/cpp/src/Ice/ProxyFunctions.cpp +4 -4
- data/dist/ice/cpp/src/Ice/Random.cpp +68 -7
- data/dist/ice/cpp/src/Ice/Random.h +6 -2
- data/dist/ice/cpp/src/Ice/Reference.cpp +37 -26
- data/dist/ice/cpp/src/Ice/Reference.h +3 -0
- data/dist/ice/cpp/src/Ice/ReferenceFactory.cpp +26 -13
- data/dist/ice/cpp/src/Ice/RequestHandler.h +3 -1
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.cpp +1 -1
- data/dist/ice/cpp/src/Ice/RequestHandlerCache.h +1 -1
- data/dist/ice/cpp/src/Ice/ResourceConfig.h +3 -3
- data/dist/ice/cpp/src/Ice/RetryQueue.cpp +8 -12
- data/dist/ice/cpp/src/Ice/SHA1.cpp +11 -11
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.cpp +0 -6
- data/dist/ice/cpp/src/Ice/SSL/DistinguishedName.h +0 -6
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.cpp +27 -12
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.h +1 -2
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.cpp +77 -27
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.h +2 -1
- data/dist/ice/cpp/src/Ice/SSL/RFC2253.cpp +2 -2
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.h +1 -4
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.cpp +39 -34
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.cpp +165 -80
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.h +1 -5
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.cpp +73 -33
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.h +0 -1
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.cpp +110 -17
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.h +7 -2
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp +9 -3
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.cpp +73 -51
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.h +0 -8
- data/dist/ice/cpp/src/Ice/Selector.cpp +13 -11
- data/dist/ice/cpp/src/Ice/ServantManager.cpp +3 -3
- data/dist/ice/cpp/src/Ice/Service.cpp +33 -115
- data/dist/ice/cpp/src/Ice/StreamSocket.cpp +33 -40
- data/dist/ice/cpp/src/Ice/StreamSocket.h +4 -4
- data/dist/ice/cpp/src/Ice/StringConverter.cpp +1 -1
- data/dist/ice/cpp/src/Ice/StringUtil.cpp +12 -21
- data/dist/ice/cpp/src/Ice/SysLoggerI.cpp +136 -100
- data/dist/ice/cpp/src/Ice/SysLoggerI.h +7 -3
- data/dist/ice/cpp/src/Ice/SystemdJournalI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/TcpAcceptor.cpp +7 -7
- data/dist/ice/cpp/src/Ice/TcpAcceptor.h +2 -1
- data/dist/ice/cpp/src/Ice/TcpBufSize.h +40 -0
- data/dist/ice/cpp/src/Ice/TcpConnector.cpp +5 -2
- data/dist/ice/cpp/src/Ice/TcpConnector.h +2 -0
- data/dist/ice/cpp/src/Ice/TcpEndpointI.cpp +2 -2
- data/dist/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -2
- data/dist/ice/cpp/src/Ice/ThreadPool.cpp +2 -8
- data/dist/ice/cpp/src/Ice/ThreadPool.h +0 -2
- data/dist/ice/cpp/src/Ice/Timer.cpp +7 -3
- data/dist/ice/cpp/src/Ice/UUID.cpp +1 -2
- data/dist/ice/cpp/src/Ice/UdpEndpointI.cpp +6 -3
- data/dist/ice/cpp/src/Ice/UdpTransceiver.cpp +136 -123
- data/dist/ice/cpp/src/Ice/UdpTransceiver.h +3 -4
- data/dist/ice/cpp/src/Ice/WSAcceptor.cpp +8 -3
- data/dist/ice/cpp/src/Ice/WSAcceptor.h +5 -1
- data/dist/ice/cpp/src/Ice/WSEndpoint.cpp +45 -2
- data/dist/ice/cpp/src/Ice/WSTransceiver.cpp +214 -34
- data/dist/ice/cpp/src/Ice/WSTransceiver.h +13 -2
- data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Context.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Identity.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Locator.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/LocatorRegistry.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Metrics.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/OperationMode.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Process.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertiesAdmin.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/PropertyDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/RemoteLogger.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/ReplyStatus.cpp +4 -2
- data/dist/ice/cpp/src/Ice/generated/Router.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/SliceChecksumDict.cpp +2 -2
- data/dist/ice/cpp/src/Ice/generated/Version.cpp +2 -2
- data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp +47 -9
- data/dist/ice/cpp/src/IceDiscovery/LookupI.h +8 -3
- data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +43 -14
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/Slice/DocCommentParser.cpp +32 -26
- data/dist/ice/cpp/src/Slice/DocCommentParser.h +6 -4
- data/dist/ice/cpp/src/Slice/FileTracker.cpp +3 -11
- data/dist/ice/cpp/src/Slice/FileTracker.h +0 -2
- data/dist/ice/cpp/src/Slice/Grammar.cpp +211 -210
- data/dist/ice/cpp/src/Slice/MetadataValidation.cpp +34 -14
- data/dist/ice/cpp/src/Slice/MetadataValidation.h +3 -2
- data/dist/ice/cpp/src/Slice/Parser.cpp +145 -97
- data/dist/ice/cpp/src/Slice/Parser.h +22 -8
- data/dist/ice/cpp/src/Slice/Preprocessor.cpp +77 -29
- data/dist/ice/cpp/src/Slice/Preprocessor.h +0 -3
- data/dist/ice/cpp/src/Slice/Scanner.cpp +3 -3
- data/dist/ice/cpp/src/Slice/SliceUtil.cpp +203 -172
- data/dist/ice/cpp/src/Slice/StringLiteralUtil.cpp +0 -2
- data/dist/ice/cpp/src/Slice/Util.h +21 -12
- data/dist/ice/cpp/src/slice2rb/Ruby.cpp +7 -3
- data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp +26 -20
- data/dist/ice/cpp/src/slice2rb/RubyUtil.h +10 -13
- data/dist/ice/slice/Glacier2/Router.ice +3 -3
- data/dist/ice/slice/Ice/Identity.ice +3 -0
- data/dist/ice/slice/Ice/Locator.ice +6 -5
- data/dist/ice/slice/Ice/LocatorRegistry.ice +3 -0
- data/dist/ice/slice/Ice/Metrics.ice +7 -6
- data/dist/ice/slice/Ice/OperationMode.ice +8 -0
- data/dist/ice/slice/Ice/Process.ice +3 -0
- data/dist/ice/slice/Ice/RemoteLogger.ice +5 -5
- data/dist/ice/slice/Ice/ReplyStatus.ice +13 -0
- data/dist/ice/slice/IceGrid/Admin.ice +9 -9
- data/dist/ice/slice/IceGrid/Descriptor.ice +5 -5
- data/dist/ice/slice/IceStorm/Metrics.ice +1 -1
- data/dist/lib/Glacier2/Metrics.rb +1 -1
- data/dist/lib/Glacier2/PermissionsVerifier.rb +3 -3
- data/dist/lib/Glacier2/Router.rb +9 -9
- data/dist/lib/Glacier2/SSLInfo.rb +1 -1
- data/dist/lib/Glacier2/Session.rb +15 -15
- data/dist/lib/Ice/BuiltinSequences.rb +1 -1
- data/dist/lib/Ice/CompressBatch.rb +1 -2
- data/dist/lib/Ice/Context.rb +1 -1
- data/dist/lib/Ice/EndpointSelectionType.rb +1 -2
- data/dist/lib/Ice/EndpointTypes.rb +1 -1
- data/dist/lib/Ice/Identity.rb +1 -1
- data/dist/lib/Ice/IdentitySpaceship.rb +1 -0
- data/dist/lib/Ice/LocalExceptions.rb +3 -0
- data/dist/lib/Ice/Locator.rb +5 -5
- data/dist/lib/Ice/LocatorRegistry.rb +4 -4
- data/dist/lib/Ice/Metrics.rb +7 -7
- data/dist/lib/Ice/OperationMode.rb +2 -3
- data/dist/lib/Ice/Process.rb +3 -3
- data/dist/lib/Ice/PropertiesAdmin.rb +4 -4
- data/dist/lib/Ice/PropertyDict.rb +1 -1
- data/dist/lib/Ice/ProxyFunctions.rb +8 -4
- data/dist/lib/Ice/RemoteLogger.rb +7 -8
- data/dist/lib/Ice/ReplyStatus.rb +4 -4
- data/dist/lib/Ice/Router.rb +5 -5
- data/dist/lib/Ice/SliceChecksumDict.rb +1 -1
- data/dist/lib/Ice/SliceUtil.rb +2 -2
- data/dist/lib/Ice/Struct.rb +1 -0
- data/dist/lib/Ice/ToStringMode.rb +1 -2
- data/dist/lib/Ice/Value.rb +2 -2
- data/dist/lib/Ice/Version.rb +1 -1
- data/dist/lib/IceBox/ServiceManager.rb +8 -8
- data/dist/lib/IceGrid/Admin.rb +85 -86
- data/dist/lib/IceGrid/Descriptor.rb +1 -1
- data/dist/lib/IceGrid/Exception.rb +1 -1
- data/dist/lib/IceGrid/FileParser.rb +2 -2
- data/dist/lib/IceGrid/Registry.rb +14 -15
- data/dist/lib/IceGrid/Session.rb +7 -7
- data/dist/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/dist/lib/IceStorm/IceStorm.rb +16 -16
- data/dist/lib/IceStorm/Metrics.rb +1 -1
- data/extconf.rb +1 -1
- data/ice.gemspec +3 -3
- metadata +5 -5
- data/dist/ice/cpp/src/Ice/DLLMain.cpp +0 -40
- data/dist/ice/cpp/src/Ice/UndefSysMacros.h +0 -37
|
@@ -15,16 +15,19 @@ using namespace IceInternal;
|
|
|
15
15
|
|
|
16
16
|
namespace
|
|
17
17
|
{
|
|
18
|
-
|
|
18
|
+
// Returns the name of the synthesized trailing 'context' parameter for a generated proxy method. It is escaped
|
|
19
|
+
// to 'context_' when an in-parameter's lower-cased mapped name is already 'context' (e.g. a parameter named
|
|
20
|
+
// 'Context'), to avoid emitting a duplicate parameter name in the method signature.
|
|
21
|
+
string getEscapedContextParam(const OperationPtr& p)
|
|
19
22
|
{
|
|
20
|
-
for (const auto& param : p->
|
|
23
|
+
for (const auto& param : p->inParameters())
|
|
21
24
|
{
|
|
22
|
-
if (Slice::Ruby::getMappedName(param) ==
|
|
25
|
+
if (Slice::Ruby::getMappedName(param, Slice::Ruby::IdentToLower) == "context")
|
|
23
26
|
{
|
|
24
|
-
return
|
|
27
|
+
return "context_";
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
|
-
return
|
|
30
|
+
return "context";
|
|
28
31
|
}
|
|
29
32
|
}
|
|
30
33
|
|
|
@@ -241,13 +244,14 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
|
|
|
241
244
|
}
|
|
242
245
|
for (auto q = members.begin(); q != members.end(); ++q)
|
|
243
246
|
{
|
|
247
|
+
const bool isOptional = (*q)->isOptional();
|
|
244
248
|
if (q != members.begin())
|
|
245
249
|
{
|
|
246
250
|
_out << ',' << nl;
|
|
247
251
|
}
|
|
248
252
|
_out << "['" << getMappedName(*q) << "', ";
|
|
249
253
|
writeType((*q)->type());
|
|
250
|
-
_out << ", " << (
|
|
254
|
+
_out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? (*q)->tag() : 0) << ']';
|
|
251
255
|
}
|
|
252
256
|
if (members.size() > 1)
|
|
253
257
|
{
|
|
@@ -318,7 +322,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
|
|
|
318
322
|
{
|
|
319
323
|
_out << inParams << ", ";
|
|
320
324
|
}
|
|
321
|
-
const string contextParamName =
|
|
325
|
+
const string contextParamName = getEscapedContextParam(op);
|
|
322
326
|
_out << contextParamName << "=nil)";
|
|
323
327
|
_out.inc();
|
|
324
328
|
_out << nl << proxyName << "_mixin::OP_" << op->name() << ".invoke(self, [" << inParams;
|
|
@@ -407,6 +411,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
|
|
|
407
411
|
bool isFirst = true;
|
|
408
412
|
for (const auto& param : op->inParameters())
|
|
409
413
|
{
|
|
414
|
+
const bool isOptional = param->isOptional();
|
|
410
415
|
if (!isFirst)
|
|
411
416
|
{
|
|
412
417
|
_out << ", ";
|
|
@@ -414,13 +419,13 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
|
|
|
414
419
|
isFirst = false;
|
|
415
420
|
_out << '[';
|
|
416
421
|
writeType(param->type());
|
|
417
|
-
_out << ", " << (
|
|
418
|
-
<< ']';
|
|
422
|
+
_out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? param->tag() : 0) << ']';
|
|
419
423
|
}
|
|
420
424
|
_out << "], [";
|
|
421
425
|
isFirst = true;
|
|
422
426
|
for (const auto& param : op->outParameters())
|
|
423
427
|
{
|
|
428
|
+
const bool isOptional = param->isOptional();
|
|
424
429
|
if (!isFirst)
|
|
425
430
|
{
|
|
426
431
|
_out << ", ";
|
|
@@ -428,8 +433,7 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
|
|
|
428
433
|
isFirst = false;
|
|
429
434
|
_out << '[';
|
|
430
435
|
writeType(param->type());
|
|
431
|
-
_out << ", " << (
|
|
432
|
-
<< ']';
|
|
436
|
+
_out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? param->tag() : 0) << ']';
|
|
433
437
|
}
|
|
434
438
|
_out << "], ";
|
|
435
439
|
TypePtr returnType = op->returnType();
|
|
@@ -456,13 +460,15 @@ Slice::Ruby::CodeVisitor::visitInterfaceDefStart(const InterfaceDefPtr& p)
|
|
|
456
460
|
_out << getMetaTypeReference(ex);
|
|
457
461
|
}
|
|
458
462
|
_out.epar("]");
|
|
463
|
+
_out << ", " << (op->hasMetadata("oneway") ? "true" : "false");
|
|
459
464
|
_out << ")";
|
|
460
465
|
|
|
461
466
|
if (op->isDeprecated())
|
|
462
467
|
{
|
|
463
468
|
// Get the deprecation reason if present, or default to an empty string.
|
|
464
|
-
string reason = op->getDeprecationReason().value_or("");
|
|
465
|
-
|
|
469
|
+
const string reason = op->getDeprecationReason().value_or("");
|
|
470
|
+
const string escapedReason = toStringLiteral(reason, "\a\b\f\n\r\t\v\x20\x1b", "#", EC6UCN, 0);
|
|
471
|
+
_out << nl << proxyName << "_mixin::OP_" << opName << ".deprecate(\"" << escapedReason << "\")";
|
|
466
472
|
}
|
|
467
473
|
}
|
|
468
474
|
|
|
@@ -547,14 +553,14 @@ Slice::Ruby::CodeVisitor::visitExceptionStart(const ExceptionPtr& p)
|
|
|
547
553
|
//
|
|
548
554
|
for (auto dmli = members.begin(); dmli != members.end(); ++dmli)
|
|
549
555
|
{
|
|
556
|
+
const bool isOptional = (*dmli)->isOptional();
|
|
550
557
|
if (dmli != members.begin())
|
|
551
558
|
{
|
|
552
559
|
_out << ',' << nl;
|
|
553
560
|
}
|
|
554
561
|
_out << "[\"" << getMappedName(*dmli) << "\", ";
|
|
555
562
|
writeType((*dmli)->type());
|
|
556
|
-
_out << ", " << (
|
|
557
|
-
<< ']';
|
|
563
|
+
_out << ", " << (isOptional ? "true" : "false") << ", " << (isOptional ? (*dmli)->tag() : 0) << ']';
|
|
558
564
|
}
|
|
559
565
|
if (members.size() > 1)
|
|
560
566
|
{
|
|
@@ -776,9 +782,7 @@ Slice::Ruby::CodeVisitor::visitEnum(const EnumPtr& p)
|
|
|
776
782
|
//
|
|
777
783
|
_out << sp << nl << "def <=>(other)";
|
|
778
784
|
_out.inc();
|
|
779
|
-
_out << nl << "other.is_a?(" << name << ")
|
|
780
|
-
<< name << "\"";
|
|
781
|
-
_out << nl << "@value <=> other.to_i";
|
|
785
|
+
_out << nl << "@value <=> other.to_i if other.is_a?(" << name << ")";
|
|
782
786
|
_out.dec();
|
|
783
787
|
_out << nl << "end";
|
|
784
788
|
|
|
@@ -1000,7 +1004,9 @@ Slice::Ruby::CodeVisitor::writeConstantValue(
|
|
|
1000
1004
|
case Builtin::KindString:
|
|
1001
1005
|
{
|
|
1002
1006
|
// RubyUCN available in Ruby 1.9 or greater
|
|
1003
|
-
|
|
1007
|
+
// Escape '#' so that '#{', '#@', and '#$' are not interpreted as interpolation in the
|
|
1008
|
+
// double-quoted Ruby string literal.
|
|
1009
|
+
_out << "\"" << toStringLiteral(value, "\a\b\f\n\r\t\v\x20\x1b", "#", EC6UCN, 0) << "\"";
|
|
1004
1010
|
break;
|
|
1005
1011
|
}
|
|
1006
1012
|
|
|
@@ -1038,7 +1044,7 @@ Slice::Ruby::CodeVisitor::writeConstructorParams(const DataMemberList& members)
|
|
|
1038
1044
|
{
|
|
1039
1045
|
writeConstantValue(member->type(), member->defaultValueType(), *member->defaultValue());
|
|
1040
1046
|
}
|
|
1041
|
-
else if (member->
|
|
1047
|
+
else if (member->isOptional())
|
|
1042
1048
|
{
|
|
1043
1049
|
_out << "Ice::Unset";
|
|
1044
1050
|
}
|
|
@@ -9,13 +9,10 @@
|
|
|
9
9
|
namespace Slice::Ruby
|
|
10
10
|
{
|
|
11
11
|
/// Generates Ruby code for the provided translation unit.
|
|
12
|
-
void
|
|
13
|
-
|
|
14
|
-
bool all,
|
|
15
|
-
const std::vector<std::string>& includePaths,
|
|
16
|
-
IceInternal::Output& out);
|
|
12
|
+
void
|
|
13
|
+
generate(const UnitPtr& unit, bool all, const std::vector<std::string>& includePaths, IceInternal::Output& out);
|
|
17
14
|
|
|
18
|
-
/// This enum is used by
|
|
15
|
+
/// This enum is used by `getMappedName` to control the casing of the identifier it returns.
|
|
19
16
|
enum IdentStyle
|
|
20
17
|
{
|
|
21
18
|
/// No change will be made to the mapped identifier.
|
|
@@ -31,17 +28,17 @@ namespace Slice::Ruby
|
|
|
31
28
|
/// Returns the mapped name of the provided Slice element.
|
|
32
29
|
/// If the element has 'ruby:identifier' metadata on it, the metadata's argument is returned as-is.
|
|
33
30
|
/// Otherwise, the slice name is returned, after its casing has been fixed according to the provided @p style.
|
|
34
|
-
std::string getMappedName(const
|
|
31
|
+
std::string getMappedName(const ContainedPtr& p, IdentStyle style = IdentNormal);
|
|
35
32
|
|
|
36
33
|
/// Returns the fully-qualified mapped-identifier of the provided Slice element.
|
|
37
|
-
/// This is equivalent to calling
|
|
38
|
-
std::string getAbsolute(const
|
|
34
|
+
/// This is equivalent to calling `getMappedName` on @p p and all its containers.
|
|
35
|
+
std::string getAbsolute(const ContainedPtr& p);
|
|
39
36
|
|
|
40
|
-
/// Equivalent to
|
|
41
|
-
std::string getMetaTypeName(const
|
|
37
|
+
/// Equivalent to `getMappedName` but with "T_" prepended to the name.
|
|
38
|
+
std::string getMetaTypeName(const ContainedPtr& p);
|
|
42
39
|
|
|
43
|
-
/// Equivalent to
|
|
44
|
-
std::string getMetaTypeReference(const
|
|
40
|
+
/// Equivalent to `getAbsolute` but with "T_" prepended to the name.
|
|
41
|
+
std::string getMetaTypeReference(const ContainedPtr& p);
|
|
45
42
|
|
|
46
43
|
/// Emits a comment header for a generated file.
|
|
47
44
|
void printHeader(IceInternal::Output& out);
|
|
@@ -64,14 +64,14 @@ module Glacier2
|
|
|
64
64
|
/// @throws PermissionDeniedException Thrown when an authentication or authorization failure occurs.
|
|
65
65
|
/// @throws CannotCreateSessionException Thrown when the session cannot be created.
|
|
66
66
|
/// @see Session
|
|
67
|
-
/// @see
|
|
68
|
-
/// @see
|
|
67
|
+
/// @see SSLSessionManager
|
|
68
|
+
/// @see SSLPermissionsVerifier
|
|
69
69
|
Session* createSessionFromSecureConnection()
|
|
70
70
|
throws PermissionDeniedException, CannotCreateSessionException;
|
|
71
71
|
|
|
72
72
|
/// Keeps the session with this router alive.
|
|
73
73
|
/// @throws SessionNotExistException Thrown when no session exists for the caller (client).
|
|
74
|
-
["deprecated:As of Ice 3.8, this operation
|
|
74
|
+
["deprecated:As of Ice 3.8, this operation no longer keeps the session alive; it only verifies that the session exists."]
|
|
75
75
|
void refreshSession()
|
|
76
76
|
throws SessionNotExistException;
|
|
77
77
|
|
|
@@ -12,17 +12,18 @@
|
|
|
12
12
|
|
|
13
13
|
#include "Identity.ice"
|
|
14
14
|
|
|
15
|
+
#ifdef __ICERPC__
|
|
16
|
+
["cs:identifier:IceRpc.Ice"]
|
|
17
|
+
#endif
|
|
15
18
|
["java:identifier:com.zeroc.Ice"]
|
|
16
19
|
module Ice
|
|
17
20
|
{
|
|
18
|
-
/// The exception that is thrown by a {@link Locator} implementation when it cannot find an object adapter
|
|
19
|
-
/// provided adapter ID.
|
|
21
|
+
/// The exception that is thrown by a {@link Locator} implementation when it cannot find an object adapter.
|
|
20
22
|
exception AdapterNotFoundException
|
|
21
23
|
{
|
|
22
24
|
}
|
|
23
25
|
|
|
24
|
-
/// The exception that is thrown by a {@link Locator} implementation when it cannot find an object
|
|
25
|
-
/// identity.
|
|
26
|
+
/// The exception that is thrown by a {@link Locator} implementation when it cannot find an object.
|
|
26
27
|
exception ObjectNotFoundException
|
|
27
28
|
{
|
|
28
29
|
}
|
|
@@ -34,7 +35,7 @@ module Ice
|
|
|
34
35
|
/// their object adapters.
|
|
35
36
|
interface Locator
|
|
36
37
|
{
|
|
37
|
-
/// Finds an object by identity and returns a dummy proxy with
|
|
38
|
+
/// Finds an object by identity and returns a dummy proxy with endpoint(s) that can be used to reach this
|
|
38
39
|
/// object. This dummy proxy may be an indirect proxy that requires further resolution using
|
|
39
40
|
/// {@link findAdapterById}.
|
|
40
41
|
/// @param id The identity.
|
|
@@ -18,7 +18,7 @@ module IceMX
|
|
|
18
18
|
/// A dictionary of strings to integers.
|
|
19
19
|
dictionary<string, int> StringIntDict;
|
|
20
20
|
|
|
21
|
-
/// The base class for metrics. A metrics object represents a collection of measurements associated
|
|
21
|
+
/// The base class for metrics. A metrics object represents a collection of measurements associated with a given
|
|
22
22
|
/// system.
|
|
23
23
|
class Metrics
|
|
24
24
|
{
|
|
@@ -32,7 +32,7 @@ module IceMX
|
|
|
32
32
|
/// The number of objects currently observed by this metrics.
|
|
33
33
|
int current = 0;
|
|
34
34
|
|
|
35
|
-
/// The sum of the
|
|
35
|
+
/// The sum of the lifetimes of each observed object. This does not include the lifetimes of objects which are
|
|
36
36
|
/// currently observed, only the objects observed in the past.
|
|
37
37
|
long totalLifetime = 0;
|
|
38
38
|
|
|
@@ -71,7 +71,7 @@ module IceMX
|
|
|
71
71
|
/// metrics of an application that enabled the Ice administrative facility and configured one or more metrics views.
|
|
72
72
|
interface MetricsAdmin
|
|
73
73
|
{
|
|
74
|
-
/// Gets the names of enabled and disabled metrics.
|
|
74
|
+
/// Gets the names of the enabled and disabled metrics views.
|
|
75
75
|
/// @param disabledViews The names of the disabled views.
|
|
76
76
|
/// @return The names of the enabled views.
|
|
77
77
|
Ice::StringSeq getMetricsViewNames(out Ice::StringSeq disabledViews);
|
|
@@ -92,7 +92,7 @@ module IceMX
|
|
|
92
92
|
/// @param view The name of the metrics view.
|
|
93
93
|
/// @param timestamp The local time of the process when the metrics objects were retrieved.
|
|
94
94
|
/// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
|
|
95
|
-
/// The @p timestamp allows the client to compute averages which are not dependent
|
|
95
|
+
/// The @p timestamp allows the client to compute averages which are not dependent on the invocation latency for
|
|
96
96
|
/// this operation.
|
|
97
97
|
/// @throws UnknownMetricsView Thrown when the metrics view cannot be found.
|
|
98
98
|
["format:sliced"]
|
|
@@ -107,7 +107,7 @@ module IceMX
|
|
|
107
107
|
MetricsFailuresSeq getMapMetricsFailures(string view, string map)
|
|
108
108
|
throws UnknownMetricsView;
|
|
109
109
|
|
|
110
|
-
/// Gets the metrics
|
|
110
|
+
/// Gets the metrics failures associated with the given metrics.
|
|
111
111
|
/// @param view The name of the metrics view.
|
|
112
112
|
/// @param map The name of the metrics map.
|
|
113
113
|
/// @param id The ID of the metrics.
|
|
@@ -170,7 +170,8 @@ module IceMX
|
|
|
170
170
|
{
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
-
///
|
|
173
|
+
/// Provides measurements for proxy invocations. Proxy invocations can either be sent over the wire or be
|
|
174
|
+
/// collocated.
|
|
174
175
|
class InvocationMetrics extends Metrics
|
|
175
176
|
{
|
|
176
177
|
/// The number of retries for the invocations.
|
|
@@ -12,10 +12,18 @@
|
|
|
12
12
|
|
|
13
13
|
[["js:module:@zeroc/ice"]]
|
|
14
14
|
|
|
15
|
+
#ifdef __ICERPC__
|
|
16
|
+
// In IceRPC, OperationMode is an internal implementation detail of the Ice protocol; the corresponding generated code
|
|
17
|
+
// is not publicly visible.
|
|
18
|
+
["cs:identifier:IceRpc.Internal"]
|
|
19
|
+
#endif
|
|
15
20
|
["java:identifier:com.zeroc.Ice"]
|
|
16
21
|
module Ice
|
|
17
22
|
{
|
|
18
23
|
/// Specifies if an operation is idempotent, which affects the retry behavior of the Ice client runtime.
|
|
24
|
+
#ifdef __ICERPC__
|
|
25
|
+
["cs:internal"]
|
|
26
|
+
#endif
|
|
19
27
|
enum OperationMode
|
|
20
28
|
{
|
|
21
29
|
/// A non-idempotent operation (the default). The Ice client runtime guarantees that it will not violate
|
|
@@ -93,7 +93,7 @@ module Ice
|
|
|
93
93
|
/// (send all trace categories).
|
|
94
94
|
/// @param messageMax The maximum number of log messages (of all types) to be provided to
|
|
95
95
|
/// {@link RemoteLogger::init}. A negative value requests all messages available.
|
|
96
|
-
/// @throws RemoteLoggerAlreadyAttachedException Thrown
|
|
96
|
+
/// @throws RemoteLoggerAlreadyAttachedException Thrown when this remote logger is already attached to this admin
|
|
97
97
|
/// object.
|
|
98
98
|
void attachRemoteLogger(
|
|
99
99
|
RemoteLogger* prx,
|
|
@@ -110,13 +110,13 @@ module Ice
|
|
|
110
110
|
/// Retrieves recently logged log messages.
|
|
111
111
|
/// @param messageTypes The list of message types that the caller wishes to receive. An empty list means no
|
|
112
112
|
/// filtering (send all message types).
|
|
113
|
-
/// @param traceCategories The categories of traces that caller
|
|
114
|
-
/// @p messageTypes is not empty and does not include trace. An empty list means no filtering (send
|
|
115
|
-
/// categories).
|
|
113
|
+
/// @param traceCategories The categories of traces that the caller wishes to receive. This parameter is
|
|
114
|
+
/// ignored if @p messageTypes is not empty and does not include trace. An empty list means no filtering (send
|
|
115
|
+
/// all trace categories).
|
|
116
116
|
/// @param messageMax The maximum number of log messages (of all types) to be returned. A negative value
|
|
117
117
|
/// requests all messages available.
|
|
118
118
|
/// @param prefix The prefix of the associated local logger.
|
|
119
|
-
/// @return The
|
|
119
|
+
/// @return The log messages.
|
|
120
120
|
LogMessageSeq getLog(
|
|
121
121
|
LogMessageTypeSeq messageTypes,
|
|
122
122
|
StringSeq traceCategories,
|
|
@@ -12,12 +12,20 @@
|
|
|
12
12
|
|
|
13
13
|
[["js:module:@zeroc/ice"]]
|
|
14
14
|
|
|
15
|
+
#ifdef __ICERPC__
|
|
16
|
+
// In IceRPC, ReplyStatus is an internal implementation detail of the Ice protocol; the corresponding generated code is
|
|
17
|
+
// not publicly visible.
|
|
18
|
+
["cs:identifier:IceRpc.Internal"]
|
|
19
|
+
#endif
|
|
15
20
|
["java:identifier:com.zeroc.Ice"]
|
|
16
21
|
module Ice
|
|
17
22
|
{
|
|
18
23
|
/// Represents the status of a reply.
|
|
19
24
|
/// A reply status can have any value in the range 0..255. Do not use this enum to marshal or unmarshal a reply
|
|
20
25
|
/// status unless you know its value corresponds to one of the enumerators defined below.
|
|
26
|
+
#ifdef __ICERPC__
|
|
27
|
+
["cs:internal"]
|
|
28
|
+
#endif
|
|
21
29
|
enum ReplyStatus
|
|
22
30
|
{
|
|
23
31
|
/// The dispatch completed successfully.
|
|
@@ -61,5 +69,10 @@ module Ice
|
|
|
61
69
|
/// The caller is not authorized to access the requested resource.
|
|
62
70
|
["swift:identifier:unauthorized"]
|
|
63
71
|
Unauthorized,
|
|
72
|
+
|
|
73
|
+
/// The dispatch failed because the request requires a feature that the server or the target servant does not
|
|
74
|
+
/// support.
|
|
75
|
+
["swift:identifier:notSupported"]
|
|
76
|
+
NotSupported,
|
|
64
77
|
}
|
|
65
78
|
}
|
|
@@ -120,10 +120,10 @@ module IceGrid
|
|
|
120
120
|
/// The network name of the host running this node.
|
|
121
121
|
string hostname;
|
|
122
122
|
|
|
123
|
-
/// The
|
|
123
|
+
/// The operating system release level.
|
|
124
124
|
string release;
|
|
125
125
|
|
|
126
|
-
/// The
|
|
126
|
+
/// The operating system version.
|
|
127
127
|
string version;
|
|
128
128
|
|
|
129
129
|
/// The machine hardware type.
|
|
@@ -349,9 +349,9 @@ module IceGrid
|
|
|
349
349
|
void instantiateServer(string application, string node, ServerInstanceDescriptor desc)
|
|
350
350
|
throws AccessDeniedException, ApplicationNotExistException, DeploymentException;
|
|
351
351
|
|
|
352
|
-
/// Gets an application
|
|
352
|
+
/// Gets information about an application.
|
|
353
353
|
/// @param name The application name.
|
|
354
|
-
/// @return The application
|
|
354
|
+
/// @return The application information.
|
|
355
355
|
/// @throws ApplicationNotExistException Thrown when the application doesn't exist.
|
|
356
356
|
["cpp:const"]
|
|
357
357
|
idempotent ApplicationInfo getApplicationInfo(string name)
|
|
@@ -660,7 +660,7 @@ module IceGrid
|
|
|
660
660
|
/// message doesn't exceed the given size.
|
|
661
661
|
/// @param lines The lines read from the file. If there was nothing to read from the file since the last call to
|
|
662
662
|
/// read, an empty sequence is returned. The last line of the sequence is always incomplete (and therefore no
|
|
663
|
-
/// newline character should be added when writing the last line to the
|
|
663
|
+
/// newline character should be added when writing the last line to the output device).
|
|
664
664
|
/// @return `true` if EOF is encountered.
|
|
665
665
|
/// @throws FileNotAvailableException Thrown when the implementation failed to read from the file.
|
|
666
666
|
bool read(int size, out Ice::StringSeq lines)
|
|
@@ -798,7 +798,7 @@ module IceGrid
|
|
|
798
798
|
/// @param info The details of the new adapter.
|
|
799
799
|
void adapterAdded(AdapterInfo info);
|
|
800
800
|
|
|
801
|
-
|
|
801
|
+
/// Notifies the observer that a dynamically-registered adapter was updated.
|
|
802
802
|
/// @param info The details of the updated adapter.
|
|
803
803
|
void adapterUpdated(AdapterInfo info);
|
|
804
804
|
|
|
@@ -867,9 +867,9 @@ module IceGrid
|
|
|
867
867
|
/// session.
|
|
868
868
|
/// @param registryObs The registry observer identity.
|
|
869
869
|
/// @param nodeObs The node observer identity.
|
|
870
|
-
/// @param appObs The application observer.
|
|
871
|
-
/// @param adptObs The adapter observer.
|
|
872
|
-
/// @param objObs The object observer.
|
|
870
|
+
/// @param appObs The application observer identity.
|
|
871
|
+
/// @param adptObs The adapter observer identity.
|
|
872
|
+
/// @param objObs The object observer identity.
|
|
873
873
|
/// @throws ObserverAlreadyRegisteredException Thrown when an observer is already registered with this registry.
|
|
874
874
|
idempotent void setObserversByIdentity(
|
|
875
875
|
Ice::Identity registryObs,
|
|
@@ -87,7 +87,7 @@ module IceGrid
|
|
|
87
87
|
["deprecated:This field is provided for schema compatibility. It is no longer used."]
|
|
88
88
|
bool registerProcess = false;
|
|
89
89
|
|
|
90
|
-
/// When `true`, the lifetime of this object adapter is the same
|
|
90
|
+
/// When `true`, the lifetime of this object adapter is the same as the server lifetime. This information is
|
|
91
91
|
/// used by the IceGrid node to figure out the server state: the server is active when all its "server lifetime"
|
|
92
92
|
/// adapters are active.
|
|
93
93
|
bool serverLifetime;
|
|
@@ -265,7 +265,7 @@ module IceGrid
|
|
|
265
265
|
/// A mapping of template identifier to template descriptor.
|
|
266
266
|
dictionary<string, TemplateDescriptor> TemplateDescriptorDict;
|
|
267
267
|
|
|
268
|
-
/// Describes an IceBox service.
|
|
268
|
+
/// Describes an IceBox service instance.
|
|
269
269
|
struct ServiceInstanceDescriptor
|
|
270
270
|
{
|
|
271
271
|
/// The template used by this instance. It's empty when this instance does not use a template.
|
|
@@ -425,7 +425,7 @@ module IceGrid
|
|
|
425
425
|
/// The name of the node to update.
|
|
426
426
|
string name;
|
|
427
427
|
|
|
428
|
-
/// The updated description (or null if the description wasn't updated.
|
|
428
|
+
/// The updated description (or null if the description wasn't updated).
|
|
429
429
|
BoxedString description;
|
|
430
430
|
|
|
431
431
|
/// The variables to update.
|
|
@@ -501,13 +501,13 @@ module IceGrid
|
|
|
501
501
|
/// The server templates to update.
|
|
502
502
|
TemplateDescriptorDict serverTemplates;
|
|
503
503
|
|
|
504
|
-
/// The IDs of the server
|
|
504
|
+
/// The IDs of the server templates to remove.
|
|
505
505
|
Ice::StringSeq removeServerTemplates;
|
|
506
506
|
|
|
507
507
|
/// The service templates to update.
|
|
508
508
|
TemplateDescriptorDict serviceTemplates;
|
|
509
509
|
|
|
510
|
-
/// The IDs of the service
|
|
510
|
+
/// The IDs of the service templates to remove.
|
|
511
511
|
Ice::StringSeq removeServiceTemplates;
|
|
512
512
|
|
|
513
513
|
/// The application nodes to update.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.3
|
|
4
4
|
# <auto-generated>Generated from Slice file 'PermissionsVerifier.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -36,7 +36,7 @@ module ::Glacier2
|
|
|
36
36
|
|
|
37
37
|
T_PermissionsVerifierPrx.defineProxy(PermissionsVerifierPrx, nil, [])
|
|
38
38
|
|
|
39
|
-
PermissionsVerifierPrx_mixin::OP_checkPermissions = Ice::__defineOperation('checkPermissions', 'checkPermissions', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException])
|
|
39
|
+
PermissionsVerifierPrx_mixin::OP_checkPermissions = Ice::__defineOperation('checkPermissions', 'checkPermissions', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException], false)
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
if not defined?(::Glacier2::T_SSLPermissionsVerifierPrx)
|
|
@@ -56,6 +56,6 @@ module ::Glacier2
|
|
|
56
56
|
|
|
57
57
|
T_SSLPermissionsVerifierPrx.defineProxy(SSLPermissionsVerifierPrx, nil, [])
|
|
58
58
|
|
|
59
|
-
SSLPermissionsVerifierPrx_mixin::OP_authorize = Ice::__defineOperation('authorize', 'authorize', Ice::OperationMode::Idempotent, nil, [[::Glacier2::T_SSLInfo, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException])
|
|
59
|
+
SSLPermissionsVerifierPrx_mixin::OP_authorize = Ice::__defineOperation('authorize', 'authorize', Ice::OperationMode::Idempotent, nil, [[::Glacier2::T_SSLInfo, false, 0]], [[Ice::T_string, false, 0]], [Ice::T_bool, false, 0], [::Glacier2::T_PermissionDeniedException], false)
|
|
60
60
|
end
|
|
61
61
|
end
|
data/dist/lib/Glacier2/Router.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.3
|
|
4
4
|
# <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -61,13 +61,13 @@ module ::Glacier2
|
|
|
61
61
|
|
|
62
62
|
T_RouterPrx.defineProxy(RouterPrx, nil, [::Ice::T_RouterPrx])
|
|
63
63
|
|
|
64
|
-
RouterPrx_mixin::OP_getCategoryForClient = Ice::__defineOperation('getCategoryForClient', 'getCategoryForClient', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_string, false, 0], [])
|
|
65
|
-
RouterPrx_mixin::OP_createSession = Ice::__defineOperation('createSession', 'createSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException])
|
|
66
|
-
RouterPrx_mixin::OP_createSessionFromSecureConnection = Ice::__defineOperation('createSessionFromSecureConnection', 'createSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException])
|
|
67
|
-
RouterPrx_mixin::OP_refreshSession = Ice::__defineOperation('refreshSession', 'refreshSession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException])
|
|
68
|
-
RouterPrx_mixin::OP_refreshSession.deprecate("As
|
|
69
|
-
RouterPrx_mixin::OP_destroySession = Ice::__defineOperation('destroySession', 'destroySession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException])
|
|
70
|
-
RouterPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_long, false, 0], [])
|
|
71
|
-
RouterPrx_mixin::OP_getACMTimeout = Ice::__defineOperation('getACMTimeout', 'getACMTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [])
|
|
64
|
+
RouterPrx_mixin::OP_getCategoryForClient = Ice::__defineOperation('getCategoryForClient', 'getCategoryForClient', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_string, false, 0], [], false)
|
|
65
|
+
RouterPrx_mixin::OP_createSession = Ice::__defineOperation('createSession', 'createSession', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException], false)
|
|
66
|
+
RouterPrx_mixin::OP_createSessionFromSecureConnection = Ice::__defineOperation('createSessionFromSecureConnection', 'createSessionFromSecureConnection', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_PermissionDeniedException, ::Glacier2::T_CannotCreateSessionException], false)
|
|
67
|
+
RouterPrx_mixin::OP_refreshSession = Ice::__defineOperation('refreshSession', 'refreshSession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException], false)
|
|
68
|
+
RouterPrx_mixin::OP_refreshSession.deprecate("As\sof\sIce\s3.8,\sthis\soperation\sno\slonger\skeeps\sthe\ssession\salive;\sit\sonly\sverifies\sthat\sthe\ssession\sexists.")
|
|
69
|
+
RouterPrx_mixin::OP_destroySession = Ice::__defineOperation('destroySession', 'destroySession', Ice::OperationMode::Normal, nil, [], [], nil, [::Glacier2::T_SessionNotExistException], false)
|
|
70
|
+
RouterPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_long, false, 0], [], false)
|
|
71
|
+
RouterPrx_mixin::OP_getACMTimeout = Ice::__defineOperation('getACMTimeout', 'getACMTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [], false)
|
|
72
72
|
end
|
|
73
73
|
end
|