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

data/rakelib/package.rake

@@ -1,26 +1,26 @@
-#--------------------------------------------------------------------
-# package.rake - build file
-#
-# 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 'rake/packagetask'
-
-require File.join(File.dirname(__FILE__), 'config.rb')
-
-Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
-  p.need_tar_gz = true
-  p.need_zip = true
-  p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})
-  p.package_files.include(%w{example/**/* lib/**/*[^C].* test/**/* rpmbuild/**/* rakelib/**/*})
-  p.package_files.exclude(/GNUmakefile/)
-  p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README* THANKS mkrf_conf*.rb})
-  p.package_files.include(%w{ridl/lib/**/*}) if ENV['R2CORBA_PKG_RIDL']
-end
+#--------------------------------------------------------------------
+# package.rake - build file
+#
+# 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 'rake/packagetask'
+
+require File.join(File.dirname(__FILE__), 'config.rb')
+
+Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
+  p.need_tar_gz = true
+  p.need_zip = true
+  p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})
+  p.package_files.include(%w{example/**/* lib/**/*[^C].* test/**/* rpmbuild/**/* rakelib/**/*})
+  p.package_files.exclude(/GNUmakefile/)
+  p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README* THANKS mkrf_conf*.rb})
+  p.package_files.include(%w{ridl/lib/**/*}) if ENV['R2CORBA_PKG_RIDL']
+end

data/rakelib/test.rake

@@ -1,23 +1,23 @@
-#--------------------------------------------------------------------
-# test.rake - build file
-#
-# 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 File.join(File.dirname(__FILE__), 'config.rb')
-
-namespace :r2corba do
-  task :test => [R2CORBA::BUILD_CFG, 'r2corba:build'] do
-    ruby(File.join('test', 'test_runner.rb'))
-  end
-end
-
-desc 'Run R2CORBA tests'
-task :test => 'r2corba:test'
+#--------------------------------------------------------------------
+# test.rake - build file
+#
+# 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 File.join(File.dirname(__FILE__), 'config.rb')
+
+namespace :r2corba do
+  task :test => [R2CORBA::BUILD_CFG, 'r2corba:build'] do
+    ruby(File.join('test', 'test_runner.rb'))
+  end
+end
+
+desc 'Run R2CORBA tests'
+task :test => 'r2corba:test'

data/test/BiDirectional/Test.idl

@@ -1,34 +1,34 @@
-/*--------------------------------------------------------------------
- * 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 Callback
-{
-  oneway void shutdown ();
-  // A safe way to shutdown the client, using either clean shutdowns
-  // or "catastrophic failures".
-
-  void callback_method ();
-  // A simple remote call
-
-};
-
-interface Simple_Server
-{
-  long test_method (in boolean do_callback);
-  // Just call a method on the server,
-
-  void callback_object (in Callback cb);
-  // send the callback object to the server
-
-  oneway void shutdown ();
-  // A safe way to shutdown the server, it is a oneway function so we
-  // will never get a COMM_FAILURE error
-};
+/*--------------------------------------------------------------------
+ * 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 Callback
+{
+  oneway void shutdown ();
+  // A safe way to shutdown the client, using either clean shutdowns
+  // or "catastrophic failures".
+
+  void callback_method ();
+  // A simple remote call
+
+};
+
+interface Simple_Server
+{
+  long test_method (in boolean do_callback);
+  // Just call a method on the server,
+
+  void callback_object (in Callback cb);
+  // send the callback object to the server
+
+  oneway void shutdown ();
+  // A safe way to shutdown the server, it is a oneway function so we
+  // will never get a COMM_FAILURE error
+};

data/test/BiDirectional/client.rb

@@ -1,132 +1,132 @@
-#--------------------------------------------------------------------
-# 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", Integer) { |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.rb'
-  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-require 'corba/policies.rb'
-
-class MyCallback < POA::Callback
-  def initialize(orb)
-    @orb = orb
-  end
-
-  def shutdown()    # oneway
-    @orb.shutdown(false)
-  end
-
-  def callback_method()
-    if OPTIONS[:orb_debuglevel] > 0
-      puts 'Callback method called.'
-    end
-  end
-
-end #of servant Callback
-
-if defined?(JRUBY_VERSION)
-  ## JacORB needs explicit activation of this option
-  props = {
-    "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
-               "org.jacorb.orb.giop.BiDirConnectionInitializer"
-  }
-else
-  props = {}
-end
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
-
-begin
-
-  obj = orb.resolve_initial_references('RootPOA')
-
-  root_poa = PortableServer::POA._narrow(obj)
-
-  poa_man = root_poa.the_POAManager
-
-  policies = []
-  policies << orb.create_policy(BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                          CORBA::Any.to_any(BiDirPolicy::BOTH, BiDirPolicy::BidirectionalPolicyValue._tc))
-
-  puts 'policies created'
-
-  child_poa = root_poa.create_POA('childPOA', poa_man, policies)
-
-  puts 'child_poa created'
-
-  policies.each { |pol| pol.destroy() }
-
-  puts 'policies destroyed'
-
-  poa_man.activate
-
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-
-  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
-
-  simple_srv = Simple_Server._narrow(obj)
-
-  callback_i = MyCallback.new(orb)
-
-  callback_ref = callback_i._this()
-
-  # Send the calback object to the server
-  simple_srv.callback_object(callback_ref)
-
-  # A  method to kickstart callbacks from the server
-  r = simple_srv.test_method(true)
-
-  assert "unexpected result = #{r}", r == 0
-
-  orb.run()
-
-  root_poa.destroy(1, 1)
-
-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.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", Integer) { |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.rb'
+  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+require 'corba/policies.rb'
+
+class MyCallback < POA::Callback
+  def initialize(orb)
+    @orb = orb
+  end
+
+  def shutdown()    # oneway
+    @orb.shutdown(false)
+  end
+
+  def callback_method()
+    if OPTIONS[:orb_debuglevel] > 0
+      puts 'Callback method called.'
+    end
+  end
+
+end #of servant Callback
+
+if defined?(JRUBY_VERSION)
+  ## JacORB needs explicit activation of this option
+  props = {
+    "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
+               "org.jacorb.orb.giop.BiDirConnectionInitializer"
+  }
+else
+  props = {}
+end
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
+
+begin
+
+  obj = orb.resolve_initial_references('RootPOA')
+
+  root_poa = PortableServer::POA._narrow(obj)
+
+  poa_man = root_poa.the_POAManager
+
+  policies = []
+  policies << orb.create_policy(BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
+                          CORBA::Any.to_any(BiDirPolicy::BOTH, BiDirPolicy::BidirectionalPolicyValue._tc))
+
+  puts 'policies created'
+
+  child_poa = root_poa.create_POA('childPOA', poa_man, policies)
+
+  puts 'child_poa created'
+
+  policies.each { |pol| pol.destroy() }
+
+  puts 'policies destroyed'
+
+  poa_man.activate
+
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+
+  assert_not 'Object reference is nil.', CORBA::is_nil(obj)
+
+  simple_srv = Simple_Server._narrow(obj)
+
+  callback_i = MyCallback.new(orb)
+
+  callback_ref = callback_i._this()
+
+  # Send the calback object to the server
+  simple_srv.callback_object(callback_ref)
+
+  # A  method to kickstart callbacks from the server
+  r = simple_srv.test_method(true)
+
+  assert "unexpected result = #{r}", r == 0
+
+  orb.run()
+
+  root_poa.destroy(1, 1)
+
+ensure
+
+  orb.destroy()
+
 end

data/test/BiDirectional/run_test.rb

@@ -1,68 +1,68 @@
-#--------------------------------------------------------------------
-# 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)