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

data/test/IORMap/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', "#{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', "#{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/IORMap/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f0052535464fe045229de07000100000001000000020000000002000000000000000800000001000000004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f0052535466b2d3540872030001000000010000000200000000020000000000000008000000011ce201004f41540100000018000000011ce2010100010001000000010001050901010000000000

data/test/IORMap/server.rb

@@ -1,114 +1,114 @@
-#--------------------------------------------------------------------
-#
-# 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,
-  :listenport => 9999,
-  :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("--p PORT",
-            "Set endpoint port.",
-            "Default: 9999") { |v| OPTIONS[:listenport]=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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-
-class MyHello < POA::Test::Hello
-  def initialize(orb, id)
-    @orb = orb
-    @id = id
-  end
-
-  def get_string()
-    "#{@id}: Hello there!"
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-end #of servant MyHello
-
-orb = if defined?(JRUBY_VERSION)
-    CORBA.ORB_init('myORB', {'OAAddress' => "iiop://localhost:#{OPTIONS[:listenport]}"})
-  else
-    CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel], "-ORBListenEndpoints", "iiop://localhost:#{OPTIONS[:listenport]}"], 'myORB')
-  end
-
-obj = orb.resolve_initial_references('RootPOA')
-
-root_poa = PortableServer::POA._narrow(obj)
-
-poa_man = root_poa.the_POAManager
-
-poa_man.activate
-
-hello_srv = MyHello.new(orb, "Hello")
-
-hello_obj = hello_srv._this()
-
-hello_ior = orb.object_to_string(hello_obj)
-
-orb.ior_map.map_ior("Hello", hello_ior)
-
-hello_srv = MyHello.new(orb, "Hello2")
-
-hello_obj = hello_srv._this()
-
-hello_ior = orb.object_to_string(hello_obj)
-
-orb.ior_map.map_ior("Hello2", hello_ior)
-
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write hello_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,
+  :listenport => 9999,
+  :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("--p PORT",
+            "Set endpoint port.",
+            "Default: 9999") { |v| OPTIONS[:listenport]=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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+
+class MyHello < POA::Test::Hello
+  def initialize(orb, id)
+    @orb = orb
+    @id = id
+  end
+
+  def get_string()
+    "#{@id}: Hello there!"
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+end #of servant MyHello
+
+orb = if defined?(JRUBY_VERSION)
+    CORBA.ORB_init('myORB', {'OAAddress' => "iiop://localhost:#{OPTIONS[:listenport]}"})
+  else
+    CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel], "-ORBListenEndpoints", "iiop://localhost:#{OPTIONS[:listenport]}"], 'myORB')
+  end
+
+obj = orb.resolve_initial_references('RootPOA')
+
+root_poa = PortableServer::POA._narrow(obj)
+
+poa_man = root_poa.the_POAManager
+
+poa_man.activate
+
+hello_srv = MyHello.new(orb, "Hello")
+
+hello_obj = hello_srv._this()
+
+hello_ior = orb.object_to_string(hello_obj)
+
+orb.ior_map.map_ior("Hello", hello_ior)
+
+hello_srv = MyHello.new(orb, "Hello2")
+
+hello_obj = hello_srv._this()
+
+hello_ior = orb.object_to_string(hello_obj)
+
+orb.ior_map.map_ior("Hello2", hello_ior)
+
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write hello_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

data/test/IORTable/Test.idl

@@ -1,27 +1,27 @@
-/*--------------------------------------------------------------------
- * 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
- *--------------------------------------------------------------------*/
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ();
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-};
+/*--------------------------------------------------------------------
+ * 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
+ *--------------------------------------------------------------------*/
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+    /// Return a simple string
+    string get_string ();
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};

data/test/IORTable/client.rb

@@ -1,75 +1,75 @@
-#--------------------------------------------------------------------
-#
-# 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,
-  :serverport => 9999
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    opts.on("--p PORT",
-            "Set server endpoint port.",
-            "Default: 3456") { |v| OPTIONS[:serverport]=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'
-  require 'corba/poa' # to be able to test for IORTable
-  CORBA.implement('Test.idl', OPTIONS)
-else
-  require 'TestC.rb'
-end
-
-begin STDERR.puts 'Not supported on this platform'; exit(0); end unless defined?(IORTable)
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello")
-
-hello_obj = Test::Hello._narrow(obj)
-
-the_string = hello_obj.get_string()
-
-puts "servant Hello returned <#{the_string}>"
-
-obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello2")
-
-hello_obj = Test::Hello._narrow(obj)
-
-the_string = hello_obj.get_string()
-
-puts "servant Hello2 returned <#{the_string}>"
-
-hello_obj.shutdown()
-
-orb.destroy()
+#--------------------------------------------------------------------
+#
+# 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,
+  :serverport => 9999
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    opts.on("--p PORT",
+            "Set server endpoint port.",
+            "Default: 3456") { |v| OPTIONS[:serverport]=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'
+  require 'corba/poa' # to be able to test for IORTable
+  CORBA.implement('Test.idl', OPTIONS)
+else
+  require 'TestC.rb'
+end
+
+begin STDERR.puts 'Not supported on this platform'; exit(0); end unless defined?(IORTable)
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello")
+
+hello_obj = Test::Hello._narrow(obj)
+
+the_string = hello_obj.get_string()
+
+puts "servant Hello returned <#{the_string}>"
+
+obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello2")
+
+hello_obj = Test::Hello._narrow(obj)
+
+the_string = hello_obj.get_string()
+
+puts "servant Hello2 returned <#{the_string}>"
+
+hello_obj.shutdown()
+
+orb.destroy()