r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

data/test/OBV/Supports/client.rb

@@ -1,116 +1,116 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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'
-require 'lib/assert.rb'
-include TestUtil::Assertions
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba'
-  CORBA.implement('supports.idl', OPTIONS)
-else
-  require 'supportsC'
-end
-
-require 'supports_impl'
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-  # make sure valuetype factory is registered
-  BalancedAccount_factory.get_factory(orb)
-
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
-
-  account = Account._narrow(obj)
-
-  STDERR.puts "* get start balance"
-
-  balance = account.get_balance();
-
-  balance.print_it()
-
-  account.print_it()
-
-  STDERR.puts "* local deposit"
-
-  balance.deposit(10.5)
-
-  balance.print_it()
-
-  account.print_it()
-
-  STDERR.puts "* remote deposit"
-
-  account.deposit(10.77)
-
-  balance.print_it()
-
-  account.print_it()
-
-  STDERR.puts "* remote withdrawal"
-
-  account.withdraw(3.33)
-
-  balance.print_it()
-
-  account.print_it()
-
-  STDERR.puts "* update balance"
-
-  balance = account.get_balance();
-
-  balance.print_it()
-
-  account.print_it()
-
-  # shutdown Account service
-
-  account.shutdown()
-
-ensure
-
-  orb.destroy()
-
-end
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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'
+require 'lib/assert.rb'
+include TestUtil::Assertions
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'file://server.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba'
+  CORBA.implement('supports.idl', OPTIONS)
+else
+  require 'supportsC'
+end
+
+require 'supports_impl'
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+  # make sure valuetype factory is registered
+  BalancedAccount_factory.get_factory(orb)
+
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
+
+  account = Account._narrow(obj)
+
+  STDERR.puts "* get start balance"
+
+  balance = account.get_balance();
+
+  balance.print_it()
+
+  account.print_it()
+
+  STDERR.puts "* local deposit"
+
+  balance.deposit(10.5)
+
+  balance.print_it()
+
+  account.print_it()
+
+  STDERR.puts "* remote deposit"
+
+  account.deposit(10.77)
+
+  balance.print_it()
+
+  account.print_it()
+
+  STDERR.puts "* remote withdrawal"
+
+  account.withdraw(3.33)
+
+  balance.print_it()
+
+  account.print_it()
+
+  STDERR.puts "* update balance"
+
+  balance = account.get_balance();
+
+  balance.print_it()
+
+  account.print_it()
+
+  # shutdown Account service
+
+  account.shutdown()
+
+ensure
+
+  orb.destroy()
+
+end

data/test/OBV/Supports/run_test.rb

@@ -1,69 +1,69 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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
-#--------------------------------------------------------------------
-
-OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
-}
-
-require 'optparse'
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-require 'lib/test.rb'
-include TestUtil
-
-ior_file = 'server.ior'
-
-TestUtil.remove_file(ior_file)
-
-srv = Test.new
-
-exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-
-TestUtil.wait_for_file(ior_file, 400)
-
-clt = Test.new
-
-if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-  srv.kill(100)
-  exit(255)
-end
-
-exrc = clt.wait(400)
-
-if exrc ==0
-  srv.wait(400)
-else
-  srv.wait_term(400)
-end
-
-exit(exrc)
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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
+#--------------------------------------------------------------------
+
+OPTIONS = {
+  :debug_opt => '',
+  :use_implement => '--use-implement'
+}
+
+require 'optparse'
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+require 'lib/test.rb'
+include TestUtil
+
+ior_file = 'server.ior'
+
+TestUtil.remove_file(ior_file)
+
+srv = Test.new
+
+exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+
+TestUtil.wait_for_file(ior_file, 400)
+
+clt = Test.new
+
+if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  srv.kill(100)
+  exit(255)
+end
+
+exrc = clt.wait(400)
+
+if exrc ==0
+  srv.wait(400)
+else
+  srv.wait_term(400)
+end
+
+exit(exrc)

data/test/OBV/Supports/server.ior

@@ -1 +1 @@
-IOR:010000001000000049444c3a4163636f756e743a312e300001000000000000006c000000010102000d0000003137322e31362e372e3234380000e4051b00000014010f0052535493fe045271c609000000000001000000010000000002000000000000000800000001032300004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001000000049444c3a4163636f756e743a312e300001000000000000006c000000010102000d0000003137322e31362e362e313738000034dd1b00000014010f005253547ab2d354608d0300000000000100000001000000000200000000000000080000000103af00004f415401000000180000000103af000100010001000000010001050901010000000000

data/test/OBV/Supports/server.rb

@@ -1,103 +1,103 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# 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'
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba/poa'
-  CORBA.implement('supports.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'supportsS'
-end
-
-require 'supports_impl'
-
-class BalancedAccount_i < POA::BalancedAccount
-  include BalancedAccount_support
-
-  def initialize(orb)
-    @orb = orb
-    super()
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-
-  def print_it()
-    print_balance('server')
-  end
-end
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-# make sure valuetype factory is registered
-BalancedAccount_factory.get_factory(orb)
-
-obj = orb.resolve_initial_references('RootPOA')
-
-root_poa = PortableServer::POA._narrow(obj)
-
-poa_man = root_poa.the_POAManager
-
-poa_man.activate
-
-account = BalancedAccount_i.new(orb)
-
-obj = account._this()
-
-ior = orb.object_to_string(obj)
-
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write ior
-}
-
-Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
-  orb.shutdown()
-end
-
-if Signal.list.has_key?('USR2')
-  Signal.trap('USR2', 'EXIT')
-end
-
-orb.run
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# 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'
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'server.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba/poa'
+  CORBA.implement('supports.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'supportsS'
+end
+
+require 'supports_impl'
+
+class BalancedAccount_i < POA::BalancedAccount
+  include BalancedAccount_support
+
+  def initialize(orb)
+    @orb = orb
+    super()
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+
+  def print_it()
+    print_balance('server')
+  end
+end
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+# make sure valuetype factory is registered
+BalancedAccount_factory.get_factory(orb)
+
+obj = orb.resolve_initial_references('RootPOA')
+
+root_poa = PortableServer::POA._narrow(obj)
+
+poa_man = root_poa.the_POAManager
+
+poa_man.activate
+
+account = BalancedAccount_i.new(orb)
+
+obj = account._this()
+
+ior = orb.object_to_string(obj)
+
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write ior
+}
+
+Signal.trap('INT') do
+  puts "SIGINT - shutting down ORB..."
+  orb.shutdown()
+end
+
+if Signal.list.has_key?('USR2')
+  Signal.trap('USR2', 'EXIT')
+end
+
+orb.run