zeroc-ice 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 (647) hide show
  1. checksums.yaml +4 -4
  2. data/ICE_LICENSE +1 -1
  3. data/bin/slice2rb +1 -1
  4. data/ext/Communicator.cpp +1 -1
  5. data/ext/Communicator.h +1 -1
  6. data/ext/Config.h +11 -1
  7. data/ext/Connection.cpp +1 -1
  8. data/ext/Connection.h +1 -1
  9. data/ext/Endpoint.cpp +1 -1
  10. data/ext/Endpoint.h +1 -1
  11. data/ext/ImplicitContext.cpp +1 -1
  12. data/ext/ImplicitContext.h +1 -1
  13. data/ext/Init.cpp +5 -13
  14. data/ext/Logger.cpp +1 -1
  15. data/ext/Logger.h +1 -1
  16. data/ext/ObjectFactory.cpp +1 -1
  17. data/ext/ObjectFactory.h +1 -1
  18. data/ext/Operation.cpp +1 -1
  19. data/ext/Operation.h +1 -1
  20. data/ext/Properties.cpp +1 -1
  21. data/ext/Properties.h +1 -1
  22. data/ext/Proxy.cpp +1 -1
  23. data/ext/Proxy.h +1 -1
  24. data/ext/Slice.cpp +1 -1
  25. data/ext/Slice.h +1 -1
  26. data/ext/Types.cpp +2 -2
  27. data/ext/Types.h +1 -1
  28. data/ext/Util.cpp +1 -1
  29. data/ext/Util.h +1 -1
  30. data/ext/ice/cpp/include/Ice/ACMF.h +1 -1
  31. data/ext/ice/cpp/include/Ice/Application.h +1 -1
  32. data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -1
  33. data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
  34. data/ext/ice/cpp/include/Ice/BasicStream.h +1 -1
  35. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -1
  36. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
  37. data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
  38. data/ext/ice/cpp/include/Ice/BuiltinSequences.h +3 -3
  39. data/ext/ice/cpp/include/Ice/Communicator.h +3 -3
  40. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -1
  41. data/ext/ice/cpp/include/Ice/CommunicatorF.h +3 -3
  42. data/ext/ice/cpp/include/Ice/Config.h +1 -1
  43. data/ext/ice/cpp/include/Ice/Connection.h +3 -3
  44. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -1
  45. data/ext/ice/cpp/include/Ice/ConnectionF.h +3 -3
  46. data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +1 -1
  47. data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -1
  48. data/ext/ice/cpp/include/Ice/Current.h +3 -3
  49. data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +1 -1
  50. data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +1 -1
  51. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -1
  52. data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -1
  53. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
  54. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
  55. data/ext/ice/cpp/include/Ice/Endpoint.h +3 -3
  56. data/ext/ice/cpp/include/Ice/EndpointF.h +3 -3
  57. data/ext/ice/cpp/include/Ice/EndpointTypes.h +3 -3
  58. data/ext/ice/cpp/include/Ice/Exception.h +1 -1
  59. data/ext/ice/cpp/include/Ice/FacetMap.h +3 -3
  60. data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -1
  61. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
  62. data/ext/ice/cpp/include/Ice/Format.h +1 -1
  63. data/ext/ice/cpp/include/Ice/Functional.h +1 -1
  64. data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
  65. data/ext/ice/cpp/include/Ice/Handle.h +1 -1
  66. data/ext/ice/cpp/include/Ice/Ice.h +1 -1
  67. data/ext/ice/cpp/include/Ice/Identity.h +3 -3
  68. data/ext/ice/cpp/include/Ice/ImplicitContext.h +3 -3
  69. data/ext/ice/cpp/include/Ice/ImplicitContextF.h +3 -3
  70. data/ext/ice/cpp/include/Ice/Incoming.h +1 -1
  71. data/ext/ice/cpp/include/Ice/IncomingAsync.h +1 -1
  72. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
  73. data/ext/ice/cpp/include/Ice/Initialize.h +1 -1
  74. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
  75. data/ext/ice/cpp/include/Ice/Instrumentation.h +3 -3
  76. data/ext/ice/cpp/include/Ice/InstrumentationF.h +3 -3
  77. data/ext/ice/cpp/include/Ice/LocalException.h +3 -3
  78. data/ext/ice/cpp/include/Ice/LocalObject.h +1 -1
  79. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
  80. data/ext/ice/cpp/include/Ice/Locator.h +3 -3
  81. data/ext/ice/cpp/include/Ice/LocatorF.h +3 -3
  82. data/ext/ice/cpp/include/Ice/Logger.h +3 -3
  83. data/ext/ice/cpp/include/Ice/LoggerF.h +3 -3
  84. data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -1
  85. data/ext/ice/cpp/include/Ice/Metrics.h +3 -3
  86. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +1 -1
  87. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -1
  88. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +1 -1
  89. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -1
  90. data/ext/ice/cpp/include/Ice/Object.h +1 -1
  91. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +3 -3
  92. data/ext/ice/cpp/include/Ice/ObjectAdapterF.h +3 -3
  93. data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +1 -1
  94. data/ext/ice/cpp/include/Ice/ObjectF.h +1 -1
  95. data/ext/ice/cpp/include/Ice/ObjectFactory.h +3 -3
  96. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +3 -3
  97. data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +1 -1
  98. data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
  99. data/ext/ice/cpp/include/Ice/Outgoing.h +1 -1
  100. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +1 -1
  101. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
  102. data/ext/ice/cpp/include/Ice/Plugin.h +3 -3
  103. data/ext/ice/cpp/include/Ice/PluginF.h +3 -3
  104. data/ext/ice/cpp/include/Ice/Process.h +3 -3
  105. data/ext/ice/cpp/include/Ice/ProcessF.h +3 -3
  106. data/ext/ice/cpp/include/Ice/Properties.h +3 -3
  107. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +3 -3
  108. data/ext/ice/cpp/include/Ice/PropertiesF.h +3 -3
  109. data/ext/ice/cpp/include/Ice/Protocol.h +1 -1
  110. data/ext/ice/cpp/include/Ice/Proxy.h +1 -1
  111. data/ext/ice/cpp/include/Ice/ProxyF.h +1 -1
  112. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
  113. data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -1
  114. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
  115. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -1
  116. data/ext/ice/cpp/include/Ice/RemoteLogger.h +3 -3
  117. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
  118. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
  119. data/ext/ice/cpp/include/Ice/Router.h +3 -3
  120. data/ext/ice/cpp/include/Ice/RouterF.h +3 -3
  121. data/ext/ice/cpp/include/Ice/ServantLocator.h +3 -3
  122. data/ext/ice/cpp/include/Ice/ServantLocatorF.h +3 -3
  123. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
  124. data/ext/ice/cpp/include/Ice/Service.h +1 -1
  125. data/ext/ice/cpp/include/Ice/SliceChecksumDict.h +3 -3
  126. data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
  127. data/ext/ice/cpp/include/Ice/SlicedData.h +1 -1
  128. data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -1
  129. data/ext/ice/cpp/include/Ice/Stream.h +1 -1
  130. data/ext/ice/cpp/include/Ice/StreamF.h +1 -1
  131. data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -1
  132. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
  133. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -1
  134. data/ext/ice/cpp/include/Ice/Version.h +3 -3
  135. data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
  136. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +3 -3
  137. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +3 -3
  138. data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
  139. data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -1
  140. data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +1 -1
  141. data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -2
  142. data/ext/ice/cpp/include/IceUtil/Cache.h +1 -1
  143. data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
  144. data/ext/ice/cpp/include/IceUtil/Config.h +4 -4
  145. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
  146. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +1 -1
  147. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
  148. data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
  149. data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
  150. data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
  151. data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
  152. data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +1 -1
  153. data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
  154. data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
  155. data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
  156. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
  157. data/ext/ice/cpp/include/IceUtil/Mutex.h +1 -1
  158. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
  159. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
  160. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
  161. data/ext/ice/cpp/include/IceUtil/Optional.h +1 -1
  162. data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
  163. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
  164. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
  165. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
  166. data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
  167. data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
  168. data/ext/ice/cpp/include/IceUtil/SHA1.h +1 -1
  169. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -1
  170. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
  171. data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
  172. data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
  173. data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
  174. data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
  175. data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
  176. data/ext/ice/cpp/include/IceUtil/Timer.h +1 -1
  177. data/ext/ice/cpp/include/IceUtil/UUID.h +1 -1
  178. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
  179. data/ext/ice/cpp/include/IceUtil/UniquePtr.h +1 -1
  180. data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +1 -1
  181. data/ext/ice/cpp/include/Slice/Checksum.h +1 -1
  182. data/ext/ice/cpp/include/Slice/CsUtil.h +1 -1
  183. data/ext/ice/cpp/include/Slice/DotNetNames.h +1 -1
  184. data/ext/ice/cpp/include/Slice/FileTracker.h +1 -1
  185. data/ext/ice/cpp/include/Slice/JavaUtil.h +1 -1
  186. data/ext/ice/cpp/include/Slice/ObjCUtil.h +1 -1
  187. data/ext/ice/cpp/include/Slice/PHPUtil.h +1 -1
  188. data/ext/ice/cpp/include/Slice/Parser.h +1 -1
  189. data/ext/ice/cpp/include/Slice/Preprocessor.h +1 -1
  190. data/ext/ice/cpp/include/Slice/PythonUtil.h +1 -1
  191. data/ext/ice/cpp/include/Slice/RubyUtil.h +1 -1
  192. data/ext/ice/cpp/include/Slice/Util.h +1 -1
  193. data/ext/ice/cpp/src/Ice/ACM.cpp +1 -1
  194. data/ext/ice/cpp/src/Ice/ACM.h +1 -1
  195. data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
  196. data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
  197. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
  198. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
  199. data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
  200. data/ext/ice/cpp/src/Ice/Base64.h +1 -1
  201. data/ext/ice/cpp/src/Ice/BasicStream.cpp +1 -1
  202. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
  203. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
  204. data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
  205. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
  206. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
  207. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
  208. data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -3
  209. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
  210. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +1 -1
  211. data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -1
  212. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -1
  213. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
  214. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
  215. data/ext/ice/cpp/src/Ice/Connection.cpp +3 -3
  216. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
  217. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +1 -1
  218. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
  219. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +1 -1
  220. data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -1
  221. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
  222. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
  223. data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
  224. data/ext/ice/cpp/src/Ice/Connector.h +1 -1
  225. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
  226. data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
  227. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -1
  228. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
  229. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
  230. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +1 -1
  231. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
  232. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
  233. data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -3
  234. data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
  235. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -1
  236. data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
  237. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
  238. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -1
  239. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
  240. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
  241. data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -1
  242. data/ext/ice/cpp/src/Ice/EndpointI.h +1 -1
  243. data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
  244. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
  245. data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
  246. data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
  247. data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
  248. data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
  249. data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
  250. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
  251. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
  252. data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
  253. data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
  254. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
  255. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
  256. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +1 -1
  257. data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -1
  258. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
  259. data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
  260. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -3
  261. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
  262. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -1
  263. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
  264. data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
  265. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
  266. data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
  267. data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -1
  268. data/ext/ice/cpp/src/Ice/Instance.cpp +5 -4
  269. data/ext/ice/cpp/src/Ice/Instance.h +1 -1
  270. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -3
  271. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
  272. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
  273. data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
  274. data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -3
  275. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
  276. data/ext/ice/cpp/src/Ice/Locator.cpp +3 -3
  277. data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
  278. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +1 -1
  279. data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
  280. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
  281. data/ext/ice/cpp/src/Ice/Logger.cpp +3 -3
  282. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
  283. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
  284. data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
  285. data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
  286. data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
  287. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
  288. data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -3
  289. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +1 -1
  290. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
  291. data/ext/ice/cpp/src/Ice/Network.cpp +6 -6
  292. data/ext/ice/cpp/src/Ice/Network.h +2 -2
  293. data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
  294. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -3
  295. data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
  296. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
  297. data/ext/ice/cpp/src/Ice/Object.cpp +1 -1
  298. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -3
  299. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
  300. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -1
  301. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
  302. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +1 -1
  303. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -1
  304. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -3
  305. data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +3 -3
  306. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +1 -1
  307. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +1 -1
  308. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
  309. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +1 -1
  310. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -1
  311. data/ext/ice/cpp/src/Ice/Outgoing.cpp +1 -1
  312. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
  313. data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -3
  314. data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
  315. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -1
  316. data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -1
  317. data/ext/ice/cpp/src/Ice/Process.cpp +3 -3
  318. data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
  319. data/ext/ice/cpp/src/Ice/Properties.cpp +3 -3
  320. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +3 -3
  321. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
  322. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
  323. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
  324. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +1 -1
  325. data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -1
  326. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +39 -2
  327. data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
  328. data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -1
  329. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
  330. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
  331. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
  332. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
  333. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
  334. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
  335. data/ext/ice/cpp/src/Ice/Proxy.cpp +1 -1
  336. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
  337. data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
  338. data/ext/ice/cpp/src/Ice/Reference.cpp +1 -1
  339. data/ext/ice/cpp/src/Ice/Reference.h +1 -1
  340. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -1
  341. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
  342. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
  343. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
  344. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
  345. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +3 -3
  346. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
  347. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
  348. data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
  349. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
  350. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
  351. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
  352. data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
  353. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
  354. data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
  355. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
  356. data/ext/ice/cpp/src/Ice/Router.cpp +3 -3
  357. data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
  358. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +1 -1
  359. data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -1
  360. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
  361. data/ext/ice/cpp/src/Ice/Selector.cpp +1 -1
  362. data/ext/ice/cpp/src/Ice/Selector.h +1 -1
  363. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -3
  364. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
  365. data/ext/ice/cpp/src/Ice/ServantManager.cpp +1 -1
  366. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
  367. data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
  368. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
  369. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
  370. data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
  371. data/ext/ice/cpp/src/Ice/Stream.cpp +1 -1
  372. data/ext/ice/cpp/src/Ice/StreamI.cpp +1 -1
  373. data/ext/ice/cpp/src/Ice/StreamI.h +1 -1
  374. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +1 -1
  375. data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
  376. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -1
  377. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -3
  378. data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
  379. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +1 -1
  380. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
  381. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
  382. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
  383. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -1
  384. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -1
  385. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
  386. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
  387. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +1 -1
  388. data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
  389. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
  390. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
  391. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
  392. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
  393. data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
  394. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
  395. data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
  396. data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
  397. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
  398. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
  399. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -1
  400. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -1
  401. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +1 -1
  402. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
  403. data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
  404. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
  405. data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
  406. data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
  407. data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
  408. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -1
  409. data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -1
  410. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +1 -1
  411. data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
  412. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -3
  413. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +3 -3
  414. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
  415. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
  416. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
  417. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
  418. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
  419. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
  420. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -3
  421. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +3 -3
  422. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +1 -1
  423. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -1
  424. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
  425. data/ext/ice/cpp/src/IceSSL/Certificate.cpp +1 -1
  426. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -3
  427. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -1
  428. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
  429. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +1 -1
  430. data/ext/ice/cpp/src/IceSSL/EndpointI.h +1 -1
  431. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -3
  432. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
  433. data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
  434. data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
  435. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +67 -10
  436. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +1 -1
  437. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
  438. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
  439. data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
  440. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
  441. data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
  442. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +32 -9
  443. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +2 -2
  444. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
  445. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +1 -1
  446. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +2 -2
  447. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
  448. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +30 -2
  449. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
  450. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
  451. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -1
  452. data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
  453. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
  454. data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
  455. data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
  456. data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +1 -1
  457. data/ext/ice/cpp/src/IceUtil/ArgVector.h +1 -1
  458. data/ext/ice/cpp/src/IceUtil/Cond.cpp +1 -1
  459. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
  460. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
  461. data/ext/ice/cpp/src/IceUtil/CountDownLatch.cpp +1 -1
  462. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
  463. data/ext/ice/cpp/src/IceUtil/Exception.cpp +1 -1
  464. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -1
  465. data/ext/ice/cpp/src/IceUtil/FileUtil.h +1 -1
  466. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
  467. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
  468. data/ext/ice/cpp/src/IceUtil/Options.cpp +22 -7
  469. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
  470. data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
  471. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -1
  472. data/ext/ice/cpp/src/IceUtil/SHA1.cpp +1 -1
  473. data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
  474. data/ext/ice/cpp/src/IceUtil/StopWatch.h +1 -1
  475. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
  476. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
  477. data/ext/ice/cpp/src/IceUtil/Thread.cpp +1 -1
  478. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
  479. data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
  480. data/ext/ice/cpp/src/IceUtil/Timer.cpp +1 -1
  481. data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -1
  482. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
  483. data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
  484. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +2 -2
  485. data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
  486. data/ext/ice/cpp/src/Slice/CsUtil.cpp +1 -1
  487. data/ext/ice/cpp/src/Slice/DotNetNames.cpp +1 -1
  488. data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
  489. data/ext/ice/cpp/src/Slice/Grammar.cpp +1 -1
  490. data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
  491. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2 -2
  492. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
  493. data/ext/ice/cpp/src/Slice/MD5.h +1 -1
  494. data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +2 -2
  495. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
  496. data/ext/ice/cpp/src/Slice/Parser.cpp +1 -1
  497. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +1 -1
  498. data/ext/ice/cpp/src/Slice/Python.cpp +1 -1
  499. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +2 -2
  500. data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
  501. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -3
  502. data/ext/ice/cpp/src/Slice/Scanner.cpp +1 -1
  503. data/ext/ice/cpp/src/Slice/Util.cpp +1 -1
  504. data/ext/ice/mcpp/Makefile +2 -5
  505. data/ice.gemspec +1 -1
  506. data/lib/Glacier2/Metrics.rb +3 -3
  507. data/lib/Glacier2/PermissionsVerifier.rb +3 -3
  508. data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
  509. data/lib/Glacier2/Router.rb +3 -3
  510. data/lib/Glacier2/RouterF.rb +3 -3
  511. data/lib/Glacier2/SSLInfo.rb +3 -3
  512. data/lib/Glacier2/Session.rb +3 -3
  513. data/lib/Glacier2.rb +1 -1
  514. data/lib/Ice/BuiltinSequences.rb +3 -3
  515. data/lib/Ice/Communicator.rb +3 -3
  516. data/lib/Ice/CommunicatorF.rb +3 -3
  517. data/lib/Ice/Connection.rb +3 -3
  518. data/lib/Ice/ConnectionF.rb +3 -3
  519. data/lib/Ice/Current.rb +3 -3
  520. data/lib/Ice/Endpoint.rb +3 -3
  521. data/lib/Ice/EndpointF.rb +3 -3
  522. data/lib/Ice/EndpointTypes.rb +3 -3
  523. data/lib/Ice/FacetMap.rb +3 -3
  524. data/lib/Ice/Identity.rb +3 -3
  525. data/lib/Ice/ImplicitContext.rb +3 -3
  526. data/lib/Ice/ImplicitContextF.rb +3 -3
  527. data/lib/Ice/Instrumentation.rb +3 -3
  528. data/lib/Ice/InstrumentationF.rb +3 -3
  529. data/lib/Ice/LocalException.rb +3 -3
  530. data/lib/Ice/Locator.rb +3 -3
  531. data/lib/Ice/LocatorF.rb +3 -3
  532. data/lib/Ice/Logger.rb +3 -3
  533. data/lib/Ice/LoggerF.rb +3 -3
  534. data/lib/Ice/Metrics.rb +3 -3
  535. data/lib/Ice/ObjectAdapterF.rb +3 -3
  536. data/lib/Ice/ObjectFactory.rb +3 -3
  537. data/lib/Ice/ObjectFactoryF.rb +3 -3
  538. data/lib/Ice/Plugin.rb +3 -3
  539. data/lib/Ice/PluginF.rb +3 -3
  540. data/lib/Ice/Process.rb +3 -3
  541. data/lib/Ice/ProcessF.rb +3 -3
  542. data/lib/Ice/Properties.rb +3 -3
  543. data/lib/Ice/PropertiesAdmin.rb +3 -3
  544. data/lib/Ice/PropertiesF.rb +3 -3
  545. data/lib/Ice/RemoteLogger.rb +3 -3
  546. data/lib/Ice/Router.rb +3 -3
  547. data/lib/Ice/RouterF.rb +3 -3
  548. data/lib/Ice/SliceChecksumDict.rb +3 -3
  549. data/lib/Ice/Version.rb +3 -3
  550. data/lib/Ice.rb +1 -1
  551. data/lib/IceBox/IceBox.rb +3 -3
  552. data/lib/IceBox.rb +1 -1
  553. data/lib/IceGrid/Admin.rb +3 -3
  554. data/lib/IceGrid/Descriptor.rb +3 -3
  555. data/lib/IceGrid/Exception.rb +3 -3
  556. data/lib/IceGrid/FileParser.rb +3 -3
  557. data/lib/IceGrid/Locator.rb +3 -3
  558. data/lib/IceGrid/Observer.rb +3 -3
  559. data/lib/IceGrid/Query.rb +3 -3
  560. data/lib/IceGrid/Registry.rb +3 -3
  561. data/lib/IceGrid/Session.rb +3 -3
  562. data/lib/IceGrid/UserAccountMapper.rb +3 -3
  563. data/lib/IceGrid.rb +1 -1
  564. data/lib/IcePatch2/FileInfo.rb +3 -3
  565. data/lib/IcePatch2/FileServer.rb +3 -3
  566. data/lib/IcePatch2.rb +1 -1
  567. data/lib/IceStorm/IceStorm.rb +3 -3
  568. data/lib/IceStorm/Metrics.rb +3 -3
  569. data/lib/IceStorm.rb +1 -1
  570. data/slice/Freeze/BackgroundSaveEvictor.ice +1 -1
  571. data/slice/Freeze/CatalogData.ice +1 -1
  572. data/slice/Freeze/Connection.ice +12 -2
  573. data/slice/Freeze/ConnectionF.ice +1 -1
  574. data/slice/Freeze/DB.ice +1 -1
  575. data/slice/Freeze/Evictor.ice +8 -1
  576. data/slice/Freeze/EvictorF.ice +1 -1
  577. data/slice/Freeze/EvictorStorage.ice +1 -1
  578. data/slice/Freeze/Exception.ice +1 -1
  579. data/slice/Freeze/Transaction.ice +2 -1
  580. data/slice/Freeze/TransactionalEvictor.ice +1 -1
  581. data/slice/Glacier2/Metrics.ice +1 -1
  582. data/slice/Glacier2/PermissionsVerifier.ice +1 -1
  583. data/slice/Glacier2/PermissionsVerifierF.ice +1 -1
  584. data/slice/Glacier2/Router.ice +1 -1
  585. data/slice/Glacier2/RouterF.ice +1 -1
  586. data/slice/Glacier2/SSLInfo.ice +1 -1
  587. data/slice/Glacier2/Session.ice +1 -1
  588. data/slice/Ice/BuiltinSequences.ice +1 -1
  589. data/slice/Ice/Communicator.ice +50 -55
  590. data/slice/Ice/CommunicatorF.ice +1 -1
  591. data/slice/Ice/Connection.ice +34 -3
  592. data/slice/Ice/ConnectionF.ice +1 -1
  593. data/slice/Ice/Current.ice +4 -5
  594. data/slice/Ice/Endpoint.ice +6 -3
  595. data/slice/Ice/EndpointF.ice +1 -1
  596. data/slice/Ice/EndpointTypes.ice +1 -1
  597. data/slice/Ice/FacetMap.ice +1 -1
  598. data/slice/Ice/Identity.ice +1 -1
  599. data/slice/Ice/ImplicitContext.ice +5 -4
  600. data/slice/Ice/ImplicitContextF.ice +1 -1
  601. data/slice/Ice/Instrumentation.ice +1 -1
  602. data/slice/Ice/InstrumentationF.ice +1 -1
  603. data/slice/Ice/LocalException.ice +3 -4
  604. data/slice/Ice/Locator.ice +4 -4
  605. data/slice/Ice/LocatorF.ice +1 -1
  606. data/slice/Ice/Logger.ice +4 -1
  607. data/slice/Ice/LoggerF.ice +1 -1
  608. data/slice/Ice/Metrics.ice +1 -1
  609. data/slice/Ice/ObjectAdapter.ice +1 -1
  610. data/slice/Ice/ObjectAdapterF.ice +1 -1
  611. data/slice/Ice/ObjectFactory.ice +3 -3
  612. data/slice/Ice/ObjectFactoryF.ice +1 -1
  613. data/slice/Ice/Plugin.ice +1 -1
  614. data/slice/Ice/PluginF.ice +1 -1
  615. data/slice/Ice/Process.ice +2 -3
  616. data/slice/Ice/ProcessF.ice +1 -1
  617. data/slice/Ice/Properties.ice +1 -1
  618. data/slice/Ice/PropertiesAdmin.ice +1 -1
  619. data/slice/Ice/PropertiesF.ice +1 -1
  620. data/slice/Ice/RemoteLogger.ice +11 -23
  621. data/slice/Ice/Router.ice +1 -1
  622. data/slice/Ice/RouterF.ice +1 -1
  623. data/slice/Ice/ServantLocator.ice +10 -4
  624. data/slice/Ice/ServantLocatorF.ice +1 -1
  625. data/slice/Ice/SliceChecksumDict.ice +1 -1
  626. data/slice/Ice/Version.ice +1 -1
  627. data/slice/IceBox/IceBox.ice +8 -5
  628. data/slice/IceDiscovery/IceDiscovery.ice +1 -1
  629. data/slice/IceGrid/Admin.ice +13 -2
  630. data/slice/IceGrid/Descriptor.ice +1 -1
  631. data/slice/IceGrid/Exception.ice +1 -1
  632. data/slice/IceGrid/FileParser.ice +1 -1
  633. data/slice/IceGrid/Locator.ice +1 -1
  634. data/slice/IceGrid/Observer.ice +1 -1
  635. data/slice/IceGrid/PluginFacade.ice +4 -1
  636. data/slice/IceGrid/Query.ice +1 -1
  637. data/slice/IceGrid/Registry.ice +1 -1
  638. data/slice/IceGrid/Session.ice +1 -3
  639. data/slice/IceGrid/UserAccountMapper.ice +1 -1
  640. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +1 -1
  641. data/slice/IcePatch2/FileInfo.ice +1 -1
  642. data/slice/IcePatch2/FileServer.ice +1 -1
  643. data/slice/IceSSL/ConnectionInfo.ice +1 -1
  644. data/slice/IceSSL/EndpointInfo.ice +1 -1
  645. data/slice/IceStorm/IceStorm.ice +5 -7
  646. data/slice/IceStorm/Metrics.ice +1 -1
  647. metadata +3 -3
@@ -1,14 +1,14 @@
1
1
  # encoding: utf-8
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.
8
8
  #
9
9
  # **********************************************************************
10
10
  #
11
- # Ice version 3.6.4
11
+ # Ice version 3.6.5
12
12
  #
13
13
  # <auto-generated>
14
14
  #
@@ -22,7 +22,7 @@
22
22
  require 'Ice'
23
23
  require 'IcePatch2/FileInfo.rb'
24
24
 
25
- module IcePatch2
25
+ module ::IcePatch2
26
26
 
27
27
  if not defined?(::IcePatch2::T_ByteSeqSeq)
28
28
  T_ByteSeqSeq = ::Ice::__defineSequence('::IcePatch2::ByteSeqSeq', ::Ice::T_ByteSeq)
data/lib/IcePatch2.rb CHANGED
@@ -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,14 +1,14 @@
1
1
  # encoding: utf-8
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.
8
8
  #
9
9
  # **********************************************************************
10
10
  #
11
- # Ice version 3.6.4
11
+ # Ice version 3.6.5
12
12
  #
13
13
  # <auto-generated>
14
14
  #
@@ -24,7 +24,7 @@ require 'Ice/Identity.rb'
24
24
  require 'Ice/SliceChecksumDict.rb'
25
25
  require 'IceStorm/Metrics.rb'
26
26
 
27
- module IceStorm
27
+ module ::IceStorm
28
28
 
29
29
  if not defined?(::IceStorm::T_Topic)
30
30
  T_Topic = ::Ice::__declareClass('::IceStorm::Topic')
@@ -1,14 +1,14 @@
1
1
  # encoding: utf-8
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.
8
8
  #
9
9
  # **********************************************************************
10
10
  #
11
- # Ice version 3.6.4
11
+ # Ice version 3.6.5
12
12
  #
13
13
  # <auto-generated>
14
14
  #
@@ -22,7 +22,7 @@
22
22
  require 'Ice'
23
23
  require 'Ice/Metrics.rb'
24
24
 
25
- module IceMX
25
+ module ::IceMX
26
26
 
27
27
  if not defined?(::IceMX::TopicMetrics_mixin)
28
28
  module TopicMetrics_mixin
data/lib/IceStorm.rb CHANGED
@@ -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.
@@ -67,6 +67,11 @@ local interface Connection
67
67
  /**
68
68
  *
69
69
  * Remove an old unused Freeze Map index
70
+ *
71
+ * @param mapName The name of the Freeze map.
72
+ *
73
+ * @param indexName The name of the index.
74
+ *
70
75
  * @throws IndexNotFoundException Raised if this index
71
76
  * does not exist
72
77
  *
@@ -87,6 +92,8 @@ local interface Connection
87
92
  *
88
93
  * Returns the communicator associated with this connection.
89
94
  *
95
+ * @return The communicator.
96
+ *
90
97
  **/
91
98
  ["cpp:const"] Ice::Communicator getCommunicator();
92
99
 
@@ -94,6 +101,8 @@ local interface Connection
94
101
  *
95
102
  * Returns the encoding version used to encode the data.
96
103
  *
104
+ * @return The encoding version.
105
+ *
97
106
  **/
98
107
  ["cpp:const"] Ice::EncodingVersion getEncoding();
99
108
 
@@ -102,9 +111,10 @@ local interface Connection
102
111
  * The name of the connected system (for example, the Berkeley DB
103
112
  * environment).
104
113
  *
114
+ * @return The name of the connected system.
115
+ *
105
116
  **/
106
117
  ["cpp:const"] string getName();
107
-
108
118
  };
109
119
 
110
120
  };
@@ -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.
data/slice/Freeze/DB.ice CHANGED
@@ -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.
@@ -287,6 +287,8 @@ local interface Evictor extends Ice::ServantLocator
287
287
  * Returns true if the given identity is managed by the evictor
288
288
  * with the default facet.
289
289
  *
290
+ * @param id The identity of the Ice object.
291
+ *
290
292
  * @return true if the identity is managed by the evictor, false
291
293
  * otherwise.
292
294
  *
@@ -304,6 +306,11 @@ local interface Evictor extends Ice::ServantLocator
304
306
  * is equivalent to calling {@link #hasFacet} with an empty
305
307
  * facet.
306
308
  *
309
+ * @param id The identity of the Ice object.
310
+ *
311
+ * @param facet The facet name. An empty facet means the default
312
+ * facet.
313
+ *
307
314
  * @return true if the identity is managed by the evictor for the
308
315
  * given facet, false otherwise.
309
316
  *
@@ -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.
@@ -48,6 +48,7 @@ local interface Transaction
48
48
  *
49
49
  * Get the connection associated with this Transaction
50
50
  *
51
+ * @return The connection.
51
52
  **/
52
53
  ["cpp:const"] Connection getConnection();
53
54
  };
@@ -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.
@@ -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.
@@ -67,14 +67,13 @@ local interface Communicator
67
67
  /**
68
68
  *
69
69
  * Shuts down this communicator's server functionality, which
70
- * includes the deactivation of all object adapters. (Attempts to use
71
- * a deactivated object adapter raise {@link ObjectAdapterDeactivatedException}.)
72
- * Subsequent calls to {@link #shutdown} are ignored.</p>
73
- *
74
- * <p class="Note"> After {@link #shutdown} returns, no new requests are
75
- * processed. However, requests that have been started before
76
- * {@link #shutdown} was called might still be active. You can use
77
- * {@link #waitForShutdown} to wait for the completion of all
70
+ * includes the deactivation of all object adapters. Attempts to use
71
+ * a deactivated object adapter raise ObjectAdapterDeactivatedException.
72
+ * Subsequent calls to shutdown are ignored.
73
+ *
74
+ * After shutdown returns, no new requests are processed. However, requests
75
+ * that have been started before shutdown was called might still be active.
76
+ * You can use {@link #waitForShutdown} to wait for the completion of all
78
77
  * requests.
79
78
  *
80
79
  * @see #destroy
@@ -92,12 +91,11 @@ local interface Communicator
92
91
  * On the client side, the operation simply block until another
93
92
  * thread has called {@link #shutdown} or {@link #destroy}.
94
93
  *
95
- * <p>A typical use of this operation is to call it
96
- * from the main thread, which then waits until some other thread
97
- * calls {@link #shutdown}. After shut-down is complete, the main thread
98
- * returns and can do some cleanup work before it finally calls
99
- * {@link #destroy} to shut down the client functionality, and then
100
- * exits the application.
94
+ * A typical use of this operation is to call it from the main thread,
95
+ * which then waits until some other thread calls {@link #shutdown}.
96
+ * After shut-down is complete, the main thread returns and can do some
97
+ * cleanup work before it finally calls {@link #destroy} to shut down
98
+ * the client functionality, and then exits the application.
101
99
  *
102
100
  * @see #shutdown
103
101
  * @see #destroy
@@ -125,10 +123,9 @@ local interface Communicator
125
123
  * having an identity with a name "MyObject" and a category
126
124
  * "MyCategory", with the server running on host "some_host", port
127
125
  * 10000. If the stringified proxy does not parse correctly, the
128
- * operation throws one of {@link ProxyParseException},
129
- * {@link EndpointParseException}, or {@link IdentityParseException}.
130
- * An appendix in the Ice manual provides a detailed description
131
- * of the syntax supported by stringified proxies.
126
+ * operation throws one of ProxyParseException, EndpointParseException,
127
+ * or IdentityParseException. Refer to the Ice manual for a detailed
128
+ * description of the syntax supported by stringified proxies.
132
129
  *
133
130
  * @param str The stringified proxy to convert into a proxy.
134
131
  *
@@ -161,7 +158,7 @@ local interface Communicator
161
158
  * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
162
159
  * properties configure local settings for the proxy, such as
163
160
  * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
164
- * appendix in the Ice manual describes each of the supported
161
+ * section in the Ice manual describes each of the supported
165
162
  * proxy properties.
166
163
  *
167
164
  * @param property The base property name.
@@ -187,7 +184,7 @@ local interface Communicator
187
184
  /**
188
185
  *
189
186
  * Convert a string into an identity. If the string does not parse
190
- * correctly, the operation throws {@link IdentityParseException}.
187
+ * correctly, the operation throws IdentityParseException.
191
188
  *
192
189
  * @param str The string to convert into an identity.
193
190
  *
@@ -214,15 +211,15 @@ local interface Communicator
214
211
  /**
215
212
  *
216
213
  * Create a new object adapter. The endpoints for the object
217
- * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.</p>
214
+ * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.
218
215
  *
219
- * <p>It is legal to create an object adapter with the empty string as
216
+ * It is legal to create an object adapter with the empty string as
220
217
  * its name. Such an object adapter is accessible via bidirectional
221
218
  * connections or by collocated invocations that originate from the
222
- * same communicator as is used by the adapter.</p>
219
+ * same communicator as is used by the adapter.
223
220
  *
224
- * <p>Attempts to create a named object adapter for which no configuration
225
- * can be found raise {@link InitializationException}.
221
+ * Attempts to create a named object adapter for which no configuration
222
+ * can be found raise InitializationException.
226
223
  *
227
224
  * @param name The object adapter name.
228
225
  *
@@ -240,9 +237,9 @@ local interface Communicator
240
237
  * Create a new object adapter with endpoints. This operation sets
241
238
  * the property <tt><em>name</em>.Endpoints</tt>,
242
239
  * and then calls {@link #createObjectAdapter}. It is provided as a
243
- * convenience function.</p>
240
+ * convenience function.
244
241
  *
245
- * <p>Calling this operation with an empty name will result in a
242
+ * Calling this operation with an empty name will result in a
246
243
  * UUID being generated for the name.
247
244
  *
248
245
  * @param name The object adapter name.
@@ -261,9 +258,9 @@ local interface Communicator
261
258
  /**
262
259
  *
263
260
  * Create a new object adapter with a router. This operation
264
- * creates a routed object adapter.</p>
261
+ * creates a routed object adapter.
265
262
  *
266
- * <p>Calling this operation with an empty name will result in a
263
+ * Calling this operation with an empty name will result in a
267
264
  * UUID being generated for the name.
268
265
  *
269
266
  * @param name The object adapter name.
@@ -281,27 +278,26 @@ local interface Communicator
281
278
 
282
279
  /**
283
280
  *
284
- * <p>Add an object factory to this communicator. Installing a
281
+ * Add an object factory to this communicator. Installing a
285
282
  * factory with an id for which a factory is already registered
286
- * throws {@link AlreadyRegisteredException}.</p>
283
+ * throws AlreadyRegisteredException.
287
284
  *
288
- * <p>When unmarshaling an Ice object, the Ice run time reads the
285
+ * When unmarshaling an Ice object, the Ice run time reads the
289
286
  * most-derived type id off the wire and attempts to create an
290
287
  * instance of the type using a factory. If no instance is created,
291
288
  * either because no factory was found, or because all factories
292
289
  * returned nil, the behavior of the Ice run time depends on the
293
- * format with which the object was marshaled:</p>
290
+ * format with which the object was marshaled:
294
291
  *
295
- * <p>If the object uses the "sliced" format, Ice ascends the class
292
+ * If the object uses the "sliced" format, Ice ascends the class
296
293
  * hierarchy until it finds a type that is recognized by a factory,
297
294
  * or it reaches the least-derived type. If no factory is found that
298
- * can create an instance, the run time throws
299
- * {@link NoObjectFactoryException}.</p>
295
+ * can create an instance, the run time throws NoObjectFactoryException.
300
296
  *
301
- * <p>If the object uses the "compact" format, Ice immediately raises
302
- * {@link NoObjectFactoryException}.</p>
297
+ * If the object uses the "compact" format, Ice immediately raises
298
+ * NoObjectFactoryException.
303
299
  *
304
- * <p>The following order is used to locate a factory for a type:</p>
300
+ * The following order is used to locate a factory for a type:
305
301
  *
306
302
  * <ol>
307
303
  *
@@ -404,9 +400,9 @@ local interface Communicator
404
400
  * Set a default router for this communicator. All newly
405
401
  * created proxies will use this default router. To disable the
406
402
  * default router, null can be used. Note that this
407
- * operation has no effect on existing proxies.</p>
403
+ * operation has no effect on existing proxies.
408
404
  *
409
- * <p class="Note">You can also set a router for an individual proxy
405
+ * You can also set a router for an individual proxy
410
406
  * by calling the operation <tt>ice_router</tt> on the proxy.
411
407
  *
412
408
  * @param rtr The default router to use for this communicator.
@@ -436,12 +432,11 @@ local interface Communicator
436
432
  * created proxy and object adapters will use this default
437
433
  * locator. To disable the default locator, null can be used.
438
434
  * Note that this operation has no effect on existing proxies or
439
- * object adapters.</p>
435
+ * object adapters.
440
436
  *
441
- * <p class="Note"> You can also set a locator for an individual proxy
442
- * by calling the operation <tt>ice_locator</tt> on the proxy, or for an
443
- * object adapter by calling the operation {@link ObjectAdapter#setLocator}
444
- * on the object adapter.
437
+ * You can also set a locator for an individual proxy by calling the
438
+ * operation <tt>ice_locator</tt> on the proxy, or for an object adapter
439
+ * by calling {@link ObjectAdapter#setLocator} on the object adapter.
445
440
  *
446
441
  * @param loc The default locator to use for this communicator.
447
442
  *
@@ -479,7 +474,7 @@ local interface Communicator
479
474
  * If Ice.Admin.ServerId is set and the provided object adapter has a {@link Locator},
480
475
  * createAdmin registers the Admin's Process facet with the {@link Locator}'s {@link LocatorRegistry}.
481
476
  *
482
- * <p>createAdmin call only be called once; subsequent calls raise {@link InitializationException}.</p>
477
+ * createAdmin call only be called once; subsequent calls raise InitializationException.
483
478
  *
484
479
  * @param adminAdapter The object adapter used to host the Admin object; if null and
485
480
  * Ice.Admin.Endpoints is set, create, activate and use the Ice.Admin object adapter.
@@ -489,7 +484,7 @@ local interface Communicator
489
484
  * @return A proxy to the main ("") facet of the Admin object. Never returns a null proxy.
490
485
  *
491
486
  * @see #getAdmin
492
- * @see LocatorRegistry#setServerProcessProxy
487
+ * @see LocatorRegistry
493
488
  *
494
489
  **/
495
490
  Object* createAdmin(ObjectAdapter adminAdapter, Identity adminId);
@@ -500,11 +495,11 @@ local interface Communicator
500
495
  *
501
496
  * getAdmin also creates the Admin object and creates and activates the Ice.Admin object
502
497
  * adapter to host this Admin object if Ice.Admin.Enpoints is set. The identity of the Admin
503
- * object created by getAdmin is <value of Ice.Admin.InstanceName>/admin, or <UUID>/admin
498
+ * object created by getAdmin is {value of Ice.Admin.InstanceName}/admin, or {UUID}/admin
504
499
  * when Ice.Admin.InstanceName is not set.
505
500
  *
506
- * <p>If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
507
- * initialization, after initialization of all plugins.</p>
501
+ * If Ice.Admin.DelayCreation is 0 or not set, getAdmin is called by the communicator
502
+ * initialization, after initialization of all plugins.
508
503
 
509
504
  * @return A proxy to the main ("") facet of the Admin object, or a null proxy if no
510
505
  * Admin object is configured.
@@ -517,7 +512,7 @@ local interface Communicator
517
512
  *
518
513
  * Add a new facet to the Admin object.
519
514
  * Adding a servant with a facet that is already registered
520
- * throws {@link AlreadyRegisteredException}.
515
+ * throws AlreadyRegisteredException.
521
516
  *
522
517
  * @param servant The servant that implements the new Admin facet.
523
518
  * @param facet The name of the new Admin facet.
@@ -528,8 +523,8 @@ local interface Communicator
528
523
  /**
529
524
  *
530
525
  * Remove the following facet to the Admin object.
531
- * Removing a facet that was not previously registered throws
532
- * {@link NotRegisteredException}.
526
+ * Removing a facet that was not previously registered
527
+ * throws NotRegisteredException.
533
528
  *
534
529
  * @param facet The name of the Admin facet.
535
530
  * @return The servant associated with this Admin facet.
@@ -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.