r2corba 1.6.2-universal-java → 1.7.1-universal-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +5 -5
  3. data/lib/corba/cbase/ORB.rb +9 -8
  4. data/lib/corba/cbase/Request.rb +10 -12
  5. data/lib/corba/cbase/Streams.rb +20 -20
  6. data/lib/corba/cbase/Typecode.rb +12 -41
  7. data/lib/corba/cbase/Values.rb +1 -4
  8. data/lib/corba/cbase/exception.rb +0 -2
  9. data/lib/corba/cbase/poa.rb +2 -2
  10. data/lib/corba/cbase/policies.rb +9 -8
  11. data/lib/corba/cbase/require.rb +1 -1
  12. data/lib/corba/cmds/base.rb +1 -2
  13. data/lib/corba/common/Any.rb +2 -3
  14. data/lib/corba/common/IDL.rb +3 -7
  15. data/lib/corba/common/ORB.rb +19 -19
  16. data/lib/corba/common/Object.rb +32 -22
  17. data/lib/corba/common/Request.rb +0 -2
  18. data/lib/corba/common/Servant.rb +4 -9
  19. data/lib/corba/common/Stub.rb +9 -7
  20. data/lib/corba/common/Typecode.rb +44 -27
  21. data/lib/corba/common/Values.rb +4 -5
  22. data/lib/corba/common/require.rb +1 -3
  23. data/lib/corba/common/version.rb +2 -4
  24. data/lib/corba/idl/IDL.rb +0 -2
  25. data/lib/corba/idl/require.rb +2 -2
  26. data/lib/corba/jbase/Any.rb +34 -35
  27. data/lib/corba/jbase/ORB.rb +5 -6
  28. data/lib/corba/jbase/Object.rb +10 -10
  29. data/lib/corba/jbase/Request.rb +8 -9
  30. data/lib/corba/jbase/Servant.rb +32 -36
  31. data/lib/corba/jbase/ServerRequest.rb +10 -8
  32. data/lib/corba/jbase/Streams.rb +80 -78
  33. data/lib/corba/jbase/Stub.rb +1 -1
  34. data/lib/corba/jbase/Typecode.rb +18 -46
  35. data/lib/corba/jbase/Values.rb +0 -1
  36. data/lib/corba/jbase/exception.rb +2 -1
  37. data/lib/corba/jbase/poa.rb +18 -17
  38. data/lib/corba/jbase/policies.rb +42 -45
  39. data/lib/corba/jbase/require.rb +3 -3
  40. data/lib/corba/naming_service.rb +1 -1
  41. data/lib/corba/poa.rb +1 -1
  42. data/lib/corba/policies.rb +2 -2
  43. data/lib/corba/svcs/ins/cos_naming.rb +29 -18
  44. data/lib/corba/svcs/ins/ins.rb +38 -38
  45. data/lib/corba/svcs/ins/naming_service.rb +6 -6
  46. data/lib/corba.rb +1 -1
  47. data/lib/ridlbe/ruby/config.rb +2 -8
  48. data/lib/ridlbe/ruby/orb.pidlc +0 -0
  49. data/lib/ridlbe/ruby/walker.rb +94 -108
  50. data/rakelib/config.rb +9 -6
  51. data/rakelib/gem.rake +0 -30
  52. data/test/BiDirectional/client.rb +7 -7
  53. data/test/BiDirectional/run_test.rb +2 -2
  54. data/test/BiDirectional/server.rb +13 -13
  55. data/test/CORBA_Services/Naming/BindingIterator/client.rb +9 -9
  56. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +2 -2
  57. data/test/CORBA_Services/Naming/BindingIterator/server.rb +6 -6
  58. data/test/CORBA_Services/Naming/Corbaname/client.rb +6 -6
  59. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +2 -2
  60. data/test/CORBA_Services/Naming/Corbaname/server.rb +8 -8
  61. data/test/CORBA_Services/Naming/Simple/client.rb +6 -6
  62. data/test/CORBA_Services/Naming/Simple/run_test.rb +2 -2
  63. data/test/CORBA_Services/Naming/Simple/server.rb +6 -6
  64. data/test/Collocation/run_test.rb +2 -2
  65. data/test/Collocation/test.rb +1 -1
  66. data/test/Connect_Timeout/client.rb +7 -7
  67. data/test/Connect_Timeout/run_test.rb +2 -2
  68. data/test/DII/client.rb +10 -10
  69. data/test/DII/run_test.rb +2 -2
  70. data/test/DII/server.rb +7 -7
  71. data/test/DSI/client.rb +6 -6
  72. data/test/DSI/run_test.rb +2 -2
  73. data/test/DSI/server.rb +9 -9
  74. data/test/Exceptions/client.rb +6 -6
  75. data/test/Exceptions/run_test.rb +2 -2
  76. data/test/Exceptions/server.rb +7 -7
  77. data/test/Hello/client.rb +7 -7
  78. data/test/Hello/run_test.rb +2 -2
  79. data/test/Hello/server.rb +7 -7
  80. data/test/IDL_Test/client.rb +9 -9
  81. data/test/IDL_Test/run_test.rb +2 -2
  82. data/test/IDL_Test/server.rb +7 -7
  83. data/test/IORMap/client.rb +7 -7
  84. data/test/IORMap/run_test.rb +2 -2
  85. data/test/IORMap/server.rb +9 -9
  86. data/test/IORTable/client.rb +7 -7
  87. data/test/IORTable/run_test.rb +2 -2
  88. data/test/IORTable/server.rb +10 -10
  89. data/test/Implicit_Conversion/client.rb +5 -5
  90. data/test/Implicit_Conversion/run_test.rb +2 -2
  91. data/test/Implicit_Conversion/server.rb +7 -7
  92. data/test/Multi_Threading/Multiple_ORB/client.rb +6 -6
  93. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
  94. data/test/Multi_Threading/Multiple_ORB/server.rb +5 -5
  95. data/test/Multi_Threading/Simple/client.rb +6 -6
  96. data/test/Multi_Threading/Simple/run_test.rb +2 -2
  97. data/test/Multi_Threading/Simple/server.rb +8 -8
  98. data/test/Multi_Threading/Threads/client.rb +6 -6
  99. data/test/Multi_Threading/Threads/run_test.rb +2 -2
  100. data/test/Multi_Threading/Threads/server.rb +9 -9
  101. data/test/Multi_Threading/Threads/watchdog.rb +7 -7
  102. data/test/Multiple_Servant_Interfaces/client.rb +7 -7
  103. data/test/Multiple_Servant_Interfaces/run_test.rb +2 -2
  104. data/test/Multiple_Servant_Interfaces/server.rb +7 -7
  105. data/test/Nil/run_test.rb +2 -2
  106. data/test/Nil/test.rb +4 -4
  107. data/test/OBV/AbstractInterface/client.rb +9 -9
  108. data/test/OBV/AbstractInterface/run_test.rb +2 -2
  109. data/test/OBV/AbstractInterface/server.rb +7 -7
  110. data/test/OBV/Custom/client.rb +5 -5
  111. data/test/OBV/Custom/run_test.rb +2 -2
  112. data/test/OBV/Custom/server.rb +7 -7
  113. data/test/OBV/Simple/client.rb +5 -5
  114. data/test/OBV/Simple/run_test.rb +2 -2
  115. data/test/OBV/Simple/server.rb +7 -7
  116. data/test/OBV/Simple_Event/client.rb +5 -5
  117. data/test/OBV/Simple_Event/run_test.rb +2 -2
  118. data/test/OBV/Simple_Event/server.rb +7 -7
  119. data/test/OBV/Supports/client.rb +17 -17
  120. data/test/OBV/Supports/run_test.rb +2 -2
  121. data/test/OBV/Supports/server.rb +7 -7
  122. data/test/OBV/Tree/client.rb +6 -6
  123. data/test/OBV/Tree/run_test.rb +2 -2
  124. data/test/OBV/Tree/server.rb +7 -7
  125. data/test/OBV/Truncatable/client.rb +5 -5
  126. data/test/OBV/Truncatable/run_test.rb +2 -2
  127. data/test/OBV/Truncatable/server.rb +6 -6
  128. data/test/OBV/ValueBox/client.rb +20 -20
  129. data/test/OBV/ValueBox/run_test.rb +2 -2
  130. data/test/OBV/ValueBox/server.rb +8 -8
  131. data/test/Object/client.rb +6 -6
  132. data/test/Object/run_test.rb +2 -2
  133. data/test/Object/server.rb +9 -9
  134. data/test/POA/run_test.rb +2 -2
  135. data/test/POA/test.rb +4 -4
  136. data/test/Param_Test/client.rb +6 -6
  137. data/test/Param_Test/run_test.rb +2 -2
  138. data/test/Param_Test/server.rb +6 -6
  139. data/test/Performance/Simple/client.rb +6 -6
  140. data/test/Performance/Simple/run_test.rb +2 -2
  141. data/test/Performance/Simple/server.rb +7 -7
  142. data/test/Policies/run_test.rb +2 -2
  143. data/test/Policies/test.rb +4 -4
  144. data/test/Timeout/client.rb +11 -11
  145. data/test/Timeout/run_test.rb +2 -2
  146. data/test/Timeout/server.rb +9 -9
  147. data/test/lib/test.rb +5 -5
  148. data/test/test_runner.rb +8 -7
  149. metadata +3 -3
data/test/DSI/server.rb CHANGED
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -51,8 +51,8 @@ class MyHello < PortableServer::DynamicImplementation
51
51
 
52
52
  OPTABLE = {
53
53
  'echo' => {
54
- :result_type => CORBA._tc_string,
55
- :arg_list => [
54
+ result_type: CORBA._tc_string,
55
+ arg_list: [
56
56
  ['message', CORBA::ARG_IN, CORBA._tc_string],
57
57
  ['msglen', CORBA::ARG_OUT, CORBA._tc_long]] }
58
58
  }
@@ -69,7 +69,7 @@ class MyHello < PortableServer::DynamicImplementation
69
69
  end
70
70
 
71
71
  def shutdown()
72
- @orb.shutdown()
72
+ @orb.shutdown
73
73
  end
74
74
  end # of servant MyHello
75
75
 
@@ -85,17 +85,17 @@ poa_man.activate
85
85
 
86
86
  hello_srv = MyHello.new(orb)
87
87
 
88
- hello_obj = hello_srv._this()
88
+ hello_obj = hello_srv._this
89
89
 
90
90
  hello_ior = orb.object_to_string(hello_obj)
91
91
 
92
- open(OPTIONS[:iorfile], 'w') { |io|
92
+ File.open(OPTIONS[:iorfile], 'w') { |io|
93
93
  io.write hello_ior
94
94
  }
95
95
 
96
96
  Signal.trap('INT') do
97
97
  puts 'SIGINT - shutting down ORB...'
98
- orb.shutdown()
98
+ orb.shutdown
99
99
  end
100
100
 
101
101
  if Signal.list.has_key?('USR2')
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :use_implement => false,
18
- :orb_debuglevel => 0,
19
- :iorfile => 'file://server.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://server.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -102,16 +102,16 @@ begin
102
102
 
103
103
  assert 'ERROR', 99 == hello_obj.myResult
104
104
 
105
- hello_obj.shutdown()
105
+ hello_obj.shutdown
106
106
 
107
107
  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
108
108
 
109
- hello_obj._free_ref()
109
+ hello_obj._free_ref
110
110
 
111
111
  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
112
112
 
113
113
  ensure
114
114
 
115
- orb.destroy()
115
+ orb.destroy
116
116
 
117
117
  end
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -92,7 +92,7 @@ class MyHello < POA::Test::Hello
92
92
  end
93
93
 
94
94
  def shutdown()
95
- @orb.shutdown()
95
+ @orb.shutdown
96
96
  end
97
97
  end # of servant MyHello
98
98
 
@@ -108,17 +108,17 @@ poa_man.activate
108
108
 
109
109
  hello_srv = MyHello.new(orb)
110
110
 
111
- hello_obj = hello_srv._this()
111
+ hello_obj = hello_srv._this
112
112
 
113
113
  hello_ior = orb.object_to_string(hello_obj)
114
114
 
115
- open(OPTIONS[:iorfile], 'w') { |io|
115
+ File.open(OPTIONS[:iorfile], 'w') { |io|
116
116
  io.write hello_ior
117
117
  }
118
118
 
119
119
  Signal.trap('INT') do
120
120
  puts 'SIGINT - shutting down ORB...'
121
- orb.shutdown()
121
+ orb.shutdown
122
122
  end
123
123
 
124
124
  if Signal.list.has_key?('USR2')
data/test/Hello/client.rb CHANGED
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :use_implement => false,
18
- :orb_debuglevel => 0,
19
- :iorfile => 'file://server.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://server.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -58,20 +58,20 @@ begin
58
58
 
59
59
  hello_obj = Test::Hello._narrow(obj)
60
60
 
61
- the_string = hello_obj.get_string()
61
+ the_string = hello_obj.get_string
62
62
 
63
63
  puts "string returned <#{the_string}>"
64
64
 
65
- hello_obj.shutdown()
65
+ hello_obj.shutdown
66
66
 
67
67
  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
68
68
 
69
- hello_obj._free_ref()
69
+ hello_obj._free_ref
70
70
 
71
71
  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
72
72
 
73
73
  ensure
74
74
 
75
- orb.destroy()
75
+ orb.destroy
76
76
 
77
77
  end
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
data/test/Hello/server.rb CHANGED
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
58
58
  end
59
59
 
60
60
  def shutdown()
61
- @orb.shutdown()
61
+ @orb.shutdown
62
62
  end
63
63
  end # of servant MyHello
64
64
 
@@ -74,17 +74,17 @@ poa_man.activate
74
74
 
75
75
  hello_srv = MyHello.new(orb)
76
76
 
77
- hello_obj = hello_srv._this()
77
+ hello_obj = hello_srv._this
78
78
 
79
79
  hello_ior = orb.object_to_string(hello_obj)
80
80
 
81
- open(OPTIONS[:iorfile], 'w') { |io|
81
+ File.open(OPTIONS[:iorfile], 'w') { |io|
82
82
  io.write hello_ior
83
83
  }
84
84
 
85
85
  Signal.trap('INT') do
86
86
  puts 'SIGINT - shutting down ORB...'
87
- orb.shutdown()
87
+ orb.shutdown
88
88
  end
89
89
 
90
90
  if Signal.list.has_key?('USR2')
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :use_implement => false,
18
- :orb_debuglevel => 0,
19
- :iorfile => 'file://server.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://server.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -80,24 +80,24 @@ begin
80
80
 
81
81
  hello_obj = Test::Hello._narrow(obj)
82
82
 
83
- hello_obj.r_super()
83
+ hello_obj.r_super
84
84
 
85
- hello_obj2 = Test::Hello._narrow(hello_obj.r_self())
85
+ hello_obj2 = Test::Hello._narrow(hello_obj.r_self)
86
86
 
87
- the_string = hello_obj2.get_string()
87
+ the_string = hello_obj2.get_string
88
88
 
89
89
  puts "string returned <#{the_string}>"
90
90
 
91
- hello_obj.shutdown()
91
+ hello_obj.shutdown
92
92
 
93
93
  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
94
94
 
95
- hello_obj._free_ref()
95
+ hello_obj._free_ref
96
96
 
97
97
  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
98
98
 
99
99
  ensure
100
100
 
101
- orb.destroy()
101
+ orb.destroy
102
102
 
103
103
  end
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -67,7 +67,7 @@ class MyHello < POA::Test::Hello
67
67
  end
68
68
 
69
69
  def shutdown()
70
- @orb.shutdown()
70
+ @orb.shutdown
71
71
  end
72
72
  end # of servant MyHello
73
73
 
@@ -83,17 +83,17 @@ poa_man.activate
83
83
 
84
84
  hello_srv = MyHello.new(orb)
85
85
 
86
- hello_obj = hello_srv._this()
86
+ hello_obj = hello_srv._this
87
87
 
88
88
  hello_ior = orb.object_to_string(hello_obj)
89
89
 
90
- open(OPTIONS[:iorfile], 'w') { |io|
90
+ File.open(OPTIONS[:iorfile], 'w') { |io|
91
91
  io.write hello_ior
92
92
  }
93
93
 
94
94
  Signal.trap('INT') do
95
95
  puts 'SIGINT - shutting down ORB...'
96
- orb.shutdown()
96
+ orb.shutdown
97
97
  end
98
98
 
99
99
  if Signal.list.has_key?('USR2')
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :serverport => 9999
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ serverport: 9999
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -55,7 +55,7 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
55
55
 
56
56
  hello_obj = Test::Hello._narrow(obj)
57
57
 
58
- the_string = hello_obj.get_string()
58
+ the_string = hello_obj.get_string
59
59
 
60
60
  puts "servant Hello returned <#{the_string}>"
61
61
 
@@ -63,10 +63,10 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
63
63
 
64
64
  hello_obj = Test::Hello._narrow(obj)
65
65
 
66
- the_string = hello_obj.get_string()
66
+ the_string = hello_obj.get_string
67
67
 
68
68
  puts "servant Hello2 returned <#{the_string}>"
69
69
 
70
- hello_obj.shutdown()
70
+ hello_obj.shutdown
71
71
 
72
- orb.destroy()
72
+ orb.destroy
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
@@ -12,10 +12,10 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :listenport => 9999,
18
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ listenport: 9999,
18
+ iorfile: 'server.ior'
19
19
  }
20
20
 
21
21
  ARGV.options do |opts|
@@ -63,7 +63,7 @@ class MyHello < POA::Test::Hello
63
63
  end
64
64
 
65
65
  def shutdown()
66
- @orb.shutdown()
66
+ @orb.shutdown
67
67
  end
68
68
  end # of servant MyHello
69
69
 
@@ -83,7 +83,7 @@ poa_man.activate
83
83
 
84
84
  hello_srv = MyHello.new(orb, 'Hello')
85
85
 
86
- hello_obj = hello_srv._this()
86
+ hello_obj = hello_srv._this
87
87
 
88
88
  hello_ior = orb.object_to_string(hello_obj)
89
89
 
@@ -91,19 +91,19 @@ orb.ior_map.map_ior('Hello', hello_ior)
91
91
 
92
92
  hello_srv = MyHello.new(orb, 'Hello2')
93
93
 
94
- hello_obj = hello_srv._this()
94
+ hello_obj = hello_srv._this
95
95
 
96
96
  hello_ior = orb.object_to_string(hello_obj)
97
97
 
98
98
  orb.ior_map.map_ior('Hello2', hello_ior)
99
99
 
100
- open(OPTIONS[:iorfile], 'w') { |io|
100
+ File.open(OPTIONS[:iorfile], 'w') { |io|
101
101
  io.write hello_ior
102
102
  }
103
103
 
104
104
  Signal.trap('INT') do
105
105
  puts 'SIGINT - shutting down ORB...'
106
- orb.shutdown()
106
+ orb.shutdown
107
107
  end
108
108
 
109
109
  if Signal.list.has_key?('USR2')
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :serverport => 9999
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ serverport: 9999
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -57,7 +57,7 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
57
57
 
58
58
  hello_obj = Test::Hello._narrow(obj)
59
59
 
60
- the_string = hello_obj.get_string()
60
+ the_string = hello_obj.get_string
61
61
 
62
62
  puts "servant Hello returned <#{the_string}>"
63
63
 
@@ -65,10 +65,10 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
65
65
 
66
66
  hello_obj = Test::Hello._narrow(obj)
67
67
 
68
- the_string = hello_obj.get_string()
68
+ the_string = hello_obj.get_string
69
69
 
70
70
  puts "servant Hello2 returned <#{the_string}>"
71
71
 
72
- hello_obj.shutdown()
72
+ hello_obj.shutdown
73
73
 
74
- orb.destroy()
74
+ orb.destroy
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
@@ -12,10 +12,10 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :listenport => 9999,
18
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ listenport: 9999,
18
+ iorfile: 'server.ior'
19
19
  }
20
20
 
21
21
  ARGV.options do |opts|
@@ -52,7 +52,7 @@ else
52
52
  require 'TestS.rb'
53
53
  end
54
54
 
55
- begin STDERR.puts 'Not supported on this platform'; open(OPTIONS[:iorfile], 'w') {|io|io.write ''}; exit(0); end unless defined?(IORTable)
55
+ begin STDERR.puts 'Not supported on this platform'; File.open(OPTIONS[:iorfile], 'w') {|io|io.write ''}; exit(0); end unless defined?(IORTable)
56
56
 
57
57
  class MyHello < POA::Test::Hello
58
58
  def initialize(orb, id)
@@ -65,7 +65,7 @@ class MyHello < POA::Test::Hello
65
65
  end
66
66
 
67
67
  def shutdown()
68
- @orb.shutdown()
68
+ @orb.shutdown
69
69
  end
70
70
  end # of servant MyHello
71
71
 
@@ -99,7 +99,7 @@ iortbl = IORTable::Table._narrow(obj)
99
99
 
100
100
  hello_srv = MyHello.new(orb, 'Hello')
101
101
 
102
- hello_obj = hello_srv._this()
102
+ hello_obj = hello_srv._this
103
103
 
104
104
  hello_ior = orb.object_to_string(hello_obj)
105
105
 
@@ -107,19 +107,19 @@ iortbl.bind('Hello', hello_ior)
107
107
 
108
108
  hello_srv = MyHello.new(orb, 'Hello2')
109
109
 
110
- hello_obj = hello_srv._this()
110
+ hello_obj = hello_srv._this
111
111
 
112
112
  hello_ior = orb.object_to_string(hello_obj)
113
113
 
114
114
  iortbl.set_locator(MyLocator.new('Hello2', hello_ior))
115
115
 
116
- open(OPTIONS[:iorfile], 'w') { |io|
116
+ File.open(OPTIONS[:iorfile], 'w') { |io|
117
117
  io.write hello_ior
118
118
  }
119
119
 
120
120
  Signal.trap('INT') do
121
121
  puts 'SIGINT - shutting down ORB...'
122
- orb.shutdown()
122
+ orb.shutdown
123
123
  end
124
124
 
125
125
  if Signal.list.has_key?('USR2')
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :use_implement => false,
18
- :orb_debuglevel => 0,
19
- :iorfile => 'file://server.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://server.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -103,10 +103,10 @@ begin
103
103
  [arr.to_ary.collect {|l| l.to_int }, the_seq].transpose.all? {|t| t.first == t.last}
104
104
  end
105
105
 
106
- hello_obj.shutdown()
106
+ hello_obj.shutdown
107
107
 
108
108
  ensure
109
109
 
110
- orb.destroy()
110
+ orb.destroy
111
111
 
112
112
  end
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'
@@ -12,9 +12,9 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -62,7 +62,7 @@ class MyHello < POA::Test::Hello
62
62
  end
63
63
 
64
64
  def shutdown()
65
- @orb.shutdown()
65
+ @orb.shutdown
66
66
  end
67
67
  end # of servant MyHello
68
68
 
@@ -78,17 +78,17 @@ poa_man.activate
78
78
 
79
79
  hello_srv = MyHello.new(orb)
80
80
 
81
- hello_obj = hello_srv._this()
81
+ hello_obj = hello_srv._this
82
82
 
83
83
  hello_ior = orb.object_to_string(hello_obj)
84
84
 
85
- open(OPTIONS[:iorfile], 'w') { |io|
85
+ File.open(OPTIONS[:iorfile], 'w') { |io|
86
86
  io.write hello_ior
87
87
  }
88
88
 
89
89
  Signal.trap('INT') do
90
90
  puts 'SIGINT - shutting down ORB...'
91
- orb.shutdown()
91
+ orb.shutdown
92
92
  end
93
93
 
94
94
  if Signal.list.has_key?('USR2')
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :use_implement => false,
18
- :orb_debuglevel => 0,
19
- :iorfile => 'file://server'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://server'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -61,14 +61,14 @@ begin
61
61
  hello_obj = Test::Hello._narrow(obj)
62
62
 
63
63
  10.times do
64
- the_string = hello_obj.get_string()
64
+ the_string = hello_obj.get_string
65
65
 
66
66
  puts "[thread \##{sid}] string returned <#{the_string}>"
67
67
 
68
68
  Thread.pass
69
69
  end
70
70
 
71
- hello_obj.shutdown()
71
+ hello_obj.shutdown
72
72
  end
73
73
  end
74
74
 
@@ -76,6 +76,6 @@ begin
76
76
 
77
77
  ensure
78
78
 
79
- orb.destroy()
79
+ orb.destroy
80
80
 
81
81
  end
@@ -10,8 +10,8 @@
10
10
  #--------------------------------------------------------------------
11
11
 
12
12
  OPTIONS = {
13
- :debug_opt => '',
14
- :use_implement => '--use-implement'
13
+ debug_opt: '',
14
+ use_implement: '--use-implement'
15
15
  }
16
16
 
17
17
  require 'optparse'