r2corba 1.6.1-universal-java → 1.7.0-universal-java

data/test/IDL_Test/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -80,24 +80,24 @@ begin
 
   hello_obj = Test::Hello._narrow(obj)
 
-  hello_obj.r_super()
+  hello_obj.r_super
 
-  hello_obj2 = Test::Hello._narrow(hello_obj.r_self())
+  hello_obj2 = Test::Hello._narrow(hello_obj.r_self)
 
-  the_string = hello_obj2.get_string()
+  the_string = hello_obj2.get_string
 
   puts "string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
   assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
-  hello_obj._free_ref()
+  hello_obj._free_ref
 
   assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/IDL_Test/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/IDL_Test/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -67,7 +67,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -83,17 +83,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/IORMap/client.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :serverport => 9999
+  use_implement: false,
+  orb_debuglevel: 0,
+  serverport: 9999
 }
 
 ARGV.options do |opts|
@@ -55,7 +55,7 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
 
 hello_obj = Test::Hello._narrow(obj)
 
-the_string = hello_obj.get_string()
+the_string = hello_obj.get_string
 
 puts "servant Hello returned <#{the_string}>"
 
@@ -63,10 +63,10 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
 
 hello_obj = Test::Hello._narrow(obj)
 
-the_string = hello_obj.get_string()
+the_string = hello_obj.get_string
 
 puts "servant Hello2 returned <#{the_string}>"
 
-hello_obj.shutdown()
+hello_obj.shutdown
 
-orb.destroy()
+orb.destroy

data/test/IORMap/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/IORMap/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :listenport => 9999,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  listenport: 9999,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -63,7 +63,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -83,7 +83,7 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb, 'Hello')
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
@@ -91,19 +91,19 @@ orb.ior_map.map_ior('Hello', hello_ior)
 
 hello_srv = MyHello.new(orb, 'Hello2')
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
 orb.ior_map.map_ior('Hello2', hello_ior)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/IORTable/client.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :serverport => 9999
+  use_implement: false,
+  orb_debuglevel: 0,
+  serverport: 9999
 }
 
 ARGV.options do |opts|
@@ -57,7 +57,7 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
 
 hello_obj = Test::Hello._narrow(obj)
 
-the_string = hello_obj.get_string()
+the_string = hello_obj.get_string
 
 puts "servant Hello returned <#{the_string}>"
 
@@ -65,10 +65,10 @@ obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/
 
 hello_obj = Test::Hello._narrow(obj)
 
-the_string = hello_obj.get_string()
+the_string = hello_obj.get_string
 
 puts "servant Hello2 returned <#{the_string}>"
 
-hello_obj.shutdown()
+hello_obj.shutdown
 
-orb.destroy()
+orb.destroy

data/test/IORTable/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/IORTable/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :listenport => 9999,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  listenport: 9999,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -52,7 +52,7 @@ else
   require 'TestS.rb'
 end
 
-begin STDERR.puts 'Not supported on this platform'; open(OPTIONS[:iorfile], 'w') {|io|io.write ''}; exit(0); end unless defined?(IORTable)
+begin STDERR.puts 'Not supported on this platform'; File.open(OPTIONS[:iorfile], 'w') {|io|io.write ''}; exit(0); end unless defined?(IORTable)
 
 class MyHello < POA::Test::Hello
   def initialize(orb, id)
@@ -65,7 +65,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -99,7 +99,7 @@ iortbl = IORTable::Table._narrow(obj)
 
 hello_srv = MyHello.new(orb, 'Hello')
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
@@ -107,19 +107,19 @@ iortbl.bind('Hello', hello_ior)
 
 hello_srv = MyHello.new(orb, 'Hello2')
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
 iortbl.set_locator(MyLocator.new('Hello2', hello_ior))
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Implicit_Conversion/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -103,10 +103,10 @@ begin
     [arr.to_ary.collect {|l| l.to_int }, the_seq].transpose.all? {|t| t.first == t.last}
   end
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Implicit_Conversion/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Implicit_Conversion/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -62,7 +62,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -78,17 +78,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

data/test/Multi_Threading/Multiple_ORB/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server'
 }
 
 ARGV.options do |opts|
@@ -61,14 +61,14 @@ begin
       hello_obj = Test::Hello._narrow(obj)
 
       10.times do
-        the_string = hello_obj.get_string()
+        the_string = hello_obj.get_string
 
         puts "[thread \##{sid}] string returned <#{the_string}>"
 
         Thread.pass
       end
 
-      hello_obj.shutdown()
+      hello_obj.shutdown
    end
   end
 
@@ -76,6 +76,6 @@ begin
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Multi_Threading/Multiple_ORB/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Multi_Threading/Multiple_ORB/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server'
 }
 
 ARGV.options do |opts|
@@ -59,7 +59,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -67,7 +67,7 @@ orb_trds = []
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb_trds.each { |t| t[:orb].shutdown() }
+  orb_trds.each { |t| t[:orb].shutdown }
 end
 
 if Signal.list.has_key?('USR2')

data/test/Multi_Threading/Simple/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -77,16 +77,16 @@ begin
     clt_trds.each { |t| t.join }
   end
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
   assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
-  hello_obj._free_ref()
+  hello_obj._free_ref
 
   assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Multi_Threading/Simple/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Multi_Threading/Simple/server.rb

@@ -12,9 +12,9 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior'
 }
 
 ARGV.options do |opts|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -74,17 +74,17 @@ poa_man.activate
 
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')
@@ -108,7 +108,7 @@ else
   #       cooperative ORB event loop allowing multiple Ruby threads executing
   #       ORB#run to operate in parallel.
   orb_trds = (0..1).collect do
-    Thread.new() do
+    Thread.new do
       orb.run
     end
   end

data/test/Multi_Threading/Threads/client.rb

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -62,16 +62,16 @@ begin
 
   puts "Client - got #{hello_strings.length} strings."
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
   assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
-  hello_obj._free_ref()
+  hello_obj._free_ref
 
   assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/Multi_Threading/Threads/run_test.rb

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/Multi_Threading/Threads/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :watchdog_iorfile => 'file://watchdog.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior',
+  watchdog_iorfile: 'file://watchdog.ior'
 }
 
 ARGV.options do |opts|
@@ -74,9 +74,9 @@ class MyHello < POA::Test::Hello
   def shutdown()
     @stop = true
     @wdt.join
-    @watchdog.shutdown()
+    @watchdog.shutdown
     puts %Q{Server - pinged watchdog #{@count} times.}
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -96,17 +96,17 @@ watchdog_obj = Test::Watchdog._narrow(obj)
 
 hello_srv = MyHello.new(orb, watchdog_obj)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 hello_ior = orb.object_to_string(hello_obj)
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write hello_ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')