r2corba 1.5.1-universal-java → 1.6.1-universal-java

data/test/Multi_Threading/Multiple_ORB/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -22,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 base filename.",
-            "Default: 'server'") { |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 base filename.',
+            "Default: 'server'") { |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
@@ -62,12 +61,12 @@ class MyHello < POA::Test::Hello
   def shutdown()
     @orb.shutdown()
   end
-end #of servant MyHello
+end # of servant MyHello
 
 orb_trds = []
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb_trds.each { |t| t[:orb].shutdown() }
 end
 
@@ -77,7 +76,7 @@ end
 
 orb_trds.concat((0..1).collect do |i|
   Thread.new(i) do |sid|
-    orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], "myORB#{sid}")
+    orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], "myORB#{sid}")
 
     Thread.current[:orb] = orb # TSS
 
@@ -97,7 +96,7 @@ orb_trds.concat((0..1).collect do |i|
 
     hello_ior = orb.object_to_string(hello_obj)
 
-    open("#{OPTIONS[:iorfile]}#{sid}.ior" , 'w') { |io|
+    open("#{OPTIONS[:iorfile]}#{sid}.ior", 'w') { |io|
       io.write hello_ior
     }
 

data/test/Multi_Threading/Simple/Test.idl

@@ -6,7 +6,6 @@
  * included with this program.
  *
  * Copyright (c) Remedy IT Expertise BV
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
  *--------------------------------------------------------------------*/
 
 /// Put the interfaces in a module, to avoid global namespace pollution

data/test/Multi_Threading/Simple/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -24,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
@@ -51,7 +50,7 @@ else
   require 'TestC.rb'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 begin
 
@@ -60,7 +59,7 @@ begin
   hello_obj = Test::Hello._narrow(obj)
 
   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 a bug which prevents this test from succeeding
     ## JacORB 3.6 will be released with a fix for this
     clt_trds = (0..1).collect do |i|
@@ -80,11 +79,11 @@ begin
 
   hello_obj.shutdown()
 
-  assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
+  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
 
   hello_obj._free_ref()
 
-  assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
+  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
 

data/test/Multi_Threading/Simple/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -21,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
@@ -60,7 +59,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Multi_Threading/Simple/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -22,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
@@ -61,9 +60,9 @@ class MyHello < POA::Test::Hello
   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')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -84,7 +83,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
 }
 
 Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
+  puts 'SIGINT - shutting down ORB...'
   orb.shutdown()
 end
 
@@ -115,4 +114,4 @@ else
   end
 
   orb_trds.each {|t| t.join }
-end
+end

data/test/Multi_Threading/Threads/Test.idl

@@ -1,7 +1,3 @@
-//
-// $Id: Test.idl 199 2011-01-14 16:53:02Z martin $
-//
-
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
 {

data/test/Multi_Threading/Threads/client.rb

@@ -2,14 +2,11 @@
 #
 # Author: Martin Corino
 #
-# $Id: client.rb 279 2011-02-08 09:53:28Z martin $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -26,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
@@ -53,28 +50,28 @@ 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])
-  
+
   hello_obj = Test::Hello._narrow(obj)
-  
+
   hello_strings = (1..10000).map {hello_obj.get_string}
 
   puts "Client - got #{hello_strings.length} strings."
 
   hello_obj.shutdown()
-  
-  assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
-  
+
+  assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
+
   hello_obj._free_ref()
-  
-  assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
+
+  assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
 
 ensure
-    
+
   orb.destroy()
 
 end

data/test/Multi_Threading/Threads/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -21,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
@@ -67,7 +66,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/Multi_Threading/Threads/server.rb

@@ -2,14 +2,11 @@
 #
 # Author: Martin Corino
 #
-# $Id: server.rb 279 2011-02-08 09:53:28Z martin $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -25,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.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--w IORFILE",
-            "Set Watchdog IOR filename.",
-            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_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('--w IORFILE',
+            'Set Watchdog IOR filename.',
+            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_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
@@ -81,9 +78,9 @@ class MyHello < POA::Test::Hello
     puts %Q{Server - pinged watchdog #{@count} times.}
     @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')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -108,7 +105,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/Multi_Threading/Threads/watchdog.rb

@@ -12,22 +12,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: 'watchdog.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: 'watchdog.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
@@ -53,9 +53,9 @@ class MyWatchdog < POA::Test::Watchdog
     puts %Q{Watchdog - received #{@count} pings}
     @orb.shutdown()
   end
-end #of servant MyWatchdog
+end # of servant MyWatchdog
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.resolve_initial_references('RootPOA')
 
@@ -76,7 +76,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/Multiple_Servant_Interfaces/Test.idl

@@ -6,7 +6,6 @@
  * included with this program.
  *
  * Copyright (c) Remedy IT Expertise BV
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
  *--------------------------------------------------------------------*/
 
 /// Put the interfaces in a module, to avoid global namespace pollution

data/test/Multiple_Servant_Interfaces/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -22,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("--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
@@ -49,7 +48,7 @@ else
   require 'TestC.rb'
 end
 
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
 
 obj = orb.string_to_object(OPTIONS[:iorfile])