r2corba 1.6.2-x64-mingw32 → 1.7.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (151) hide show
  1. checksums.yaml +5 -5
  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/ext.rake +1 -1
  52. data/rakelib/ext_r2tao.rb +1 -1
  53. data/rakelib/gem.rake +0 -30
  54. data/test/BiDirectional/client.rb +7 -7
  55. data/test/BiDirectional/run_test.rb +2 -2
  56. data/test/BiDirectional/server.rb +13 -13
  57. data/test/CORBA_Services/Naming/BindingIterator/client.rb +9 -9
  58. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +2 -2
  59. data/test/CORBA_Services/Naming/BindingIterator/server.rb +6 -6
  60. data/test/CORBA_Services/Naming/Corbaname/client.rb +6 -6
  61. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +2 -2
  62. data/test/CORBA_Services/Naming/Corbaname/server.rb +8 -8
  63. data/test/CORBA_Services/Naming/Simple/client.rb +6 -6
  64. data/test/CORBA_Services/Naming/Simple/run_test.rb +2 -2
  65. data/test/CORBA_Services/Naming/Simple/server.rb +6 -6
  66. data/test/Collocation/run_test.rb +2 -2
  67. data/test/Collocation/test.rb +1 -1
  68. data/test/Connect_Timeout/client.rb +7 -7
  69. data/test/Connect_Timeout/run_test.rb +2 -2
  70. data/test/DII/client.rb +10 -10
  71. data/test/DII/run_test.rb +2 -2
  72. data/test/DII/server.rb +7 -7
  73. data/test/DSI/client.rb +6 -6
  74. data/test/DSI/run_test.rb +2 -2
  75. data/test/DSI/server.rb +9 -9
  76. data/test/Exceptions/client.rb +6 -6
  77. data/test/Exceptions/run_test.rb +2 -2
  78. data/test/Exceptions/server.rb +7 -7
  79. data/test/Hello/client.rb +7 -7
  80. data/test/Hello/run_test.rb +2 -2
  81. data/test/Hello/server.rb +7 -7
  82. data/test/IDL_Test/client.rb +9 -9
  83. data/test/IDL_Test/run_test.rb +2 -2
  84. data/test/IDL_Test/server.rb +7 -7
  85. data/test/IORMap/client.rb +7 -7
  86. data/test/IORMap/run_test.rb +2 -2
  87. data/test/IORMap/server.rb +9 -9
  88. data/test/IORTable/client.rb +7 -7
  89. data/test/IORTable/run_test.rb +2 -2
  90. data/test/IORTable/server.rb +10 -10
  91. data/test/Implicit_Conversion/client.rb +5 -5
  92. data/test/Implicit_Conversion/run_test.rb +2 -2
  93. data/test/Implicit_Conversion/server.rb +7 -7
  94. data/test/Multi_Threading/Multiple_ORB/client.rb +6 -6
  95. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
  96. data/test/Multi_Threading/Multiple_ORB/server.rb +5 -5
  97. data/test/Multi_Threading/Simple/client.rb +6 -6
  98. data/test/Multi_Threading/Simple/run_test.rb +2 -2
  99. data/test/Multi_Threading/Simple/server.rb +8 -8
  100. data/test/Multi_Threading/Threads/client.rb +6 -6
  101. data/test/Multi_Threading/Threads/run_test.rb +2 -2
  102. data/test/Multi_Threading/Threads/server.rb +9 -9
  103. data/test/Multi_Threading/Threads/watchdog.rb +7 -7
  104. data/test/Multiple_Servant_Interfaces/client.rb +7 -7
  105. data/test/Multiple_Servant_Interfaces/run_test.rb +2 -2
  106. data/test/Multiple_Servant_Interfaces/server.rb +7 -7
  107. data/test/Nil/run_test.rb +2 -2
  108. data/test/Nil/test.rb +4 -4
  109. data/test/OBV/AbstractInterface/client.rb +9 -9
  110. data/test/OBV/AbstractInterface/run_test.rb +2 -2
  111. data/test/OBV/AbstractInterface/server.rb +7 -7
  112. data/test/OBV/Custom/client.rb +5 -5
  113. data/test/OBV/Custom/run_test.rb +2 -2
  114. data/test/OBV/Custom/server.rb +7 -7
  115. data/test/OBV/Simple/client.rb +5 -5
  116. data/test/OBV/Simple/run_test.rb +2 -2
  117. data/test/OBV/Simple/server.rb +7 -7
  118. data/test/OBV/Simple_Event/client.rb +5 -5
  119. data/test/OBV/Simple_Event/run_test.rb +2 -2
  120. data/test/OBV/Simple_Event/server.rb +7 -7
  121. data/test/OBV/Supports/client.rb +17 -17
  122. data/test/OBV/Supports/run_test.rb +2 -2
  123. data/test/OBV/Supports/server.rb +7 -7
  124. data/test/OBV/Tree/client.rb +6 -6
  125. data/test/OBV/Tree/run_test.rb +2 -2
  126. data/test/OBV/Tree/server.rb +7 -7
  127. data/test/OBV/Truncatable/client.rb +5 -5
  128. data/test/OBV/Truncatable/run_test.rb +2 -2
  129. data/test/OBV/Truncatable/server.rb +6 -6
  130. data/test/OBV/ValueBox/client.rb +20 -20
  131. data/test/OBV/ValueBox/run_test.rb +2 -2
  132. data/test/OBV/ValueBox/server.rb +8 -8
  133. data/test/Object/client.rb +6 -6
  134. data/test/Object/run_test.rb +2 -2
  135. data/test/Object/server.rb +9 -9
  136. data/test/POA/run_test.rb +2 -2
  137. data/test/POA/test.rb +4 -4
  138. data/test/Param_Test/client.rb +6 -6
  139. data/test/Param_Test/run_test.rb +2 -2
  140. data/test/Param_Test/server.rb +6 -6
  141. data/test/Performance/Simple/client.rb +6 -6
  142. data/test/Performance/Simple/run_test.rb +2 -2
  143. data/test/Performance/Simple/server.rb +7 -7
  144. data/test/Policies/run_test.rb +2 -2
  145. data/test/Policies/test.rb +4 -4
  146. data/test/Timeout/client.rb +11 -11
  147. data/test/Timeout/run_test.rb +2 -2
  148. data/test/Timeout/server.rb +9 -9
  149. data/test/lib/test.rb +5 -5
  150. data/test/test_runner.rb +8 -7
  151. metadata +6 -7
data/rakelib/gem.rake CHANGED
@@ -211,36 +211,6 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
211
211
  end
212
212
  t_.enhance ['mkrf_conf_bingem.rb']
213
213
 
214
- unless defined?(JRUBY_VERSION)
215
- # Devkit faker Gem for binary Windows gems
216
- t_devkit = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba_devkit', '1.0.0', :devkit)}.gem") => 'lib/rubygems_plugin.rb' do
217
- # create gemspec
218
- gemspec = R2CORBA::Gem.define_spec('r2corba_devkit', '1.0.0', :devkit) do |gem|
219
- gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
220
- gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
221
- gem.email = 'info@remedy.nl'
222
- gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
223
- gem.authors = ['Martin Corino', 'Johnny Willemsen']
224
- gem.files = 'lib/rubygems_plugin.rb'
225
- gem.require_paths = %w{lib}
226
- gem.executables = []
227
- gem.extensions = []
228
- gem.required_ruby_version = '>= 2.5'
229
- gem.licenses = ['Nonstandard']
230
- gem.metadata = {
231
- 'bug_tracker_uri' => 'https://github.com/RemedyIT/r2corba/issues',
232
- 'source_code_uri' => 'https://github.com/RemedyIT/r2corba'
233
- }
234
- end
235
- R2CORBA::Gem.build_gem(gemspec)
236
- end
237
- namespace :r2corba do
238
- namespace :gem do
239
- task :devkit => t_devkit.name
240
- end
241
- end
242
- end
243
-
244
214
  desc 'Build R2CORBA gem'
245
215
  if defined?(JRUBY_VERSION)
246
216
  task :gem => 'r2corba:gem:bingem'
@@ -12,9 +12,9 @@ require 'lib/assert.rb'
12
12
  include TestUtil::Assertions
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'file://server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'file://server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -96,7 +96,7 @@ begin
96
96
 
97
97
  puts 'child_poa created'
98
98
 
99
- policies.each { |pol| pol.destroy() }
99
+ policies.each { |pol| pol.destroy }
100
100
 
101
101
  puts 'policies destroyed'
102
102
 
@@ -110,7 +110,7 @@ begin
110
110
 
111
111
  callback_i = MyCallback.new(orb)
112
112
 
113
- callback_ref = callback_i._this()
113
+ callback_ref = callback_i._this
114
114
 
115
115
  # Send the calback object to the server
116
116
  simple_srv.callback_object(callback_ref)
@@ -120,12 +120,12 @@ begin
120
120
 
121
121
  assert "unexpected result = #{r}", r == 0
122
122
 
123
- orb.run()
123
+ orb.run
124
124
 
125
125
  root_poa.destroy(1, 1)
126
126
 
127
127
  ensure
128
128
 
129
- orb.destroy()
129
+ orb.destroy
130
130
 
131
131
  end
@@ -9,8 +9,8 @@
9
9
  #--------------------------------------------------------------------
10
10
 
11
11
  OPTIONS = {
12
- :debug_opt => '',
13
- :use_implement => '--use-implement'
12
+ debug_opt: '',
13
+ use_implement: '--use-implement'
14
14
  }
15
15
 
16
16
  require 'optparse'
@@ -12,10 +12,10 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false,
16
- :orb_debuglevel => 0,
17
- :iorfile => 'server.ior',
18
- :iter_num => 10
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'server.ior',
18
+ iter_num: 10
19
19
  }
20
20
 
21
21
  ARGV.options do |opts|
@@ -73,16 +73,16 @@ class Simple_Server_i < POA::Simple_Server
73
73
  end
74
74
 
75
75
  def shutdown()
76
- @orb.shutdown()
76
+ @orb.shutdown
77
77
  end
78
78
 
79
79
  def call_client()
80
80
  if @flag
81
81
  @iter_num.times do
82
- @callback.callback_method()
82
+ @callback.callback_method
83
83
  end
84
84
 
85
- @callback.shutdown()
85
+ @callback.shutdown
86
86
  @flag = false
87
87
 
88
88
  return 1
@@ -122,7 +122,7 @@ child_poa = root_poa.create_POA('childPOA', poa_man, policies)
122
122
 
123
123
  puts 'child_poa created'
124
124
 
125
- policies.each { |pol| pol.destroy() }
125
+ policies.each { |pol| pol.destroy }
126
126
 
127
127
  puts 'policies destroyed'
128
128
 
@@ -138,13 +138,13 @@ ior = orb.object_to_string(obj)
138
138
 
139
139
  puts "Activated as <#{ior}>"
140
140
 
141
- open(OPTIONS[:iorfile], 'w') { |io|
141
+ File.open(OPTIONS[:iorfile], 'w') { |io|
142
142
  io.write ior
143
143
  }
144
144
 
145
145
  Signal.trap('INT') do
146
146
  puts 'SIGINT - shutting down ORB...'
147
- orb.shutdown()
147
+ orb.shutdown
148
148
  end
149
149
 
150
150
  if Signal.list.has_key?('USR2')
@@ -153,13 +153,13 @@ end
153
153
 
154
154
  retval = 0
155
155
  while retval == 0
156
- pending = orb.work_pending()
156
+ pending = orb.work_pending
157
157
 
158
158
  if pending
159
- orb.perform_work()
159
+ orb.perform_work
160
160
  end
161
161
 
162
- retval = simple_srv.call_client()
162
+ retval = simple_srv.call_client
163
163
  end
164
164
 
165
165
  puts 'event loop finished'
@@ -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://ins.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://ins.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -71,7 +71,7 @@ begin
71
71
  n = binding_list.first.binding_name.first
72
72
  puts "first binding: id=#{n.r_id}, kind=#{n.kind}"
73
73
 
74
- has_one, binding = binding_iterator.next_one()
74
+ has_one, binding = binding_iterator.next_one
75
75
 
76
76
  assert 'ERROR: INS BindingIterator#next_one() does not function',
77
77
  (has_one && binding) &&
@@ -93,11 +93,11 @@ begin
93
93
  puts "#{counts.shift} binding: id=#{n.r_id}, kind=#{n.kind}"
94
94
  end
95
95
 
96
- has_one, binding = binding_iterator.next_one()
96
+ has_one, binding = binding_iterator.next_one
97
97
 
98
98
  assert_not 'ERROR: INS BindingIterator#next_one() does not function (2)', has_one
99
99
 
100
- binding_iterator.destroy()
100
+ binding_iterator.destroy
101
101
 
102
102
  # retrieve object reference for servant from Naming service
103
103
  name = binding_list.last.binding_name
@@ -107,14 +107,14 @@ begin
107
107
  # narrow object ref and call
108
108
  hello_obj = Test::Hello._narrow(obj)
109
109
 
110
- the_string = hello_obj.get_string()
110
+ the_string = hello_obj.get_string
111
111
 
112
112
  puts "string returned <#{the_string}>"
113
113
 
114
- hello_obj.shutdown()
114
+ hello_obj.shutdown
115
115
 
116
116
  ensure
117
117
 
118
- orb.destroy()
118
+ orb.destroy
119
119
 
120
120
  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'
@@ -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://ins.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://ins.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -61,7 +61,7 @@ class MyHello < POA::Test::Hello
61
61
  end
62
62
 
63
63
  def shutdown()
64
- @orb.shutdown()
64
+ @orb.shutdown
65
65
  end
66
66
  end # of servant MyHello
67
67
 
@@ -87,7 +87,7 @@ poa_man.activate
87
87
  # create and activate servant
88
88
  hello_srv = MyHello.new(orb)
89
89
 
90
- hello_obj = hello_srv._this()
90
+ hello_obj = hello_srv._this
91
91
 
92
92
  # register 5 object references with Naming service
93
93
  5.times do |i|
@@ -97,7 +97,7 @@ end
97
97
  # initialize signal handling
98
98
  Signal.trap('INT') do
99
99
  puts 'SIGINT - shutting down ORB...'
100
- orb.shutdown()
100
+ orb.shutdown
101
101
  end
102
102
 
103
103
  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 => 'corbaname.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'corbaname.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -71,14 +71,14 @@ begin
71
71
 
72
72
  assert_not 'ERROR: corbaname resolved to nil object!', CORBA::is_nil(hello_obj)
73
73
 
74
- the_string = hello_obj.get_string()
74
+ the_string = hello_obj.get_string
75
75
 
76
76
  puts "client: string returned <#{the_string}>"
77
77
 
78
- hello_obj.shutdown()
78
+ hello_obj.shutdown
79
79
 
80
80
  ensure
81
81
 
82
- orb.destroy()
82
+ orb.destroy
83
83
 
84
84
  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'
@@ -14,10 +14,10 @@ require 'lib/assert.rb'
14
14
  include TestUtil::Assertions
15
15
 
16
16
  OPTIONS = {
17
- :iorfile => 'corbaname.ior',
18
- :use_implement => false,
19
- :orb_debuglevel => 0,
20
- :ins_port => 2345
17
+ iorfile: 'corbaname.ior',
18
+ use_implement: false,
19
+ orb_debuglevel: 0,
20
+ ins_port: 2345
21
21
  }
22
22
 
23
23
  ARGV.options do |opts|
@@ -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
 
@@ -104,7 +104,7 @@ poa_man.activate
104
104
  # create and activate servant
105
105
  hello_srv = MyHello.new(orb)
106
106
 
107
- hello_obj = hello_srv._this()
107
+ hello_obj = hello_srv._this
108
108
 
109
109
  # register object reference with Naming service
110
110
  name = full_name
@@ -116,14 +116,14 @@ sn = nc.to_string(name) # stringify name
116
116
  corbaname = nc.to_url(ins_url, sn) # corbaname url
117
117
 
118
118
  # write corbaname to file
119
- open(OPTIONS[:iorfile], 'w') { |io|
119
+ File.open(OPTIONS[:iorfile], 'w') { |io|
120
120
  io.write corbaname
121
121
  }
122
122
 
123
123
  # initialize signal handling
124
124
  Signal.trap('INT') do
125
125
  puts 'SIGINT - shutting down ORB...'
126
- orb.shutdown()
126
+ orb.shutdown
127
127
  end
128
128
 
129
129
  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://ins.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://ins.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -70,14 +70,14 @@ begin
70
70
  # narrow object ref and call
71
71
  hello_obj = Test::Hello._narrow(obj)
72
72
 
73
- the_string = hello_obj.get_string()
73
+ the_string = hello_obj.get_string
74
74
 
75
75
  puts "string returned <#{the_string}>"
76
76
 
77
- hello_obj.shutdown()
77
+ hello_obj.shutdown
78
78
 
79
79
  ensure
80
80
 
81
- orb.destroy()
81
+ orb.destroy
82
82
 
83
83
  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'
@@ -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://ins.ior'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ iorfile: 'file://ins.ior'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -61,7 +61,7 @@ class MyHello < POA::Test::Hello
61
61
  end
62
62
 
63
63
  def shutdown()
64
- @orb.shutdown()
64
+ @orb.shutdown
65
65
  end
66
66
  end # of servant MyHello
67
67
 
@@ -87,7 +87,7 @@ poa_man.activate
87
87
  # create and activate servant
88
88
  hello_srv = MyHello.new(orb)
89
89
 
90
- hello_obj = hello_srv._this()
90
+ hello_obj = hello_srv._this
91
91
 
92
92
  # register object reference with Naming service
93
93
  name = [CosNaming::NameComponent.new('Hello', 'ior')]
@@ -97,7 +97,7 @@ nc.bind(name, hello_obj)
97
97
  # initialize signal handling
98
98
  Signal.trap('INT') do
99
99
  puts 'SIGINT - shutting down ORB...'
100
- orb.shutdown()
100
+ orb.shutdown
101
101
  end
102
102
 
103
103
  if Signal.list.has_key?('USR2')
@@ -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,7 +12,7 @@
12
12
  require 'optparse'
13
13
 
14
14
  OPTIONS = {
15
- :use_implement => false
15
+ use_implement: false
16
16
  }
17
17
 
18
18
  ORB_ARG = []
@@ -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
- :ior => 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
17
+ use_implement: false,
18
+ orb_debuglevel: 0,
19
+ ior: 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
20
20
  }
21
21
 
22
22
  ARGV.options do |opts|
@@ -65,11 +65,11 @@ def test_timeout(object)
65
65
 
66
66
  assert_not 'Nil Test::Hello reference', CORBA::is_nil(hello)
67
67
 
68
- the_string = hello.get_string()
68
+ the_string = hello.get_string
69
69
 
70
70
  puts "string returned <#{the_string}>"
71
71
 
72
- hello.shutdown()
72
+ hello.shutdown
73
73
  rescue CORBA::Exception
74
74
  # Get the elampsed time
75
75
  el = Time.now - profile_timer
@@ -101,9 +101,9 @@ begin
101
101
  policy_current.set_policy_overrides(policy_list,
102
102
  CORBA::ADD_OVERRIDE)
103
103
 
104
- policy_list.each { |p| p.destroy() }
104
+ policy_list.each { |p| p.destroy }
105
105
 
106
106
  test_timeout(tmp)
107
107
  ensure
108
- orb.destroy()
108
+ orb.destroy
109
109
  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/DII/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|
@@ -59,7 +59,7 @@ begin
59
59
  ]
60
60
  req.set_return_type(CORBA::_tc_string)
61
61
 
62
- the_string = req.invoke()
62
+ the_string = req.invoke
63
63
 
64
64
  puts "string returned <#{the_string}>"
65
65
  puts
@@ -72,9 +72,9 @@ begin
72
72
  ]
73
73
  req.set_return_type(CORBA::_tc_string)
74
74
 
75
- req.send_deferred()
75
+ req.send_deferred
76
76
  puts 'getting response...'
77
- req.get_response()
77
+ req.get_response
78
78
 
79
79
  puts "string returned <#{req.return_value}>"
80
80
  puts
@@ -92,12 +92,12 @@ begin
92
92
  ]
93
93
  req.set_return_type(CORBA::_tc_string)
94
94
 
95
- req.send_deferred()
95
+ req.send_deferred
96
96
  begin
97
97
  puts 'sleeping...'
98
98
  sleep(0.01)
99
99
  puts 'polling for response...'
100
- end while !req.poll_response()
100
+ end while !req.poll_response
101
101
 
102
102
  puts "string returned <#{req.return_value}>"
103
103
  puts
@@ -105,10 +105,10 @@ begin
105
105
 
106
106
  puts '***** Oneway shutdown'
107
107
  req = obj._request('shutdown')
108
- req.send_oneway()
108
+ req.send_oneway
109
109
 
110
110
  ensure
111
111
 
112
- orb.destroy()
112
+ orb.destroy
113
113
 
114
114
  end
data/test/DII/run_test.rb CHANGED
@@ -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/DII/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')
data/test/DSI/client.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 => 'file://server.ior'
15
+ use_implement: false,
16
+ orb_debuglevel: 0,
17
+ iorfile: 'file://server.ior'
18
18
  }
19
19
 
20
20
  ARGV.options do |opts|
@@ -50,7 +50,7 @@ end
50
50
 
51
51
  orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
52
52
 
53
- # #s = open(OPTIONS[:iorfile], 'r').read
53
+ # #s = File.open(OPTIONS[:iorfile], 'r').read
54
54
 
55
55
  obj = orb.string_to_object(OPTIONS[:iorfile])
56
56
 
@@ -60,6 +60,6 @@ the_string, the_length = hello_obj.echo('Hello world!')
60
60
 
61
61
  puts "string returned <#{the_string}>; length = #{the_length}"
62
62
 
63
- hello_obj.shutdown()
63
+ hello_obj.shutdown
64
64
 
65
- orb.destroy()
65
+ orb.destroy
data/test/DSI/run_test.rb CHANGED
@@ -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'