r2corba 1.5.5 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (165) hide show
  1. checksums.yaml +4 -4
  2. data/ext/libr2tao/any.cpp +11 -10
  3. data/ext/libr2tao/exception.cpp +6 -8
  4. data/ext/libr2tao/exception.h +1 -1
  5. data/ext/libr2tao/longdouble.cpp +5 -9
  6. data/ext/libr2tao/object.cpp +33 -49
  7. data/ext/libr2tao/orb.cpp +38 -65
  8. data/ext/libr2tao/r2tao_ext.h +8 -7
  9. data/ext/libr2tao/required.cpp +1 -6
  10. data/ext/libr2tao/required.h +9 -23
  11. data/ext/libr2tao/values.cpp +92 -93
  12. data/ext/libr2tao/values.h +28 -30
  13. data/ext/librpoa/iortable.cpp +3 -4
  14. data/ext/librpoa/poa.cpp +22 -25
  15. data/ext/librpoa/servant.cpp +24 -23
  16. data/ext/librpoa/servant.h +10 -10
  17. data/lib/corba.rb +1 -1
  18. data/lib/corba/cbase/ORB.rb +19 -16
  19. data/lib/corba/cbase/Request.rb +3 -3
  20. data/lib/corba/cbase/Values.rb +4 -2
  21. data/lib/corba/cbase/exception.rb +4 -2
  22. data/lib/corba/cbase/poa.rb +1 -1
  23. data/lib/corba/cbase/policies.rb +1 -1
  24. data/lib/corba/cbase/require.rb +8 -1
  25. data/lib/corba/common/Any.rb +2 -1
  26. data/lib/corba/common/IDL.rb +1 -1
  27. data/lib/corba/common/ORB.rb +21 -21
  28. data/lib/corba/common/Object.rb +14 -13
  29. data/lib/corba/common/Servant.rb +4 -4
  30. data/lib/corba/common/Stub.rb +6 -6
  31. data/lib/corba/common/Typecode.rb +35 -8
  32. data/lib/corba/common/Union.rb +5 -0
  33. data/lib/corba/common/Values.rb +1 -0
  34. data/lib/corba/common/const.rb +1 -1
  35. data/lib/corba/common/exception.rb +2 -1
  36. data/lib/corba/common/version.rb +2 -2
  37. data/lib/corba/idl/IDL.rb +1 -1
  38. data/lib/corba/jbase/Any.rb +6 -4
  39. data/lib/corba/jbase/ORB.rb +2 -2
  40. data/lib/corba/jbase/Object.rb +13 -13
  41. data/lib/corba/jbase/Request.rb +3 -3
  42. data/lib/corba/jbase/Streams.rb +64 -0
  43. data/lib/corba/jbase/Typecode.rb +3 -2
  44. data/lib/corba/jbase/Values.rb +2 -0
  45. data/lib/corba/jbase/exception.rb +1 -0
  46. data/lib/corba/jbase/poa.rb +18 -18
  47. data/lib/corba/jbase/policies.rb +29 -29
  48. data/lib/corba/jbase/require.rb +4 -0
  49. data/lib/corba/svcs/ins/cos_naming.rb +10 -1
  50. data/lib/corba/svcs/ins/ins.rb +45 -45
  51. data/lib/corba/svcs/ins/naming_service.rb +6 -6
  52. data/lib/ridlbe/ruby/config.rb +27 -20
  53. data/lib/ridlbe/ruby/walker.rb +276 -253
  54. data/mkrf_conf_srcgem.rb +2 -2
  55. data/rakelib/build.rake +1 -1
  56. data/rakelib/config.rake +1 -1
  57. data/rakelib/config.rb +9 -9
  58. data/rakelib/ext.rake +6 -65
  59. data/rakelib/ext_r2tao.rb +2 -39
  60. data/rakelib/gem.rake +20 -20
  61. data/rakelib/gem.rb +1 -1
  62. data/rakelib/package.rake +1 -1
  63. data/test/BiDirectional/client.rb +16 -16
  64. data/test/BiDirectional/run_test.rb +10 -10
  65. data/test/BiDirectional/server.rb +20 -20
  66. data/test/CORBA_Services/Naming/BindingIterator/client.rb +14 -14
  67. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +12 -12
  68. data/test/CORBA_Services/Naming/BindingIterator/server.rb +17 -17
  69. data/test/CORBA_Services/Naming/Corbaname/client.rb +14 -14
  70. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +12 -12
  71. data/test/CORBA_Services/Naming/Corbaname/server.rb +20 -20
  72. data/test/CORBA_Services/Naming/Simple/client.rb +14 -14
  73. data/test/CORBA_Services/Naming/Simple/run_test.rb +12 -12
  74. data/test/CORBA_Services/Naming/Simple/server.rb +17 -17
  75. data/test/Collocation/run_test.rb +10 -10
  76. data/test/Collocation/test.rb +26 -19
  77. data/test/Connect_Timeout/client.rb +15 -15
  78. data/test/Connect_Timeout/run_test.rb +10 -10
  79. data/test/DII/client.rb +27 -27
  80. data/test/DII/run_test.rb +10 -10
  81. data/test/DII/server.rb +15 -15
  82. data/test/DSI/client.rb +15 -15
  83. data/test/DSI/run_test.rb +10 -10
  84. data/test/DSI/server.rb +16 -16
  85. data/test/Exceptions/client.rb +19 -19
  86. data/test/Exceptions/run_test.rb +10 -10
  87. data/test/Exceptions/server.rb +15 -15
  88. data/test/Hello/client.rb +15 -15
  89. data/test/Hello/run_test.rb +10 -10
  90. data/test/Hello/server.rb +16 -16
  91. data/test/IDL_Test/client.rb +20 -20
  92. data/test/IDL_Test/run_test.rb +10 -10
  93. data/test/IDL_Test/server.rb +18 -18
  94. data/test/IORMap/client.rb +14 -14
  95. data/test/IORMap/run_test.rb +10 -10
  96. data/test/IORMap/server.rb +22 -22
  97. data/test/IORTable/client.rb +14 -14
  98. data/test/IORTable/run_test.rb +10 -10
  99. data/test/IORTable/server.rb +22 -22
  100. data/test/Implicit_Conversion/client.rb +19 -16
  101. data/test/Implicit_Conversion/run_test.rb +10 -10
  102. data/test/Implicit_Conversion/server.rb +15 -15
  103. data/test/Multi_Threading/Multiple_ORB/client.rb +13 -13
  104. data/test/Multi_Threading/Multiple_ORB/run_test.rb +10 -10
  105. data/test/Multi_Threading/Multiple_ORB/server.rb +16 -16
  106. data/test/Multi_Threading/Simple/client.rb +15 -15
  107. data/test/Multi_Threading/Simple/run_test.rb +10 -10
  108. data/test/Multi_Threading/Simple/server.rb +15 -15
  109. data/test/Multi_Threading/Threads/client.rb +15 -15
  110. data/test/Multi_Threading/Threads/run_test.rb +10 -10
  111. data/test/Multi_Threading/Threads/server.rb +17 -17
  112. data/test/Multi_Threading/Threads/watchdog.rb +15 -15
  113. data/test/Multiple_Servant_Interfaces/client.rb +13 -13
  114. data/test/Multiple_Servant_Interfaces/run_test.rb +10 -10
  115. data/test/Multiple_Servant_Interfaces/server.rb +17 -17
  116. data/test/Nil/run_test.rb +10 -10
  117. data/test/Nil/test.rb +13 -13
  118. data/test/OBV/AbstractInterface/client.rb +13 -13
  119. data/test/OBV/AbstractInterface/run_test.rb +10 -10
  120. data/test/OBV/AbstractInterface/server.rb +19 -18
  121. data/test/OBV/Custom/OBV_impl.rb +2 -0
  122. data/test/OBV/Custom/client.rb +13 -13
  123. data/test/OBV/Custom/run_test.rb +10 -10
  124. data/test/OBV/Custom/server.rb +15 -15
  125. data/test/OBV/Simple/OBV_impl.rb +1 -0
  126. data/test/OBV/Simple/client.rb +13 -13
  127. data/test/OBV/Simple/run_test.rb +10 -10
  128. data/test/OBV/Simple/server.rb +15 -15
  129. data/test/OBV/Simple_Event/Event_impl.rb +1 -0
  130. data/test/OBV/Simple_Event/client.rb +13 -13
  131. data/test/OBV/Simple_Event/run_test.rb +10 -10
  132. data/test/OBV/Simple_Event/server.rb +15 -15
  133. data/test/OBV/Supports/client.rb +18 -18
  134. data/test/OBV/Supports/run_test.rb +10 -10
  135. data/test/OBV/Supports/server.rb +14 -14
  136. data/test/OBV/Supports/supports_impl.rb +3 -0
  137. data/test/OBV/Tree/client.rb +13 -13
  138. data/test/OBV/Tree/run_test.rb +10 -10
  139. data/test/OBV/Tree/server.rb +18 -18
  140. data/test/OBV/Truncatable/client.rb +56 -56
  141. data/test/OBV/Truncatable/run_test.rb +10 -10
  142. data/test/OBV/Truncatable/server.rb +14 -14
  143. data/test/OBV/ValueBox/client.rb +148 -147
  144. data/test/OBV/ValueBox/run_test.rb +10 -10
  145. data/test/OBV/ValueBox/server.rb +15 -15
  146. data/test/Object/client.rb +13 -13
  147. data/test/Object/run_test.rb +10 -10
  148. data/test/Object/server.rb +18 -18
  149. data/test/POA/run_test.rb +10 -10
  150. data/test/POA/test.rb +15 -15
  151. data/test/Param_Test/client.rb +47 -47
  152. data/test/Param_Test/run_test.rb +10 -10
  153. data/test/Param_Test/server.rb +55 -55
  154. data/test/Performance/Simple/client.rb +15 -15
  155. data/test/Performance/Simple/run_test.rb +10 -10
  156. data/test/Performance/Simple/server.rb +15 -15
  157. data/test/Policies/run_test.rb +10 -10
  158. data/test/Policies/test.rb +23 -23
  159. data/test/Timeout/client.rb +17 -17
  160. data/test/Timeout/run_test.rb +10 -10
  161. data/test/Timeout/server.rb +18 -18
  162. data/test/lib/test.rb +13 -7
  163. data/test/test_runner.rb +19 -19
  164. metadata +4 -5
  165. data/ext/extload/extload.c +0 -59
data/test/Nil/test.rb CHANGED
@@ -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.",
28
+ opts.on('--k IOR',
29
+ 'Set IOR.',
30
30
  "Default: 'corbaname::foo'") { |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 }
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 'TestS.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
  begin
@@ -29,22 +29,22 @@ ARGV.options do |opts|
29
29
  script_name = File.basename($0)
30
30
  opts.banner = "Usage: ruby #{script_name} [options]"
31
31
 
32
- opts.separator ""
32
+ opts.separator ''
33
33
 
34
- opts.on("--k IORFILE",
35
- "Set IOR.",
34
+ opts.on('--k IORFILE',
35
+ 'Set IOR.',
36
36
  "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
37
- opts.on("--d LVL",
38
- "Set ORBDebugLevel value.",
39
- "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
40
- opts.on("--use-implement",
41
- "Load IDL through CORBA.implement() instead of precompiled code.",
42
- "Default: off") { |v| OPTIONS[:use_implement] = v }
37
+ opts.on('--d LVL',
38
+ 'Set ORBDebugLevel value.',
39
+ 'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
40
+ opts.on('--use-implement',
41
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
42
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
43
43
 
44
- opts.separator ""
44
+ opts.separator ''
45
45
 
46
- opts.on("-h", "--help",
47
- "Show this help message.") { puts opts; exit }
46
+ opts.on('-h', '--help',
47
+ 'Show this help message.') { puts opts; exit }
48
48
 
49
49
  opts.parse!
50
50
  end
@@ -122,7 +122,7 @@ def test_exception(abs)
122
122
  end
123
123
  end
124
124
 
125
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
125
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
126
126
 
127
127
  begin
128
128
  obj = orb.string_to_object(OPTIONS[:iorfile])
@@ -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
@@ -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.",
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
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 }
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
@@ -55,6 +55,7 @@ class Foo_i < POA::Foo
55
55
  end
56
56
  raise BadInput.new('expected "base_op"')
57
57
  end
58
+
58
59
  def foo_op (inarg)
59
60
  if inarg == 'foo_op'
60
61
  return 'good'
@@ -84,17 +85,17 @@ class Passer_i < POA::Passer
84
85
 
85
86
  # Create the root node.
86
87
  sn = StringNode.new
87
- sn.name = "RootNode"
88
+ sn.name = 'RootNode'
88
89
  tc.root = sn
89
90
 
90
91
  # Create the left leaf.
91
92
  l_dummy = StringNode.new
92
- l_dummy.name = "LeftNode"
93
+ l_dummy.name = 'LeftNode'
93
94
  sn.left = l_dummy
94
95
 
95
96
  # Create the right leaf.
96
97
  r_dummy = StringNode.new
97
- r_dummy.name = "RightNode"
98
+ r_dummy.name = 'RightNode'
98
99
  sn.right = r_dummy
99
100
 
100
101
  [tc]
@@ -107,9 +108,9 @@ class Passer_i < POA::Passer
107
108
  def shutdown ()
108
109
  @orb.shutdown()
109
110
  end
110
- end #of servant Passer_i
111
+ end # of servant Passer_i
111
112
 
112
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
113
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
113
114
 
114
115
  # make sure valuetype factories are registered
115
116
  BaseNodeFactory.get_factory(orb)
@@ -135,7 +136,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
135
136
  }
136
137
 
137
138
  Signal.trap('INT') do
138
- puts "SIGINT - shutting down ORB..."
139
+ puts 'SIGINT - shutting down ORB...'
139
140
  orb.shutdown()
140
141
  end
141
142
 
@@ -14,6 +14,7 @@ class Event_impl < Event
14
14
  self.value_ = val
15
15
  self.msg_ = msg
16
16
  end
17
+
17
18
  def do_print(loc)
18
19
  STDERR.puts("@#{loc} (value=#{self.value_}; msg=#{self.msg_})")
19
20
  end
@@ -22,6 +23,7 @@ class Event_impl < Event
22
23
  os.write_long(self.value_)
23
24
  os.write_string(self.msg_)
24
25
  end
26
+
25
27
  def unmarshal(is)
26
28
  self.value_ = is.read_long
27
29
  self.msg_ = is.read_string
@@ -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.",
28
+ opts.on('--k IORFILE',
29
+ 'Set IOR.',
30
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 }
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
@@ -52,7 +52,7 @@ end
52
52
 
53
53
  require 'OBV_impl'
54
54
 
55
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
55
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
56
56
 
57
57
  begin
58
58
  # make sure valuetype factory is registered
@@ -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
@@ -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.",
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
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 }
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
@@ -62,9 +62,9 @@ class Checkpoint_i < POA::Checkpoint
62
62
  def shutdown()
63
63
  @orb.shutdown()
64
64
  end
65
- end #of servant MyHello
65
+ end # of servant MyHello
66
66
 
67
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
67
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
68
68
 
69
69
  # make sure valuetype factory is registered
70
70
  Event_factory.get_factory(orb)
@@ -88,7 +88,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
88
88
  }
89
89
 
90
90
  Signal.trap('INT') do
91
- puts "SIGINT - shutting down ORB..."
91
+ puts 'SIGINT - shutting down ORB...'
92
92
  orb.shutdown()
93
93
  end
94
94
 
@@ -13,6 +13,7 @@ class Event_impl < Event
13
13
  def initialize(val = nil)
14
14
  self.value_ = val
15
15
  end
16
+
16
17
  def do_print(loc)
17
18
  STDERR.puts("@#{loc} (value #{self.value_})")
18
19
  end
@@ -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.",
28
+ opts.on('--k IORFILE',
29
+ 'Set IOR.',
30
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 }
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
@@ -52,7 +52,7 @@ end
52
52
 
53
53
  require 'OBV_impl'
54
54
 
55
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
55
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
56
56
 
57
57
  begin
58
58
  # make sure valuetype factory is registered
@@ -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
@@ -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.",
26
+ opts.on('--o IORFILE',
27
+ 'Set IOR filename.',
28
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 }
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
@@ -62,9 +62,9 @@ class Checkpoint_i < POA::Checkpoint
62
62
  def shutdown()
63
63
  @orb.shutdown()
64
64
  end
65
- end #of servant MyHello
65
+ end # of servant MyHello
66
66
 
67
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
67
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
68
68
 
69
69
  # make sure valuetype factory is registered
70
70
  Event_factory.get_factory(orb)
@@ -88,7 +88,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
88
88
  }
89
89
 
90
90
  Signal.trap('INT') do
91
- puts "SIGINT - shutting down ORB..."
91
+ puts 'SIGINT - shutting down ORB...'
92
92
  orb.shutdown()
93
93
  end
94
94