zeroc-ice-x64-mingw 3.6.4 → 3.6.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (147) hide show
  1. checksums.yaml +5 -5
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -1
  4. data/ice-x64-mingw.gemspec +1 -1
  5. data/lib/Glacier2.rb +1 -1
  6. data/lib/Glacier2/Metrics.rb +3 -3
  7. data/lib/Glacier2/PermissionsVerifier.rb +3 -3
  8. data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
  9. data/lib/Glacier2/Router.rb +3 -3
  10. data/lib/Glacier2/RouterF.rb +3 -3
  11. data/lib/Glacier2/SSLInfo.rb +3 -3
  12. data/lib/Glacier2/Session.rb +3 -3
  13. data/lib/Ice.rb +1 -1
  14. data/lib/Ice/BuiltinSequences.rb +3 -3
  15. data/lib/Ice/Communicator.rb +3 -3
  16. data/lib/Ice/CommunicatorF.rb +3 -3
  17. data/lib/Ice/Connection.rb +3 -3
  18. data/lib/Ice/ConnectionF.rb +3 -3
  19. data/lib/Ice/Current.rb +3 -3
  20. data/lib/Ice/Endpoint.rb +3 -3
  21. data/lib/Ice/EndpointF.rb +3 -3
  22. data/lib/Ice/EndpointTypes.rb +3 -3
  23. data/lib/Ice/FacetMap.rb +3 -3
  24. data/lib/Ice/Identity.rb +3 -3
  25. data/lib/Ice/ImplicitContext.rb +3 -3
  26. data/lib/Ice/ImplicitContextF.rb +3 -3
  27. data/lib/Ice/Instrumentation.rb +3 -3
  28. data/lib/Ice/InstrumentationF.rb +3 -3
  29. data/lib/Ice/LocalException.rb +3 -3
  30. data/lib/Ice/Locator.rb +3 -3
  31. data/lib/Ice/LocatorF.rb +3 -3
  32. data/lib/Ice/Logger.rb +3 -3
  33. data/lib/Ice/LoggerF.rb +3 -3
  34. data/lib/Ice/Metrics.rb +3 -3
  35. data/lib/Ice/ObjectAdapterF.rb +3 -3
  36. data/lib/Ice/ObjectFactory.rb +3 -3
  37. data/lib/Ice/ObjectFactoryF.rb +3 -3
  38. data/lib/Ice/Plugin.rb +3 -3
  39. data/lib/Ice/PluginF.rb +3 -3
  40. data/lib/Ice/Process.rb +3 -3
  41. data/lib/Ice/ProcessF.rb +3 -3
  42. data/lib/Ice/Properties.rb +3 -3
  43. data/lib/Ice/PropertiesAdmin.rb +3 -3
  44. data/lib/Ice/PropertiesF.rb +3 -3
  45. data/lib/Ice/RemoteLogger.rb +3 -3
  46. data/lib/Ice/Router.rb +3 -3
  47. data/lib/Ice/RouterF.rb +3 -3
  48. data/lib/Ice/SliceChecksumDict.rb +3 -3
  49. data/lib/Ice/Version.rb +3 -3
  50. data/lib/IceBox.rb +1 -1
  51. data/lib/IceBox/IceBox.rb +3 -3
  52. data/lib/IceGrid.rb +1 -1
  53. data/lib/IceGrid/Admin.rb +3 -3
  54. data/lib/IceGrid/Descriptor.rb +3 -3
  55. data/lib/IceGrid/Exception.rb +3 -3
  56. data/lib/IceGrid/FileParser.rb +3 -3
  57. data/lib/IceGrid/Locator.rb +3 -3
  58. data/lib/IceGrid/Observer.rb +3 -3
  59. data/lib/IceGrid/Query.rb +3 -3
  60. data/lib/IceGrid/Registry.rb +3 -3
  61. data/lib/IceGrid/Session.rb +3 -3
  62. data/lib/IceGrid/UserAccountMapper.rb +3 -3
  63. data/lib/IcePatch2.rb +1 -1
  64. data/lib/IcePatch2/FileInfo.rb +3 -3
  65. data/lib/IcePatch2/FileServer.rb +3 -3
  66. data/lib/IceRuby.so +0 -0
  67. data/lib/IceStorm.rb +1 -1
  68. data/lib/IceStorm/IceStorm.rb +3 -3
  69. data/lib/IceStorm/Metrics.rb +3 -3
  70. data/slice/Freeze/BackgroundSaveEvictor.ice +1 -1
  71. data/slice/Freeze/CatalogData.ice +1 -1
  72. data/slice/Freeze/Connection.ice +12 -2
  73. data/slice/Freeze/ConnectionF.ice +1 -1
  74. data/slice/Freeze/DB.ice +1 -1
  75. data/slice/Freeze/Evictor.ice +8 -1
  76. data/slice/Freeze/EvictorF.ice +1 -1
  77. data/slice/Freeze/EvictorStorage.ice +1 -1
  78. data/slice/Freeze/Exception.ice +1 -1
  79. data/slice/Freeze/Transaction.ice +2 -1
  80. data/slice/Freeze/TransactionalEvictor.ice +1 -1
  81. data/slice/Glacier2/Metrics.ice +1 -1
  82. data/slice/Glacier2/PermissionsVerifier.ice +1 -1
  83. data/slice/Glacier2/PermissionsVerifierF.ice +1 -1
  84. data/slice/Glacier2/Router.ice +1 -1
  85. data/slice/Glacier2/RouterF.ice +1 -1
  86. data/slice/Glacier2/SSLInfo.ice +1 -1
  87. data/slice/Glacier2/Session.ice +1 -1
  88. data/slice/Ice/BuiltinSequences.ice +1 -1
  89. data/slice/Ice/Communicator.ice +50 -55
  90. data/slice/Ice/CommunicatorF.ice +1 -1
  91. data/slice/Ice/Connection.ice +34 -3
  92. data/slice/Ice/ConnectionF.ice +1 -1
  93. data/slice/Ice/Current.ice +4 -5
  94. data/slice/Ice/Endpoint.ice +6 -3
  95. data/slice/Ice/EndpointF.ice +1 -1
  96. data/slice/Ice/EndpointTypes.ice +1 -1
  97. data/slice/Ice/FacetMap.ice +1 -1
  98. data/slice/Ice/Identity.ice +1 -1
  99. data/slice/Ice/ImplicitContext.ice +5 -4
  100. data/slice/Ice/ImplicitContextF.ice +1 -1
  101. data/slice/Ice/Instrumentation.ice +1 -1
  102. data/slice/Ice/InstrumentationF.ice +1 -1
  103. data/slice/Ice/LocalException.ice +3 -4
  104. data/slice/Ice/Locator.ice +4 -4
  105. data/slice/Ice/LocatorF.ice +1 -1
  106. data/slice/Ice/Logger.ice +4 -1
  107. data/slice/Ice/LoggerF.ice +1 -1
  108. data/slice/Ice/Metrics.ice +1 -1
  109. data/slice/Ice/ObjectAdapter.ice +1 -1
  110. data/slice/Ice/ObjectAdapterF.ice +1 -1
  111. data/slice/Ice/ObjectFactory.ice +3 -3
  112. data/slice/Ice/ObjectFactoryF.ice +1 -1
  113. data/slice/Ice/Plugin.ice +1 -1
  114. data/slice/Ice/PluginF.ice +1 -1
  115. data/slice/Ice/Process.ice +2 -3
  116. data/slice/Ice/ProcessF.ice +1 -1
  117. data/slice/Ice/Properties.ice +1 -1
  118. data/slice/Ice/PropertiesAdmin.ice +1 -1
  119. data/slice/Ice/PropertiesF.ice +1 -1
  120. data/slice/Ice/RemoteLogger.ice +11 -23
  121. data/slice/Ice/Router.ice +1 -1
  122. data/slice/Ice/RouterF.ice +1 -1
  123. data/slice/Ice/ServantLocator.ice +10 -4
  124. data/slice/Ice/ServantLocatorF.ice +1 -1
  125. data/slice/Ice/SliceChecksumDict.ice +1 -1
  126. data/slice/Ice/Version.ice +1 -1
  127. data/slice/IceBox/IceBox.ice +8 -5
  128. data/slice/IceDiscovery/IceDiscovery.ice +1 -1
  129. data/slice/IceGrid/Admin.ice +13 -2
  130. data/slice/IceGrid/Descriptor.ice +1 -1
  131. data/slice/IceGrid/Exception.ice +1 -1
  132. data/slice/IceGrid/FileParser.ice +1 -1
  133. data/slice/IceGrid/Locator.ice +1 -1
  134. data/slice/IceGrid/Observer.ice +1 -1
  135. data/slice/IceGrid/PluginFacade.ice +4 -1
  136. data/slice/IceGrid/Query.ice +1 -1
  137. data/slice/IceGrid/Registry.ice +1 -1
  138. data/slice/IceGrid/Session.ice +1 -3
  139. data/slice/IceGrid/UserAccountMapper.ice +1 -1
  140. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +1 -1
  141. data/slice/IcePatch2/FileInfo.ice +1 -1
  142. data/slice/IcePatch2/FileServer.ice +1 -1
  143. data/slice/IceSSL/ConnectionInfo.ice +1 -1
  144. data/slice/IceSSL/EndpointInfo.ice +1 -1
  145. data/slice/IceStorm/IceStorm.ice +5 -7
  146. data/slice/IceStorm/Metrics.ice +1 -1
  147. metadata +3 -4
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -24,8 +24,9 @@ module Ice
24
24
  *
25
25
  * When you make a remote invocation without an explicit context parameter,
26
26
  * Ice uses the per-proxy context (if any) combined with the <tt>ImplicitContext</tt>
27
- * associated with the communicator.</p>
28
- * <p>Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
27
+ * associated with the communicator.
28
+ *
29
+ * Ice provides several implementations of <tt>ImplicitContext</tt>. The implementation
29
30
  * used depends on the value of the <tt>Ice.ImplicitContext</tt> property.
30
31
  * <dl>
31
32
  * <dt><tt>None</tt> (default)</dt>
@@ -34,7 +35,7 @@ module Ice
34
35
  * <dd>The implementation maintains a context per thread.</dd>
35
36
  * <dt><tt>Shared</tt></dt>
36
37
  * <dd>The implementation maintains a single context shared by all threads.</dd>
37
- * </dl><p>
38
+ * </dl>
38
39
  *
39
40
  * <tt>ImplicitContext</tt> also provides a number of operations to create, update or retrieve
40
41
  * an entry in the underlying context without first retrieving a copy of the entire
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -58,7 +58,7 @@ local exception PluginInitializationException
58
58
  * supported with collocation optimization.
59
59
  *
60
60
  **/
61
- ["cpp:ice_print", "deprecate:this exception isn't used anymore by the Ice runtime"]
61
+ ["cpp:ice_print", "deprecate:This exception is no longer used by the Ice run time"]
62
62
  local exception CollocationOptimizationException
63
63
  {
64
64
  };
@@ -661,8 +661,7 @@ local exception InvocationTimeoutException extends TimeoutException
661
661
  /**
662
662
  *
663
663
  * This exception indicates that an asynchronous invocation failed
664
- * because it was canceled explicitly by the user using the
665
- * <tt>Ice::AsyncResult::cancel</tt> method.
664
+ * because it was canceled explicitly by the user.
666
665
  *
667
666
  **/
668
667
  ["cpp:ice_print"]
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -92,11 +92,11 @@ interface Locator
92
92
  *
93
93
  * @return The proxy, or null if the object is not active.
94
94
  *
95
- * @throws ObjectNotFoundException Raised if the object cannot
95
+ * @throws Ice.ObjectNotFoundException Raised if the object cannot
96
96
  * be found.
97
97
  *
98
98
  **/
99
- ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Ice::Identity id)
99
+ ["amd", "nonmutating", "cpp:const"] idempotent Object* findObjectById(Identity id)
100
100
  throws ObjectNotFoundException;
101
101
 
102
102
  /**
@@ -108,7 +108,7 @@ interface Locator
108
108
  *
109
109
  * @return The adapter proxy, or null if the adapter is not active.
110
110
  *
111
- * @throws AdapterNotFoundException Raised if the adapter cannot be
111
+ * @throws Ice.AdapterNotFoundException Raised if the adapter cannot be
112
112
  * found.
113
113
  *
114
114
  **/
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -28,6 +28,8 @@ local interface Logger
28
28
  * Print a message. The message is printed literally, without
29
29
  * any decorations such as executable name or time stamp.
30
30
  *
31
+ * @param message The message to log.
32
+ *
31
33
  **/
32
34
  void print(string message);
33
35
 
@@ -78,6 +80,7 @@ local interface Logger
78
80
  * Returns a clone of the logger with a new prefix.
79
81
  *
80
82
  * @param prefix The new prefix for the logger.
83
+ * @return A logger instance.
81
84
  *
82
85
  */
83
86
  Logger cloneWithPrefix(string prefix);
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -32,9 +32,9 @@ local interface ObjectFactory
32
32
  * absolute Slice type id, i.e., the id relative to the
33
33
  * unnamed top-level Slice module. For example, the absolute
34
34
  * Slice type id for interfaces of type <tt>Bar</tt> in the module
35
- * <tt>Foo</tt> is <tt>::Foo::Bar</tt>.
35
+ * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
36
36
  *
37
- * <p class="Note">The leading "<tt>::</tt>" is required.
37
+ * The leading "<tt>::</tt>" is required.
38
38
  *
39
39
  * @param type The object type.
40
40
  *
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,7 +1,7 @@
1
1
 
2
2
  // **********************************************************************
3
3
  //
4
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
4
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
5
5
  //
6
6
  // This copy of Ice is licensed to you under the terms described in the
7
7
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -20,7 +20,7 @@ module Ice
20
20
  * An administrative interface for process management. Managed servers must
21
21
  * implement this interface.
22
22
  *
23
- * <p class="Note">A servant implementing this interface is a potential target
23
+ * A servant implementing this interface is a potential target
24
24
  * for denial-of-service attacks, therefore proper security precautions
25
25
  * should be taken. For example, the servant can use a UUID to make its
26
26
  * identity harder to guess, and be registered in an object adapter with
@@ -38,7 +38,6 @@ interface Process
38
38
  **/
39
39
  void shutdown();
40
40
 
41
-
42
41
  /**
43
42
  *
44
43
  * Write a message on the process' stdout or stderr.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -122,29 +122,21 @@ interface RemoteLogger
122
122
  {
123
123
  /**
124
124
  *
125
- * init is called by {@link LoggerAdmin#attachRemoteLogger} when a
126
- * RemoteLogger proxy is attached.
125
+ * init is called by attachRemoteLogger when a RemoteLogger proxy is attached.
127
126
  *
128
- * @param prefix The prefix of the associated local {@link Logger}
127
+ * @param prefix The prefix of the associated local Logger.
129
128
  *
130
129
  * @param logMessages Old log messages generated before "now".
131
130
  *
132
- * @see LoggerAdmin#attachRemoteLogger
133
- *
134
- *
135
131
  **/
136
132
  void init(string prefix, LogMessageSeq logMessages);
137
133
 
138
-
139
134
  /**
140
135
  *
141
- * Log a {@link LogMessage}. Note that log may be called by {@link LoggerAdmin}
142
- * before {@link #init}.
136
+ * Log a LogMessage. Note that log may be called by LoggerAdmin before init.
143
137
  *
144
138
  * @param message The message to log.
145
139
  *
146
- * @see Logger
147
- *
148
140
  **/
149
141
  void log(LogMessage message);
150
142
  };
@@ -152,9 +144,7 @@ interface RemoteLogger
152
144
 
153
145
  /**
154
146
  *
155
- * An exception thrown by {@link LoggerAdmin#attachRemoteLogger} to report
156
- * that the provided {@link RemoteLogger} was previously attached to this
157
- * {@link LoggerAdmin}.
147
+ * Thrown when the provided RemoteLogger was previously attached to a LoggerAdmin.
158
148
  *
159
149
  **/
160
150
  exception RemoteLoggerAlreadyAttachedException
@@ -171,9 +161,8 @@ interface LoggerAdmin
171
161
  {
172
162
  /**
173
163
  *
174
- * attachRemoteLogger is called to attach a {@link RemoteLogger} object to
175
- * the local {@link Logger}.
176
- * attachRemoteLogger calls init on the provided {@link RemoteLogger} proxy.
164
+ * Attaches a RemoteLogger object to the local logger.
165
+ * attachRemoteLogger calls init on the provided RemoteLogger proxy.
177
166
  *
178
167
  * @param prx A proxy to the remote logger.
179
168
  *
@@ -185,7 +174,7 @@ interface LoggerAdmin
185
174
  * An empty list means no filtering (send all trace categories).
186
175
  *
187
176
  * @param messageMax The maximum number of log messages (of all types) to be provided
188
- * to {@link RemoteLogger#init}. A negative value requests all messages available.
177
+ * to init. A negative value requests all messages available.
189
178
  *
190
179
  * @throws RemoteLoggerAlreadyAttachedException Raised if this remote logger is already
191
180
  * attached to this admin object.
@@ -197,8 +186,7 @@ interface LoggerAdmin
197
186
 
198
187
  /**
199
188
  *
200
- * detachRemoteLogger is called to detach a {@link RemoteLogger} object from
201
- * the local {@link Logger}.
189
+ * Detaches a RemoteLogger object from the local logger.
202
190
  *
203
191
  * @param prx A proxy to the remote logger.
204
192
  *
@@ -209,7 +197,7 @@ interface LoggerAdmin
209
197
 
210
198
  /**
211
199
  *
212
- * getLog retrieves log messages recently logged.
200
+ * Retrieves log messages recently logged.
213
201
  *
214
202
  * @param messageTypes The list of message types that the caller wishes to receive.
215
203
  * An empty list means no filtering (send all message types).
@@ -221,7 +209,7 @@ interface LoggerAdmin
221
209
  * @param messageMax The maximum number of log messages (of all types) to be returned.
222
210
  * A negative value requests all messages available.
223
211
  *
224
- * @param prefix The prefix of the associated local {@link Logger}.
212
+ * @param prefix The prefix of the associated local logger.
225
213
  *
226
214
  * @return The Log messages.
227
215
  *
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
4
4
  //
5
5
  // This copy of Ice is licensed to you under the terms described in the
6
6
  // ICE_LICENSE file included in this distribution.
@@ -42,12 +42,12 @@ local interface ServantLocator
42
42
  * is marshaled back to the client. If the Slice definition for the
43
43
  * corresponding operation includes that user exception, the client
44
44
  * receives that user exception; otherwise, the client receives
45
- * {@link UnknownUserException}.
45
+ * UnknownUserException.
46
46
  *
47
47
  * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
48
48
  * call <tt>finished</tt>.
49
49
  *
50
- * <p class="Note">If you call <tt>locate</tt> from your own code, you
50
+ * If you call <tt>locate</tt> from your own code, you
51
51
  * must also call <tt>finished</tt> when you have finished using the
52
52
  * servant, provided that <tt>locate</tt> returned a non-null servant;
53
53
  * otherwise, you will get undefined behavior if you use
@@ -61,6 +61,9 @@ local interface ServantLocator
61
61
  * @return The located servant, or null if no suitable servant has
62
62
  * been found.
63
63
  *
64
+ * @throws UserException The implementation can raise a UserException
65
+ * and the run time will marshal it as the result of the invocation.
66
+ *
64
67
  * @see ObjectAdapter
65
68
  * @see Current
66
69
  * @see #finished
@@ -79,7 +82,7 @@ local interface ServantLocator
79
82
  * is marshaled back to the client. If the Slice definition for the
80
83
  * corresponding operation includes that user exception, the client
81
84
  * receives that user exception; otherwise, the client receives
82
- * {@link UnknownUserException}.
85
+ * UnknownUserException.
83
86
  *
84
87
  * If both the operation and <tt>finished</tt> throw an exception, the
85
88
  * exception thrown by <tt>finished</tt> is marshaled back to the client.
@@ -91,6 +94,9 @@ local interface ServantLocator
91
94
  *
92
95
  * @param cookie The cookie that was returned by <tt>locate</tt>.
93
96
  *
97
+ * @throws UserException The implementation can raise a UserException
98
+ * and the run time will marshal it as the result of the invocation.
99
+ *
94
100
  * @see ObjectAdapter
95
101
  * @see Current
96
102
  * @see #locate