r2corba 1.6.2-universal-java → 1.7.0-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640150752a87f8b344a736819d6c490cdfea52b892fb0cab7dab0a39c35b5912
-  data.tar.gz: 8484b78a86519ca4580d59f2c55a01c23e65b1bee2c8c3e0f8d4625c3c4755fe
+  metadata.gz: f22769ffb4afdeadab2eaecddc987b259f3dbe5764d3d5ccb875579e0d940ff0
+  data.tar.gz: 1e7b638dd450c5d1e5d1e433f16dafbe71f3a53ece6d91cd783e9858bbf9545b
 SHA512:
-  metadata.gz: e60b48fb0baacf948adb771cdd2e6f33a5975975f74f3e7eea204cfec6daadfdb637ca9c351930de485cfe7740f92207eeeeb225a91ac37ff81785d257f0a442
-  data.tar.gz: c95f423ffc6baa1030d97b72a52cf9f04bd2440df5c1d77559f010e31aae6e86409a6763fdf091fce3d806fd2cdec2dac5388f4df4cd3172a8a44669ab6da9ee
+  metadata.gz: db93b16885d95dc340eb45d8828af6583cd7e6a263e13873d1b0329b123640d551334038cc96c064e7787f11eb893a5769d6d1031fd1c9f70c2840e067d8b8b0
+  data.tar.gz: eab98c69d422d61198ceae1a5944724abca62eb4b5a4e066099cec7b4ba7be392988dada68f8018986460639ed2c2dc5b61fc6aacdefadbf70cd77d1379c3245

data/README.rdoc

@@ -1,7 +1,7 @@
-{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
-{<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
-{<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
+{rdoc-image:https://badge.fury.io/rb/r2corba.svg}[https://rubygems.org/gems/r2corba]
+{rdoc-image:https://www.codefactor.io/repository/github/remedyit/r2corba/badge}[https://www.codefactor.io/repository/github/remedyit/r2corba]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
+{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
 
 = R2CORBA
 
@@ -40,7 +40,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
 
 == License
 
-R2CORBA is Copyright (c) 2007-2022 Remedy IT Expertise BV, The Netherlands.
+R2CORBA is Copyright (c) 2007-2023 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
 

data/lib/corba/cbase/Request.rb

@@ -79,9 +79,9 @@ module R2CORBA
 
       def invoke
         self._invoke({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 
@@ -91,9 +91,9 @@ module R2CORBA
 
       def send_deferred
         self._send_deferred({
-          :arg_list => self._arguments,
-          :result_type => @_rettc,
-          :exc_list => self._exceptions
+          arg_list: self._arguments,
+          result_type: @_rettc,
+          exc_list: self._exceptions
           })
       end
 

data/lib/corba/cmds/base.rb

@@ -21,7 +21,7 @@ module R2CORBA
     end
 
     @@options = {
-      :verbose => false
+      verbose: false
     }
 
     def self.register(cmdid, cmdhandler)

data/lib/corba/common/Any.rb

@@ -19,7 +19,7 @@ module R2CORBA
             return val._tc
           when ::NilClass
             return CORBA._tc_null
-          when ::Bignum
+          when BIGNUM_KLASS
             return CORBA._tc_longlong
           when ::Integer
             return CORBA._tc_long

data/lib/corba/common/Values.rb

@@ -79,10 +79,10 @@ module R2CORBA
     VM_TRUNCATABLE = 3
 
     VT_MODIFIERS = {
-      :none => VM_NONE,
-      :abstract => VM_ABSTRACT,
-      :truncatable => VM_TRUNCATABLE,
-      :custom => VM_CUSTOM
+      none: VM_NONE,
+      abstract: VM_ABSTRACT,
+      truncatable: VM_TRUNCATABLE,
+      custom: VM_CUSTOM
     }.freeze
 
     PRIVATE_MEMBER = 0

data/lib/corba/common/version.rb

@@ -13,8 +13,8 @@
 module R2CORBA
 
   R2CORBA_MAJOR = 1
-  R2CORBA_MINOR = 6
-  R2CORBA_RELEASE = 2
+  R2CORBA_MINOR = 7
+  R2CORBA_RELEASE = 0
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/jbase/Servant.rb

@@ -44,25 +44,25 @@ module R2CORBA
             begin
               case rsrvreq.srvreq_.operation()
               when '_is_a'
-                rsrvreq.describe({:arg_list => [['', CORBA::ARG_IN, CORBA._tc_string]], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
                 rc = self._is_a(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_non_existent'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_boolean})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
                 rc = self._non_existent(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_boolean(rc == true)
                 jsrvreq.set_result(jany)
               when '_repository_id'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_string})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
                 rc = self._repository_id(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_string(rc)
                 jsrvreq.set_result(jany)
               when '_component'
-                rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
+                rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
                 jany.insert_Object(rc)

data/lib/corba/svcs/ins/cos_naming.rb

@@ -363,9 +363,9 @@ module R2CORBA
         @map.synchronize do
           raise CosNaming::NamingContext::AlreadyBound.new if @map.has_key?(key_)
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end
@@ -380,9 +380,9 @@ module R2CORBA
             raise CosNaming::NamingContext::NotFound.new(why, [])
           end
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end

data/lib/corba/svcs/ins/ins.rb

@@ -181,14 +181,14 @@ module R2CORBA
             report 'INS - starting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['start'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['start'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -252,11 +252,11 @@ module R2CORBA
           report 'INS - stopping service'
           if @options[:daemon]
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['stop'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
+              app_name: 'rins',
+              ARGV: ['stop'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
             }
 
             Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -279,14 +279,14 @@ module R2CORBA
             report 'INS - restarting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['restart'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['restart'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -310,11 +310,11 @@ module R2CORBA
         def status
           report 'INS - retrieving service status'
           daemon_opt = {
-            :app_name => 'rins',
-            :ARGV => ['status'],
-            :dir_mode => :normal,
-            :dir => @options[:piddir],
-            :multiple => true,
+            app_name: 'rins',
+            ARGV: ['status'],
+            dir_mode: :normal,
+            dir: @options[:piddir],
+            multiple: true,
           }
 
           Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -351,13 +351,13 @@ module R2CORBA
     end
 
     OPTIONS = {
-      :piddir => Dir.getwd,
-      :iorfile => 'ins.ior',
-      :debug => 0,
-      :logdir => nil,
-      :threads => 5,
-      :orbprop => {},
-      :port => 0,
+      piddir: Dir.getwd,
+      iorfile: 'ins.ior',
+      debug: 0,
+      logdir: nil,
+      threads: 5,
+      orbprop: {},
+      port: 0,
     }
 
     COMMANDS = [

data/lib/corba/svcs/ins/naming_service.rb

@@ -18,11 +18,11 @@ module R2CORBA
     class Service
       # default options
       OPTIONS = {
-        :iorfile => 'ins.ior',
-        :debug => 0,
-        :threads => 5,
-        :orbprop => {},
-        :port => 0
+        iorfile: 'ins.ior',
+        debug: 0,
+        threads: 5,
+        orbprop: {},
+        port: 0
       }
 
       def initialize(options = {})

data/rakelib/config.rb

@@ -346,10 +346,12 @@ module R2CORBA
 
       @@ridlc = File.join('bin', 'ridlc')
 
-      # check availability of RIDL; either as gem or in subdir
-      if (@@ridl_local = File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')))
+      # check availability of RIDL; either as gem or in ridl subdir, or to a location as set
+      # in the RIDL_ROOT environment variable
+      ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
+      if (@@ridl_local = File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')))
         incdirs = [
-            File.expand_path(File.join('ridl', 'lib')),
+            File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')),
             File.expand_path('lib'),
             ENV['RUBYLIB']
         ].compact
@@ -513,9 +515,10 @@ module R2CORBA
         end
       end
 
-      # check availability of RIDL; either as gem or in subdir
-      unless File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
-        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
+      # check availability of RIDL; either as gem or in subdir or as set in RIDL_ROOT
+      ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
+      unless File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
+        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in the subdirectory ridl, or at the location as set by RIDL_ROOT.'
       end
     end
 

data/test/BiDirectional/client.rb

@@ -12,9 +12,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://server.ior'
 }
 
 ARGV.options do |opts|
@@ -96,7 +96,7 @@ begin
 
   puts 'child_poa created'
 
-  policies.each { |pol| pol.destroy() }
+  policies.each { |pol| pol.destroy }
 
   puts 'policies destroyed'
 
@@ -110,7 +110,7 @@ begin
 
   callback_i = MyCallback.new(orb)
 
-  callback_ref = callback_i._this()
+  callback_ref = callback_i._this
 
   # Send the calback object to the server
   simple_srv.callback_object(callback_ref)
@@ -120,12 +120,12 @@ begin
 
   assert "unexpected result = #{r}", r == 0
 
-  orb.run()
+  orb.run
 
   root_poa.destroy(1, 1)
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

data/test/BiDirectional/run_test.rb

@@ -9,8 +9,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

data/test/BiDirectional/server.rb

@@ -12,10 +12,10 @@
 require 'optparse'
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :iter_num => 10
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'server.ior',
+  iter_num: 10
 }
 
 ARGV.options do |opts|
@@ -73,16 +73,16 @@ class Simple_Server_i < POA::Simple_Server
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 
   def call_client()
     if @flag
       @iter_num.times do
-        @callback.callback_method()
+        @callback.callback_method
       end
 
-      @callback.shutdown()
+      @callback.shutdown
       @flag = false
 
       return 1
@@ -122,7 +122,7 @@ child_poa = root_poa.create_POA('childPOA', poa_man, policies)
 
 puts 'child_poa created'
 
-policies.each { |pol| pol.destroy() }
+policies.each { |pol| pol.destroy }
 
 puts 'policies destroyed'
 
@@ -138,13 +138,13 @@ ior = orb.object_to_string(obj)
 
 puts "Activated as <#{ior}>"
 
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write ior
 }
 
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')
@@ -153,13 +153,13 @@ end
 
 retval = 0
 while retval == 0
-  pending = orb.work_pending()
+  pending = orb.work_pending
 
   if pending
-    orb.perform_work()
+    orb.perform_work
   end
 
-  retval = simple_srv.call_client()
+  retval = simple_srv.call_client
 end
 
 puts 'event loop finished'

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

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -71,7 +71,7 @@ begin
   n = binding_list.first.binding_name.first
   puts "first binding: id=#{n.r_id}, kind=#{n.kind}"
 
-  has_one, binding = binding_iterator.next_one()
+  has_one, binding = binding_iterator.next_one
 
   assert 'ERROR: INS BindingIterator#next_one() does not function',
          (has_one && binding) &&
@@ -93,11 +93,11 @@ begin
     puts "#{counts.shift} binding: id=#{n.r_id}, kind=#{n.kind}"
   end
 
-  has_one, binding = binding_iterator.next_one()
+  has_one, binding = binding_iterator.next_one
 
   assert_not 'ERROR: INS BindingIterator#next_one() does not function (2)', has_one
 
-  binding_iterator.destroy()
+  binding_iterator.destroy
 
   # retrieve object reference for servant from Naming service
   name = binding_list.last.binding_name
@@ -107,14 +107,14 @@ begin
   # narrow object ref and call
   hello_obj = Test::Hello._narrow(obj)
 
-  the_string = hello_obj.get_string()
+  the_string = hello_obj.get_string
 
   puts "string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

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

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

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

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://ins.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'file://ins.ior'
 }
 
 ARGV.options do |opts|
@@ -61,7 +61,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -87,7 +87,7 @@ poa_man.activate
 # create and activate servant
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 # register 5 object references with Naming service
 5.times do |i|
@@ -97,7 +97,7 @@ end
 # initialize signal handling
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')

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

@@ -14,9 +14,9 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'corbaname.ior'
+  use_implement: false,
+  orb_debuglevel: 0,
+  iorfile: 'corbaname.ior'
 }
 
 ARGV.options do |opts|
@@ -71,14 +71,14 @@ begin
 
   assert_not 'ERROR: corbaname resolved to nil object!', CORBA::is_nil(hello_obj)
 
-  the_string = hello_obj.get_string()
+  the_string = hello_obj.get_string
 
   puts "client: string returned <#{the_string}>"
 
-  hello_obj.shutdown()
+  hello_obj.shutdown
 
 ensure
 
-  orb.destroy()
+  orb.destroy
 
 end

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

@@ -10,8 +10,8 @@
 #--------------------------------------------------------------------
 
 OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
+  debug_opt: '',
+  use_implement: '--use-implement'
 }
 
 require 'optparse'

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

@@ -14,10 +14,10 @@ require 'lib/assert.rb'
 include TestUtil::Assertions
 
 OPTIONS = {
-  :iorfile => 'corbaname.ior',
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :ins_port => 2345
+  iorfile: 'corbaname.ior',
+  use_implement: false,
+  orb_debuglevel: 0,
+  ins_port: 2345
 }
 
 ARGV.options do |opts|
@@ -65,7 +65,7 @@ class MyHello < POA::Test::Hello
   end
 
   def shutdown()
-    @orb.shutdown()
+    @orb.shutdown
   end
 end # of servant MyHello
 
@@ -104,7 +104,7 @@ poa_man.activate
 # create and activate servant
 hello_srv = MyHello.new(orb)
 
-hello_obj = hello_srv._this()
+hello_obj = hello_srv._this
 
 # register object reference with Naming service
 name = full_name
@@ -116,14 +116,14 @@ sn = nc.to_string(name)             # stringify name
 corbaname = nc.to_url(ins_url, sn)  # corbaname url
 
 # write corbaname to file
-open(OPTIONS[:iorfile], 'w') { |io|
+File.open(OPTIONS[:iorfile], 'w') { |io|
   io.write corbaname
 }
 
 # initialize signal handling
 Signal.trap('INT') do
   puts 'SIGINT - shutting down ORB...'
-  orb.shutdown()
+  orb.shutdown
 end
 
 if Signal.list.has_key?('USR2')