r2corba 1.5.4 → 1.6.1

data/test/OBV/ValueBox/server.rb

@@ -22,22 +22,22 @@ 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.",
-            "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('--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.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
@@ -55,7 +55,7 @@ class Test_impl < POA::Test
   end
 
   def ros(s)
-    s.slice(s.size-1,1) << s.slice(0,s.size-1)
+    s.slice(s.size - 1, 1) << s.slice(0, s.size - 1)
   end
 
   def basic_op1(p1, p2)
@@ -94,25 +94,25 @@ class Test_impl < POA::Test
   end
 
   def seq_op1(p1, p2)
-    p3 = p2.collect {|e| e*5}
-    p2.collect! {|e| e*3}
+    p3 = p2.collect {|e| e * 5}
+    p2.collect! {|e| e * 3}
     retval = p1
     [retval, p2, p3]
   end
 
   def seq_op2(p1, p2)
-    p3 = p2.collect {|e| e*5}
-    p2.collect! {|e| e*3}
+    p3 = p2.collect {|e| e * 5}
+    p2.collect! {|e| e * 3}
     [p2, p3]
   end
 
   def struct_op1(p1, p2)
-    p3 = Fixed_Struct1.new(p2.l*5,
-                           Fixed_Struct1::Bstruct.new(p2.abstruct.s1*5,
-                                                      p2.abstruct.s2*5))
-    p2.l = p2.l*3
-    p2.abstruct.s1 = p2.abstruct.s1*3
-    p2.abstruct.s2 = p2.abstruct.s2*3
+    p3 = Fixed_Struct1.new(p2.l * 5,
+                           Fixed_Struct1::Bstruct.new(p2.abstruct.s1 * 5,
+                                                      p2.abstruct.s2 * 5))
+    p2.l = p2.l * 3
+    p2.abstruct.s1 = p2.abstruct.s1 * 3
+    p2.abstruct.s2 = p2.abstruct.s2 * 3
 
     retval = p1
     [retval, p2, p3]
@@ -121,9 +121,9 @@ class Test_impl < POA::Test
   def struct_op2(p1, p2)
     p3 = p1
 
-    p2.l = p2.l*3
-    p2.abstruct.s1 = p2.abstruct.s1*3
-    p2.abstruct.s2 = p2.abstruct.s2*3
+    p2.l = p2.l * 3
+    p2.abstruct.s1 = p2.abstruct.s1 * 3
+    p2.abstruct.s2 = p2.abstruct.s2 * 3
 
     [p2, p3]
   end
@@ -147,14 +147,14 @@ class Test_impl < POA::Test
   end
 
   def array_op1(p1, p2)
-    p2.collect! {|e| e*3}
+    p2.collect! {|e| e * 3}
     p3 = p2
     retval = p1
     [retval, p2, p3]
   end
 
   def array_op2(p1, p2)
-    p2.collect! {|e| e*3}
+    p2.collect! {|e| e * 3}
     p3 = p1
     [p2, p3]
   end
@@ -177,17 +177,17 @@ class Test_impl < POA::Test
     retval = VBfixed_union1.new(Fixed_Union1.new)
     case p1._disc
     when 1
-      p3.value.m1 = p1.m1*3
-      retval.value.m1 = p1.m1*3
+      p3.value.m1 = p1.m1 * 3
+      retval.value.m1 = p1.m1 * 3
     when 2
-      p3.value.m2 = p1.m2*3
-      retval.value.m2 = p1.m2*3
+      p3.value.m2 = p1.m2 * 3
+      retval.value.m2 = p1.m2 * 3
     end
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
-      p2.m2 = p2.m2*3
+      p2.m2 = p2.m2 * 3
     end
     [retval, p2, p3]
   end
@@ -196,9 +196,9 @@ class Test_impl < POA::Test
     p3 = p1
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
-      p2.m2 = p2.m2*3
+      p2.m2 = p2.m2 * 3
     end
     [p2, p3]
   end
@@ -216,7 +216,7 @@ class Test_impl < POA::Test
     end
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
       p2.m2 = ros(p2.m2)
     end
@@ -227,7 +227,7 @@ class Test_impl < POA::Test
     p3 = p1
     case p2._disc
     when 1
-      p2.m1 = p2.m1*3
+      p2.m1 = p2.m1 * 3
     when 2
       p2.m2 = ros(p2.m2)
     end
@@ -237,9 +237,9 @@ class Test_impl < POA::Test
   def shutdown()
     @orb.shutdown()
   end
-end #of servant Test_impl
+end # of servant Test_impl
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -260,7 +260,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/Object/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.",
-            "Default: 'file://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('--k IORFILE',
+            'Set IOR.',
+            "Default: 'file://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.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
@@ -50,14 +50,14 @@ else
   require 'TestC.rb'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
   obj = orb.string_to_object(OPTIONS[:iorfile])
 
   unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
-      ([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
+      ([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
     ## JacORB 3.4 introduced an optimization which *requires* use of the Java endorsed dirs
     ## mechanism to replace standard JDK CORBA stubs with the JacORB version in order to
     ## have JacORB process these base methods correctly with DSI servants

data/test/Object/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
@@ -59,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Object/server.rb

@@ -21,22 +21,22 @@ 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.",
-            "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('--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.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
@@ -54,7 +54,7 @@ class MyHello < POA::Test::Hello
   end
 
   def get_string()
-    "Hello there!"
+    'Hello there!'
   end
 
   def shutdown()
@@ -69,7 +69,7 @@ class MyHello < POA::Test::Hello
     # activate and return object ref
     hello_srv._this()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 class MyHello2 < POA::Test::Hello
   def initialize(orb)
@@ -77,7 +77,7 @@ class MyHello2 < POA::Test::Hello
   end
 
   def get_string()
-    "Hello2 there!"
+    'Hello2 there!'
   end
 
   def shutdown()
@@ -92,8 +92,8 @@ class MyHello2 < POA::Test::Hello
   def _is_a?(id)
     Intf::Ids.include?(id) or id == 'IDL:org.omg/custom.Test/Hello:1.0'
   end
-end #of servant MyHello
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+end # of servant MyHello
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -114,7 +114,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/POA/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

data/test/POA/test.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("--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('--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.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
@@ -56,15 +56,15 @@ 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
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
   obj = orb.resolve_initial_references('RootPOA')