r2corba 1.5.4 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (181) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +3 -2
  3. data/ext/libr2tao/any.cpp +11 -10
  4. data/ext/libr2tao/exception.cpp +6 -8
  5. data/ext/libr2tao/exception.h +1 -1
  6. data/ext/libr2tao/longdouble.cpp +5 -9
  7. data/ext/libr2tao/object.cpp +37 -53
  8. data/ext/libr2tao/orb.cpp +46 -73
  9. data/ext/libr2tao/r2tao_ext.h +8 -19
  10. data/ext/libr2tao/required.cpp +3 -8
  11. data/ext/libr2tao/required.h +18 -34
  12. data/ext/libr2tao/values.cpp +97 -98
  13. data/ext/libr2tao/values.h +35 -37
  14. data/ext/librpoa/iortable.cpp +6 -7
  15. data/ext/librpoa/poa.cpp +29 -32
  16. data/ext/librpoa/servant.cpp +39 -113
  17. data/ext/librpoa/servant.h +18 -40
  18. data/lib/corba/cbase/ORB.rb +26 -23
  19. data/lib/corba/cbase/Request.rb +3 -3
  20. data/lib/corba/cbase/Streams.rb +2 -2
  21. data/lib/corba/cbase/Typecode.rb +6 -6
  22. data/lib/corba/cbase/Values.rb +4 -2
  23. data/lib/corba/cbase/exception.rb +6 -4
  24. data/lib/corba/cbase/poa.rb +1 -1
  25. data/lib/corba/cbase/policies.rb +2 -2
  26. data/lib/corba/cbase/require.rb +8 -1
  27. data/lib/corba/cmds/base.rb +1 -1
  28. data/lib/corba/common/Any.rb +3 -2
  29. data/lib/corba/common/IDL.rb +1 -1
  30. data/lib/corba/common/ORB.rb +22 -22
  31. data/lib/corba/common/Object.rb +14 -14
  32. data/lib/corba/common/Servant.rb +4 -4
  33. data/lib/corba/common/Stub.rb +6 -6
  34. data/lib/corba/common/Typecode.rb +69 -42
  35. data/lib/corba/common/Union.rb +5 -0
  36. data/lib/corba/common/Values.rb +1 -0
  37. data/lib/corba/common/const.rb +2 -2
  38. data/lib/corba/common/exception.rb +2 -1
  39. data/lib/corba/common/version.rb +2 -2
  40. data/lib/corba/idl/IDL.rb +1 -1
  41. data/lib/corba/jbase/Any.rb +28 -26
  42. data/lib/corba/jbase/ORB.rb +5 -5
  43. data/lib/corba/jbase/Object.rb +13 -13
  44. data/lib/corba/jbase/Request.rb +8 -8
  45. data/lib/corba/jbase/Servant.rb +10 -10
  46. data/lib/corba/jbase/ServerRequest.rb +7 -7
  47. data/lib/corba/jbase/Streams.rb +67 -3
  48. data/lib/corba/jbase/Typecode.rb +17 -16
  49. data/lib/corba/jbase/Values.rb +2 -0
  50. data/lib/corba/jbase/exception.rb +2 -1
  51. data/lib/corba/jbase/poa.rb +20 -20
  52. data/lib/corba/jbase/policies.rb +32 -32
  53. data/lib/corba/jbase/require.rb +4 -0
  54. data/lib/corba/poa.rb +1 -1
  55. data/lib/corba/policies.rb +1 -1
  56. data/lib/corba/require.rb +2 -2
  57. data/lib/corba/svcs/ins/cos_naming.rb +37 -28
  58. data/lib/corba/svcs/ins/ins.rb +51 -51
  59. data/lib/corba/svcs/ins/naming_service.rb +8 -8
  60. data/lib/corba.rb +1 -1
  61. data/lib/ridlbe/ruby/config.rb +37 -30
  62. data/lib/ridlbe/ruby/walker.rb +295 -272
  63. data/mkrf_conf_srcgem.rb +6 -6
  64. data/rakelib/bin.rake +1 -1
  65. data/rakelib/bin.rb +3 -3
  66. data/rakelib/build.rake +16 -16
  67. data/rakelib/config.rake +1 -1
  68. data/rakelib/config.rb +22 -22
  69. data/rakelib/ext.rake +7 -68
  70. data/rakelib/ext.rb +15 -15
  71. data/rakelib/ext_r2tao.rb +12 -55
  72. data/rakelib/gem.rake +25 -25
  73. data/rakelib/gem.rb +6 -6
  74. data/rakelib/package.rake +1 -1
  75. data/test/BiDirectional/client.rb +17 -17
  76. data/test/BiDirectional/run_test.rb +11 -11
  77. data/test/BiDirectional/server.rb +24 -25
  78. data/test/CORBA_Services/Naming/BindingIterator/client.rb +17 -17
  79. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +13 -13
  80. data/test/CORBA_Services/Naming/BindingIterator/server.rb +19 -19
  81. data/test/CORBA_Services/Naming/Corbaname/client.rb +15 -15
  82. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +13 -13
  83. data/test/CORBA_Services/Naming/Corbaname/server.rb +30 -30
  84. data/test/CORBA_Services/Naming/Simple/client.rb +16 -16
  85. data/test/CORBA_Services/Naming/Simple/run_test.rb +13 -13
  86. data/test/CORBA_Services/Naming/Simple/server.rb +19 -19
  87. data/test/Collocation/run_test.rb +10 -10
  88. data/test/Collocation/test.rb +27 -20
  89. data/test/Connect_Timeout/client.rb +16 -17
  90. data/test/Connect_Timeout/run_test.rb +10 -10
  91. data/test/DII/client.rb +30 -30
  92. data/test/DII/run_test.rb +11 -11
  93. data/test/DII/server.rb +16 -16
  94. data/test/DSI/client.rb +16 -16
  95. data/test/DSI/run_test.rb +11 -11
  96. data/test/DSI/server.rb +17 -17
  97. data/test/Exceptions/client.rb +21 -21
  98. data/test/Exceptions/run_test.rb +11 -11
  99. data/test/Exceptions/server.rb +16 -16
  100. data/test/Hello/client.rb +16 -16
  101. data/test/Hello/run_test.rb +11 -11
  102. data/test/Hello/server.rb +17 -17
  103. data/test/IDL_Test/client.rb +21 -21
  104. data/test/IDL_Test/run_test.rb +11 -11
  105. data/test/IDL_Test/server.rb +19 -19
  106. data/test/IORMap/client.rb +14 -14
  107. data/test/IORMap/run_test.rb +11 -11
  108. data/test/IORMap/server.rb +26 -26
  109. data/test/IORTable/client.rb +14 -14
  110. data/test/IORTable/run_test.rb +11 -11
  111. data/test/IORTable/server.rb +26 -26
  112. data/test/Implicit_Conversion/client.rb +20 -17
  113. data/test/Implicit_Conversion/run_test.rb +11 -11
  114. data/test/Implicit_Conversion/server.rb +16 -16
  115. data/test/Multi_Threading/Multiple_ORB/client.rb +14 -14
  116. data/test/Multi_Threading/Multiple_ORB/run_test.rb +12 -12
  117. data/test/Multi_Threading/Multiple_ORB/server.rb +17 -17
  118. data/test/Multi_Threading/Simple/client.rb +17 -17
  119. data/test/Multi_Threading/Simple/run_test.rb +11 -11
  120. data/test/Multi_Threading/Simple/server.rb +16 -16
  121. data/test/Multi_Threading/Threads/client.rb +16 -16
  122. data/test/Multi_Threading/Threads/run_test.rb +11 -11
  123. data/test/Multi_Threading/Threads/server.rb +22 -22
  124. data/test/Multi_Threading/Threads/watchdog.rb +16 -16
  125. data/test/Multiple_Servant_Interfaces/client.rb +14 -14
  126. data/test/Multiple_Servant_Interfaces/run_test.rb +11 -11
  127. data/test/Multiple_Servant_Interfaces/server.rb +18 -18
  128. data/test/Nil/run_test.rb +10 -10
  129. data/test/Nil/test.rb +14 -15
  130. data/test/OBV/AbstractInterface/client.rb +14 -14
  131. data/test/OBV/AbstractInterface/run_test.rb +11 -11
  132. data/test/OBV/AbstractInterface/server.rb +20 -19
  133. data/test/OBV/Custom/OBV_impl.rb +2 -0
  134. data/test/OBV/Custom/client.rb +14 -14
  135. data/test/OBV/Custom/run_test.rb +11 -11
  136. data/test/OBV/Custom/server.rb +16 -16
  137. data/test/OBV/Simple/OBV_impl.rb +1 -0
  138. data/test/OBV/Simple/client.rb +14 -14
  139. data/test/OBV/Simple/run_test.rb +11 -11
  140. data/test/OBV/Simple/server.rb +16 -16
  141. data/test/OBV/Simple_Event/Event_impl.rb +1 -0
  142. data/test/OBV/Simple_Event/client.rb +14 -14
  143. data/test/OBV/Simple_Event/run_test.rb +11 -11
  144. data/test/OBV/Simple_Event/server.rb +16 -16
  145. data/test/OBV/Supports/client.rb +19 -19
  146. data/test/OBV/Supports/run_test.rb +11 -11
  147. data/test/OBV/Supports/server.rb +15 -15
  148. data/test/OBV/Supports/supports_impl.rb +3 -0
  149. data/test/OBV/Tree/client.rb +14 -14
  150. data/test/OBV/Tree/run_test.rb +11 -11
  151. data/test/OBV/Tree/server.rb +19 -19
  152. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -1
  153. data/test/OBV/Truncatable/client.rb +57 -57
  154. data/test/OBV/Truncatable/run_test.rb +11 -11
  155. data/test/OBV/Truncatable/server.rb +15 -15
  156. data/test/OBV/ValueBox/client.rb +154 -153
  157. data/test/OBV/ValueBox/run_test.rb +11 -11
  158. data/test/OBV/ValueBox/server.rb +42 -42
  159. data/test/Object/client.rb +15 -15
  160. data/test/Object/run_test.rb +11 -11
  161. data/test/Object/server.rb +19 -19
  162. data/test/POA/run_test.rb +10 -10
  163. data/test/POA/test.rb +16 -16
  164. data/test/Param_Test/client.rb +51 -51
  165. data/test/Param_Test/run_test.rb +11 -11
  166. data/test/Param_Test/server.rb +59 -59
  167. data/test/Performance/Simple/client.rb +16 -16
  168. data/test/Performance/Simple/run_test.rb +11 -11
  169. data/test/Performance/Simple/server.rb +16 -16
  170. data/test/Policies/run_test.rb +10 -10
  171. data/test/Policies/test.rb +23 -24
  172. data/test/Timeout/client.rb +21 -21
  173. data/test/Timeout/run_test.rb +11 -11
  174. data/test/Timeout/server.rb +22 -22
  175. data/test/lib/assert.rb +0 -1
  176. data/test/lib/test.rb +28 -23
  177. data/test/test_runner.rb +21 -22
  178. metadata +6 -9
  179. data/ext/extload/extload.c +0 -60
  180. data/ext/librpoa/srvreq_fix.cpp +0 -282
  181. data/ext/librpoa/srvreq_fix.h +0 -148
@@ -23,22 +23,22 @@ ARGV.options do |opts|
23
23
  script_name = File.basename($0)
24
24
  opts.banner = "Usage: ruby #{script_name} [options]"
25
25
 
26
- opts.separator ""
26
+ opts.separator ''
27
27
 
28
- opts.on("--k IOR",
29
- "Set IOR.",
30
- "Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior]=v }
31
- opts.on("--d LVL",
32
- "Set ORBDebugLevel value.",
33
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
34
- opts.on("--use-implement",
35
- "Load IDL through CORBA.implement() instead of precompiled code.",
36
- "Default: off") { |v| OPTIONS[:use_implement]=v }
28
+ opts.on('--k IOR',
29
+ 'Set IOR.',
30
+ "Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior] = v }
31
+ opts.on('--d LVL',
32
+ 'Set ORBDebugLevel value.',
33
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
34
+ opts.on('--use-implement',
35
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
36
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
37
37
 
38
- opts.separator ""
38
+ opts.separator ''
39
39
 
40
- opts.on("-h", "--help",
41
- "Show this help message.") { puts opts; exit }
40
+ opts.on('-h', '--help',
41
+ 'Show this help message.') { puts opts; exit }
42
42
 
43
43
  opts.parse!
44
44
  end
@@ -63,7 +63,7 @@ def test_timeout(object)
63
63
  # First connection happens here..
64
64
  hello = Test::Hello._narrow(object)
65
65
 
66
- assert_not "Nil Test::Hello reference", CORBA::is_nil(hello)
66
+ assert_not 'Nil Test::Hello reference', CORBA::is_nil(hello)
67
67
 
68
68
  the_string = hello.get_string()
69
69
 
@@ -85,12 +85,12 @@ def test_timeout(object)
85
85
  end
86
86
 
87
87
 
88
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
88
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
89
89
 
90
90
  begin
91
91
  tmp = orb.string_to_object(OPTIONS[:ior])
92
92
 
93
- object = orb.resolve_initial_references("PolicyCurrent")
93
+ object = orb.resolve_initial_references('PolicyCurrent')
94
94
 
95
95
  policy_current = CORBA::PolicyCurrent::_narrow(object)
96
96
 
@@ -107,4 +107,3 @@ begin
107
107
  ensure
108
108
  orb.destroy()
109
109
  end
110
-
@@ -20,19 +20,19 @@ ARGV.options do |opts|
20
20
  script_name = File.basename($0)
21
21
  opts.banner = "Usage: ruby #{script_name} [options]"
22
22
 
23
- opts.separator ""
23
+ opts.separator ''
24
24
 
25
- opts.on("-d",
26
- "Run with debugging output.",
27
- "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
28
- opts.on("--use-stubs",
29
- "Use stubs generated by RIDL.",
30
- "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
25
+ opts.on('-d',
26
+ 'Run with debugging output.',
27
+ 'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
28
+ opts.on('--use-stubs',
29
+ 'Use stubs generated by RIDL.',
30
+ 'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
31
31
 
32
- opts.separator ""
32
+ opts.separator ''
33
33
 
34
- opts.on("-h", "--help",
35
- "Show this help message.") { puts opts; exit }
34
+ opts.on('-h', '--help',
35
+ 'Show this help message.') { puts opts; exit }
36
36
 
37
37
  opts.parse!
38
38
  end
data/test/DII/client.rb CHANGED
@@ -23,39 +23,39 @@ ARGV.options do |opts|
23
23
  script_name = File.basename($0)
24
24
  opts.banner = "Usage: ruby #{script_name} [options]"
25
25
 
26
- opts.separator ""
26
+ opts.separator ''
27
27
 
28
- opts.on("--k IORFILE",
29
- "Set IOR.",
30
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
31
- opts.on("--d LVL",
32
- "Set ORBDebugLevel value.",
33
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
34
- opts.on("--use-implement",
35
- "Load IDL through CORBA.implement() instead of precompiled code.",
36
- "Default: off") { |v| OPTIONS[:use_implement]=v }
28
+ opts.on('--k IORFILE',
29
+ 'Set IOR.',
30
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
31
+ opts.on('--d LVL',
32
+ 'Set ORBDebugLevel value.',
33
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
34
+ opts.on('--use-implement',
35
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
36
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
37
37
 
38
- opts.separator ""
38
+ opts.separator ''
39
39
 
40
- opts.on("-h", "--help",
41
- "Show this help message.") { puts opts; exit }
40
+ opts.on('-h', '--help',
41
+ 'Show this help message.') { puts opts; exit }
42
42
 
43
43
  opts.parse!
44
44
  end
45
45
 
46
46
  require 'corba'
47
47
 
48
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
48
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
49
49
 
50
50
  begin
51
51
 
52
52
  obj = orb.string_to_object(OPTIONS[:iorfile])
53
53
 
54
- puts "***** Synchronous twoway DII"
55
- req = obj._request("echo")
54
+ puts '***** Synchronous twoway DII'
55
+ req = obj._request('echo')
56
56
  req.arguments = [
57
- ['method', CORBA::ARG_IN, CORBA::_tc_string, "sync twoway"],
58
- ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
57
+ ['method', CORBA::ARG_IN, CORBA::_tc_string, 'sync twoway'],
58
+ ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
59
59
  ]
60
60
  req.set_return_type(CORBA::_tc_string)
61
61
 
@@ -64,11 +64,11 @@ begin
64
64
  puts "string returned <#{the_string}>"
65
65
  puts
66
66
 
67
- puts "***** Deferred twoway DII (using get_response())"
68
- req = obj._request("echo")
67
+ puts '***** Deferred twoway DII (using get_response())'
68
+ req = obj._request('echo')
69
69
  req.arguments = [
70
- ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (1)"],
71
- ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
70
+ ['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (1)'],
71
+ ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
72
72
  ]
73
73
  req.set_return_type(CORBA::_tc_string)
74
74
 
@@ -80,15 +80,15 @@ begin
80
80
  puts
81
81
 
82
82
  ### DOESN'T WORK WITH TAO <= 1.5.9 BECAUSE OF BUG IN TAO
83
- if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
83
+ if !defined?(TAO) || TAO::MAJOR_VERSION > 1 ||
84
84
  (TAO::MAJOR_VERSION == 1 &&
85
85
  (TAO::MINOR_VERSION > 5 ||
86
- (TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION>9)))
87
- puts "***** Deferred twoway DII (using poll_response())"
88
- req = obj._request("echo")
86
+ (TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION > 9)))
87
+ puts '***** Deferred twoway DII (using poll_response())'
88
+ req = obj._request('echo')
89
89
  req.arguments = [
90
- ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (2)"],
91
- ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
90
+ ['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (2)'],
91
+ ['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
92
92
  ]
93
93
  req.set_return_type(CORBA::_tc_string)
94
94
 
@@ -103,8 +103,8 @@ begin
103
103
  puts
104
104
  end
105
105
 
106
- puts "***** Oneway shutdown"
107
- req = obj._request("shutdown")
106
+ puts '***** Oneway shutdown'
107
+ req = obj._request('shutdown')
108
108
  req.send_oneway()
109
109
 
110
110
  ensure
data/test/DII/run_test.rb CHANGED
@@ -20,19 +20,19 @@ ARGV.options do |opts|
20
20
  script_name = File.basename($0)
21
21
  opts.banner = "Usage: ruby #{script_name} [options]"
22
22
 
23
- opts.separator ""
23
+ opts.separator ''
24
24
 
25
- opts.on("-d",
26
- "Run with debugging output.",
27
- "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
28
- opts.on("--use-stubs",
29
- "Use stubs generated by RIDL.",
30
- "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
25
+ opts.on('-d',
26
+ 'Run with debugging output.',
27
+ 'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
28
+ opts.on('--use-stubs',
29
+ 'Use stubs generated by RIDL.',
30
+ 'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
31
31
 
32
- opts.separator ""
32
+ opts.separator ''
33
33
 
34
- opts.on("-h", "--help",
35
- "Show this help message.") { puts opts; exit }
34
+ opts.on('-h', '--help',
35
+ 'Show this help message.') { puts opts; exit }
36
36
 
37
37
  opts.parse!
38
38
  end
@@ -59,7 +59,7 @@ end
59
59
 
60
60
  exrc = clt.wait(400)
61
61
 
62
- if exrc ==0
62
+ if exrc == 0
63
63
  srv.wait(400)
64
64
  else
65
65
  srv.wait_term(400)
data/test/DII/server.rb CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
21
21
  script_name = File.basename($0)
22
22
  opts.banner = "Usage: ruby #{script_name} [options]"
23
23
 
24
- opts.separator ""
24
+ opts.separator ''
25
25
 
26
- opts.on("--o IORFILE",
27
- "Set IOR filename.",
28
- "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
29
- opts.on("--d LVL",
30
- "Set ORBDebugLevel value.",
31
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
32
- opts.on("--use-implement",
33
- "Load IDL through CORBA.implement() instead of precompiled code.",
34
- "Default: off") { |v| OPTIONS[:use_implement]=v }
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
+ "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
29
+ opts.on('--d LVL',
30
+ 'Set ORBDebugLevel value.',
31
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
32
+ opts.on('--use-implement',
33
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
34
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
35
35
 
36
- opts.separator ""
36
+ opts.separator ''
37
37
 
38
- opts.on("-h", "--help",
39
- "Show this help message.") { puts opts; exit }
38
+ opts.on('-h', '--help',
39
+ 'Show this help message.') { puts opts; exit }
40
40
 
41
41
  opts.parse!
42
42
  end
@@ -60,9 +60,9 @@ class MyHello < POA::Test::Hello
60
60
  def shutdown()
61
61
  @orb.shutdown()
62
62
  end
63
- end #of servant MyHello
63
+ end # of servant MyHello
64
64
 
65
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
65
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
66
66
 
67
67
  obj = orb.resolve_initial_references('RootPOA')
68
68
 
@@ -83,7 +83,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
83
83
  }
84
84
 
85
85
  Signal.trap('INT') do
86
- puts "SIGINT - shutting down ORB..."
86
+ puts 'SIGINT - shutting down ORB...'
87
87
  orb.shutdown()
88
88
  end
89
89
 
data/test/DSI/client.rb CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
21
21
  script_name = File.basename($0)
22
22
  opts.banner = "Usage: ruby #{script_name} [options]"
23
23
 
24
- opts.separator ""
24
+ opts.separator ''
25
25
 
26
- opts.on("--k IORFILE",
27
- "Set IOR.",
28
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
29
- opts.on("--d LVL",
30
- "Set ORBDebugLevel value.",
31
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
32
- opts.on("--use-implement",
33
- "Load IDL through CORBA.implement() instead of precompiled code.",
34
- "Default: off") { |v| OPTIONS[:use_implement]=v }
26
+ opts.on('--k IORFILE',
27
+ 'Set IOR.',
28
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
29
+ opts.on('--d LVL',
30
+ 'Set ORBDebugLevel value.',
31
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
32
+ opts.on('--use-implement',
33
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
34
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
35
35
 
36
- opts.separator ""
36
+ opts.separator ''
37
37
 
38
- opts.on("-h", "--help",
39
- "Show this help message.") { puts opts; exit }
38
+ opts.on('-h', '--help',
39
+ 'Show this help message.') { puts opts; exit }
40
40
 
41
41
  opts.parse!
42
42
  end
@@ -48,15 +48,15 @@ else
48
48
  require 'TestC.rb'
49
49
  end
50
50
 
51
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
51
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
52
52
 
53
- ##s = open(OPTIONS[:iorfile], 'r').read
53
+ # #s = open(OPTIONS[:iorfile], 'r').read
54
54
 
55
55
  obj = orb.string_to_object(OPTIONS[:iorfile])
56
56
 
57
57
  hello_obj = Test::Hello._narrow(obj)
58
58
 
59
- the_string, the_length = hello_obj.echo("Hello world!")
59
+ the_string, the_length = hello_obj.echo('Hello world!')
60
60
 
61
61
  puts "string returned <#{the_string}>; length = #{the_length}"
62
62
 
data/test/DSI/run_test.rb CHANGED
@@ -20,19 +20,19 @@ ARGV.options do |opts|
20
20
  script_name = File.basename($0)
21
21
  opts.banner = "Usage: ruby #{script_name} [options]"
22
22
 
23
- opts.separator ""
23
+ opts.separator ''
24
24
 
25
- opts.on("-d",
26
- "Run with debugging output.",
27
- "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
28
- opts.on("--use-stubs",
29
- "Use stubs generated by RIDL.",
30
- "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
25
+ opts.on('-d',
26
+ 'Run with debugging output.',
27
+ 'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
28
+ opts.on('--use-stubs',
29
+ 'Use stubs generated by RIDL.',
30
+ 'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
31
31
 
32
- opts.separator ""
32
+ opts.separator ''
33
33
 
34
- opts.on("-h", "--help",
35
- "Show this help message.") { puts opts; exit }
34
+ opts.on('-h', '--help',
35
+ 'Show this help message.') { puts opts; exit }
36
36
 
37
37
  opts.parse!
38
38
  end
@@ -59,7 +59,7 @@ end
59
59
 
60
60
  exrc = clt.wait(400)
61
61
 
62
- if exrc ==0
62
+ if exrc == 0
63
63
  srv.wait(400)
64
64
  else
65
65
  srv.wait_term(400)
data/test/DSI/server.rb CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
21
21
  script_name = File.basename($0)
22
22
  opts.banner = "Usage: ruby #{script_name} [options]"
23
23
 
24
- opts.separator ""
24
+ opts.separator ''
25
25
 
26
- opts.on("--o IORFILE",
27
- "Set IOR filename.",
28
- "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
29
- opts.on("--d LVL",
30
- "Set ORBDebugLevel value.",
31
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
32
- opts.on("--use-implement",
33
- "Load IDL through CORBA.implement() instead of precompiled code.",
34
- "Default: off") { |v| OPTIONS[:use_implement]=v }
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
+ "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
29
+ opts.on('--d LVL',
30
+ 'Set ORBDebugLevel value.',
31
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
32
+ opts.on('--use-implement',
33
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
34
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
35
35
 
36
- opts.separator ""
36
+ opts.separator ''
37
37
 
38
- opts.on("-h", "--help",
39
- "Show this help message.") { puts opts; exit }
38
+ opts.on('-h', '--help',
39
+ 'Show this help message.') { puts opts; exit }
40
40
 
41
41
  opts.parse!
42
42
  end
@@ -54,7 +54,7 @@ class MyHello < PortableServer::DynamicImplementation
54
54
  :result_type => CORBA._tc_string,
55
55
  :arg_list => [
56
56
  ['message', CORBA::ARG_IN, CORBA._tc_string],
57
- ['msglen', CORBA::ARG_OUT, CORBA._tc_long] ] }
57
+ ['msglen', CORBA::ARG_OUT, CORBA._tc_long]] }
58
58
  }
59
59
 
60
60
  Id = 'IDL:Test/Hello:1.0'
@@ -71,9 +71,9 @@ class MyHello < PortableServer::DynamicImplementation
71
71
  def shutdown()
72
72
  @orb.shutdown()
73
73
  end
74
- end #of servant MyHello
74
+ end # of servant MyHello
75
75
 
76
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
76
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
77
77
 
78
78
  obj = orb.resolve_initial_references('RootPOA')
79
79
 
@@ -94,7 +94,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
94
94
  }
95
95
 
96
96
  Signal.trap('INT') do
97
- puts "SIGINT - shutting down ORB..."
97
+ puts 'SIGINT - shutting down ORB...'
98
98
  orb.shutdown()
99
99
  end
100
100
 
@@ -23,22 +23,22 @@ ARGV.options do |opts|
23
23
  script_name = File.basename($0)
24
24
  opts.banner = "Usage: ruby #{script_name} [options]"
25
25
 
26
- opts.separator ""
26
+ opts.separator ''
27
27
 
28
- opts.on("--k IORFILE",
29
- "Set IOR.",
30
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
31
- opts.on("--d LVL",
32
- "Set ORBDebugLevel value.",
33
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
34
- opts.on("--use-implement",
35
- "Load IDL through CORBA.implement() instead of precompiled code.",
36
- "Default: off") { |v| OPTIONS[:use_implement]=v }
28
+ opts.on('--k IORFILE',
29
+ 'Set IOR.',
30
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
31
+ opts.on('--d LVL',
32
+ 'Set ORBDebugLevel value.',
33
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
34
+ opts.on('--use-implement',
35
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
36
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
37
37
 
38
- opts.separator ""
38
+ opts.separator ''
39
39
 
40
- opts.on("-h", "--help",
41
- "Show this help message.") { puts opts; exit }
40
+ opts.on('-h', '--help',
41
+ 'Show this help message.') { puts opts; exit }
42
42
 
43
43
  opts.parse!
44
44
  end
@@ -50,7 +50,7 @@ else
50
50
  require 'TestC.rb'
51
51
  end
52
52
 
53
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
53
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
54
54
 
55
55
  begin
56
56
 
@@ -62,19 +62,19 @@ begin
62
62
  begin
63
63
  hello_obj.test_exception
64
64
  rescue Test::ExOne => ex1
65
- assert "ERROR: got exception Test::ExOne when not expected" do
66
- (i % 3) == 0 && ex1.code == (i+1)
65
+ assert 'ERROR: got exception Test::ExOne when not expected' do
66
+ (i % 3) == 0 && ex1.code == (i + 1)
67
67
  end
68
68
  puts "Caught expected exception Test::ExOne{why=#{ex1.why},code=#{ex1.code})"
69
69
  rescue CORBA::UNKNOWN => exu
70
- assert "ERROR: got unexpected unknown userexception" do
70
+ assert 'ERROR: got unexpected unknown userexception' do
71
71
  (i % 3) == 1
72
72
  end
73
- puts "Caught expected unknown userexception"
73
+ puts 'Caught expected unknown userexception'
74
74
  rescue Exception => ex
75
75
  assert "ERROR: unknown exception caught\n#{ex}", false
76
76
  else
77
- assert_not "ERROR: no exception caught where one was expected" do
77
+ assert_not 'ERROR: no exception caught where one was expected' do
78
78
  (i % 3) != 2
79
79
  end
80
80
  end
@@ -104,11 +104,11 @@ begin
104
104
 
105
105
  hello_obj.shutdown()
106
106
 
107
- assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
107
+ assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
108
108
 
109
109
  hello_obj._free_ref()
110
110
 
111
- assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
111
+ assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
112
112
 
113
113
  ensure
114
114
 
@@ -20,19 +20,19 @@ ARGV.options do |opts|
20
20
  script_name = File.basename($0)
21
21
  opts.banner = "Usage: ruby #{script_name} [options]"
22
22
 
23
- opts.separator ""
23
+ opts.separator ''
24
24
 
25
- opts.on("-d",
26
- "Run with debugging output.",
27
- "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
28
- opts.on("--use-stubs",
29
- "Use stubs generated by RIDL.",
30
- "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
25
+ opts.on('-d',
26
+ 'Run with debugging output.',
27
+ 'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
28
+ opts.on('--use-stubs',
29
+ 'Use stubs generated by RIDL.',
30
+ 'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
31
31
 
32
- opts.separator ""
32
+ opts.separator ''
33
33
 
34
- opts.on("-h", "--help",
35
- "Show this help message.") { puts opts; exit }
34
+ opts.on('-h', '--help',
35
+ 'Show this help message.') { puts opts; exit }
36
36
 
37
37
  opts.parse!
38
38
  end
@@ -59,7 +59,7 @@ end
59
59
 
60
60
  exrc = clt.wait(400)
61
61
 
62
- if exrc ==0
62
+ if exrc == 0
63
63
  srv.wait(400)
64
64
  else
65
65
  srv.wait_term(400)
@@ -21,22 +21,22 @@ ARGV.options do |opts|
21
21
  script_name = File.basename($0)
22
22
  opts.banner = "Usage: ruby #{script_name} [options]"
23
23
 
24
- opts.separator ""
24
+ opts.separator ''
25
25
 
26
- opts.on("--o IORFILE",
27
- "Set IOR filename.",
28
- "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
29
- opts.on("--d LVL",
30
- "Set ORBDebugLevel value.",
31
- "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
32
- opts.on("--use-implement",
33
- "Load IDL through CORBA.implement() instead of precompiled code.",
34
- "Default: off") { |v| OPTIONS[:use_implement]=v }
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
+ "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
29
+ opts.on('--d LVL',
30
+ 'Set ORBDebugLevel value.',
31
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
32
+ opts.on('--use-implement',
33
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
34
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
35
35
 
36
- opts.separator ""
36
+ opts.separator ''
37
37
 
38
- opts.on("-h", "--help",
39
- "Show this help message.") { puts opts; exit }
38
+ opts.on('-h', '--help',
39
+ 'Show this help message.') { puts opts; exit }
40
40
 
41
41
  opts.parse!
42
42
  end
@@ -94,9 +94,9 @@ class MyHello < POA::Test::Hello
94
94
  def shutdown()
95
95
  @orb.shutdown()
96
96
  end
97
- end #of servant MyHello
97
+ end # of servant MyHello
98
98
 
99
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
99
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
100
100
 
101
101
  obj = orb.resolve_initial_references('RootPOA')
102
102
 
@@ -117,7 +117,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
117
117
  }
118
118
 
119
119
  Signal.trap('INT') do
120
- puts "SIGINT - shutting down ORB..."
120
+ puts 'SIGINT - shutting down ORB...'
121
121
  orb.shutdown()
122
122
  end
123
123