zeroc-ice 3.8.0 → 3.8.2
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/Operation.cpp +22 -6
- data/dist/IceRuby/Slice.cpp +1 -1
- data/dist/ice/cpp/include/Ice/Communicator.h +4 -4
- data/dist/ice/cpp/include/Ice/Config.h +2 -2
- data/dist/ice/cpp/include/Ice/Connection.h +3 -3
- data/dist/ice/cpp/include/Ice/Endpoint.h +2 -2
- data/dist/ice/cpp/include/Ice/Exception.h +1 -1
- data/dist/ice/cpp/include/Ice/Initialize.h +1 -1
- data/dist/ice/cpp/include/Ice/LocalExceptions.h +22 -1
- data/dist/ice/cpp/include/Ice/Logger.h +3 -3
- data/dist/ice/cpp/include/Ice/NativePropertiesAdmin.h +2 -0
- data/dist/ice/cpp/include/Ice/ObjectAdapter.h +3 -3
- data/dist/ice/cpp/include/Ice/ObserverHelper.h +1 -0
- data/dist/ice/cpp/include/Ice/OutputStream.h +27 -5
- data/dist/ice/cpp/include/Ice/Properties.h +3 -3
- data/dist/ice/cpp/include/Ice/Proxy.h +1 -1
- data/dist/ice/cpp/include/Ice/SSL/ClientAuthenticationOptions.h +10 -2
- data/dist/ice/cpp/include/Ice/SSL/ServerAuthenticationOptions.h +10 -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 +9 -11
- data/dist/ice/cpp/include/generated/Ice/LocatorRegistry.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Metrics.h +7 -7
- data/dist/ice/cpp/include/generated/Ice/OperationMode.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/Process.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/PropertyDict.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h +2 -2
- data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h +8 -4
- data/dist/ice/cpp/include/generated/Ice/Router.h +7 -7
- 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 +2 -2
- data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h +2 -2
- data/dist/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +5 -3
- data/dist/ice/cpp/src/Ice/ConnectionFactory.h +8 -8
- data/dist/ice/cpp/src/Ice/ConnectionI.cpp +28 -11
- data/dist/ice/cpp/src/Ice/ConnectionI.h +1 -1
- data/dist/ice/cpp/src/Ice/Demangle.cpp +1 -0
- data/dist/ice/cpp/src/Ice/FileUtil.cpp +3 -67
- data/dist/ice/cpp/src/Ice/FileUtil.h +0 -3
- data/dist/ice/cpp/src/Ice/IPEndpointI.cpp +4 -0
- data/dist/ice/cpp/src/Ice/IncomingRequest.cpp +1 -1
- data/dist/ice/cpp/src/Ice/InputStream.cpp +28 -17
- data/dist/ice/cpp/src/Ice/LocalException.cpp +1 -1
- data/dist/ice/cpp/src/Ice/LocalExceptions.cpp +6 -0
- data/dist/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- 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 +80 -115
- data/dist/ice/cpp/src/Ice/PropertyNames.cpp +3 -2
- data/dist/ice/cpp/src/Ice/ProxyFunctions.cpp +4 -4
- data/dist/ice/cpp/src/Ice/Reference.cpp +15 -15
- data/dist/ice/cpp/src/Ice/ReferenceFactory.cpp +16 -13
- data/dist/ice/cpp/src/Ice/ResourceConfig.h +2 -2
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.cpp +29 -20
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLEngine.h +1 -2
- data/dist/ice/cpp/src/Ice/SSL/OpenSSLTransceiverI.cpp +14 -3
- data/dist/ice/cpp/src/Ice/SSL/RFC2253.cpp +3 -3
- data/dist/ice/cpp/src/Ice/SSL/SSLEndpointI.cpp +1 -1
- data/dist/ice/cpp/src/Ice/SSL/SSLEngine.h +4 -10
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.cpp +21 -2
- data/dist/ice/cpp/src/Ice/SSL/SSLUtil.h +15 -1
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.cpp +67 -48
- data/dist/ice/cpp/src/Ice/SSL/SchannelEngine.h +1 -5
- data/dist/ice/cpp/src/Ice/SSL/SchannelTransceiverI.cpp +14 -2
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.cpp +111 -15
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportEngine.h +7 -2
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportTransceiverI.h +1 -1
- data/dist/ice/cpp/src/Ice/SSL/SecureTransportUtil.cpp +3 -16
- data/dist/ice/cpp/src/Ice/SSL/TrustManager.cpp +12 -1
- data/dist/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/dist/ice/cpp/src/Ice/StringConverter.cpp +4 -0
- data/dist/ice/cpp/src/Ice/TcpEndpointI.cpp +2 -2
- data/dist/ice/cpp/src/Ice/UdpEndpointI.cpp +2 -2
- 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 +118 -7
- data/dist/ice/cpp/src/Ice/WSTransceiver.h +12 -1
- 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/LocatorI.cpp +2 -2
- data/dist/ice/cpp/src/IceDiscovery/LookupI.cpp +4 -3
- data/dist/ice/cpp/src/IceDiscovery/LookupI.h +2 -1
- data/dist/ice/cpp/src/IceDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +6 -18
- data/dist/ice/cpp/src/IceLocatorDiscovery/generated/Lookup.cpp +2 -2
- data/dist/ice/cpp/src/Slice/DocCommentParser.cpp +6 -6
- data/dist/ice/cpp/src/Slice/DocCommentParser.h +4 -2
- data/dist/ice/cpp/src/Slice/FileTracker.h +1 -0
- data/dist/ice/cpp/src/Slice/Grammar.cpp +261 -264
- data/dist/ice/cpp/src/Slice/MetadataValidation.cpp +39 -7
- data/dist/ice/cpp/src/Slice/MetadataValidation.h +3 -2
- data/dist/ice/cpp/src/Slice/Parser.cpp +192 -155
- data/dist/ice/cpp/src/Slice/Parser.h +44 -9
- data/dist/ice/cpp/src/Slice/Preprocessor.cpp +76 -20
- data/dist/ice/cpp/src/Slice/Preprocessor.h +0 -1
- data/dist/ice/cpp/src/Slice/Scanner.cpp +1 -1
- data/dist/ice/cpp/src/Slice/SliceUtil.cpp +44 -58
- data/dist/ice/cpp/src/Slice/StringLiteralUtil.cpp +3 -10
- data/dist/ice/cpp/src/Slice/Util.h +7 -3
- data/dist/ice/cpp/src/slice2rb/Main.cpp +2 -2
- data/dist/ice/cpp/src/slice2rb/Ruby.cpp +1 -1
- data/dist/ice/cpp/src/slice2rb/RubyUtil.cpp +10 -8
- data/dist/ice/cpp/src/slice2rb/RubyUtil.h +10 -13
- data/dist/ice/mcpp/directive.c +5 -2
- data/dist/ice/mcpp/mcpp_main.c +1 -1
- data/dist/ice/mcpp/support.c +6 -6
- data/dist/ice/mcpp/system.c +5 -5
- 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 +1 -1
- data/dist/ice/slice/Ice/OperationMode.ice +8 -0
- data/dist/ice/slice/Ice/Process.ice +3 -0
- data/dist/ice/slice/Ice/ReplyStatus.ice +13 -0
- data/dist/lib/Glacier2/Metrics.rb +1 -1
- data/dist/lib/Glacier2/PermissionsVerifier.rb +3 -3
- data/dist/lib/Glacier2/Router.rb +8 -8
- 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/Context.rb +1 -1
- data/dist/lib/Ice/EndpointTypes.rb +1 -1
- data/dist/lib/Ice/Identity.rb +1 -1
- 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 +1 -1
- 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 +6 -6
- data/dist/lib/Ice/ReplyStatus.rb +3 -2
- data/dist/lib/Ice/Router.rb +5 -5
- data/dist/lib/Ice/SliceChecksumDict.rb +1 -1
- data/dist/lib/Ice/Version.rb +1 -1
- data/dist/lib/IceBox/ServiceManager.rb +8 -8
- data/dist/lib/IceGrid/Admin.rb +83 -83
- 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 +13 -13
- data/dist/lib/IceGrid/Session.rb +6 -6
- 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/ice.gemspec +1 -1
- metadata +2 -1
|
@@ -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 it's 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_" preprended 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_" preprended 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);
|
data/dist/ice/mcpp/directive.c
CHANGED
|
@@ -820,6 +820,7 @@ static int get_repl(
|
|
|
820
820
|
int token_type; /* Type of token */
|
|
821
821
|
char * temp;
|
|
822
822
|
char * repl_cur = repl_base; /* Pointer into repl-text buffer*/
|
|
823
|
+
char * repl_min = repl_base; /* Pointer into repl-text buffer*/
|
|
823
824
|
|
|
824
825
|
*repl_cur = EOS;
|
|
825
826
|
token_p = NULL;
|
|
@@ -892,7 +893,9 @@ static int get_repl(
|
|
|
892
893
|
if ((temp = mgtoken_save( macroname)) != NULL)
|
|
893
894
|
repl_cur = temp; /* Macro name */
|
|
894
895
|
} else { /* Parameter name */
|
|
895
|
-
|
|
896
|
+
/* Formal parameter numbers can look like a '\t' or */
|
|
897
|
+
/* ' ' when removing trailing spaces, set repl_min. */
|
|
898
|
+
repl_min = repl_cur = temp;
|
|
896
899
|
}
|
|
897
900
|
break;
|
|
898
901
|
|
|
@@ -912,7 +915,7 @@ static int get_repl(
|
|
|
912
915
|
}
|
|
913
916
|
}
|
|
914
917
|
|
|
915
|
-
while (
|
|
918
|
+
while (repl_min < repl_cur
|
|
916
919
|
&& (*(repl_cur - 1) == ' ' || *(repl_cur - 1) == '\t'))
|
|
917
920
|
repl_cur--; /* Remove trailing spaces */
|
|
918
921
|
*repl_cur = EOS; /* Terminate work */
|
data/dist/ice/mcpp/mcpp_main.c
CHANGED
|
@@ -302,7 +302,7 @@ int mcpp_lib_main
|
|
|
302
302
|
inc_dirp = &null; /* Initialize to current (null) directory */
|
|
303
303
|
cur_fname = cur_fullname = "(predefined)"; /* For predefined macros */
|
|
304
304
|
init_defines(); /* Predefine macros */
|
|
305
|
-
mb_init(
|
|
305
|
+
mb_init(); /* Should be initialized prior to get options */
|
|
306
306
|
do_options( argc, argv, &in_file, &out_file); /* Command line options */
|
|
307
307
|
|
|
308
308
|
/* Open input file, "-" means stdin. */
|
data/dist/ice/mcpp/support.c
CHANGED
|
@@ -593,9 +593,9 @@ char * scan_quote(
|
|
|
593
593
|
const char * const unterm_string
|
|
594
594
|
= "Unterminated string literal%s";
|
|
595
595
|
const char * const unterm_char
|
|
596
|
-
= "Unterminated character constant
|
|
596
|
+
= "Unterminated character constant%s";
|
|
597
597
|
const char * const empty_const
|
|
598
|
-
= "Empty character constant
|
|
598
|
+
= "Empty character constant%s";
|
|
599
599
|
const char * skip;
|
|
600
600
|
size_t len;
|
|
601
601
|
int c;
|
|
@@ -652,7 +652,7 @@ char * scan_quote(
|
|
|
652
652
|
if (diag && iscntrl( c) && ((char_type[ c] & SPA) == 0)
|
|
653
653
|
&& (warn_level & 1))
|
|
654
654
|
cwarn(
|
|
655
|
-
"Illegal control character %.
|
|
655
|
+
"Illegal control character %.0s0x%02lx in quotation" /* _W1_ */
|
|
656
656
|
, NULL, (long) c, NULL);
|
|
657
657
|
*out_p++ = c;
|
|
658
658
|
chk_limit:
|
|
@@ -673,14 +673,14 @@ chk_limit:
|
|
|
673
673
|
if (delim == '"') {
|
|
674
674
|
cerror( unterm_string, skip, 0L, NULL); /* _E_ */
|
|
675
675
|
} else if (delim == '\'') {
|
|
676
|
-
cerror( unterm_char,
|
|
676
|
+
cerror( unterm_char, skip, 0L, NULL); /* _E_ */
|
|
677
677
|
} else {
|
|
678
678
|
cerror( "Unterminated header name %s%.0ld%s" /* _E_ */
|
|
679
679
|
, out, 0L, skip);
|
|
680
680
|
}
|
|
681
681
|
out_p = NULL;
|
|
682
682
|
} else if (delim == '\'' && out_p - out <= 2) {
|
|
683
|
-
cerror( empty_const,
|
|
683
|
+
cerror( empty_const, skip, 0L, NULL); /* _E_ */
|
|
684
684
|
out_p = NULL;
|
|
685
685
|
goto done;
|
|
686
686
|
}
|
|
@@ -1158,7 +1158,7 @@ static char * parse_line( void)
|
|
|
1158
1158
|
default:
|
|
1159
1159
|
if (iscntrl( c)) {
|
|
1160
1160
|
cerror( /* Skip the control character */
|
|
1161
|
-
"Illegal control character %.0s0x%
|
|
1161
|
+
"Illegal control character %.0s0x%02lx, skipped the character" /* _E_ */
|
|
1162
1162
|
, NULL, (long) c, NULL);
|
|
1163
1163
|
} else { /* Any valid character */
|
|
1164
1164
|
*tp++ = c;
|
data/dist/ice/mcpp/system.c
CHANGED
|
@@ -1738,7 +1738,7 @@ static int open_file(
|
|
|
1738
1738
|
if (! fullname) /* Non-existent or directory */
|
|
1739
1739
|
return FALSE;
|
|
1740
1740
|
if (included( fullname)) /* Once included */
|
|
1741
|
-
goto
|
|
1741
|
+
goto exit_success;
|
|
1742
1742
|
|
|
1743
1743
|
if ((max_open != 0 && max_open <= include_nest)
|
|
1744
1744
|
/* Exceed the known limit of open files */
|
|
@@ -1765,12 +1765,12 @@ static int open_file(
|
|
|
1765
1765
|
if ((fp = mcpp_fopen( fullname, "r")) == NULL) {
|
|
1766
1766
|
file->fp = mcpp_fopen( cur_fullname, "r");
|
|
1767
1767
|
fseek( file->fp, file->pos, SEEK_SET);
|
|
1768
|
-
goto
|
|
1768
|
+
goto exit_fail;
|
|
1769
1769
|
}
|
|
1770
1770
|
if (max_open == 0) /* Remember the limit of the system */
|
|
1771
1771
|
max_open = include_nest;
|
|
1772
1772
|
} else if (fp == NULL) /* No read permission */
|
|
1773
|
-
goto
|
|
1773
|
+
goto exit_fail;
|
|
1774
1774
|
/* Truncate buffer of the includer to save memory */
|
|
1775
1775
|
len = (int) (file->bptr - file->buffer);
|
|
1776
1776
|
if (len) {
|
|
@@ -1802,9 +1802,9 @@ static int open_file(
|
|
|
1802
1802
|
if (mkdep && ((mkdep & MD_SYSHEADER) || ! infile->sys_header))
|
|
1803
1803
|
put_depend( fullname); /* Output dependency line */
|
|
1804
1804
|
|
|
1805
|
-
|
|
1805
|
+
exit_success:
|
|
1806
1806
|
return TRUE;
|
|
1807
|
-
|
|
1807
|
+
exit_fail:
|
|
1808
1808
|
free( fullname);
|
|
1809
1809
|
return FALSE;
|
|
1810
1810
|
}
|
|
@@ -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.
|
|
@@ -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"]
|
|
@@ -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
|
|
@@ -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
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
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.2
|
|
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])
|
|
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
68
|
RouterPrx_mixin::OP_refreshSession.deprecate("As of Ice 3.8, this operation does nothing.")
|
|
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], [])
|
|
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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'Session.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -42,7 +42,7 @@ module ::Glacier2
|
|
|
42
42
|
|
|
43
43
|
T_SessionPrx.defineProxy(SessionPrx, nil, [])
|
|
44
44
|
|
|
45
|
-
SessionPrx_mixin::OP_destroy = Ice::__defineOperation('destroy', 'destroy', Ice::OperationMode::Normal, nil, [], [], nil, [])
|
|
45
|
+
SessionPrx_mixin::OP_destroy = Ice::__defineOperation('destroy', 'destroy', Ice::OperationMode::Normal, nil, [], [], nil, [], false)
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
if not defined?(::Glacier2::T_StringSetPrx)
|
|
@@ -70,9 +70,9 @@ module ::Glacier2
|
|
|
70
70
|
|
|
71
71
|
T_StringSetPrx.defineProxy(StringSetPrx, nil, [])
|
|
72
72
|
|
|
73
|
-
StringSetPrx_mixin::OP_add = Ice::__defineOperation('add', 'add', Ice::OperationMode::Idempotent, nil, [[::Ice::T_StringSeq, false, 0]], [], nil, [])
|
|
74
|
-
StringSetPrx_mixin::OP_remove = Ice::__defineOperation('remove', 'remove', Ice::OperationMode::Idempotent, nil, [[::Ice::T_StringSeq, false, 0]], [], nil, [])
|
|
75
|
-
StringSetPrx_mixin::OP_get = Ice::__defineOperation('get', 'get', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_StringSeq, false, 0], [])
|
|
73
|
+
StringSetPrx_mixin::OP_add = Ice::__defineOperation('add', 'add', Ice::OperationMode::Idempotent, nil, [[::Ice::T_StringSeq, false, 0]], [], nil, [], false)
|
|
74
|
+
StringSetPrx_mixin::OP_remove = Ice::__defineOperation('remove', 'remove', Ice::OperationMode::Idempotent, nil, [[::Ice::T_StringSeq, false, 0]], [], nil, [], false)
|
|
75
|
+
StringSetPrx_mixin::OP_get = Ice::__defineOperation('get', 'get', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_StringSeq, false, 0], [], false)
|
|
76
76
|
end
|
|
77
77
|
|
|
78
78
|
if not defined?(::Glacier2::T_IdentitySetPrx)
|
|
@@ -100,9 +100,9 @@ module ::Glacier2
|
|
|
100
100
|
|
|
101
101
|
T_IdentitySetPrx.defineProxy(IdentitySetPrx, nil, [])
|
|
102
102
|
|
|
103
|
-
IdentitySetPrx_mixin::OP_add = Ice::__defineOperation('add', 'add', Ice::OperationMode::Idempotent, nil, [[::Ice::T_IdentitySeq, false, 0]], [], nil, [])
|
|
104
|
-
IdentitySetPrx_mixin::OP_remove = Ice::__defineOperation('remove', 'remove', Ice::OperationMode::Idempotent, nil, [[::Ice::T_IdentitySeq, false, 0]], [], nil, [])
|
|
105
|
-
IdentitySetPrx_mixin::OP_get = Ice::__defineOperation('get', 'get', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_IdentitySeq, false, 0], [])
|
|
103
|
+
IdentitySetPrx_mixin::OP_add = Ice::__defineOperation('add', 'add', Ice::OperationMode::Idempotent, nil, [[::Ice::T_IdentitySeq, false, 0]], [], nil, [], false)
|
|
104
|
+
IdentitySetPrx_mixin::OP_remove = Ice::__defineOperation('remove', 'remove', Ice::OperationMode::Idempotent, nil, [[::Ice::T_IdentitySeq, false, 0]], [], nil, [], false)
|
|
105
|
+
IdentitySetPrx_mixin::OP_get = Ice::__defineOperation('get', 'get', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_IdentitySeq, false, 0], [], false)
|
|
106
106
|
end
|
|
107
107
|
|
|
108
108
|
if not defined?(::Glacier2::T_SessionControlPrx)
|
|
@@ -138,11 +138,11 @@ module ::Glacier2
|
|
|
138
138
|
|
|
139
139
|
T_SessionControlPrx.defineProxy(SessionControlPrx, nil, [])
|
|
140
140
|
|
|
141
|
-
SessionControlPrx_mixin::OP_categories = Ice::__defineOperation('categories', 'categories', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_StringSetPrx, false, 0], [])
|
|
142
|
-
SessionControlPrx_mixin::OP_adapterIds = Ice::__defineOperation('adapterIds', 'adapterIds', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_StringSetPrx, false, 0], [])
|
|
143
|
-
SessionControlPrx_mixin::OP_identities = Ice::__defineOperation('identities', 'identities', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_IdentitySetPrx, false, 0], [])
|
|
144
|
-
SessionControlPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [])
|
|
145
|
-
SessionControlPrx_mixin::OP_destroy = Ice::__defineOperation('destroy', 'destroy', Ice::OperationMode::Normal, nil, [], [], nil, [])
|
|
141
|
+
SessionControlPrx_mixin::OP_categories = Ice::__defineOperation('categories', 'categories', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_StringSetPrx, false, 0], [], false)
|
|
142
|
+
SessionControlPrx_mixin::OP_adapterIds = Ice::__defineOperation('adapterIds', 'adapterIds', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_StringSetPrx, false, 0], [], false)
|
|
143
|
+
SessionControlPrx_mixin::OP_identities = Ice::__defineOperation('identities', 'identities', Ice::OperationMode::Normal, nil, [], [], [::Glacier2::T_IdentitySetPrx, false, 0], [], false)
|
|
144
|
+
SessionControlPrx_mixin::OP_getSessionTimeout = Ice::__defineOperation('getSessionTimeout', 'getSessionTimeout', Ice::OperationMode::Idempotent, nil, [], [], [Ice::T_int, false, 0], [], false)
|
|
145
|
+
SessionControlPrx_mixin::OP_destroy = Ice::__defineOperation('destroy', 'destroy', Ice::OperationMode::Normal, nil, [], [], nil, [], false)
|
|
146
146
|
end
|
|
147
147
|
|
|
148
148
|
if not defined?(::Glacier2::T_SessionManagerPrx)
|
|
@@ -162,7 +162,7 @@ module ::Glacier2
|
|
|
162
162
|
|
|
163
163
|
T_SessionManagerPrx.defineProxy(SessionManagerPrx, nil, [])
|
|
164
164
|
|
|
165
|
-
SessionManagerPrx_mixin::OP_create = Ice::__defineOperation('create', 'create', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [::Glacier2::T_SessionControlPrx, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_CannotCreateSessionException])
|
|
165
|
+
SessionManagerPrx_mixin::OP_create = Ice::__defineOperation('create', 'create', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [::Glacier2::T_SessionControlPrx, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_CannotCreateSessionException], false)
|
|
166
166
|
end
|
|
167
167
|
|
|
168
168
|
if not defined?(::Glacier2::T_SSLSessionManagerPrx)
|
|
@@ -182,6 +182,6 @@ module ::Glacier2
|
|
|
182
182
|
|
|
183
183
|
T_SSLSessionManagerPrx.defineProxy(SSLSessionManagerPrx, nil, [])
|
|
184
184
|
|
|
185
|
-
SSLSessionManagerPrx_mixin::OP_create = Ice::__defineOperation('create', 'create', Ice::OperationMode::Normal, nil, [[::Glacier2::T_SSLInfo, false, 0], [::Glacier2::T_SessionControlPrx, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_CannotCreateSessionException])
|
|
185
|
+
SSLSessionManagerPrx_mixin::OP_create = Ice::__defineOperation('create', 'create', Ice::OperationMode::Normal, nil, [[::Glacier2::T_SSLInfo, false, 0], [::Glacier2::T_SessionControlPrx, false, 0]], [], [::Glacier2::T_SessionPrx, false, 0], [::Glacier2::T_CannotCreateSessionException], false)
|
|
186
186
|
end
|
|
187
187
|
end
|
data/dist/lib/Ice/Context.rb
CHANGED
data/dist/lib/Ice/Identity.rb
CHANGED
data/dist/lib/Ice/Locator.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'Locator.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -56,9 +56,9 @@ module ::Ice
|
|
|
56
56
|
|
|
57
57
|
T_LocatorPrx.defineProxy(LocatorPrx, nil, [])
|
|
58
58
|
|
|
59
|
-
LocatorPrx_mixin::OP_findObjectById = Ice::__defineOperation('findObjectById', 'findObjectById', Ice::OperationMode::Idempotent, nil, [[::Ice::T_Identity, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::Ice::T_ObjectNotFoundException])
|
|
60
|
-
LocatorPrx_mixin::OP_findAdapterById = Ice::__defineOperation('findAdapterById', 'findAdapterById', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::Ice::T_AdapterNotFoundException])
|
|
61
|
-
LocatorPrx_mixin::OP_getRegistry = Ice::__defineOperation('getRegistry', 'getRegistry', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_LocatorRegistryPrx, false, 0], [])
|
|
59
|
+
LocatorPrx_mixin::OP_findObjectById = Ice::__defineOperation('findObjectById', 'findObjectById', Ice::OperationMode::Idempotent, nil, [[::Ice::T_Identity, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::Ice::T_ObjectNotFoundException], false)
|
|
60
|
+
LocatorPrx_mixin::OP_findAdapterById = Ice::__defineOperation('findAdapterById', 'findAdapterById', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0]], [], [Ice::T_ObjectPrx, false, 0], [::Ice::T_AdapterNotFoundException], false)
|
|
61
|
+
LocatorPrx_mixin::OP_getRegistry = Ice::__defineOperation('getRegistry', 'getRegistry', Ice::OperationMode::Idempotent, nil, [], [], [::Ice::T_LocatorRegistryPrx, false, 0], [], false)
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
if not defined?(::Ice::T_LocatorFinderPrx)
|
|
@@ -78,6 +78,6 @@ module ::Ice
|
|
|
78
78
|
|
|
79
79
|
T_LocatorFinderPrx.defineProxy(LocatorFinderPrx, nil, [])
|
|
80
80
|
|
|
81
|
-
LocatorFinderPrx_mixin::OP_getLocator = Ice::__defineOperation('getLocator', 'getLocator', Ice::OperationMode::Normal, nil, [], [], [::Ice::T_LocatorPrx, false, 0], [])
|
|
81
|
+
LocatorFinderPrx_mixin::OP_getLocator = Ice::__defineOperation('getLocator', 'getLocator', Ice::OperationMode::Normal, nil, [], [], [::Ice::T_LocatorPrx, false, 0], [], false)
|
|
82
82
|
end
|
|
83
83
|
end
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'LocatorRegistry.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -66,8 +66,8 @@ module ::Ice
|
|
|
66
66
|
|
|
67
67
|
T_LocatorRegistryPrx.defineProxy(LocatorRegistryPrx, nil, [])
|
|
68
68
|
|
|
69
|
-
LocatorRegistryPrx_mixin::OP_setAdapterDirectProxy = Ice::__defineOperation('setAdapterDirectProxy', 'setAdapterDirectProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_ObjectPrx, false, 0]], [], nil, [::Ice::T_AdapterNotFoundException, ::Ice::T_AdapterAlreadyActiveException])
|
|
70
|
-
LocatorRegistryPrx_mixin::OP_setReplicatedAdapterDirectProxy = Ice::__defineOperation('setReplicatedAdapterDirectProxy', 'setReplicatedAdapterDirectProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0], [Ice::T_ObjectPrx, false, 0]], [], nil, [::Ice::T_AdapterNotFoundException, ::Ice::T_AdapterAlreadyActiveException, ::Ice::T_InvalidReplicaGroupIdException])
|
|
71
|
-
LocatorRegistryPrx_mixin::OP_setServerProcessProxy = Ice::__defineOperation('setServerProcessProxy', 'setServerProcessProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [::Ice::T_ProcessPrx, false, 0]], [], nil, [::Ice::T_ServerNotFoundException])
|
|
69
|
+
LocatorRegistryPrx_mixin::OP_setAdapterDirectProxy = Ice::__defineOperation('setAdapterDirectProxy', 'setAdapterDirectProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_ObjectPrx, false, 0]], [], nil, [::Ice::T_AdapterNotFoundException, ::Ice::T_AdapterAlreadyActiveException], false)
|
|
70
|
+
LocatorRegistryPrx_mixin::OP_setReplicatedAdapterDirectProxy = Ice::__defineOperation('setReplicatedAdapterDirectProxy', 'setReplicatedAdapterDirectProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0], [Ice::T_ObjectPrx, false, 0]], [], nil, [::Ice::T_AdapterNotFoundException, ::Ice::T_AdapterAlreadyActiveException, ::Ice::T_InvalidReplicaGroupIdException], false)
|
|
71
|
+
LocatorRegistryPrx_mixin::OP_setServerProcessProxy = Ice::__defineOperation('setServerProcessProxy', 'setServerProcessProxy', Ice::OperationMode::Idempotent, nil, [[Ice::T_string, false, 0], [::Ice::T_ProcessPrx, false, 0]], [], nil, [::Ice::T_ServerNotFoundException], false)
|
|
72
72
|
end
|
|
73
73
|
end
|
data/dist/lib/Ice/Metrics.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -132,12 +132,12 @@ module ::IceMX
|
|
|
132
132
|
|
|
133
133
|
T_MetricsAdminPrx.defineProxy(MetricsAdminPrx, nil, [])
|
|
134
134
|
|
|
135
|
-
MetricsAdminPrx_mixin::OP_getMetricsViewNames = Ice::__defineOperation('getMetricsViewNames', 'getMetricsViewNames', Ice::OperationMode::Normal, nil, [], [[::Ice::T_StringSeq, false, 0]], [::Ice::T_StringSeq, false, 0], [])
|
|
136
|
-
MetricsAdminPrx_mixin::OP_enableMetricsView = Ice::__defineOperation('enableMetricsView', 'enableMetricsView', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], nil, [::IceMX::T_UnknownMetricsView])
|
|
137
|
-
MetricsAdminPrx_mixin::OP_disableMetricsView = Ice::__defineOperation('disableMetricsView', 'disableMetricsView', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], nil, [::IceMX::T_UnknownMetricsView])
|
|
138
|
-
MetricsAdminPrx_mixin::OP_getMetricsView = Ice::__defineOperation('getMetricsView', 'getMetricsView', Ice::OperationMode::Normal, Ice::FormatType::SlicedFormat, [[Ice::T_string, false, 0]], [[Ice::T_long, false, 0]], [::IceMX::T_MetricsView, false, 0], [::IceMX::T_UnknownMetricsView])
|
|
139
|
-
MetricsAdminPrx_mixin::OP_getMapMetricsFailures = Ice::__defineOperation('getMapMetricsFailures', 'getMapMetricsFailures', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceMX::T_MetricsFailuresSeq, false, 0], [::IceMX::T_UnknownMetricsView])
|
|
140
|
-
MetricsAdminPrx_mixin::OP_getMetricsFailures = Ice::__defineOperation('getMetricsFailures', 'getMetricsFailures', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceMX::T_MetricsFailures, false, 0], [::IceMX::T_UnknownMetricsView])
|
|
135
|
+
MetricsAdminPrx_mixin::OP_getMetricsViewNames = Ice::__defineOperation('getMetricsViewNames', 'getMetricsViewNames', Ice::OperationMode::Normal, nil, [], [[::Ice::T_StringSeq, false, 0]], [::Ice::T_StringSeq, false, 0], [], false)
|
|
136
|
+
MetricsAdminPrx_mixin::OP_enableMetricsView = Ice::__defineOperation('enableMetricsView', 'enableMetricsView', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], nil, [::IceMX::T_UnknownMetricsView], false)
|
|
137
|
+
MetricsAdminPrx_mixin::OP_disableMetricsView = Ice::__defineOperation('disableMetricsView', 'disableMetricsView', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], nil, [::IceMX::T_UnknownMetricsView], false)
|
|
138
|
+
MetricsAdminPrx_mixin::OP_getMetricsView = Ice::__defineOperation('getMetricsView', 'getMetricsView', Ice::OperationMode::Normal, Ice::FormatType::SlicedFormat, [[Ice::T_string, false, 0]], [[Ice::T_long, false, 0]], [::IceMX::T_MetricsView, false, 0], [::IceMX::T_UnknownMetricsView], false)
|
|
139
|
+
MetricsAdminPrx_mixin::OP_getMapMetricsFailures = Ice::__defineOperation('getMapMetricsFailures', 'getMapMetricsFailures', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceMX::T_MetricsFailuresSeq, false, 0], [::IceMX::T_UnknownMetricsView], false)
|
|
140
|
+
MetricsAdminPrx_mixin::OP_getMetricsFailures = Ice::__defineOperation('getMetricsFailures', 'getMetricsFailures', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_string, false, 0], [Ice::T_string, false, 0]], [], [::IceMX::T_MetricsFailures, false, 0], [::IceMX::T_UnknownMetricsView], false)
|
|
141
141
|
end
|
|
142
142
|
|
|
143
143
|
if not defined?(::IceMX::T_ThreadMetrics)
|
data/dist/lib/Ice/Process.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'Process.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -28,7 +28,7 @@ module ::Ice
|
|
|
28
28
|
|
|
29
29
|
T_ProcessPrx.defineProxy(ProcessPrx, nil, [])
|
|
30
30
|
|
|
31
|
-
ProcessPrx_mixin::OP_shutdown = Ice::__defineOperation('shutdown', 'shutdown', Ice::OperationMode::Normal, nil, [], [], nil, [])
|
|
32
|
-
ProcessPrx_mixin::OP_writeMessage = Ice::__defineOperation('writeMessage', 'writeMessage', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_int, false, 0]], [], nil, [])
|
|
31
|
+
ProcessPrx_mixin::OP_shutdown = Ice::__defineOperation('shutdown', 'shutdown', Ice::OperationMode::Normal, nil, [], [], nil, [], false)
|
|
32
|
+
ProcessPrx_mixin::OP_writeMessage = Ice::__defineOperation('writeMessage', 'writeMessage', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0], [Ice::T_int, false, 0]], [], nil, [], false)
|
|
33
33
|
end
|
|
34
34
|
end
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Copyright (c) ZeroC, Inc.
|
|
2
2
|
|
|
3
|
-
# slice2rb version 3.8.
|
|
3
|
+
# slice2rb version 3.8.2
|
|
4
4
|
# <auto-generated>Generated from Slice file 'PropertiesAdmin.ice'.</auto-generated>
|
|
5
5
|
|
|
6
6
|
require 'Ice'
|
|
@@ -32,8 +32,8 @@ module ::Ice
|
|
|
32
32
|
|
|
33
33
|
T_PropertiesAdminPrx.defineProxy(PropertiesAdminPrx, nil, [])
|
|
34
34
|
|
|
35
|
-
PropertiesAdminPrx_mixin::OP_getProperty = Ice::__defineOperation('getProperty', 'getProperty', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [Ice::T_string, false, 0], [])
|
|
36
|
-
PropertiesAdminPrx_mixin::OP_getPropertiesForPrefix = Ice::__defineOperation('getPropertiesForPrefix', 'getPropertiesForPrefix', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [::Ice::T_PropertyDict, false, 0], [])
|
|
37
|
-
PropertiesAdminPrx_mixin::OP_setProperties = Ice::__defineOperation('setProperties', 'setProperties', Ice::OperationMode::Normal, nil, [[::Ice::T_PropertyDict, false, 0]], [], nil, [])
|
|
35
|
+
PropertiesAdminPrx_mixin::OP_getProperty = Ice::__defineOperation('getProperty', 'getProperty', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [Ice::T_string, false, 0], [], false)
|
|
36
|
+
PropertiesAdminPrx_mixin::OP_getPropertiesForPrefix = Ice::__defineOperation('getPropertiesForPrefix', 'getPropertiesForPrefix', Ice::OperationMode::Normal, nil, [[Ice::T_string, false, 0]], [], [::Ice::T_PropertyDict, false, 0], [], false)
|
|
37
|
+
PropertiesAdminPrx_mixin::OP_setProperties = Ice::__defineOperation('setProperties', 'setProperties', Ice::OperationMode::Normal, nil, [[::Ice::T_PropertyDict, false, 0]], [], nil, [], false)
|
|
38
38
|
end
|
|
39
39
|
end
|