r2corba 1.4.1-x64-mingw32 → 1.5.1-x64-mingw32

data/rakelib/ext.rake

@@ -206,7 +206,7 @@ else # !JRUBY_VERSION
             cur_dir = Dir.getwd
             Dir.chdir File.expand_path(get_config('aceroot'))
             begin
-              if R2CORBA::Config.is_linux && R2CORBA::Config.cpu_cores > 2
+              if R2CORBA::Config.is_linux && R2CORBA::Config::linux_distro != :ubuntu && R2CORBA::Config.cpu_cores > 2
                 sh("#{get_config('makeprog')} -j#{R2CORBA::Config.cpu_cores - 2} #{get_config('with-debug') ? ' debug=1' : ''}")
               else
                 sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")

data/rakelib/ext.rb

@@ -56,7 +56,7 @@ module R2CORBA
     if is_win32
       def self.sys_dlls
         sysdlls = []
-        except_dll = R2CORBA::Config.is_win64 ? 'libgcc_s_sjlj-1.dll' : 'libgcc_s_dw2-1.dll'
+        except_dll = R2CORBA::Config.is_win64 ? 'libgcc_s_seh-1.dll' : 'libgcc_s_dw2-1.dll'
         ENV['PATH'].split(';').each do |p|
           if File.exists?(File.join(p, except_dll)) && File.exists?(File.join(p, 'libstdc++-6.dll'))
             sysdlls << File.join(p, except_dll)
@@ -94,8 +94,16 @@ module R2CORBA
                          'tiger'
                        when 5
                          'leopard'
-                       when 6,7,8
+                       when 6
                          'snowleopard'
+                       when 7
+                         'lion'
+                       when 8
+                         'mountainlion'
+                       when 9
+                         'mavericks'
+                       when 10
+                         'yosemite'
                      end
       end
       platform_error unless @@osx_name

data/rakelib/ext_r2tao.rb

@@ -182,7 +182,7 @@ THE_END__
     def self.get_latest_ace_version
       print 'Latest ACE release is '
       _version = nil
-      open('https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/ace/Version.h?revision=HEAD') do |f|
+      open('https://raw.githubusercontent.com/DOCGroup/ATCD/master/ACE/ace/Version.h') do |f|
         f.each_line do |ln|
           if /define\s+ACE_VERSION\s+\"(.*)\"/ =~ ln
             _version = $1
@@ -196,8 +196,9 @@ THE_END__
     def self.download_tao_source(version, targetdir)
       print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz ")
       _url = "http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-#{version}.tar.gz"
+      _fnm = File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz")
       Net::HTTP.start("download.dre.vanderbilt.edu") do |http|
-        _fout = File.open(File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz"), "wb")
+        _fout = File.open(_fnm, "wb")
         begin
           http.request_get("/previous_versions/ACE+TAO-src-#{version}.tar.gz") do |resp|
             _sndlen =  resp.content_length
@@ -217,6 +218,8 @@ THE_END__
           puts
         end
       end
+      FileUtils::Verbose.sh("rm -rf #{File.join(targetdir, 'ACE_wrappers')} && tar -xzf #{_fnm} -C #{targetdir}")
+      FileUtils::Verbose.sh("rm -f #{_fnm} && tar --format=gnu -czf #{_fnm} -C src ACE_wrappers")
     end
 
     def self.ext_shlibs
@@ -229,4 +232,4 @@ THE_END__
 
   end
 
-end
+end

data/rakelib/gem.rake

@@ -40,16 +40,18 @@ namespace :r2corba do
     end
 
     task :binbuild => ['r2corba:bin:build', 'r2corba:build_idl'] do
-      if R2CORBA::Config.is_linux
-        # create unversioned ACE/TAO lib symlinks
-        R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
-          acelib_ver = File.expand_path(Dir[acelib+'.*'].first)
-          ln_s(acelib_ver, acelib)
+      unless defined?(JRUBY_VERSION)
+        if R2CORBA::Config.is_linux
+          # create unversioned ACE/TAO lib symlinks
+          R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
+            acelib_ver = File.expand_path(Dir[acelib+'.*'].first)
+            ln_s(acelib_ver, acelib)
+          end
+        end
+        unless R2CORBA::Config.is_win32
+          # patch RPATH setting of shared libs
+          R2CORBA::Gem.patch_extlib_rpath
         end
-      end
-      unless defined?(JRUBY_VERSION) || R2CORBA::Config.is_win32
-        # patch RPATH setting of shared libs
-        R2CORBA::Gem.patch_extlib_rpath
       end
     end
 
@@ -74,7 +76,7 @@ namespace :r2corba do
           gem.extensions = ['mkrf_conf_taogem.rb']
           gem.require_paths = %w{lib}
           gem.executables = []
-          gem.required_ruby_version = '>= 1.8.6'
+          gem.required_ruby_version = '>= 1.9.3'
           gem.licenses = ['ACE']
         end
         R2CORBA::Gem.build_gem(gemspec)
@@ -95,11 +97,11 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.extensions = ['mkrf_conf_srcgem.rb']
     gem.require_paths = %w{lib}
     gem.executables = %w{ridlc rins r2corba}
-    gem.required_ruby_version = '>= 1.8.6'
+    gem.required_ruby_version = '>= 1.9.3'
     gem.licenses = ['R2CORBA', 'ACE', 'GPL']
     gem.require_paths << 'ext'
-    gem.add_dependency 'ridl', '>= 2.2.2'
-    gem.add_dependency 'rake', '>= 10.0.1'
+    gem.add_dependency 'ridl', '~> 2.5'
+    gem.add_dependency 'rake', '~> 10.0'
     gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
   end
   R2CORBA::Gem.build_gem(gemspec)
@@ -131,16 +133,12 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.require_paths = %w{ext}
       gem.executables = []
       if R2CORBA::Config.rb_ver_major < 2
-        if R2CORBA::Config.rb_ver_minor > 8
-          gem.required_ruby_version = '>= 1.9.1'
-        else
-          gem.required_ruby_version = '>= 1.8.6'
-        end
+        gem.required_ruby_version = '>= 1.9.3'
       else
         gem.required_ruby_version = '>= 2.0.0'
       end
       gem.licenses = ['R2CORBA', 'ACE']
-      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -179,17 +177,17 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
       gem.extensions = ['mkrf_conf_bingem.rb']
       if defined?(JRUBY_VERSION)
         gem.require_paths << 'jacorb/lib'
-        gem.required_ruby_version = '>= 1.5.0'
+        gem.required_ruby_version = '>= 1.7.0'
         gem.licenses = ['R2CORBA', 'JacORB']
       else
         gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
-        gem.required_ruby_version = '>= 1.8.6'
+        gem.required_ruby_version = '>= 1.9.3'
         gem.licenses = ['R2CORBA', 'ACE', 'GPL']
         gem.require_paths << 'ext'
       end
-      gem.add_dependency 'ridl', '>= 2.2.2'
-      gem.add_dependency 'rake', '>= 10.0.1'
-      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
+      gem.add_dependency 'ridl', '~> 2.5'
+      gem.add_dependency 'rake', '~> 10.0'
+      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -202,6 +200,32 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
 end
 t_.enhance ['mkrf_conf_bingem.rb']
 
+unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
+  # Devkit faker Gem for binary Windows gems
+  t_devkit = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba_devkit', '1.0.0', :devkit)}.gem") => 'lib/rubygems_plugin.rb' do
+    # create gemspec
+    gemspec = R2CORBA::Gem.define_spec('r2corba_devkit', '1.0.0', :devkit) do |gem|
+      gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
+      gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
+      gem.email = 'mcorino@remedy.nl'
+      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
+      gem.authors = ['Martin Corino']
+      gem.files = 'lib/rubygems_plugin.rb'
+      gem.require_paths = %w{lib}
+      gem.executables = []
+      gem.extensions = []
+      gem.required_ruby_version = '>= 1.9.3'
+      gem.licenses = ['R2CORBA']
+    end
+    R2CORBA::Gem.build_gem(gemspec)
+  end
+  namespace :r2corba do
+    namespace :gem do
+      task :devkit => t_devkit.name
+    end
+  end
+end
+
 desc 'Build R2CORBA gem'
 if defined?(JRUBY_VERSION)
   task :gem => 'r2corba:gem:bingem'

data/rakelib/gem.rb

@@ -12,10 +12,10 @@
 #--------------------------------------------------------------------
 
 require 'rubygems'
+require 'rubygems/package'
 begin
   require 'rubygems/builder'
 rescue LoadError
-  require 'rubygems/package'
 end
 
 require File.join(File.dirname(__FILE__), 'config.rb')
@@ -97,7 +97,7 @@ module R2CORBA
       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 = ::Gem::Platform::CURRENT
+        gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
       gemspec.required_rubygems_version = ::Gem::Requirement.new(">= 0") if gemspec.respond_to? :required_rubygems_version=
       block.call(gemspec) if block_given?
@@ -109,16 +109,16 @@ module R2CORBA
       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 = ::Gem::Platform::CURRENT
+        gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
       gemspec.full_name
     end
 
     def self.build_gem(gemspec)
-      if defined?(::Gem::Builder)
-        gem_file_name = ::Gem::Builder.new(gemspec).build
-      else
+      if defined?(::Gem::Package) && ::Gem::Package.respond_to?(:build)
         gem_file_name = ::Gem::Package.build(gemspec)
+      else
+        gem_file_name = ::Gem::Builder.new(gemspec).build
       end
 
       FileUtils.mkdir_p('pkg')

data/test/BiDirectional/server.ior

@@ -1 +1 @@
-IOR:010000001600000049444c3a53696d706c655f5365727665723a312e30000000010000000000000074000000010102000d0000003137322e31362e372e3135300000afc02300000014010f004e5354b6f1045258180d0001000000010000000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001600000049444c3a53696d706c655f5365727665723a312e30000000010000000000000074000000010102000d0000003137322e31362e362e32333400002bec2300000014010f004e5354c293d354c07e070001000000010000000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/CORBA_Services/Naming/BindingIterator/ins.ior

@@ -1 +1 @@
-IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3135300000b6c01b00000014010f00525354b7f1045228140f000000000001000000010000000002000000000000000800000001000000004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000032ec1b00000014010f00525354c393d354d8d30d000000000001000000010000000002000000000000000800000001ff406b004f4154010000001800000001ff406b0100010001000000010001050901010000000000

data/test/CORBA_Services/Naming/Corbaname/ins.ior

@@ -1 +1 @@
-IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000029091b00000014010f00525354baf10452b0bc0b000000000001000000010000000002000000000000000800000001020000004f41540100000018000000010200000100010001000000010001050901010000000000
+IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000029091b00000014010f00525354c693d35460760b000000000001000000010000000002000000000000000800000001ff406b004f4154010000001800000001ff406b0100010001000000010001050901010000000000

data/test/CORBA_Services/Naming/Simple/ins.ior

@@ -1 +1 @@
-IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3135300000cdc01b00000014010f00525354bcf1045218f90c000000000001000000010000000002000000000000000800000001000000004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000002b00000049444c3a6f6d672e6f72672f436f734e616d696e672f4e616d696e67436f6e746578744578743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000049ec1b00000014010f00525354c893d35448eb0d000000000001000000010000000002000000000000000800000001ff406b004f4154010000001800000001ff406b0100010001000000010001050901010000000000

data/test/DII/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3135300000dec01b00000014010f00525354c0f10452d85c0c000000000001000000010000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e32333400005aec1b00000014010f00525354cc93d354c0d70d000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/DSI/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3135300000e4c01b00000014010f00525354c1f10452486e0d000000000001000000010000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000060ec1b00000014010f00525354ce93d354681000000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Exceptions/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3135300000eac01b00000014010f00525354c2f10452c82f0d000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000066ec1b00000014010f00525354cf93d35410ef00000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/IDL_Test/server.ior

@@ -1 +1 @@
-IOR:010000001a00000049444c3a52656d6564792f546573742f48656c6c6f3a312e3000000001000000000000006c000000010102000d0000003137322e31362e372e3135300000f6c01b00000014010f00525354c4f1045220450e000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001a00000049444c3a52656d6564792f546573742f48656c6c6f3a312e3000000001000000000000006c000000010102020d0000003137322e31362e362e323334000072ec1b00000014010f00525354d193d354380603000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/IORMap/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f00525354c6f10452483f00000100000001000000020000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f00525354d293d354987902000100000001000000020000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/IORTable/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f00525354c7f10452688701000100000001000000020000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e300000010000000000000068000000010102000a0000003132372e302e302e31000f271b00000014010f00525354d393d354a05401000100000001000000020000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Implicit_Conversion/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000008c11b00000014010f00525354c8f1045258d702000000000001000000010000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e323334000084ec1b00000014010f00525354d493d354406a00000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Multi_Threading/Multiple_ORB/server0.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000010c11b00000014010f00525354c9f10452208d02000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e32333400008cec1b00000014010f00525354d593d354208d0200000000000100000001000000000200000000000000080000000103406b004f415401000000180000000103406b0100010001000000010001050901010000000000

data/test/Multi_Threading/Multiple_ORB/server1.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000011c11b00000014010f00525354c9f10452089102000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e32333400008dec1b00000014010f00525354d593d35408910200000000000100000001000000000200000000000000080000000103406b004f415401000000180000000103406b0100010001000000010001050901010000000000

data/test/Multi_Threading/Simple/Test.idl

@@ -16,7 +16,7 @@ module Test
   interface Hello
   {
     /// Return a simple string
-    string get_string ();
+    string get_string (in long tid);
 
     /// A method to shutdown the ORB
     /**

data/test/Multi_Threading/Simple/client.rb

@@ -59,20 +59,25 @@ begin
 
   hello_obj = Test::Hello._narrow(obj)
 
-  clt_trds = (0..1).collect do |i|
-    Thread.new(i) do |i_|
-      10.times do
-        the_string = hello_obj.get_string()
-
-        puts "[thread \##{i_}] string returned <#{the_string}>"
-
-        Thread.pass
-      end
-   end
+  unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
+      ([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
+    ## JacORB 3.4 introduced a bug which prevents this test from succeeding
+    ## JacORB 3.6 will be released with a fix for this
+    clt_trds = (0..1).collect do |i|
+      Thread.new(i) do |i_|
+        10.times do
+          the_string = hello_obj.get_string(i_)
+
+          puts "[thread \##{i_}] string returned <#{the_string}>"
+
+          Thread.pass
+        end
+     end
+    end
+
+    clt_trds.each { |t| t.join }
   end
 
-  clt_trds.each { |t| t.join }
-
   hello_obj.shutdown()
 
   assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)

data/test/Multi_Threading/Simple/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000018c11b00000014010f00525354caf10452807d02000000000001000000010000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c0000000101026b0d0000003137322e31362e362e323334000094ec1b00000014010f00525354d693d354087307000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Multi_Threading/Simple/server.rb

@@ -54,8 +54,8 @@ class MyHello < POA::Test::Hello
     @orb = orb
   end
 
-  def get_string()
-    "[#{Thread.current}] Hello there!"
+  def get_string(tid)
+    "[server #{Thread.current}] Hello there thread \##{tid}!"
   end
 
   def shutdown()

data/test/Multi_Threading/Threads/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000022c11b00000014010f00525354cbf10452e04908000000000001000000010000000002000000000000000800000001020000004f41540100000018000000010200000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e32333400009eec1b00000014010f00525354d893d354d0c90100000000000100000001000000000200000000000000080000000103406b004f415401000000180000000103406b0100010001000000010001050901010000000000

data/test/Multi_Threading/Threads/server.rb

@@ -76,9 +76,9 @@ class MyHello < POA::Test::Hello
 
   def shutdown()
     @stop = true
+    @wdt.join
     @watchdog.shutdown()
     puts %Q{Server - pinged watchdog #{@count} times.}
-    @wdt.join
     @orb.shutdown()
   end
 end #of servant MyHello

data/test/Multi_Threading/Threads/watchdog.ior

@@ -1 +1 @@
-IOR:010000001600000049444c3a546573742f5761746368646f673a312e3000000001000000000000006c000000010102000d0000003137322e31362e372e31353000001fc11b00000014010f00525354cbf10452a89a03000000000001000000010000000002000000000000000800000001030000004f41540100000018000000010300000100010001000000010001050901010000000000
+IOR:010000001600000049444c3a546573742f5761746368646f673a312e3000000001000000000000006c000000010102000d0000003137322e31362e362e32333400009bec1b00000014010f00525354d793d354180b0a000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Multiple_Servant_Interfaces/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000029c11b00000014010f00525354d0f10452c8f401000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e3233340000a5ec1b00000014010f00525354db93d35430ef0d000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/AbstractInterface/server.ior

@@ -1 +1 @@
-IOR:010000000f00000049444c3a7061737365723a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000032c11b00000014010f00525354d6f10452300d09000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000000f00000049444c3a7061737365723a312e30000001000000000000006c000000010102020d0000003137322e31362e362e3233340000aeec1b00000014010f00525354e293d354f0f307000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/Custom/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000038c11b00000014010f00525354d7f10452582a0a000000000001000000010000000002000000000000000800000001020000004f41540100000018000000010200000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e3233340000b4ec1b00000014010f00525354e393d354701a0c000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/Simple/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e31353000003ec11b00000014010f00525354d8f10452d8eb09000000000001000000010000000002000000000000000800000001020000004f41540100000018000000010200000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102010d0000003137322e31362e362e3233340000baec1b00000014010f00525354e493d354d8560d000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/Simple_Event/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000044c11b00000014010f00525354d9f1045270260a000000000001000000010000000002000000000000000800000001020000004f41540100000018000000010200000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a436865636b706f696e743a312e30000001000000000000006c000000010102000d0000003137322e31362e362e3233340000c0ec1b00000014010f00525354e593d35400f10e000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/Supports/server.ior

@@ -1 +1 @@
-IOR:010000001000000049444c3a4163636f756e743a312e300001000000000000006c000000010102000d0000003137322e31362e372e31353000004ac11b00000014010f00525354daf1045248f70b000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000001000000049444c3a4163636f756e743a312e300001000000000000006c000000010102010d0000003137322e31362e362e3233340000c6ec1b00000014010f00525354e793d35460b800000000000001000000010000000002000000000000000800000001ff0000004f4154010000001800000001ff00000100010001000000010001050901010000000000

data/test/OBV/Tree/server.ior

@@ -1 +1 @@
-IOR:010000000f00000049444c3a7061737365723a312e30000001000000000000006c000000010102000d0000003137322e31362e372e313530000050c11b00000014010f00525354dbf1045250430d000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000000f00000049444c3a7061737365723a312e30000001000000000000006c000000010102000d0000003137322e31362e362e3233340000ccec1b00000014010f00525354e893d354d89e01000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/Truncatable/server.ior

@@ -1 +1 @@
-IOR:010000002100000049444c3a4f42565f5472756e63617461626c65546573742f546573743a312e300000000001000000000000006c000000010102670d0000003137322e31362e372e313530000056c11b00000014010f00525354dcf10452d8500e000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000
+IOR:010000002100000049444c3a4f42565f5472756e63617461626c65546573742f546573743a312e300000000001000000000000006c000000010102000d0000003137322e31362e362e3233340000d2ec1b00000014010f00525354e993d354c80000000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/OBV/ValueBox/server.ior

@@ -1 +1 @@
-IOR:010000000d00000049444c3a546573743a312e300000000001000000000000006c000000010102000d0000003137322e31362e372e31353000005cc11b00000014010f00525354def10452807d02000000000001000000010000000002000000000000000800000001ff0000004f4154010000001800000001ff00000100010001000000010001050901010000000000
+IOR:010000000d00000049444c3a546573743a312e300000000001000000000000006c000000010102000d0000003137322e31362e362e3233340000d8ec1b00000014010f00525354ea93d354609a05000000000001000000010000000002000000000000000800000001010000004f41540100000018000000010100000100010001000000010001050901010000000000

data/test/Object/client.rb

@@ -57,42 +57,51 @@ begin
 
   obj = orb.string_to_object(OPTIONS[:iorfile])
 
-  id = obj._repository_id # fetches id remotely as obj has not been narrowed
-                          # yet and thus there is no type known yet
+  unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
+      ([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
+    ## JacORB 3.4 introduced an optimization which *requires* use of the Java endorsed dirs
+    ## mechanism to replace standard JDK CORBA stubs with the JacORB version in order to
+    ## have JacORB process these base methods correctly with DSI servants
+    ## JacORB 3.6 may be released with a fix for this
+    id = obj._repository_id # fetches id remotely as obj has not been narrowed
+                            # yet and thus there is no type known yet
 
-  assert 'incorrect repository id returned (1)', id == Test::Hello._tc.id
+    assert 'incorrect repository id returned (1)', id == Test::Hello._tc.id
 
-  STDERR.puts "Got Object reference for [#{id}]"
+    STDERR.puts "Got Object reference for [#{id}]"
 
-  hello_obj = Test::Hello._narrow(obj)
+    hello_obj = Test::Hello._narrow(obj)
 
-  id = obj._repository_id # returns locally known id as obj has been narrowed
-                          # and thus type is known
+    id = obj._repository_id # returns locally known id as obj has been narrowed
+                            # and thus type is known
 
-  assert 'incorrect repository id returned (2)', id == Test::Hello._tc.id
+    assert 'incorrect repository id returned (2)', id == Test::Hello._tc.id
 
-  the_string = hello_obj.get_string()
+    the_string = hello_obj.get_string()
 
-  puts "string returned <#{the_string}>"
+    puts "string returned <#{the_string}>"
 
-  obj = hello_obj._get_component
+    obj = hello_obj._get_component
 
-  id = obj._repository_id # fetches id remotely which is doctored by
-                          # overridden servant method
+    id = obj._repository_id # fetches id remotely which is doctored by
+                            # overridden servant method
 
-  assert 'original repository id returned', id != Test::Hello._tc.id
+    assert 'original repository id returned', id != Test::Hello._tc.id
 
-  STDERR.puts "Got Object reference for [#{id}]"
+    STDERR.puts "Got Object reference for [#{id}]"
 
-  # since _is_a? is also overridden we still get a match on the original id
-  assert '_is_a? returned FALSE', obj._is_a?(Test::Hello._tc.id)
+    # since _is_a? is also overridden we still get a match on the original id
+    assert '_is_a? returned FALSE', obj._is_a?(Test::Hello._tc.id)
 
-  hello2_obj = Test::Hello._narrow(obj)
+    hello2_obj = Test::Hello._narrow(obj)
 
-  id = obj._repository_id # returns locally known id as obj has been narrowed
-                          # and thus type is known
+    id = obj._repository_id # returns locally known id as obj has been narrowed
+                            # and thus type is known
 
-  assert 'incorrect repository id returned (3)', id == Test::Hello._tc.id
+    assert 'incorrect repository id returned (3)', id == Test::Hello._tc.id
+  else
+    hello2_obj = Test::Hello._narrow(obj)
+  end
 
   hello2_obj.shutdown()