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

data/test/Connect_Timeout/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/Connect_Timeout/client.rb

@@ -1,111 +1,111 @@
-#--------------------------------------------------------------------
-#
-# 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,
-  :ior => 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    opts.on("--k IOR",
-            "Set IOR.",
-            "Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior]=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('Test.idl', OPTIONS)
-else
-  require 'TestC.rb'
-end
-require 'corba/policies.rb'
-
-begin STDERR.puts 'Not supported on this platform'; exit(0); end unless defined?(TAO::CONNECTION_TIMEOUT_POLICY_TYPE)
-
-Timeout_period = 1000000
-
-def test_timeout(object)
-  # Start the timer
-  profile_timer = Time.now
-
-  begin
-    # First connection happens here..
-    hello = Test::Hello._narrow(object)
-
-    assert_not "Nil Test::Hello reference", CORBA::is_nil(hello)
-
-    the_string = hello.get_string()
-
-    puts "string returned <#{the_string}>"
-
-    hello.shutdown()
-  rescue CORBA::Exception
-    # Get the elampsed time
-    el = Time.now - profile_timer
-
-    # Give a 30% error margin for handling exceptions etc. It is a
-    # high margin, though!. But the timeout is too small and wider
-    # range would help.
-    # The elapsed time is in secs
-    assert "ERROR: Too long to timeout: #{el.to_s}", el <= 0.200
-
-    puts "Success, timeout: #{el.to_s}"
-  end
-end
-
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-  tmp = orb.string_to_object(OPTIONS[:ior])
-
-  object = orb.resolve_initial_references("PolicyCurrent")
-
-  policy_current = CORBA::PolicyCurrent::_narrow(object)
-
-  policy_list = []
-  policy_list << orb.create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-                        CORBA::Any.to_any(Timeout_period, TimeBase::TimeT._tc))
-
-  policy_current.set_policy_overrides(policy_list,
-                                        CORBA::ADD_OVERRIDE)
-
-  policy_list.each { |p| p.destroy() }
-
-  test_timeout(tmp)
-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,
+  :ior => 'corbaloc:iiop:192.3.47.5/10007/RandomObject'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    opts.on("--k IOR",
+            "Set IOR.",
+            "Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior]=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('Test.idl', OPTIONS)
+else
+  require 'TestC.rb'
+end
+require 'corba/policies.rb'
+
+begin STDERR.puts 'Not supported on this platform'; exit(0); end unless defined?(TAO::CONNECTION_TIMEOUT_POLICY_TYPE)
+
+Timeout_period = 1000000
+
+def test_timeout(object)
+  # Start the timer
+  profile_timer = Time.now
+
+  begin
+    # First connection happens here..
+    hello = Test::Hello._narrow(object)
+
+    assert_not "Nil Test::Hello reference", CORBA::is_nil(hello)
+
+    the_string = hello.get_string()
+
+    puts "string returned <#{the_string}>"
+
+    hello.shutdown()
+  rescue CORBA::Exception
+    # Get the elampsed time
+    el = Time.now - profile_timer
+
+    # Give a 30% error margin for handling exceptions etc. It is a
+    # high margin, though!. But the timeout is too small and wider
+    # range would help.
+    # The elapsed time is in secs
+    assert "ERROR: Too long to timeout: #{el.to_s}", el <= 0.200
+
+    puts "Success, timeout: #{el.to_s}"
+  end
+end
+
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+  tmp = orb.string_to_object(OPTIONS[:ior])
+
+  object = orb.resolve_initial_references("PolicyCurrent")
+
+  policy_current = CORBA::PolicyCurrent::_narrow(object)
+
+  policy_list = []
+  policy_list << orb.create_policy(TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
+                        CORBA::Any.to_any(Timeout_period, TimeBase::TimeT._tc))
+
+  policy_current.set_policy_overrides(policy_list,
+                                        CORBA::ADD_OVERRIDE)
+
+  policy_list.each { |p| p.destroy() }
+
+  test_timeout(tmp)
+ensure
+  orb.destroy()
+end
+

data/test/Connect_Timeout/run_test.rb

@@ -1,52 +1,52 @@
-#--------------------------------------------------------------------
-#
-# 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
-
-clt = Test.new
-
-if !clt.run('client.rb', "#{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-  exit(255)
-end
-
-exrc = clt.wait(400)
-
-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
+
+clt = Test.new
+
+if !clt.run('client.rb', "#{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  exit(255)
+end
+
+exrc = clt.wait(400)
+
+exit(exrc)

data/test/DII/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 echo (in string method, in string message);
-
-    /// 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 echo (in string method, in string message);
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};

data/test/DII/client.rb

@@ -1,115 +1,115 @@
-#--------------------------------------------------------------------
-#
-# 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
-
-require 'corba'
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  puts "***** Synchronous twoway DII"
-  req = obj._request("echo")
-  req.arguments = [
-    ['method', CORBA::ARG_IN, CORBA::_tc_string, "sync twoway"],
-    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
-  ]
-  req.set_return_type(CORBA::_tc_string)
-
-  the_string = req.invoke()
-
-  puts "string returned <#{the_string}>"
-  puts
-
-  puts "***** Deferred twoway DII (using get_response())"
-  req = obj._request("echo")
-  req.arguments = [
-    ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (1)"],
-    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
-  ]
-  req.set_return_type(CORBA::_tc_string)
-
-  req.send_deferred()
-  puts 'getting response...'
-  req.get_response()
-
-  puts "string returned <#{req.return_value}>"
-  puts
-
-  ### DOESN'T WORK WITH TAO <= 1.5.9 BECAUSE OF BUG IN TAO
-  if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
-    (TAO::MAJOR_VERSION == 1 &&
-        (TAO::MINOR_VERSION > 5 ||
-          (TAO::MINOR_VERSION == 5 && TAO::BETA_VERSION>9)))
-    puts "***** Deferred twoway DII (using poll_response())"
-    req = obj._request("echo")
-    req.arguments = [
-      ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (2)"],
-      ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
-    ]
-    req.set_return_type(CORBA::_tc_string)
-
-    req.send_deferred()
-    begin
-      puts 'sleeping...'
-      sleep(0.01)
-      puts 'polling for response...'
-    end while !req.poll_response()
-
-    puts "string returned <#{req.return_value}>"
-    puts
-  end
-
-  puts "***** Oneway shutdown"
-  req = obj._request("shutdown")
-  req.send_oneway()
-
-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
+
+require 'corba'
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  puts "***** Synchronous twoway DII"
+  req = obj._request("echo")
+  req.arguments = [
+    ['method', CORBA::ARG_IN, CORBA::_tc_string, "sync twoway"],
+    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+  ]
+  req.set_return_type(CORBA::_tc_string)
+
+  the_string = req.invoke()
+
+  puts "string returned <#{the_string}>"
+  puts
+
+  puts "***** Deferred twoway DII (using get_response())"
+  req = obj._request("echo")
+  req.arguments = [
+    ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (1)"],
+    ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+  ]
+  req.set_return_type(CORBA::_tc_string)
+
+  req.send_deferred()
+  puts 'getting response...'
+  req.get_response()
+
+  puts "string returned <#{req.return_value}>"
+  puts
+
+  ### DOESN'T WORK WITH TAO <= 1.5.9 BECAUSE OF BUG IN TAO
+  if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
+    (TAO::MAJOR_VERSION == 1 &&
+        (TAO::MINOR_VERSION > 5 ||
+          (TAO::MINOR_VERSION == 5 && TAO::BETA_VERSION>9)))
+    puts "***** Deferred twoway DII (using poll_response())"
+    req = obj._request("echo")
+    req.arguments = [
+      ['method', CORBA::ARG_IN, CORBA::_tc_string, "deferred twoway (2)"],
+      ['message', CORBA::ARG_IN, CORBA::_tc_string, "Hello world!"]
+    ]
+    req.set_return_type(CORBA::_tc_string)
+
+    req.send_deferred()
+    begin
+      puts 'sleeping...'
+      sleep(0.01)
+      puts 'polling for response...'
+    end while !req.poll_response()
+
+    puts "string returned <#{req.return_value}>"
+    puts
+  end
+
+  puts "***** Oneway shutdown"
+  req = obj._request("shutdown")
+  req.send_oneway()
+
+ensure
+
+  orb.destroy()
+
+end