r2corba 1.5.5-x64-mingw32 → 1.6.0-x64-mingw32

data/test/BiDirectional/run_test.rb

@@ -19,19 +19,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end

data/test/BiDirectional/server.rb

@@ -22,25 +22,25 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
+    opts.on('--o IORFILE',
+            'Set IOR filename.',
             "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
-    opts.on("--i ITERATIONS",
-            "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
+    opts.on('--i ITERATIONS',
+            'Set number of iterations.',
+            'Default: 10', Integer) { |v| OPTIONS[:iter_num] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -92,19 +92,19 @@ class Simple_Server_i < POA::Simple_Server
     return 0
   end
 
-end #of servant Simple_Server_i
+end # of servant Simple_Server_i
 
 if defined?(JRUBY_VERSION)
   ## JacORB needs explicit activation of this option
   props = {
-    "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
-               "org.jacorb.orb.giop.BiDirConnectionInitializer"
+    'org.omg.PortableInterceptor.ORBInitializerClass.bidir_init' =>
+               'org.jacorb.orb.giop.BiDirConnectionInitializer'
   }
 else
   props = {}
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB', props)
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -143,7 +143,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/CORBA_Services/Naming/BindingIterator/client.rb

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set IOR.",
+    opts.on('--k IORFILE',
+            'Set IOR.',
             "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -51,7 +51,7 @@ else
 end
 require 'corba/naming'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -60,7 +60,7 @@ begin
 
   nc = CosNaming::NamingContextExt._narrow(obj)
 
-  assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+  assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
   # list registered items in context
   binding_list, binding_iterator = nc.list(1)

data/test/CORBA_Services/Naming/BindingIterator/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -42,7 +42,7 @@ include TestUtil
 
 def do_exit(rc)
   ins_stop = Test.new
-  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- stop --no-daemon")
+  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
   ins_stop.wait(50)
   exit(rc)
 end
@@ -53,7 +53,7 @@ TestUtil.remove_file(ior_file)
 
 ins = Test.new
 
-exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- start")
+exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start')
 
 do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
 

data/test/CORBA_Services/Naming/BindingIterator/server.rb

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set INS IOR filename.",
+    opts.on('--k IORFILE',
+            'Set INS IOR filename.',
             "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -57,23 +57,23 @@ class MyHello < POA::Test::Hello
   end
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 # initialize ORB
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 # resolve NamingContext
 obj = orb.string_to_object(OPTIONS[:iorfile])
 
 nc = CosNaming::NamingContextExt._narrow(obj)
 
-assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
 # initialize POA
 obj = orb.resolve_initial_references('RootPOA')
@@ -96,7 +96,7 @@ end
 
 # initialize signal handling
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 

data/test/CORBA_Services/Naming/Corbaname/client.rb

@@ -23,22 +23,22 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--k IORFILE",
-            "Set IOR file.",
+    opts.on('--k IORFILE',
+            'Set IOR file.',
             "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -51,7 +51,7 @@ else
 end
 require 'corba/naming'
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -69,7 +69,7 @@ begin
   # narrow object ref and call
   hello_obj = Test::Hello._narrow(obj)
 
-  assert_not "ERROR: corbaname resolved to nil object!", CORBA::is_nil(hello_obj)
+  assert_not 'ERROR: corbaname resolved to nil object!', CORBA::is_nil(hello_obj)
 
   the_string = hello_obj.get_string()
 

data/test/CORBA_Services/Naming/Corbaname/run_test.rb

@@ -20,19 +20,19 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+    opts.on('-d',
+            'Run with debugging output.',
+            'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on('--use-stubs',
+            'Use stubs generated by RIDL.',
+            'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -42,7 +42,7 @@ include TestUtil
 
 def do_exit(rc)
   ins_stop = Test.new
-  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- stop --no-daemon")
+  ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
   ins_stop.wait(50)
   exit(rc)
 end
@@ -56,7 +56,7 @@ TestUtil.remove_file(corbaname_file)
 
 ins = Test.new
 
-exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", "-- start -l 2345")
+exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start -l 2345')
 
 do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
 

data/test/CORBA_Services/Naming/Corbaname/server.rb

@@ -24,25 +24,25 @@ ARGV.options do |opts|
     script_name = File.basename($0)
     opts.banner = "Usage: ruby #{script_name} [options]"
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("--o FILENAME",
-            "Set corbaname IOR filename.",
+    opts.on('--o FILENAME',
+            'Set corbaname IOR filename.',
             "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile] = v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
-    opts.on("--p PORT", Integer,
-            "INS port number.",
-            "Default: 2345") { |v| OPTIONS[:ins_port] = v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement] = v }
+    opts.on('--d LVL',
+            'Set ORBDebugLevel value.',
+            'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
+    opts.on('--p PORT', Integer,
+            'INS port number.',
+            'Default: 2345') { |v| OPTIONS[:ins_port] = v }
+    opts.on('--use-implement',
+            'Load IDL through CORBA.implement() instead of precompiled code.',
+            'Default: off') { |v| OPTIONS[:use_implement] = v }
 
-    opts.separator ""
+    opts.separator ''
 
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
+    opts.on('-h', '--help',
+            'Show this help message.') { puts opts; exit }
 
     opts.parse!
 end
@@ -61,16 +61,16 @@ class MyHello < POA::Test::Hello
   end
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 # initialize ORB
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 # create NameService corbaloc
 ins_url = "iiop:localhost:#{OPTIONS[:ins_port]}/NamingService"
@@ -90,7 +90,7 @@ full_name = [CosNaming::NameComponent.new('', 'root'),
 nc_new = nc.bind_new_context(full_name[0, 1])
 nc_new = nc_new.bind_new_context(full_name[1, 1])
 
-assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
+assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
 
 # initialize POA
 obj = orb.resolve_initial_references('RootPOA')
@@ -122,7 +122,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 
 # initialize signal handling
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end