zeroc-ice-x86-mingw 3.6b1 → 3.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/BZIP2_LICENSE +42 -0
  3. data/ICE_LICENSE +8 -14
  4. data/LICENSE +2 -1
  5. data/MCPP_LICENSE +29 -0
  6. data/bin/slice2rb +1 -1
  7. data/ice-x86-mingw.gemspec +3 -3
  8. data/lib/Glacier2.rb +1 -1
  9. data/lib/Glacier2/Metrics.rb +2 -2
  10. data/lib/Glacier2/PermissionsVerifier.rb +2 -2
  11. data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
  12. data/lib/Glacier2/Router.rb +2 -2
  13. data/lib/Glacier2/RouterF.rb +2 -2
  14. data/lib/Glacier2/SSLInfo.rb +2 -2
  15. data/lib/Glacier2/Session.rb +2 -2
  16. data/lib/Ice.rb +1 -1
  17. data/lib/Ice/BuiltinSequences.rb +2 -2
  18. data/lib/Ice/Communicator.rb +2 -2
  19. data/lib/Ice/CommunicatorF.rb +2 -2
  20. data/lib/Ice/Connection.rb +26 -14
  21. data/lib/Ice/ConnectionF.rb +2 -2
  22. data/lib/Ice/Current.rb +2 -2
  23. data/lib/Ice/Endpoint.rb +4 -2
  24. data/lib/Ice/EndpointF.rb +2 -2
  25. data/lib/Ice/EndpointTypes.rb +2 -2
  26. data/lib/Ice/FacetMap.rb +2 -2
  27. data/lib/Ice/Identity.rb +2 -2
  28. data/lib/Ice/ImplicitContext.rb +2 -2
  29. data/lib/Ice/ImplicitContextF.rb +2 -2
  30. data/lib/Ice/Instrumentation.rb +2 -2
  31. data/lib/Ice/InstrumentationF.rb +2 -2
  32. data/lib/Ice/LocalException.rb +2 -2
  33. data/lib/Ice/Locator.rb +2 -2
  34. data/lib/Ice/LocatorF.rb +2 -2
  35. data/lib/Ice/Logger.rb +2 -2
  36. data/lib/Ice/LoggerF.rb +2 -2
  37. data/lib/Ice/Metrics.rb +2 -2
  38. data/lib/Ice/ObjectAdapterF.rb +2 -2
  39. data/lib/Ice/ObjectFactory.rb +2 -2
  40. data/lib/Ice/ObjectFactoryF.rb +2 -2
  41. data/lib/Ice/Plugin.rb +2 -2
  42. data/lib/Ice/PluginF.rb +2 -2
  43. data/lib/Ice/Process.rb +2 -2
  44. data/lib/Ice/ProcessF.rb +2 -2
  45. data/lib/Ice/Properties.rb +2 -2
  46. data/lib/Ice/PropertiesAdmin.rb +2 -2
  47. data/lib/Ice/PropertiesF.rb +2 -2
  48. data/lib/Ice/Router.rb +2 -2
  49. data/lib/Ice/RouterF.rb +2 -2
  50. data/lib/Ice/SliceChecksumDict.rb +2 -2
  51. data/lib/Ice/Version.rb +2 -2
  52. data/lib/IceBox.rb +1 -1
  53. data/lib/IceBox/IceBox.rb +2 -2
  54. data/lib/IceGrid.rb +1 -1
  55. data/lib/IceGrid/Admin.rb +2 -2
  56. data/lib/IceGrid/Descriptor.rb +2 -2
  57. data/lib/IceGrid/Exception.rb +2 -2
  58. data/lib/IceGrid/FileParser.rb +2 -2
  59. data/lib/IceGrid/Locator.rb +2 -2
  60. data/lib/IceGrid/Observer.rb +2 -2
  61. data/lib/IceGrid/Query.rb +2 -2
  62. data/lib/IceGrid/Registry.rb +2 -2
  63. data/lib/IceGrid/Session.rb +2 -2
  64. data/lib/IceGrid/UserAccountMapper.rb +2 -2
  65. data/lib/IcePatch2.rb +1 -1
  66. data/lib/IcePatch2/FileInfo.rb +52 -2
  67. data/lib/IcePatch2/FileServer.rb +33 -4
  68. data/lib/IceRuby.so +0 -0
  69. data/lib/IceStorm.rb +1 -1
  70. data/lib/IceStorm/IceStorm.rb +2 -2
  71. data/lib/IceStorm/Metrics.rb +2 -2
  72. data/slice/Freeze/BackgroundSaveEvictor.ice +2 -2
  73. data/slice/Freeze/CatalogData.ice +2 -2
  74. data/slice/Freeze/Connection.ice +2 -2
  75. data/slice/Freeze/ConnectionF.ice +2 -2
  76. data/slice/Freeze/DB.ice +2 -2
  77. data/slice/Freeze/Evictor.ice +2 -2
  78. data/slice/Freeze/EvictorF.ice +2 -2
  79. data/slice/Freeze/EvictorStorage.ice +2 -2
  80. data/slice/Freeze/Exception.ice +2 -2
  81. data/slice/Freeze/Transaction.ice +2 -2
  82. data/slice/Freeze/TransactionalEvictor.ice +2 -2
  83. data/slice/Glacier2/Metrics.ice +7 -6
  84. data/slice/Glacier2/PermissionsVerifier.ice +4 -3
  85. data/slice/Glacier2/PermissionsVerifierF.ice +3 -2
  86. data/slice/Glacier2/Router.ice +4 -3
  87. data/slice/Glacier2/RouterF.ice +3 -2
  88. data/slice/Glacier2/SSLInfo.ice +3 -2
  89. data/slice/Glacier2/Session.ice +12 -11
  90. data/slice/Ice/BuiltinSequences.ice +4 -3
  91. data/slice/Ice/Communicator.ice +22 -25
  92. data/slice/Ice/CommunicatorF.ice +3 -2
  93. data/slice/Ice/Connection.ice +39 -11
  94. data/slice/Ice/ConnectionF.ice +3 -2
  95. data/slice/Ice/Current.ice +4 -3
  96. data/slice/Ice/Endpoint.ice +11 -3
  97. data/slice/Ice/EndpointF.ice +3 -2
  98. data/slice/Ice/EndpointTypes.ice +3 -2
  99. data/slice/Ice/FacetMap.ice +3 -2
  100. data/slice/Ice/Identity.ice +3 -2
  101. data/slice/Ice/ImplicitContext.ice +3 -2
  102. data/slice/Ice/ImplicitContextF.ice +3 -2
  103. data/slice/Ice/Instrumentation.ice +4 -2
  104. data/slice/Ice/InstrumentationF.ice +4 -2
  105. data/slice/Ice/LocalException.ice +29 -10
  106. data/slice/Ice/Locator.ice +5 -3
  107. data/slice/Ice/LocatorF.ice +3 -2
  108. data/slice/Ice/Logger.ice +3 -2
  109. data/slice/Ice/LoggerF.ice +3 -2
  110. data/slice/Ice/Metrics.ice +15 -14
  111. data/slice/Ice/ObjectAdapter.ice +5 -4
  112. data/slice/Ice/ObjectAdapterF.ice +3 -2
  113. data/slice/Ice/ObjectFactory.ice +3 -2
  114. data/slice/Ice/ObjectFactoryF.ice +3 -2
  115. data/slice/Ice/Plugin.ice +3 -2
  116. data/slice/Ice/PluginF.ice +3 -2
  117. data/slice/Ice/Process.ice +3 -2
  118. data/slice/Ice/ProcessF.ice +3 -2
  119. data/slice/Ice/Properties.ice +3 -2
  120. data/slice/Ice/PropertiesAdmin.ice +3 -2
  121. data/slice/Ice/PropertiesF.ice +3 -2
  122. data/slice/Ice/RemoteLogger.ice +3 -2
  123. data/slice/Ice/Router.ice +3 -2
  124. data/slice/Ice/RouterF.ice +3 -2
  125. data/slice/Ice/ServantLocator.ice +3 -2
  126. data/slice/Ice/ServantLocatorF.ice +3 -2
  127. data/slice/Ice/SliceChecksumDict.ice +3 -2
  128. data/slice/Ice/Version.ice +3 -2
  129. data/slice/IceBox/IceBox.ice +2 -2
  130. data/slice/IceDiscovery/IceDiscovery.ice +2 -2
  131. data/slice/IceGrid/Admin.ice +49 -48
  132. data/slice/IceGrid/Descriptor.ice +3 -2
  133. data/slice/IceGrid/Exception.ice +6 -5
  134. data/slice/IceGrid/FileParser.ice +4 -3
  135. data/slice/IceGrid/Locator.ice +4 -3
  136. data/slice/IceGrid/Observer.ice +28 -27
  137. data/slice/IceGrid/PluginFacade.ice +3 -2
  138. data/slice/IceGrid/Query.ice +3 -2
  139. data/slice/IceGrid/Registry.ice +4 -3
  140. data/slice/IceGrid/Session.ice +9 -8
  141. data/slice/IceGrid/UserAccountMapper.ice +4 -3
  142. data/slice/{IceGrid/Discovery.ice → IceLocatorDiscovery/IceLocatorDiscovery.ice} +12 -14
  143. data/slice/IcePatch2/FileInfo.ice +31 -2
  144. data/slice/IcePatch2/FileServer.ice +63 -5
  145. data/slice/IceSSL/ConnectionInfo.ice +17 -2
  146. data/slice/IceSSL/EndpointInfo.ice +21 -3
  147. data/slice/IceStorm/IceStorm.ice +3 -2
  148. data/slice/IceStorm/Metrics.ice +4 -3
  149. metadata +8 -6
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
14
  #include <Ice/CommunicatorF.ice>
15
15
  #include <Ice/ServantLocatorF.ice>
@@ -18,6 +18,7 @@
18
18
  #include <Ice/FacetMap.ice>
19
19
  #include <Ice/Endpoint.ice>
20
20
 
21
+ ["objc:prefix:ICE"]
21
22
  module Ice
22
23
  {
23
24
 
@@ -188,7 +189,7 @@ local interface ObjectAdapter
188
189
  * @see #find
189
190
  *
190
191
  **/
191
- Object* add(Object servant, Identity id);
192
+ Object* add(Object servant, ["objc:param:identity"] Identity id);
192
193
 
193
194
  /**
194
195
  *
@@ -212,7 +213,7 @@ local interface ObjectAdapter
212
213
  * @see #findFacet
213
214
  *
214
215
  **/
215
- Object* addFacet(Object servant, Identity id, string facet);
216
+ Object* addFacet(Object servant, ["objc:param:identity"] Identity id, string facet);
216
217
 
217
218
  /**
218
219
  *
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
data/slice/Ice/Plugin.ice CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  // **********************************************************************
3
3
  //
4
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
4
+ // Copyright (c) 2003-2015 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.
@@ -10,11 +10,12 @@
10
10
 
11
11
  #pragma once
12
12
 
13
- [["cpp:header-ext:h"]]
13
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
14
14
 
15
15
  #include <Ice/LoggerF.ice>
16
16
  #include <Ice/BuiltinSequences.ice>
17
17
 
18
+ ["objc:prefix:ICE"]
18
19
  module Ice
19
20
  {
20
21
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,10 +9,11 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
14
  #include <Ice/PropertiesAdmin.ice>
15
15
 
16
+ ["objc:prefix:ICE"]
16
17
  module Ice
17
18
  {
18
19
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,10 +9,11 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
14
  #include <Ice/BuiltinSequences.ice>
15
15
 
16
+ ["objc:prefix:ICE"]
16
17
  module Ice
17
18
  {
18
19
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -11,9 +11,10 @@
11
11
 
12
12
  #include <Ice/BuiltinSequences.ice>
13
13
 
14
- [["cpp:header-ext:h"]]
14
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
15
15
  [["cpp:include:list"]]
16
16
 
17
+ ["objc:prefix:ICE"]
17
18
  module Ice
18
19
  {
19
20
 
data/slice/Ice/Router.ice CHANGED
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,10 +9,11 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
14
  #include <Ice/BuiltinSequences.ice>
15
15
 
16
+ ["objc:prefix:ICE"]
16
17
  module Ice
17
18
  {
18
19
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,11 +9,12 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
14
  #include <Ice/ObjectAdapterF.ice>
15
15
  #include <Ice/Current.ice>
16
16
 
17
+ ["objc:prefix:ICE"]
17
18
  module Ice
18
19
  {
19
20
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,8 +9,9 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
 
14
+ ["objc:prefix:ICE"]
14
15
  module Ice
15
16
  {
16
17
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
13
13
  [["cpp:include:IceBox/Config.h"]]
14
14
 
15
15
  #include <Ice/BuiltinSequences.ice>
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -8,7 +8,7 @@
8
8
  // **********************************************************************
9
9
 
10
10
  #pragma once
11
- [["cpp:header-ext:h"]]
11
+ [["cpp:header-ext:h", "objc:header-dir:objc"]]
12
12
 
13
13
  #include <Ice/Identity.ice>
14
14
 
@@ -1,6 +1,6 @@
1
1
  // **********************************************************************
2
2
  //
3
- // Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
3
+ // Copyright (c) 2003-2015 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.
@@ -9,7 +9,7 @@
9
9
 
10
10
  #pragma once
11
11
 
12
- [["cpp:header-ext:h"]]
12
+ [["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
13
13
  [["cpp:include:IceGrid/Config.h"]]
14
14
 
15
15
  #include <Ice/Identity.ice>
@@ -20,6 +20,7 @@
20
20
  #include <IceGrid/Exception.ice>
21
21
  #include <IceGrid/Descriptor.ice>
22
22
 
23
+ ["objc:prefix:ICEGRID"]
23
24
  module IceGrid
24
25
  {
25
26
 
@@ -61,7 +62,7 @@ enum ServerState
61
62
  *
62
63
  **/
63
64
  Active,
64
-
65
+
65
66
  /**
66
67
  *
67
68
  * The server is being deactivated.
@@ -101,14 +102,14 @@ struct ObjectInfo
101
102
  {
102
103
  /**
103
104
  *
104
- * The proxy of the object.
105
+ * The proxy of the object.
105
106
  *
106
107
  **/
107
108
  Object* proxy;
108
109
 
109
- /**
110
+ /**
110
111
  *
111
- * The type of the object.
112
+ * The type of the object.
112
113
  *
113
114
  **/
114
115
  string type;
@@ -129,7 +130,7 @@ sequence<ObjectInfo> ObjectInfoSeq;
129
130
  ["cpp:comparable"]
130
131
  struct AdapterInfo
131
132
  {
132
- /**
133
+ /**
133
134
  *
134
135
  * The id of the adapter.
135
136
  *
@@ -138,12 +139,12 @@ struct AdapterInfo
138
139
 
139
140
  /**
140
141
  *
141
- * A dummy direct proxy that contains the adapter endpoints.
142
+ * A dummy direct proxy that contains the adapter endpoints.
142
143
  *
143
144
  **/
144
145
  Object* proxy;
145
146
 
146
- /**
147
+ /**
147
148
  *
148
149
  * The replica group id of the object adapter, or empty if the
149
150
  * adapter doesn't belong to a replica group.
@@ -168,7 +169,7 @@ struct ServerInfo
168
169
  {
169
170
  /**
170
171
  *
171
- * The server application.
172
+ * The server application.
172
173
  *
173
174
  **/
174
175
  string application;
@@ -179,7 +180,7 @@ struct ServerInfo
179
180
  *
180
181
  **/
181
182
  string uuid;
182
-
183
+
183
184
  /**
184
185
  *
185
186
  * The application revision.
@@ -187,16 +188,16 @@ struct ServerInfo
187
188
  **/
188
189
  int revision;
189
190
 
190
- /**
191
+ /**
191
192
  *
192
- * The server node.
193
+ * The server node.
193
194
  *
194
195
  **/
195
196
  string node;
196
-
197
+
197
198
  /**
198
199
  *
199
- * The server descriptor.
200
+ * The server descriptor.
200
201
  *
201
202
  **/
202
203
  ServerDescriptor descriptor;
@@ -241,7 +242,7 @@ struct NodeInfo
241
242
  /**
242
243
  *
243
244
  * The operation system release level (as defined in uname()).
244
- *
245
+ *
245
246
  **/
246
247
  string release;
247
248
 
@@ -257,7 +258,7 @@ struct NodeInfo
257
258
  * The machine hardware type (as defined in uname()).
258
259
  *
259
260
  **/
260
- string machine;
261
+ string machine;
261
262
 
262
263
  /**
263
264
  *
@@ -267,7 +268,7 @@ struct NodeInfo
267
268
  *
268
269
  **/
269
270
  int nProcessors;
270
-
271
+
271
272
  /**
272
273
  *
273
274
  * The path to the node data directory.
@@ -335,7 +336,7 @@ struct ApplicationInfo
335
336
 
336
337
  /** The creation time. */
337
338
  long createTime;
338
-
339
+
339
340
  /** The user who created the application. */
340
341
  string createUser;
341
342
 
@@ -344,7 +345,7 @@ struct ApplicationInfo
344
345
 
345
346
  /** The user who updated the application. */
346
347
  string updateUser;
347
-
348
+
348
349
  /** The application revision number. */
349
350
  int revision;
350
351
 
@@ -522,12 +523,12 @@ interface Admin
522
523
  * node.
523
524
  *
524
525
  * @param application The application name.
525
- *
526
+ *
526
527
  * @param node The name of the node where the server will be
527
528
  * deployed.
528
529
  *
529
530
  * @param desc The descriptor of the server instance to deploy.
530
- *
531
+ *
531
532
  * @throws AccessDeniedException Raised if the session doesn't
532
533
  * hold the exclusive lock or if another session is holding the
533
534
  * lock.
@@ -616,7 +617,7 @@ interface Admin
616
617
  * @param id The server id.
617
618
  *
618
619
  * @return The server state.
619
- *
620
+ *
620
621
  * @throws ServerNotExistException Raised if the server doesn't exist.
621
622
  *
622
623
  * @throws NodeUnreachableException Raised if the node could not be
@@ -628,7 +629,7 @@ interface Admin
628
629
  **/
629
630
  ["nonmutating", "cpp:const"] idempotent ServerState getServerState(string id)
630
631
  throws ServerNotExistException, NodeUnreachableException, DeploymentException;
631
-
632
+
632
633
  /**
633
634
  *
634
635
  * Get a server's system process id. The process id is operating
@@ -637,7 +638,7 @@ interface Admin
637
638
  * @param id The server id.
638
639
  *
639
640
  * @return The server's process id.
640
- *
641
+ *
641
642
  * @throws ServerNotExistException Raised if the server doesn't exist.
642
643
  *
643
644
  * @throws NodeUnreachableException Raised if the node could not be
@@ -659,7 +660,7 @@ interface Admin
659
660
  * @return The category for server admin objects.
660
661
  *
661
662
  **/
662
- ["cpp:const"]
663
+ ["cpp:const"]
663
664
  idempotent string getServerAdminCategory();
664
665
 
665
666
  /**
@@ -679,7 +680,7 @@ interface Admin
679
680
  * deployed on the node.
680
681
  *
681
682
  **/
682
- ["cpp:const"]
683
+ ["cpp:const"]
683
684
  idempotent Object* getServerAdmin(string id)
684
685
  throws ServerNotExistException, NodeUnreachableException, DeploymentException;
685
686
 
@@ -718,7 +719,7 @@ interface Admin
718
719
  *
719
720
  * @throws NodeUnreachableException Raised if the node could not
720
721
  * be reached.
721
- *
722
+ *
722
723
  * @throws DeploymentException Raised if the server couldn't be
723
724
  * deployed on the node.
724
725
  *
@@ -811,7 +812,7 @@ interface Admin
811
812
  * @throws DeploymentException Raised if the server couldn't be
812
813
  * deployed on the node.
813
814
  *
814
- * @throws BadSignalException Raised if the signal is not recognized
815
+ * @throws BadSignalException Raised if the signal is not recognized
815
816
  * by the target server.
816
817
  *
817
818
  **/
@@ -941,7 +942,7 @@ interface Admin
941
942
  * deployment descriptor.
942
943
  *
943
944
  **/
944
- void removeObject(Ice::Identity id)
945
+ void removeObject(Ice::Identity id)
945
946
  throws ObjectNotRegisteredException, DeploymentException;
946
947
 
947
948
  /**
@@ -985,7 +986,7 @@ interface Admin
985
986
  *
986
987
  **/
987
988
  ["nonmutating", "cpp:const"] idempotent ObjectInfoSeq getAllObjectInfos(string expr);
988
-
989
+
989
990
  /**
990
991
  *
991
992
  * Ping an IceGrid node to see if it is active.
@@ -993,7 +994,7 @@ interface Admin
993
994
  * @param name The node name.
994
995
  *
995
996
  * @return true if the node ping succeeded, false otherwise.
996
- *
997
+ *
997
998
  * @throws NodeNotExistException Raised if the node doesn't exist.
998
999
  *
999
1000
  **/
@@ -1007,7 +1008,7 @@ interface Admin
1007
1008
  * @param name The node name.
1008
1009
  *
1009
1010
  * @return The node load information.
1010
- *
1011
+ *
1011
1012
  * @throws NodeNotExistException Raised if the node doesn't exist.
1012
1013
  *
1013
1014
  * @throws NodeUnreachableException Raised if the node could not be
@@ -1024,7 +1025,7 @@ interface Admin
1024
1025
  * @param name The node name.
1025
1026
  *
1026
1027
  * @return The node information.
1027
- *
1028
+ *
1028
1029
  * @throws NodeNotExistException Raised if the node doesn't exist.
1029
1030
  *
1030
1031
  * @throws NodeUnreachableException Raised if the node could not be
@@ -1055,7 +1056,7 @@ interface Admin
1055
1056
  /**
1056
1057
  *
1057
1058
  * Get the number of physical processor sockets for the machine
1058
- * running the node with the given name.
1059
+ * running the node with the given name.
1059
1060
  *
1060
1061
  * Note that this method will return 1 on operating systems where
1061
1062
  * this can't be automatically determined and where the
@@ -1066,20 +1067,20 @@ interface Admin
1066
1067
  *
1067
1068
  * @return The number of processor sockets or 1 if the number of
1068
1069
  * sockets can't determined.
1069
- *
1070
+ *
1070
1071
  * @throws NodeNotExistException Raised if the node doesn't exist.
1071
1072
  *
1072
1073
  * @throws NodeUnreachableException Raised if the node could not be
1073
1074
  * reached.
1074
1075
  *
1075
- **/
1076
+ **/
1076
1077
  ["nonmutating", "cpp:const"] idempotent int getNodeProcessorSocketCount(string name)
1077
1078
  throws NodeNotExistException, NodeUnreachableException;
1078
-
1079
+
1079
1080
  /**
1080
1081
  *
1081
1082
  * Shutdown an IceGrid node.
1082
- *
1083
+ *
1083
1084
  * @param name The node name.
1084
1085
  *
1085
1086
  * @throws NodeNotExistException Raised if the node doesn't exist.
@@ -1124,7 +1125,7 @@ interface Admin
1124
1125
  * @param name The registry name.
1125
1126
  *
1126
1127
  * @return true if the registry ping succeeded, false otherwise.
1127
- *
1128
+ *
1128
1129
  * @throws RegistryNotExistException Raised if the registry doesn't exist.
1129
1130
  *
1130
1131
  **/
@@ -1138,7 +1139,7 @@ interface Admin
1138
1139
  * @param name The registry name.
1139
1140
  *
1140
1141
  * @return The registry information.
1141
- *
1142
+ *
1142
1143
  * @throws RegistryNotExistException Raised if the registry doesn't exist.
1143
1144
  *
1144
1145
  * @throws RegistryUnreachableException Raised if the registry could not be
@@ -1147,7 +1148,7 @@ interface Admin
1147
1148
  **/
1148
1149
  ["cpp:const"] idempotent RegistryInfo getRegistryInfo(string name)
1149
1150
  throws RegistryNotExistException, RegistryUnreachableException;
1150
-
1151
+
1151
1152
  /**
1152
1153
  *
1153
1154
  * Get a proxy to the IceGrid registry's admin object.
@@ -1159,13 +1160,13 @@ interface Admin
1159
1160
  * @throws RegistryNotExistException Raised if the registry doesn't exist.
1160
1161
  *
1161
1162
  **/
1162
- ["cpp:const"] idempotent Object* getRegistryAdmin(string name)
1163
+ ["cpp:const"] idempotent Object* getRegistryAdmin(string name)
1163
1164
  throws RegistryNotExistException;
1164
1165
 
1165
1166
  /**
1166
1167
  *
1167
1168
  * Shutdown an IceGrid registry.
1168
- *
1169
+ *
1169
1170
  * @param name The registry name.
1170
1171
  *
1171
1172
  * @throws RegistryNotExistException Raised if the registry doesn't exist.
@@ -1217,7 +1218,7 @@ interface FileIterator
1217
1218
  * @param size Specifies the maximum number of bytes to be
1218
1219
  * received. The server will ensure that the returned message
1219
1220
  * doesn't exceed the given size.
1220
- *
1221
+ *
1221
1222
  * @param lines The lines read from the file. If there was nothing to
1222
1223
  * read from the file since the last call to read, an empty
1223
1224
  * sequence is returned. The last line of the sequence is always
@@ -1253,7 +1254,7 @@ interface ObjectObserver;
1253
1254
  * update, and receive observer updates from the IceGrid
1254
1255
  * registry. Admin sessions are created either with the {@link Registry}
1255
1256
  * object or the registry admin {@link Glacier2.SessionManager} object.
1256
- *
1257
+ *
1257
1258
  * @see Registry
1258
1259
  * @see Glacier2.SessionManager
1259
1260
  *
@@ -1350,7 +1351,7 @@ interface AdminSession extends Glacier2::Session
1350
1351
  * Acquires an exclusive lock to start updating the registry applications.
1351
1352
  *
1352
1353
  * @return The current serial.
1353
- *
1354
+ *
1354
1355
  * @throws AccessDeniedException Raised if the exclusive lock can't be
1355
1356
  * acquired. This might happen if the lock is currently acquired by
1356
1357
  * another session.
@@ -1358,7 +1359,7 @@ interface AdminSession extends Glacier2::Session
1358
1359
  **/
1359
1360
  int startUpdate()
1360
1361
  throws AccessDeniedException;
1361
-
1362
+
1362
1363
  /**
1363
1364
  *
1364
1365
  * Finish updating the registry and release the exclusive lock.