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

data/test/CORBA_Services/Naming/Corbaname/ins.ior

@@ -1 +1 @@
-IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e323438000029091b00000014010f0052535446fe0452a24a04000000000001000000010000000002000000000000000800000001032300004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e313738000029091b00000014010f005253545ab2d354b0af0900000000000100000001000000000200000000000000080000000176b701004f415401000000180000000176b7010100010001000000010001050901010000000000

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

@@ -1,88 +1,88 @@
-#--------------------------------------------------------------------
-#
-# 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
-
-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.wait(50)
-  exit(rc)
-end
-
-ior_file = 'ins.ior'
-
-corbaname_file = 'corbaname.ior'
-
-TestUtil.remove_file(ior_file)
-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")
-
-do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
-
-srv = Test.new
-
-do_exit(255) if !srv.run('server.rb', "--o #{corbaname_file} --p 2345 #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-
-if !TestUtil.wait_for_file(corbaname_file, 400)
-  svr.kill(100)
-  do_exit(255)
-end
-
-clt = Test.new
-
-if !clt.run('client.rb', "--k #{corbaname_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-  srv.kill(100)
-  do_exit(255)
-end
-
-exrc = clt.wait(400)
-
-if exrc ==0
-  srv.wait(400)
-else
-  srv.wait_term(400)
-end
-
-do_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
+
+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.wait(50)
+  exit(rc)
+end
+
+ior_file = 'ins.ior'
+
+corbaname_file = 'corbaname.ior'
+
+TestUtil.remove_file(ior_file)
+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")
+
+do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
+
+srv = Test.new
+
+do_exit(255) if !srv.run('server.rb', "--o #{corbaname_file} --p 2345 #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+
+if !TestUtil.wait_for_file(corbaname_file, 400)
+  svr.kill(100)
+  do_exit(255)
+end
+
+clt = Test.new
+
+if !clt.run('client.rb', "--k #{corbaname_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  srv.kill(100)
+  do_exit(255)
+end
+
+exrc = clt.wait(400)
+
+if exrc ==0
+  srv.wait(400)
+else
+  srv.wait_term(400)
+end
+
+do_exit(exrc)

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

@@ -1,135 +1,135 @@
-#--------------------------------------------------------------------
-#
-# 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 = {
-  :iorfile => 'corbaname.ior',
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :ins_port => 2345
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    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.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba/poa'
-  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-require 'corba/naming'
-
-class MyHello < POA::Test::Hello
-  def initialize(orb)
-    @orb = orb
-  end
-
-  def get_string()
-    "Hello there!"
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-end #of servant MyHello
-
-# initialize ORB
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-# create NameService corbaloc
-ins_url = "iiop:localhost:#{OPTIONS[:ins_port]}/NamingService"
-
-puts "server: resolving [corbaloc:#{ins_url}]"
-
-# resolve NamingContext
-obj = orb.string_to_object('corbaloc:'+ins_url)
-
-nc = CosNaming::NamingContextExt._narrow(obj)
-
-# create context tree for registration
-full_name = [CosNaming::NameComponent.new('','root'),
-             CosNaming::NameComponent.new('base','dir'),
-             CosNaming::NameComponent.new('Hello','ior')]
-
-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)
-
-# initialize POA
-obj = orb.resolve_initial_references('RootPOA')
-
-root_poa = PortableServer::POA._narrow(obj)
-
-poa_man = root_poa.the_POAManager
-
-poa_man.activate
-
-# create and activate servant
-hello_srv = MyHello.new(orb)
-
-hello_obj = hello_srv._this()
-
-# register object reference with Naming service
-name = full_name
-
-nc.bind(name, hello_obj)
-
-# create corbaname url for registered object
-sn = nc.to_string(name)             # stringify name
-corbaname = nc.to_url(ins_url, sn)  # corbaname url
-
-# write corbaname to file
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write corbaname
-}
-
-# initialize signal handling
-Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
-  orb.shutdown()
-end
-
-if Signal.list.has_key?('USR2')
-  Signal.trap('USR2', 'EXIT')
-end
-
-# run ORB event loop
-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'
+require 'lib/assert.rb'
+include TestUtil::Assertions
+
+OPTIONS = {
+  :iorfile => 'corbaname.ior',
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :ins_port => 2345
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    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.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba/poa'
+  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+require 'corba/naming'
+
+class MyHello < POA::Test::Hello
+  def initialize(orb)
+    @orb = orb
+  end
+
+  def get_string()
+    "Hello there!"
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+end #of servant MyHello
+
+# initialize ORB
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+# create NameService corbaloc
+ins_url = "iiop:localhost:#{OPTIONS[:ins_port]}/NamingService"
+
+puts "server: resolving [corbaloc:#{ins_url}]"
+
+# resolve NamingContext
+obj = orb.string_to_object('corbaloc:'+ins_url)
+
+nc = CosNaming::NamingContextExt._narrow(obj)
+
+# create context tree for registration
+full_name = [CosNaming::NameComponent.new('','root'),
+             CosNaming::NameComponent.new('base','dir'),
+             CosNaming::NameComponent.new('Hello','ior')]
+
+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)
+
+# initialize POA
+obj = orb.resolve_initial_references('RootPOA')
+
+root_poa = PortableServer::POA._narrow(obj)
+
+poa_man = root_poa.the_POAManager
+
+poa_man.activate
+
+# create and activate servant
+hello_srv = MyHello.new(orb)
+
+hello_obj = hello_srv._this()
+
+# register object reference with Naming service
+name = full_name
+
+nc.bind(name, hello_obj)
+
+# create corbaname url for registered object
+sn = nc.to_string(name)             # stringify name
+corbaname = nc.to_url(ins_url, sn)  # corbaname url
+
+# write corbaname to file
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write corbaname
+}
+
+# initialize signal handling
+Signal.trap('INT') do
+  puts "SIGINT - shutting down ORB..."
+  orb.shutdown()
+end
+
+if Signal.list.has_key?('USR2')
+  Signal.trap('USR2', 'EXIT')
+end
+
+# run ORB event loop
+orb.run