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

data/test/OBV/Supports/supports.idl

@@ -1,33 +1,33 @@
-/*--------------------------------------------------------------------
- * 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
- *--------------------------------------------------------------------*/
-
-valuetype Balance
-{
-    public double amount;
-    public double total_deposited;
-    public double total_withdrawn;
-};
-
-interface Account
-{
-    void deposit (in double amount);
-    void withdraw (in double amount);
-
-    Balance get_balance();
-
-    oneway void shutdown();
-
-    void print_it();
-};
-
-valuetype BalancedAccount : Balance supports Account
-{
-};
+/*--------------------------------------------------------------------
+ * 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
+ *--------------------------------------------------------------------*/
+
+valuetype Balance
+{
+    public double amount;
+    public double total_deposited;
+    public double total_withdrawn;
+};
+
+interface Account
+{
+    void deposit (in double amount);
+    void withdraw (in double amount);
+
+    Balance get_balance();
+
+    oneway void shutdown();
+
+    void print_it();
+};
+
+valuetype BalancedAccount : Balance supports Account
+{
+};

data/test/OBV/Supports/supports_impl.rb

@@ -1,57 +1,57 @@
-#--------------------------------------------------------------------
-#
-# 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 'corba'
-CORBA.implement('supports.idl')
-
-module BalancedAccount_support
-  def initialize(start_balance = 0.0)
-    self.amount = start_balance
-    self.total_deposited = 0.0
-    self.total_withdrawn = 0.0
-    super()
-  end
-  def deposit(amount)
-    self.amount += amount
-    self.total_deposited += amount
-  end
-  def withdraw(amount)
-    self.amount -= amount
-    self.total_withdrawn += amount
-  end
-  def get_balance
-    self
-  end
-
-  def print_it()
-    print_balance('client')
-  end
-
-  def print_balance(location)
-    STDERR.puts %Q{
-      Account balance @ #{location}
-      -----------------------------
-      Amount:      #{'%.2f' % self.amount}
-      Deposited:   #{'%.2f' % self.total_deposited}
-      Withdrawn:   #{'%.2f' % self.total_withdrawn}
-    }
-  end
-end
-
-class BalancedAccount_impl < BalancedAccount
-  include BalancedAccount_support
-end
-
-class BalancedAccount_factory < BalancedAccountFactory
-  def _create_default
-    BalancedAccount_impl.new
-  end
-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 'corba'
+CORBA.implement('supports.idl')
+
+module BalancedAccount_support
+  def initialize(start_balance = 0.0)
+    self.amount = start_balance
+    self.total_deposited = 0.0
+    self.total_withdrawn = 0.0
+    super()
+  end
+  def deposit(amount)
+    self.amount += amount
+    self.total_deposited += amount
+  end
+  def withdraw(amount)
+    self.amount -= amount
+    self.total_withdrawn += amount
+  end
+  def get_balance
+    self
+  end
+
+  def print_it()
+    print_balance('client')
+  end
+
+  def print_balance(location)
+    STDERR.puts %Q{
+      Account balance @ #{location}
+      -----------------------------
+      Amount:      #{'%.2f' % self.amount}
+      Deposited:   #{'%.2f' % self.total_deposited}
+      Withdrawn:   #{'%.2f' % self.total_withdrawn}
+    }
+  end
+end
+
+class BalancedAccount_impl < BalancedAccount
+  include BalancedAccount_support
+end
+
+class BalancedAccount_factory < BalancedAccountFactory
+  def _create_default
+    BalancedAccount_impl.new
+  end
+end

data/test/OBV/Tree/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('test.idl', OPTIONS)
-else
-  require 'testC'
-end
-
-def dump_node(node, indent)
-  return if node.nil?
-
-  if $VERBOSE
-    STDERR.print ' ' * indent
-
-    if node.is_a?(StringNode)
-      STDERR.puts("#{node} <StringNode> #{node.name}")
-    else
-      STDERR.puts("#{node} <BaseNode> #{node.name}")
-    end
-  end
-
-  dump_node(node.left, indent + 1)
-  dump_node(node.right, indent + 1)
-end
-
-def dump_tree(tc)
-  if $VERBOSE
-    STDERR.puts "start tree dump #{tc}"
-  end
-
-  dump_node(tc.root, 1)
-
-  if $VERBOSE
-    STDERR.puts "end tree dump #{tc}"
-  end
-end
-
-def test_state(abs)
-  raise CORBA::BAD_PARAM.new unless abs.is_a?(TreeController)
-  dump_tree(abs)
-end
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
-
-  passer = Passer._narrow(obj)
-
-  # make sure valuetype factories are registered
-  BaseNodeFactory.get_factory(orb)
-  StringNodeFactory.get_factory(orb)
-  TreeControllerFactory.get_factory(orb)
-
-  package = passer.pass_tree()
-  if CORBA::is_nil(package)
-    STDERR.puts "ERROR: passer.pass_state returned nil 'out' arg (#{package})"
-  end
-
-  test_state(package)
-  # shutdown passer service
-
-  passer.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('test.idl', OPTIONS)
+else
+  require 'testC'
+end
+
+def dump_node(node, indent)
+  return if node.nil?
+
+  if $VERBOSE
+    STDERR.print ' ' * indent
+
+    if node.is_a?(StringNode)
+      STDERR.puts("#{node} <StringNode> #{node.name}")
+    else
+      STDERR.puts("#{node} <BaseNode> #{node.name}")
+    end
+  end
+
+  dump_node(node.left, indent + 1)
+  dump_node(node.right, indent + 1)
+end
+
+def dump_tree(tc)
+  if $VERBOSE
+    STDERR.puts "start tree dump #{tc}"
+  end
+
+  dump_node(tc.root, 1)
+
+  if $VERBOSE
+    STDERR.puts "end tree dump #{tc}"
+  end
+end
+
+def test_state(abs)
+  raise CORBA::BAD_PARAM.new unless abs.is_a?(TreeController)
+  dump_tree(abs)
+end
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
+
+  passer = Passer._narrow(obj)
+
+  # make sure valuetype factories are registered
+  BaseNodeFactory.get_factory(orb)
+  StringNodeFactory.get_factory(orb)
+  TreeControllerFactory.get_factory(orb)
+
+  package = passer.pass_tree()
+  if CORBA::is_nil(package)
+    STDERR.puts "ERROR: passer.pass_state returned nil 'out' arg (#{package})"
+  end
+
+  test_state(package)
+  # shutdown passer service
+
+  passer.shutdown()
+
+ensure
+
+  orb.destroy()
+
+end

data/test/OBV/Tree/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)