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

data/test/Object/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102650d0000003137322e31362e372e3234380020fc051b00000014010f00525354a1fe04521bb700000000000001000000010000005202000000000000000800000001000000004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e31373800004cdd1b00000014010f005253547eb2d354f0c20b00000000000100000001000000000200000000000000080000000122b901004f415401000000180000000122b9010100010001000000010001050901010000000000

data/test/Object/server.rb

@@ -1,126 +1,126 @@
-#--------------------------------------------------------------------
-#
-# 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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-
-class MyHello < POA::Test::Hello
-  def initialize(orb)
-    @orb = orb
-  end
-
-  def get_string()
-    "Hello there!"
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-
-  ## overrides for standard CORBA::Object methods
-  def _get_component
-    # misuse this method to
-    # create second servant and
-    hello_srv = MyHello2.new(@orb)
-    # activate and return object ref
-    hello_srv._this()
-  end
-end #of servant MyHello
-
-class MyHello2 < POA::Test::Hello
-  def initialize(orb)
-    @orb = orb
-  end
-
-  def get_string()
-    "Hello2 there!"
-  end
-
-  def shutdown()
-    @orb.shutdown()
-  end
-
-  ## overrides for standard CORBA::Object methods
-  def _repository_id
-    'IDL:org.omg/custom.Test/Hello2:1.0'
-  end
-
-  def _is_a?(id)
-    Intf::Ids.include?(id) or id == 'IDL:org.omg/custom.Test/Hello:1.0'
-  end
-end #of servant MyHello
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-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_obj = hello_srv._this()
-
-hello_ior = orb.object_to_string(hello_obj)
-
-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,
+  :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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+
+class MyHello < POA::Test::Hello
+  def initialize(orb)
+    @orb = orb
+  end
+
+  def get_string()
+    "Hello there!"
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+
+  ## overrides for standard CORBA::Object methods
+  def _get_component
+    # misuse this method to
+    # create second servant and
+    hello_srv = MyHello2.new(@orb)
+    # activate and return object ref
+    hello_srv._this()
+  end
+end #of servant MyHello
+
+class MyHello2 < POA::Test::Hello
+  def initialize(orb)
+    @orb = orb
+  end
+
+  def get_string()
+    "Hello2 there!"
+  end
+
+  def shutdown()
+    @orb.shutdown()
+  end
+
+  ## overrides for standard CORBA::Object methods
+  def _repository_id
+    'IDL:org.omg/custom.Test/Hello2:1.0'
+  end
+
+  def _is_a?(id)
+    Intf::Ids.include?(id) or id == 'IDL:org.omg/custom.Test/Hello:1.0'
+  end
+end #of servant MyHello
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+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_obj = hello_srv._this()
+
+hello_ior = orb.object_to_string(hello_obj)
+
+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/POA/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/POA/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('test.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('test.rb', "#{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  exit(255)
+end
+
+exrc = clt.wait(400)
+
+exit(exrc)

data/test/POA/test.rb

@@ -1,112 +1,112 @@
-#--------------------------------------------------------------------
-#
-# 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'
-include TestUtil::Assertions
-
-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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-
-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
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-  obj = orb.resolve_initial_references('RootPOA')
-
-  rootpoa = PortableServer::POA._narrow(obj)
-
-  assert_not 'Failed to resolve RootPOA', CORBA.is_nil(rootpoa) || !rootpoa.is_a?(PortableServer::POA)
-
-  poaman = rootpoa.the_POAManager
-
-  assert_not 'Failed to resolve the_POAManager', CORBA.is_nil(poaman) || !poaman.is_a?(PortableServer::POAManager)
-
-  childpoa = rootpoa.create_POA('childPOA', poaman, [])
-
-  assert_not 'Failed to create child POA', CORBA.is_nil(childpoa) || !childpoa.is_a?(PortableServer::POA)
-
-  assert 'POAManager state should have been HOLDING', poaman.get_state == PortableServer::POAManager::HOLDING
-
-  poaman.activate
-
-  assert_except('No PortableServer::POA::AdapterNonExistent exception thrown on rootpoa.find_POA(\'non-existent-poa\')',
-                PortableServer::POA::AdapterNonExistent) { rootpoa.find_POA('non-existent-poa', true) }
-
-  childpoa = rootpoa.find_POA('childPOA', true)
-
-  hello_srv = MyHello.new(orb)
-
-  assert_except('childpoa.servant_to_id should have thrown ServantNotActive',
-                PortableServer::POA::ServantNotActive) { childpoa.servant_to_id(hello_srv) }
-
-  id = childpoa.activate_object(hello_srv)
-
-  assert 'object ids returned from #activate_object and #servant_to_id not equal', id == childpoa.servant_to_id(hello_srv)
-
-  poaman.deactivate(true, true)
-
-  assert 'POAManager state should have been INACTIVE', poaman.get_state == PortableServer::POAManager::INACTIVE
-
-  assert_except('poaman.activate should have thrown AdapterInactive',
-                PortableServer::POAManager::AdapterInactive) { poaman.activate }
-
-ensure
-  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'
+require 'lib/assert'
+include TestUtil::Assertions
+
+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('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+
+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
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+  obj = orb.resolve_initial_references('RootPOA')
+
+  rootpoa = PortableServer::POA._narrow(obj)
+
+  assert_not 'Failed to resolve RootPOA', CORBA.is_nil(rootpoa) || !rootpoa.is_a?(PortableServer::POA)
+
+  poaman = rootpoa.the_POAManager
+
+  assert_not 'Failed to resolve the_POAManager', CORBA.is_nil(poaman) || !poaman.is_a?(PortableServer::POAManager)
+
+  childpoa = rootpoa.create_POA('childPOA', poaman, [])
+
+  assert_not 'Failed to create child POA', CORBA.is_nil(childpoa) || !childpoa.is_a?(PortableServer::POA)
+
+  assert 'POAManager state should have been HOLDING', poaman.get_state == PortableServer::POAManager::HOLDING
+
+  poaman.activate
+
+  assert_except('No PortableServer::POA::AdapterNonExistent exception thrown on rootpoa.find_POA(\'non-existent-poa\')',
+                PortableServer::POA::AdapterNonExistent) { rootpoa.find_POA('non-existent-poa', true) }
+
+  childpoa = rootpoa.find_POA('childPOA', true)
+
+  hello_srv = MyHello.new(orb)
+
+  assert_except('childpoa.servant_to_id should have thrown ServantNotActive',
+                PortableServer::POA::ServantNotActive) { childpoa.servant_to_id(hello_srv) }
+
+  id = childpoa.activate_object(hello_srv)
+
+  assert 'object ids returned from #activate_object and #servant_to_id not equal', id == childpoa.servant_to_id(hello_srv)
+
+  poaman.deactivate(true, true)
+
+  assert 'POAManager state should have been INACTIVE', poaman.get_state == PortableServer::POAManager::INACTIVE
+
+  assert_except('poaman.activate should have thrown AdapterInactive',
+                PortableServer::POAManager::AdapterInactive) { poaman.activate }
+
+ensure
+  orb.destroy
 end