r2corba 1.6.2-x64-mingw-ucrt → 1.7.0-x64-mingw-ucrt

Sign up to get free protection for your applications and to get access to all the features.
Files changed (110) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +5 -5
  3. data/lib/corba/cbase/Request.rb +6 -6
  4. data/lib/corba/cmds/base.rb +1 -1
  5. data/lib/corba/common/Any.rb +1 -1
  6. data/lib/corba/common/Values.rb +4 -4
  7. data/lib/corba/common/version.rb +2 -2
  8. data/lib/corba/jbase/Servant.rb +4 -4
  9. data/lib/corba/svcs/ins/cos_naming.rb +6 -6
  10. data/lib/corba/svcs/ins/ins.rb +33 -33
  11. data/lib/corba/svcs/ins/naming_service.rb +5 -5
  12. data/rakelib/config.rb +9 -6
  13. data/test/BiDirectional/client.rb +7 -7
  14. data/test/BiDirectional/run_test.rb +2 -2
  15. data/test/BiDirectional/server.rb +13 -13
  16. data/test/CORBA_Services/Naming/BindingIterator/client.rb +9 -9
  17. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +2 -2
  18. data/test/CORBA_Services/Naming/BindingIterator/server.rb +6 -6
  19. data/test/CORBA_Services/Naming/Corbaname/client.rb +6 -6
  20. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +2 -2
  21. data/test/CORBA_Services/Naming/Corbaname/server.rb +8 -8
  22. data/test/CORBA_Services/Naming/Simple/client.rb +6 -6
  23. data/test/CORBA_Services/Naming/Simple/run_test.rb +2 -2
  24. data/test/CORBA_Services/Naming/Simple/server.rb +6 -6
  25. data/test/Collocation/run_test.rb +2 -2
  26. data/test/Collocation/test.rb +1 -1
  27. data/test/Connect_Timeout/client.rb +7 -7
  28. data/test/Connect_Timeout/run_test.rb +2 -2
  29. data/test/DII/client.rb +10 -10
  30. data/test/DII/run_test.rb +2 -2
  31. data/test/DII/server.rb +7 -7
  32. data/test/DSI/client.rb +6 -6
  33. data/test/DSI/run_test.rb +2 -2
  34. data/test/DSI/server.rb +9 -9
  35. data/test/Exceptions/client.rb +6 -6
  36. data/test/Exceptions/run_test.rb +2 -2
  37. data/test/Exceptions/server.rb +7 -7
  38. data/test/Hello/client.rb +7 -7
  39. data/test/Hello/run_test.rb +2 -2
  40. data/test/Hello/server.rb +7 -7
  41. data/test/IDL_Test/client.rb +9 -9
  42. data/test/IDL_Test/run_test.rb +2 -2
  43. data/test/IDL_Test/server.rb +7 -7
  44. data/test/IORMap/client.rb +7 -7
  45. data/test/IORMap/run_test.rb +2 -2
  46. data/test/IORMap/server.rb +9 -9
  47. data/test/IORTable/client.rb +7 -7
  48. data/test/IORTable/run_test.rb +2 -2
  49. data/test/IORTable/server.rb +10 -10
  50. data/test/Implicit_Conversion/client.rb +5 -5
  51. data/test/Implicit_Conversion/run_test.rb +2 -2
  52. data/test/Implicit_Conversion/server.rb +7 -7
  53. data/test/Multi_Threading/Multiple_ORB/client.rb +6 -6
  54. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
  55. data/test/Multi_Threading/Multiple_ORB/server.rb +5 -5
  56. data/test/Multi_Threading/Simple/client.rb +6 -6
  57. data/test/Multi_Threading/Simple/run_test.rb +2 -2
  58. data/test/Multi_Threading/Simple/server.rb +8 -8
  59. data/test/Multi_Threading/Threads/client.rb +6 -6
  60. data/test/Multi_Threading/Threads/run_test.rb +2 -2
  61. data/test/Multi_Threading/Threads/server.rb +9 -9
  62. data/test/Multi_Threading/Threads/watchdog.rb +7 -7
  63. data/test/Multiple_Servant_Interfaces/client.rb +7 -7
  64. data/test/Multiple_Servant_Interfaces/run_test.rb +2 -2
  65. data/test/Multiple_Servant_Interfaces/server.rb +7 -7
  66. data/test/Nil/run_test.rb +2 -2
  67. data/test/Nil/test.rb +4 -4
  68. data/test/OBV/AbstractInterface/client.rb +9 -9
  69. data/test/OBV/AbstractInterface/run_test.rb +2 -2
  70. data/test/OBV/AbstractInterface/server.rb +7 -7
  71. data/test/OBV/Custom/client.rb +5 -5
  72. data/test/OBV/Custom/run_test.rb +2 -2
  73. data/test/OBV/Custom/server.rb +7 -7
  74. data/test/OBV/Simple/client.rb +5 -5
  75. data/test/OBV/Simple/run_test.rb +2 -2
  76. data/test/OBV/Simple/server.rb +7 -7
  77. data/test/OBV/Simple_Event/client.rb +5 -5
  78. data/test/OBV/Simple_Event/run_test.rb +2 -2
  79. data/test/OBV/Simple_Event/server.rb +7 -7
  80. data/test/OBV/Supports/client.rb +17 -17
  81. data/test/OBV/Supports/run_test.rb +2 -2
  82. data/test/OBV/Supports/server.rb +7 -7
  83. data/test/OBV/Tree/client.rb +6 -6
  84. data/test/OBV/Tree/run_test.rb +2 -2
  85. data/test/OBV/Tree/server.rb +7 -7
  86. data/test/OBV/Truncatable/client.rb +5 -5
  87. data/test/OBV/Truncatable/run_test.rb +2 -2
  88. data/test/OBV/Truncatable/server.rb +6 -6
  89. data/test/OBV/ValueBox/client.rb +20 -20
  90. data/test/OBV/ValueBox/run_test.rb +2 -2
  91. data/test/OBV/ValueBox/server.rb +8 -8
  92. data/test/Object/client.rb +6 -6
  93. data/test/Object/run_test.rb +2 -2
  94. data/test/Object/server.rb +9 -9
  95. data/test/POA/run_test.rb +2 -2
  96. data/test/POA/test.rb +4 -4
  97. data/test/Param_Test/client.rb +6 -6
  98. data/test/Param_Test/run_test.rb +2 -2
  99. data/test/Param_Test/server.rb +6 -6
  100. data/test/Performance/Simple/client.rb +6 -6
  101. data/test/Performance/Simple/run_test.rb +2 -2
  102. data/test/Performance/Simple/server.rb +7 -7
  103. data/test/Policies/run_test.rb +2 -2
  104. data/test/Policies/test.rb +4 -4
  105. data/test/Timeout/client.rb +11 -11
  106. data/test/Timeout/run_test.rb +2 -2
  107. data/test/Timeout/server.rb +9 -9
  108. data/test/lib/test.rb +5 -5
  109. data/test/test_runner.rb +8 -7
  110. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2d43fdfec92ab96163531e3f625398a226aa108cfceea904a18dcede2a504b31
4
- data.tar.gz: 43d64dcd520cf990a84644b5d8939d98318ce88a66460dc24d0e8c80097f7653
3
+ metadata.gz: 49e14d6a9fe997ce882796cdb32481e707d33814a0c8f20480f2086de180b1cb
4
+ data.tar.gz: af746c8e9047c0b52034acb706ea6c9162a06d2924529cc0a9f164db896e51bc
5
5
  SHA512:
6
- metadata.gz: 02ab613df8046d19c53c599fe9dac97e1f01456cd67ff8f5aa408def6a516731318aca4f158244c0faf44ae07ef2bc290d98cbfc026b673fc09f3fe5e6cdb00f
7
- data.tar.gz: cf40b4c681d7656feb0b046cce23f67b22596e76f84e21c4aa9fa2c5f65b87bf24b0b7aa750ba0d25981a5e8b5da9e8462ac5480728857ccffda53a72c2628ce
6
+ metadata.gz: 7dc04bf80b6ac344e94c6a2db4602bbd9738230824d0b21a73f73477756ff23a3563411aee3d6736f53d67e4d321d9f7cec8a50c36029e1ef1dcd2f37108bc34
7
+ data.tar.gz: fa53b40209454f462dc7d54cc0061555a443927b8db861c1368bc14ed37e31ea1433cefc1c68aa3a02b45df95445df1c3b7acd0e109062ce879369f75364a916
data/README.rdoc CHANGED
@@ -1,7 +1,7 @@
1
- {<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
2
- {<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
3
- {<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
4
- {<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
1
+ {rdoc-image:https://badge.fury.io/rb/r2corba.svg}[https://rubygems.org/gems/r2corba]
2
+ {rdoc-image:https://www.codefactor.io/repository/github/remedyit/r2corba/badge}[https://www.codefactor.io/repository/github/remedyit/r2corba]
3
+ {rdoc-image:https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
4
+ {rdoc-image:https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
5
5
 
6
6
  = R2CORBA
7
7
 
@@ -40,7 +40,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
40
40
 
41
41
  == License
42
42
 
43
- R2CORBA is Copyright (c) 2007-2022 Remedy IT Expertise BV, The Netherlands.
43
+ R2CORBA is Copyright (c) 2007-2023 Remedy IT Expertise BV, The Netherlands.
44
44
 
45
45
  It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
46
46
 
@@ -79,9 +79,9 @@ module R2CORBA
79
79
 
80
80
  def invoke
81
81
  self._invoke({
82
- :arg_list => self._arguments,
83
- :result_type => @_rettc,
84
- :exc_list => self._exceptions
82
+ arg_list: self._arguments,
83
+ result_type: @_rettc,
84
+ exc_list: self._exceptions
85
85
  })
86
86
  end
87
87
 
@@ -91,9 +91,9 @@ module R2CORBA
91
91
 
92
92
  def send_deferred
93
93
  self._send_deferred({
94
- :arg_list => self._arguments,
95
- :result_type => @_rettc,
96
- :exc_list => self._exceptions
94
+ arg_list: self._arguments,
95
+ result_type: @_rettc,
96
+ exc_list: self._exceptions
97
97
  })
98
98
  end
99
99
 
@@ -21,7 +21,7 @@ module R2CORBA
21
21
  end
22
22
 
23
23
  @@options = {
24
- :verbose => false
24
+ verbose: false
25
25
  }
26
26
 
27
27
  def self.register(cmdid, cmdhandler)
@@ -19,7 +19,7 @@ module R2CORBA
19
19
  return val._tc
20
20
  when ::NilClass
21
21
  return CORBA._tc_null
22
- when ::Bignum
22
+ when BIGNUM_KLASS
23
23
  return CORBA._tc_longlong
24
24
  when ::Integer
25
25
  return CORBA._tc_long
@@ -79,10 +79,10 @@ module R2CORBA
79
79
  VM_TRUNCATABLE = 3
80
80
 
81
81
  VT_MODIFIERS = {
82
- :none => VM_NONE,
83
- :abstract => VM_ABSTRACT,
84
- :truncatable => VM_TRUNCATABLE,
85
- :custom => VM_CUSTOM
82
+ none: VM_NONE,
83
+ abstract: VM_ABSTRACT,
84
+ truncatable: VM_TRUNCATABLE,
85
+ custom: VM_CUSTOM
86
86
  }.freeze
87
87
 
88
88
  PRIVATE_MEMBER = 0
@@ -13,8 +13,8 @@
13
13
  module R2CORBA
14
14
 
15
15
  R2CORBA_MAJOR = 1
16
- R2CORBA_MINOR = 6
17
- R2CORBA_RELEASE = 2
16
+ R2CORBA_MINOR = 7
17
+ R2CORBA_RELEASE = 0
18
18
 
19
19
  R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
20
20
 
@@ -44,25 +44,25 @@ module R2CORBA
44
44
  begin
45
45
  case rsrvreq.srvreq_.operation()
46
46
  when '_is_a'
47
- rsrvreq.describe({:arg_list => [['', CORBA::ARG_IN, CORBA._tc_string]], :result_type => CORBA._tc_boolean})
47
+ rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
48
48
  rc = self._is_a(*rsrvreq.arguments)
49
49
  jany = rsrvreq.orb_.create_any()
50
50
  jany.insert_boolean(rc == true)
51
51
  jsrvreq.set_result(jany)
52
52
  when '_non_existent'
53
- rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_boolean})
53
+ rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
54
54
  rc = self._non_existent(*rsrvreq.arguments)
55
55
  jany = rsrvreq.orb_.create_any()
56
56
  jany.insert_boolean(rc == true)
57
57
  jsrvreq.set_result(jany)
58
58
  when '_repository_id'
59
- rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_string})
59
+ rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
60
60
  rc = self._repository_id(*rsrvreq.arguments)
61
61
  jany = rsrvreq.orb_.create_any()
62
62
  jany.insert_string(rc)
63
63
  jsrvreq.set_result(jany)
64
64
  when '_component'
65
- rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
65
+ rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
66
66
  rc = self._get_component(*rsrvreq.arguments)
67
67
  jany = rsrvreq.orb_.create_any()
68
68
  jany.insert_Object(rc)
@@ -363,9 +363,9 @@ module R2CORBA
363
363
  @map.synchronize do
364
364
  raise CosNaming::NamingContext::AlreadyBound.new if @map.has_key?(key_)
365
365
  @map[key_] = {
366
- :name => full_name,
367
- :type => type,
368
- :object => obj
366
+ name: full_name,
367
+ type: type,
368
+ object: obj
369
369
  }
370
370
  end
371
371
  end
@@ -380,9 +380,9 @@ module R2CORBA
380
380
  raise CosNaming::NamingContext::NotFound.new(why, [])
381
381
  end
382
382
  @map[key_] = {
383
- :name => full_name,
384
- :type => type,
385
- :object => obj
383
+ name: full_name,
384
+ type: type,
385
+ object: obj
386
386
  }
387
387
  end
388
388
  end
@@ -181,14 +181,14 @@ module R2CORBA
181
181
  report 'INS - starting daemon mode'
182
182
 
183
183
  daemon_opt = {
184
- :app_name => 'rins',
185
- :ARGV => ['start'],
186
- :dir_mode => :normal,
187
- :dir => @options[:piddir],
188
- :multiple => true,
189
- :log_dir => @options[:logdir] || @options[:piddir],
190
- :log_output => true,
191
- :stop_proc => Proc.new do
184
+ app_name: 'rins',
185
+ ARGV: ['start'],
186
+ dir_mode: :normal,
187
+ dir: @options[:piddir],
188
+ multiple: true,
189
+ log_dir: @options[:logdir] || @options[:piddir],
190
+ log_output: true,
191
+ stop_proc: Proc.new do
192
192
  report 'INS - shutting down'
193
193
  ins_svc.shutdown
194
194
  end
@@ -252,11 +252,11 @@ module R2CORBA
252
252
  report 'INS - stopping service'
253
253
  if @options[:daemon]
254
254
  daemon_opt = {
255
- :app_name => 'rins',
256
- :ARGV => ['stop'],
257
- :dir_mode => :normal,
258
- :dir => @options[:piddir],
259
- :multiple => true,
255
+ app_name: 'rins',
256
+ ARGV: ['stop'],
257
+ dir_mode: :normal,
258
+ dir: @options[:piddir],
259
+ multiple: true,
260
260
  }
261
261
 
262
262
  Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -279,14 +279,14 @@ module R2CORBA
279
279
  report 'INS - restarting daemon mode'
280
280
 
281
281
  daemon_opt = {
282
- :app_name => 'rins',
283
- :ARGV => ['restart'],
284
- :dir_mode => :normal,
285
- :dir => @options[:piddir],
286
- :multiple => true,
287
- :log_dir => @options[:logdir] || @options[:piddir],
288
- :log_output => true,
289
- :stop_proc => Proc.new do
282
+ app_name: 'rins',
283
+ ARGV: ['restart'],
284
+ dir_mode: :normal,
285
+ dir: @options[:piddir],
286
+ multiple: true,
287
+ log_dir: @options[:logdir] || @options[:piddir],
288
+ log_output: true,
289
+ stop_proc: Proc.new do
290
290
  report 'INS - shutting down'
291
291
  ins_svc.shutdown
292
292
  end
@@ -310,11 +310,11 @@ module R2CORBA
310
310
  def status
311
311
  report 'INS - retrieving service status'
312
312
  daemon_opt = {
313
- :app_name => 'rins',
314
- :ARGV => ['status'],
315
- :dir_mode => :normal,
316
- :dir => @options[:piddir],
317
- :multiple => true,
313
+ app_name: 'rins',
314
+ ARGV: ['status'],
315
+ dir_mode: :normal,
316
+ dir: @options[:piddir],
317
+ multiple: true,
318
318
  }
319
319
 
320
320
  Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -351,13 +351,13 @@ module R2CORBA
351
351
  end
352
352
 
353
353
  OPTIONS = {
354
- :piddir => Dir.getwd,
355
- :iorfile => 'ins.ior',
356
- :debug => 0,
357
- :logdir => nil,
358
- :threads => 5,
359
- :orbprop => {},
360
- :port => 0,
354
+ piddir: Dir.getwd,
355
+ iorfile: 'ins.ior',
356
+ debug: 0,
357
+ logdir: nil,
358
+ threads: 5,
359
+ orbprop: {},
360
+ port: 0,
361
361
  }
362
362
 
363
363
  COMMANDS = [
@@ -18,11 +18,11 @@ module R2CORBA
18
18
  class Service
19
19
  # default options
20
20
  OPTIONS = {
21
- :iorfile => 'ins.ior',
22
- :debug => 0,
23
- :threads => 5,
24
- :orbprop => {},
25
- :port => 0
21
+ iorfile: 'ins.ior',
22
+ debug: 0,
23
+ threads: 5,
24
+ orbprop: {},
25
+ port: 0
26
26
  }
27
27
 
28
28
  def initialize(options = {})
data/rakelib/config.rb CHANGED
@@ -346,10 +346,12 @@ module R2CORBA
346
346
 
347
347
  @@ridlc = File.join('bin', 'ridlc')
348
348
 
349
- # check availability of RIDL; either as gem or in subdir
350
- if (@@ridl_local = File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')))
349
+ # check availability of RIDL; either as gem or in ridl subdir, or to a location as set
350
+ # in the RIDL_ROOT environment variable
351
+ ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
352
+ if (@@ridl_local = File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')))
351
353
  incdirs = [
352
- File.expand_path(File.join('ridl', 'lib')),
354
+ File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')),
353
355
  File.expand_path('lib'),
354
356
  ENV['RUBYLIB']
355
357
  ].compact
@@ -513,9 +515,10 @@ module R2CORBA
513
515
  end
514
516
  end
515
517
 
516
- # check availability of RIDL; either as gem or in subdir
517
- unless File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
518
- raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
518
+ # check availability of RIDL; either as gem or in subdir or as set in RIDL_ROOT
519
+ ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
520
+ unless File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
521
+ raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in the subdirectory ridl, or at the location as set by RIDL_ROOT.'
519
522
  end
520
523
  end
521
524
 
@@ -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')