r2corba 1.5.1-universal-java → 1.5.5-universal-java

data/rakelib/gem.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'rubygems'
@@ -66,7 +65,7 @@ module R2CORBA
         manifest.concat Dir['lib/ridlbe/**/*']
         manifest << 'lib/corba.rb'
         manifest.concat Dir['test/**/*']
-        manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_bingem.rb}
+        manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_bingem.rb}
         manifest << 'LICENSE.jacorb' if defined?(JRUBY_VERSION)
       elsif gemtype == :extbin
         unless defined?(JRUBY_VERSION)
@@ -80,7 +79,7 @@ module R2CORBA
         manifest.concat Dir['lib/ridlbe/**/*.[^p]*']
         manifest << 'lib/corba.rb'
         manifest.concat Dir['test/**/*']
-        manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_srcgem.rb}
+        manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_srcgem.rb}
       end
       unless gemtype == :extbin
         if defined?(JRUBY_VERSION)
@@ -93,9 +92,9 @@ module R2CORBA
     end
 
     def self.define_spec(name, version, gemtype = :src, &block)
-      name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
@@ -106,8 +105,8 @@ module R2CORBA
 
     def self.gem_name(name, version, gemtype = :src)
       name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
@@ -143,4 +142,4 @@ module R2CORBA
 
   end
 
-end
+end

data/rakelib/package.rake

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'rake/packagetask'
@@ -21,6 +20,6 @@ Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
   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{CHANGES INSTALL* LICENSE* Gemfile Rakefile README.rdoc THANKS mkrf_conf*.rb})
   p.package_files.include(%w{ridl/lib/**/*}) if ENV['R2CORBA_PKG_RIDL']
 end

data/rakelib/test.rake

@@ -8,7 +8,6 @@
 # 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')

data/test/BiDirectional/Test.idl

@@ -6,7 +6,6 @@
  * included with this program.
  *
  * Copyright (c) Remedy IT Expertise BV
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
  *--------------------------------------------------------------------*/
 
 interface Callback

data/test/BiDirectional/client.rb

@@ -6,7 +6,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'optparse'
 require 'lib/assert.rb'
@@ -26,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -129,4 +128,4 @@ ensure
 
   orb.destroy()
 
-end
+end

data/test/BiDirectional/run_test.rb

@@ -6,7 +6,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -59,7 +58,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/BiDirectional/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -27,16 +26,16 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
     opts.on("--i ITERATIONS",
             "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
+            "Default: 10", Integer) { |v| OPTIONS[:iter_num] = v }
 
     opts.separator ""
 
@@ -166,4 +165,3 @@ end
 puts 'event loop finished'
 
 root_poa.destroy(true, true)
-

data/test/CORBA_Services/Naming/BindingIterator/Test.idl

@@ -6,7 +6,6 @@
  * 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

data/test/CORBA_Services/Naming/BindingIterator/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -66,7 +65,7 @@ begin
   # list registered items in context
   binding_list, binding_iterator = nc.list(1)
 
-  assert 'ERROR: INS list() does not function', (!CORBA::is_nil(binding_iterator) && binding_list.size==1) &&
+  assert 'ERROR: INS list() does not function', (!CORBA::is_nil(binding_iterator) && binding_list.size == 1) &&
                                                 binding_list.first.binding_type == CosNaming::Nobject
 
   n = binding_list.first.binding_name.first
@@ -84,7 +83,7 @@ begin
   has_list, binding_list = binding_iterator.next_n(3)
 
   assert 'ERROR: INS BindingIterator#next_n() does not function',
-         (has_list && binding_list.size==3) &&
+         (has_list && binding_list.size == 3) &&
          binding_list.first.binding_type == CosNaming::Nobject &&
          binding_list.last.binding_type == CosNaming::Nobject
 

data/test/CORBA_Services/Naming/BindingIterator/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -73,7 +72,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/CORBA_Services/Naming/BindingIterator/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set INS IOR filename.",
-            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -92,7 +91,7 @@ hello_obj = hello_srv._this()
 
 # register 5 object references with Naming service
 5.times do |i|
-  nc.bind([CosNaming::NameComponent.new("Hello#{i}",'ior')], hello_obj)
+  nc.bind([CosNaming::NameComponent.new("Hello#{i}", 'ior')], hello_obj)
 end
 
 # initialize signal handling

data/test/CORBA_Services/Naming/Corbaname/Test.idl

@@ -6,7 +6,6 @@
  * 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

data/test/CORBA_Services/Naming/Corbaname/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR file.",
-            "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/CORBA_Services/Naming/Corbaname/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -79,7 +78,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/CORBA_Services/Naming/Corbaname/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -29,16 +28,16 @@ ARGV.options do |opts|
 
     opts.on("--o FILENAME",
             "Set corbaname IOR filename.",
-            "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
     opts.on("--p PORT", Integer,
             "INS port number.",
-            "Default: 2345") { |v| OPTIONS[:ins_port]=v }
+            "Default: 2345") { |v| OPTIONS[:ins_port] = v }
     opts.on("--use-implement",
             "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -79,17 +78,17 @@ ins_url = "iiop:localhost:#{OPTIONS[:ins_port]}/NamingService"
 puts "server: resolving [corbaloc:#{ins_url}]"
 
 # resolve NamingContext
-obj = orb.string_to_object('corbaloc:'+ins_url)
+obj = orb.string_to_object('corbaloc:' + ins_url)
 
 nc = CosNaming::NamingContextExt._narrow(obj)
 
 # create context tree for registration
-full_name = [CosNaming::NameComponent.new('','root'),
-             CosNaming::NameComponent.new('base','dir'),
-             CosNaming::NameComponent.new('Hello','ior')]
+full_name = [CosNaming::NameComponent.new('', 'root'),
+             CosNaming::NameComponent.new('base', 'dir'),
+             CosNaming::NameComponent.new('Hello', 'ior')]
 
-nc_new = nc.bind_new_context(full_name[0,1])
-nc_new = nc_new.bind_new_context(full_name[1,1])
+nc_new = nc.bind_new_context(full_name[0, 1])
+nc_new = nc_new.bind_new_context(full_name[1, 1])
 
 assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
 

data/test/CORBA_Services/Naming/Simple/Test.idl

@@ -6,7 +6,6 @@
  * 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

data/test/CORBA_Services/Naming/Simple/client.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -64,7 +63,7 @@ begin
   assert_not "ERROR: INS IOR resolved to nil object!", CORBA::is_nil(nc)
 
   # retrieve object reference for servant from Naming service
-  name = [CosNaming::NameComponent.new('Hello','ior')]
+  name = [CosNaming::NameComponent.new('Hello', 'ior')]
 
   obj = nc.resolve(name)
 

data/test/CORBA_Services/Naming/Simple/run_test.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 OPTIONS = {
@@ -73,7 +72,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/CORBA_Services/Naming/Simple/server.rb

@@ -7,7 +7,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -28,13 +27,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set INS IOR filename.",
-            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://ins.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "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 }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 
@@ -91,7 +90,7 @@ hello_srv = MyHello.new(orb)
 hello_obj = hello_srv._this()
 
 # register object reference with Naming service
-name = [CosNaming::NameComponent.new('Hello','ior')]
+name = [CosNaming::NameComponent.new('Hello', 'ior')]
 
 nc.bind(name, hello_obj)