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

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

data/test/Timeout/server.ior

@@ -1 +1 @@
-IOR:010000001600000049444c3a53696d706c655f5365727665723a312e3000000001000000000000006c000000010102650d0000003137322e31362e372e323438002014061b00000014010f00525354b2fe045295ba0a000000000001000000010000005202000000000000000800000001032300004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001600000049444c3a53696d706c655f5365727665723a312e3000000001000000000000006c000000010102000d0000003137322e31362e362e313738000064dd1b00000014010f0052535486b2d35448140300000000000100000001000000000200000000000000080000000126b101004f415401000000180000000126b1010100010001000000010001050901010000000000

data/test/Timeout/server.rb

@@ -1,109 +1,109 @@
-#--------------------------------------------------------------------
-#
-# 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',
-  :iter_num => 10
-}
-
-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.on("--i ITERATIONS",
-            "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
-
-    opts.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba/poa.rb'
-  CORBA.implement('test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'testS.rb'
-end
-
-class Simple_Server_i < POA::Simple_Server
-  def initialize(orb)
-    @orb = orb
-  end
-
-  def echo(x, msecs)
-    sleep_time = msecs / 1000.0
-
-    puts "server (#{Process.pid}) will request sleep for #{sleep_time.to_s} sec"
-
-    t = Time.now
-    sleep(sleep_time)
-
-    puts "server (#{Process.pid}) actually slept for #{(Time.now - t).to_s} sec"
-
-    return x
-  end
-
-  def shutdown()
-    puts "server (#{Process.pid}) received shutdown request from client"
-    @orb.shutdown()
-  end
-end #of servant Simple_Server_i
-
-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
-
-simple_srv = Simple_Server_i.new(orb)
-
-simple_ref = simple_srv._this()
-
-ior = orb.object_to_string(simple_ref)
-
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write 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',
+  :iter_num => 10
+}
+
+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.on("--i ITERATIONS",
+            "Set number of iterations.",
+            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
+
+    opts.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba/poa.rb'
+  CORBA.implement('test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'testS.rb'
+end
+
+class Simple_Server_i < POA::Simple_Server
+  def initialize(orb)
+    @orb = orb
+  end
+
+  def echo(x, msecs)
+    sleep_time = msecs / 1000.0
+
+    puts "server (#{Process.pid}) will request sleep for #{sleep_time.to_s} sec"
+
+    t = Time.now
+    sleep(sleep_time)
+
+    puts "server (#{Process.pid}) actually slept for #{(Time.now - t).to_s} sec"
+
+    return x
+  end
+
+  def shutdown()
+    puts "server (#{Process.pid}) received shutdown request from client"
+    @orb.shutdown()
+  end
+end #of servant Simple_Server_i
+
+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
+
+simple_srv = Simple_Server_i.new(orb)
+
+simple_ref = simple_srv._this()
+
+ior = orb.object_to_string(simple_ref)
+
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write 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/Timeout/test.idl

@@ -1,19 +1,19 @@
-/*--------------------------------------------------------------------
- * 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
- *--------------------------------------------------------------------*/
-
-interface Simple_Server {
-
-  /// Returns <x>, but sleep for <msecs> milliseconds before returning
-  long echo (in long x, in long msecs);
-
-  /// Shutdown the ORB
-  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
+ *--------------------------------------------------------------------*/
+
+interface Simple_Server {
+
+  /// Returns <x>, but sleep for <msecs> milliseconds before returning
+  long echo (in long x, in long msecs);
+
+  /// Shutdown the ORB
+  oneway void shutdown ();
+};

data/test/lib/assert.rb

@@ -1,43 +1,43 @@
-#--------------------------------------------------------------------
-# assert.rb - simple assertion testers
-#
-# 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
-#--------------------------------------------------------------------
-
-module TestUtil
-
-  module Assertions
-    def assert(message = 'Assertion failed', boolean = nil, &block)
-      raise ArgumentError, '#assert requires a boolean or a block' unless !boolean.nil? or block_given?
-      boolean = yield if boolean.nil?
-      raise message unless boolean
-    end
-
-    def assert_not(message = 'Assertion failed', boolean = nil, &block)
-      raise ArgumentError, '#assert_not requires a boolean or a block' unless !boolean.nil? or block_given?
-      boolean = yield if boolean.nil?
-      raise message unless !boolean
-    end
-
-    def assert_except(message = 'Assertion failed', exception = Exception, &block)
-      raise ArgumentError, '#assert_except requires a block' unless block_given?
-      begin
-        yield
-      rescue exception => ex_
-        return # this should happen
-      rescue
-        raise "caught #{$!}\n#{message}"
-      end
-      raise message
-    end
-  end
-
-end
-
+#--------------------------------------------------------------------
+# assert.rb - simple assertion testers
+#
+# 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
+#--------------------------------------------------------------------
+
+module TestUtil
+
+  module Assertions
+    def assert(message = 'Assertion failed', boolean = nil, &block)
+      raise ArgumentError, '#assert requires a boolean or a block' unless !boolean.nil? or block_given?
+      boolean = yield if boolean.nil?
+      raise message unless boolean
+    end
+
+    def assert_not(message = 'Assertion failed', boolean = nil, &block)
+      raise ArgumentError, '#assert_not requires a boolean or a block' unless !boolean.nil? or block_given?
+      boolean = yield if boolean.nil?
+      raise message unless !boolean
+    end
+
+    def assert_except(message = 'Assertion failed', exception = Exception, &block)
+      raise ArgumentError, '#assert_except requires a block' unless block_given?
+      begin
+        yield
+      rescue exception => ex_
+        return # this should happen
+      rescue
+        raise "caught #{$!}\n#{message}"
+      end
+      raise message
+    end
+  end
+
+end
+