r2corba 1.5.1-universal-java → 1.6.1-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e6b95d59f8d521b64451c1ff1026067fdc59505a
-  data.tar.gz: 5516386d5748f30e2be3897a6a500ff04adc280d
+SHA256:
+  metadata.gz: ae28ae687f9571f4d97fd495e273164decf3c09b5d45e4a93c68fe369d87209c
+  data.tar.gz: 5cefa2e37ff72e34637cb4e9b572b17a8f8a6bad604ba60a3acfc4ff0f3ff453
 SHA512:
-  metadata.gz: 009683046f48760a4f9440f95b6064c79f4a30d74e057e4f61db98f0e7abffdb86deaabeb9d9b6524449e8f47ee557d2d335feb25fd7f479f72171dd6978c202
-  data.tar.gz: fa5b7068afbf4fbf1f3dadd28ee11eb71060d713f1a7db2fe14dee362127f72bfb505d5fbcbf182318fdc168ae0b5b249be44f84e1dc3aed602aff50ae67472e
+  metadata.gz: d529b6c28ff5ccb95eab85e92ae3aec18b44bbdb1ae37250d3fed328a5a5947e438a44cb6248566d7b05c76a369e979acb5a8aca63adc1c667deaa599276aebf
+  data.tar.gz: c3dfd76cb580b3f26a049a393c10ac317883cef3228854bbb10b4fdf8346c117f13fd6dbe6fcda4bc2c734c50767c662111dfb6eb45d42cde9432f3bd926e331

data/LICENSE

@@ -8,12 +8,12 @@ written in Ruby, C++ and Java. It is designed to provide a CORBA mapping for
 the Ruby programming language.
 Instead of going for a complete native Ruby mapping implementing a native
 Ruby ORB, R2CORBA aims at providing CORBA functionality through a Ruby
-extension using the DII and DSI interfaces of an existing CORBA ORB 
+extension using the DII and DSI interfaces of an existing CORBA ORB
 implementation.
 There are currently two flavors of this extension available:
-  o an MRI Ruby extension written in Ruby and C/C++ using TAO 
-    (The ACE ORB; see http://www.cs.wustl.edu/~schmidt/TAO.html).
-  o a JRuby extension written in Ruby and Java using JacORB 
+  o an MRI Ruby extension written in Ruby and C/C++ using TAO
+    (The ACE ORB; see http://www.dre.vanderbilt.edu/~schmidt/TAO.html).
+  o a JRuby extension written in Ruby and Java using JacORB
     (http://www.jacorb.org/index.html).
 A native Ruby implementation of an OMG IDL compiler supplements this
 extension and provides powerful features like direct inclusion of IDL
@@ -56,4 +56,4 @@ IN NO EVENT WILL REMEDY IT OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE
 FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
 DAMAGES, EVEN IF REMEDY IT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-R2CORBA is Copyright Remedy IT. Nijkerk, The Netherlands, 2006-2013.
+R2CORBA is Copyright Remedy IT. Duiven, The Netherlands, 2006-2019.

data/README.rdoc

@@ -0,0 +1,62 @@
+{<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]
+
+= R2CORBA
+
+== Description
+
+R2CORBA (Ruby2CORBA) is a {CORBA}[https://www.omg.org/spec/CORBA] language mapping implementation for the {Ruby programming language}[https://www.ruby-lang.org].
+
+== Synopsis
+
+R2CORBA provides a complete implementation of the standard OMG Ruby CORBA Language Mapping ({RCLM}[https://www.omg.org/spec/RCLM]) compliant with the latest version of the CORBA standard.
+
+R2CORBA includes:
+
+* an RCLM compliant RIDL code generator backend
+* an RCLM compliant API
+* multiple ORB implementations through an extension framework
+
+Instead of going for a complete native Ruby mapping implementing a native Ruby ORB, R2CORBA aims at providing CORBA functionality through a Ruby extension using the DII and DSI interfaces of an existing CORBA ORB implementation. There are currently two flavors of this extension available:
+
+* an MRI Ruby extension written in Ruby and C/C++ using {TAO}[https://www.remedy.nl/opensource/tao.html]
+* a JRuby extension written in Ruby and Java using {JacORB}[https://www.remedy.nl/opensource/jacorb.html]
+
+The {RIDL}[https://www.remedy.nl/opensource/ridl.html] based, native Ruby implementation of an OMG \IDL compiler supplements this extension and provides powerful features like direct inclusion of \IDL language modules into your Ruby programs without the need of explicit, separate stub generation.
+
+== How to get R2CORBA
+
+Execute
+
+ gem install r2corba
+
+to install R2CORBA as a gem.
+
+== Bugs
+
+If you find a bug, please report it at the R2CORBA project's {issue tracker}[https://github.com/RemedyIT/r2corba/issues].
+
+== License
+
+R2CORBA is Copyright (c) 2007-2022 Remedy IT Expertise BV, The Netherlands.
+
+It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
+
+== Acknowledgments
+
+See the link:THANKS file.
+
+== Warranty
+
+This software is provided "as is" and without any express or implied warranties, including, without limitation, the implied warranties of merchantibility and fitness for a particular purpose.
+
+== Releasing new r2corba gems
+
+A new r2corba ruby gem release can be made by incrementing the R2CORBA version in link:lib/corba/common/version.rb and create a new release on {github}[https://github.com/RemedyIT/r2corba/releases] matching the new version (for example v1.6.0). The github {Ruby Gem Release}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3A%22Ruby+Gem+Release%22] action will automatically create a new {r2corba}[https://www.rubygems.org/gems/r2corba] and {taosource}[https://www.rubygems.org/gems/taosource] gem and push these to Rubygems.org.
+
+A new R2CORBA taosource gem can be created by executing
+
+  rake r2corba:gem:taogem
+

data/THANKS

@@ -15,7 +15,7 @@ Our thanks go to:
   OS abstraction and multiplatform compatibility of this software
   make it an ideal ingredient for a Ruby CORBA implementation.
 
-* The people of the JacORB development team (a.o. Gerald Brose and 
+* The people of the JacORB development team (a.o. Gerald Brose and
   Andre Spiegel) and all their collaborators for creating a high-
   performance, multi threaded and spec compliant ORB for the
   Java environment.
@@ -26,7 +26,7 @@ Our thanks go to:
   2001 (incl. RINN and Ruby-Orbit) which has helped us in many ways
   to create R2CORBA.
 
-* Paul Brannan of Automated Trading Desk, LLC for his insightfull
+* Paul Brannan of Automated Trading Desk, LLC for his insightful
   comments on the first release of the Ruby CORBA language mapping.
 
 * Renato Lucindo and Eider Oliveira for their remarks and fixes for
@@ -36,7 +36,7 @@ Our thanks go to:
 
 * William Otte for his patches for the Mac OSX port.
 
-* David MacMahon for his comments and tests, especially with regard to 
+* David MacMahon for his comments and tests, especially with regard to
   omniORBpy interoperability.
 
 * David MacMahon for his Multi_Threading/Threads test.
@@ -46,7 +46,7 @@ Our thanks go to:
 
 * Karsten Richter for reporting a bug in union implicit default
   handling and providing a partial patch and regression test.
-  
+
 * Grant Birchmeier for reporting the RIDL logger bug (triggered
   by an unknown pragma)
 

data/lib/corba/cbase/IORMap.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'corba/idl/IORTableC'
 

data/lib/corba/cbase/ORB.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'monitor'
 
@@ -42,12 +41,12 @@ module R2CORBA
           prop = nil
           a1, a2, a3 = args
           if Array === a1
-            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size>3
+            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 3
             argv = a1
             orb_id = (Hash === a2 ? nil : a2)
             prop = (Hash === a2 ? a2 : a3)
           elsif args.size == 1 || Hash === a2
-            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size>2
+            raise ArgumentError, "Incorrect nr. of arguments; #{args.size}" if args.size > 2
             orb_id = a1
             prop = a2
           else
@@ -55,7 +54,7 @@ module R2CORBA
           end
           raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
           unless prop.nil?()
-            prop.inject(argv) {|a,(k,v)| a << k; a << v; a}
+            prop.inject(argv) {|a, (k, v)| a << k; a << v; a}
           end
           @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.concat(@@_default_args), orb_id.nil?() ? nil : orb_id.to_s)
         end
@@ -99,11 +98,11 @@ module R2CORBA
         else
           @running ||= true
           raise CORBA::BAD_INV_ORDER.new('ORB has been shutdown', 0, CORBA::COMPLETED_NO) if @shutdown
-          while (timeout.nil? or timeout>0) and !@shutdown
+          while (timeout.nil? or timeout > 0) and !@shutdown
             to = timeout || 0.05
             f, to = self.work_pending(to)
             timeout = to unless timeout.nil?
-            if f and !@shutdown and (timeout.nil? or timeout>0)
+            if f and !@shutdown and (timeout.nil? or timeout > 0)
               to = timeout || 0.05
               to = self.perform_work(to)
               timeout = to unless timeout.nil?
@@ -145,17 +144,20 @@ module R2CORBA
           @q_ = []
           super
         end
+
         def push(vfklass)
           synchronize do
             @q_ << vfklass
           end
         end
+
         def process_all(&block)
           synchronize do
             @q_.each { |vf| block.call(vf) }
             @q_.clear
           end
         end
+
         def empty?()
           f = false
           synchronize do
@@ -187,22 +189,22 @@ module R2CORBA
    private
      @@sigreg = {}
      def CORBA.signal_numbers
-      ( [1, # HUP
-         2, # INT
-         3, # QUIT
-         5, # TRAP
-         6, # ABRT
-         10, # USR1
-         12, # USR2
-         13, # SIGPIPE
-         14, # ALRM
-         15, # TERM
-         17, # CHLD
-         18, # CONT
-         23, # URG
-         30, # PWR
-         31  # SYS
-        ]) & Signal.list.values
+      ([1, # HUP
+        2, # INT
+        3, # QUIT
+        5, # TRAP
+        6, # ABRT
+        10, # USR1
+        12, # USR2
+        13, # SIGPIPE
+        14, # ALRM
+        15, # TERM
+        17, # CHLD
+        18, # CONT
+        23, # URG
+        30, # PWR
+        31  # SYS
+       ]) & Signal.list.values
      end
 
      def CORBA.handled_signals
@@ -211,7 +213,7 @@ module R2CORBA
          sigcmd = Signal.trap(signum, 'DEFAULT')
          Signal.trap(signum, sigcmd)
          @@sigreg[signum] = sigcmd
-         if sigcmd.respond_to?(:call) or ['IGNORE','SIG_IGN','EXIT'].include?(sigcmd.to_s)
+         if sigcmd.respond_to?(:call) or ['IGNORE', 'SIG_IGN', 'EXIT'].include?(sigcmd.to_s)
            signum
          else
            nil
@@ -223,7 +225,7 @@ module R2CORBA
      def CORBA.handle_signal(signum)
        if @@sigreg.has_key?(signum)
          if @@sigreg[signum].respond_to?(:call)
-           if @@sigreg[signum].respond_to?(:parameters) && @@sigreg[signum].parameters.size>0
+           if @@sigreg[signum].respond_to?(:parameters) && @@sigreg[signum].parameters.size > 0
              @@sigreg[signum].call(signum)
            else
              @@sigreg[signum].call

data/lib/corba/cbase/Request.rb

@@ -8,24 +8,23 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
 
     module Request
 
-      def add_in_arg(tc, val, nm='')
+      def add_in_arg(tc, val, nm = '')
         self._arguments << [nm, CORBA::ARG_IN, tc, val]
         self._arguments.size
       end
 
-      def add_out_arg(tc, nm='')
+      def add_out_arg(tc, nm = '')
         self._arguments << [nm, CORBA::ARG_OUT, tc]
         self._arguments.size
       end
 
-      def add_inout_arg(tc, val, nm='')
+      def add_inout_arg(tc, val, nm = '')
         self._arguments << [nm, CORBA::ARG_INOUT, tc, val]
         self._arguments.size
       end
@@ -131,4 +130,4 @@ module R2CORBA
     end
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/cbase/Streams.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -43,7 +42,7 @@ module R2CORBA
           when TK_DOUBLE
             read_double()
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             read_fixed()
           when TK_CHAR
@@ -99,7 +98,7 @@ module R2CORBA
           when TK_DOUBLE
             write_double(value)
           when TK_LONGDOUBLE
-            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('LongDouble not supported', 0, CORBA::COMPLETED_NO)
           when TK_FIXED
             write_fixed(value)
           when TK_CHAR

data/lib/corba/cbase/Stub.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA

data/lib/corba/cbase/Typecode.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -119,7 +118,7 @@ module R2CORBA
             content_tc = args.shift
             length = args
             raise ArgumentError, 'expected CORBA::TypeCode' unless content_tc.is_a?(CORBA::TypeCode)
-            if length.size>1
+            if length.size > 1
               this_len = length.shift
               content_tc = self.class.new(content_tc, *length)
             else
@@ -197,7 +196,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,members)
+        def _create_tc(id, name, modifier, base, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_VALUE, id.to_s, name.to_s,
                                               CORBA::VT_MODIFIERS[modifier],
@@ -214,7 +213,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,modifier,base,members)
+        def _create_tc(id, name, modifier, base, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_EVENT, id.to_s, name.to_s,
                                               CORBA::VT_MODIFIERS[modifier],
@@ -322,7 +321,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,members)
+        def _create_tc(id, name, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_STRUCT, id.to_s, name.to_s, members)
           rescue ::NativeException
@@ -336,7 +335,7 @@ module R2CORBA
 
         protected
 
-        def _create_tc(id,name,members)
+        def _create_tc(id, name, members)
           begin
             CORBA::Native::TypeCode.create_tc(TK_EXCEPT, id.to_s, name.to_s, members)
           rescue ::NativeException
@@ -357,7 +356,7 @@ module R2CORBA
             @members = []
             def_inx = @tc_.default_index
             @tc_.member_count.times do |i|
-              if def_inx < 0  || def_inx != i
+              if def_inx < 0 || def_inx != i
                 ml_ = @tc_.member_label(i)
               else
                 ml_ = :default

data/lib/corba/cbase/Values.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
@@ -22,6 +21,7 @@ module R2CORBA
         end
       end
     end
+
     module ValueBase
       def self.included(mod)
         mod.module_eval do
@@ -31,10 +31,10 @@ module R2CORBA
           def kind_of?(mod)
             if mod < CORBA::AbstractValueBase && mod.const_defined?(:Intf)
               org_kind_of?(mod::Intf)
-              #super(mod::Intf)   ## problematic with Ruby 1.9.2 (known bug)
+              # super(mod::Intf)   ## problematic with Ruby 1.9.2 (known bug)
             else
               org_kind_of?(mod)
-              #super              ## problematic with Ruby 1.9.2 (known bug)
+              # super              ## problematic with Ruby 1.9.2 (known bug)
             end
           end
           alias :is_a? :kind_of?
@@ -98,6 +98,7 @@ module R2CORBA
         class FactoryBase < CORBA::Portable::ValueFactoryBase
           ## generic factory base
         end
+
         def self.included(mod)
           mod.module_eval do
             include CORBA::ValueBase unless self.include?(CORBA::ValueBase)

data/lib/corba/cbase/exception.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 # import all java CORBA exceptions into the R2CORBA::CORBA namespace
@@ -40,13 +39,14 @@ module R2CORBA
         exklass = CORBA.const_defined?(exklass) ? CORBA.const_get(exklass) : nil
         if exklass.nil? || !(CORBA::SystemException > exklass)
           Kernel.raise InternalError,
-                "Unknown SystemException raised: " +
-                id.to_s+' ['+reason.to_s+']'
+                'Unknown SystemException raised: ' +
+                id.to_s + ' [' + reason.to_s + ']'
         else
-          Kernel.raise exklass.new(reason,minor,completed)
+          Kernel.raise exklass.new(reason, minor, completed)
         end
       end
-      def initialize(reason="", minor=0, completed=nil)
+
+      def initialize(reason = '', minor = 0, completed = nil)
         super(reason)
         @minor = minor
         @completed = completed
@@ -54,6 +54,7 @@ module R2CORBA
       end
       attr_accessor :ids
       def _ids; @ids; end
+
       def _interface_repository_id
         self.class::Id
       end

data/lib/corba/cbase/poa.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/common/Servant.rb'
@@ -16,7 +15,7 @@ require 'corba/idl/POAC.rb'
 require 'corba/idl/IORTableC'
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "librpoaw" : "librpoa"
+  require 'librpoa'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise

data/lib/corba/cbase/policies.rb

@@ -8,12 +8,11 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'corba/idl/TAO_ExtC'
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "librpolw" : "librpol"
+  require 'librpol'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise
@@ -25,7 +24,7 @@ module R2CORBA
 
     module ORB
       def create_policy(type, val)
-        raise CORBA::BAD_PARAM.new('Any expected',0,CORBA::COMPLETED_NO) unless CORBA::Any === val
+        raise CORBA::BAD_PARAM.new('Any expected', 0, CORBA::COMPLETED_NO) unless CORBA::Any === val
         begin
           self.orb_.create_policy(type.to_i, val)
         rescue ::NativeException
@@ -75,4 +74,4 @@ module R2CORBA
 
   end # CORBA
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/cbase/post_require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
-require 'corba/cbase/IORMap'
+require 'corba/cbase/IORMap'

data/lib/corba/cbase/require.rb

@@ -8,11 +8,19 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "libr2taow" : "libr2tao"
+  _ext_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../../ext'))
+  $: << _ext_dir unless $:.include?(_ext_dir) || !File.directory?(_ext_dir)
+  if RUBY_PLATFORM =~ /mingw/
+    require 'ruby_installer/runtime'
+    RubyInstaller::Runtime.add_dll_directory(_ext_dir)
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'libACE.dll'))
+    end
+  end
+  require 'libr2tao'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise

data/lib/corba/cmds/base.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'optparse'
@@ -49,7 +48,7 @@ module R2CORBA
     def self.parse_args(args)
       opts = OptionParser.new
       opts.banner = "Usage: r2corba [global options] command [command options]\n\n" +
-          "    command\t\tSpecifies R2CORBA command to execute.\n"+
+          "    command\t\tSpecifies R2CORBA command to execute.\n" +
           "           \t\tDefault = list :== list commands\n"
       opts.separator ''
       opts.on('-v', '--verbose',

data/lib/corba/cmds/test.rb

@@ -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__), '..', '..', '..', 'test', 'test_runner.rb')

data/lib/corba/common/Any.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
@@ -59,13 +58,13 @@ module R2CORBA
         end
       end
 
-      def Any.to_any(o, tc=nil)
+      def Any.to_any(o, tc = nil)
         if tc.nil?
           tc = self.typecode_for_value(o)
           if tc.is_a?(CORBA::TypeCode)
             return new(o, tc)
           end
-          raise CORBA::MARSHAL.new('missing TypeCode',0,CORBA::COMPLETED_NO)
+          raise CORBA::MARSHAL.new('missing TypeCode', 0, CORBA::COMPLETED_NO)
         end
         return new(o, tc)
       end
@@ -73,6 +72,7 @@ module R2CORBA
       def _tc
         @__tc
       end
+
       def _value
         @__value
       end

data/lib/corba/common/IDL.rb

@@ -8,20 +8,16 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
-# hardwire RIDL to embedded state for Ruby language mapping
-module IDL
-  @@embedded = true
-  @@be_name = :ruby
-end
-
 begin
   require 'rubygems'
 rescue LoadError
   # ignore error, RIDL may be installed locally not as gem
 end
+# hardwire R2CORBA :ruby RIDL backend
+ENV['RIDL_BE_SELECT'] = 'ruby'
+# load RIDL
 require 'ridl/ridl'
 
 module R2CORBA
@@ -29,8 +25,8 @@ module R2CORBA
   module CORBA
 
     module IDL
-      CLIENT_STUB = 1.freeze
-      SERVANT_INTF = 2.freeze
+      CLIENT_STUB = 1
+      SERVANT_INTF = 2
 
       @@loaded_idls = {}
 
@@ -64,7 +60,7 @@ module R2CORBA
           fname
         else
           fp = paths.find do |p|
-            f = p + "/" + fname
+            f = p + '/' + fname
             File.file?(f) && File.readable?(f)
           end
           fp += '/' + fname if !fp.nil?