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

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 = {}
 

data/lib/corba/common/ORB.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
@@ -260,7 +259,7 @@ module R2CORBA
       # Identifier name
       # TypeCode boxed_type
       # ret TypeCode
-      def create_value_box_tc (id, name, boxed_type)
+      def create_value_box_tc(id, name, boxed_type)
         return CORBA::TypeCode::Valuebox.new(id, name, boxed_type)
       end
 

data/lib/corba/common/Object.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
@@ -48,6 +47,10 @@ module R2CORBA
         obj
       end
 
+      def self._tc
+        CORBA._tc_Object
+      end
+
       #-------------------  4.3 "Object Reference Operations"
 
       def ==(other)
@@ -205,4 +208,3 @@ module R2CORBA
     end # Object
   end # CORBA
 end # R2CORBA
-

data/lib/corba/common/Request.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
@@ -17,4 +16,4 @@ module R2CORBA
     end
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/common/Servant.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

data/lib/corba/common/Struct.rb

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

data/lib/corba/common/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
@@ -71,7 +70,7 @@ module R2CORBA
           s = ""
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<
-               "  " <<  @ids.join("\n  ") << "\n"
+               "  " << @ids.join("\n  ") << "\n"
         end
       end # Stub
     end # Portable

data/lib/corba/common/Typecode.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'
 
@@ -16,7 +15,7 @@ module R2CORBA
   module CORBA
     class TypeCode
       def initialize
-        raise RuntimeError, 'not allowed'
+        raise 'not allowed'
       end
 
       @@wrapper_klass = Class.new(CORBA::TypeCode) do
@@ -93,10 +92,10 @@ module R2CORBA
       end
 
       def TypeCode.from_native(ntc)
-        if [TK_NULL,TK_VOID,TK_ANY,TK_BOOLEAN,TK_SHORT,TK_LONG,TK_USHORT,
-            TK_WCHAR,TK_ULONG,TK_LONGLONG,TK_ULONGLONG,TK_OCTET,
-            TK_FLOAT,TK_DOUBLE,TK_LONGDOUBLE,TK_CHAR,
-            TK_TYPECODE,TK_PRINCIPAL].include?(native_kind(ntc))
+        if [TK_NULL, TK_VOID, TK_ANY, TK_BOOLEAN, TK_SHORT, TK_LONG, TK_USHORT,
+            TK_WCHAR, TK_ULONG, TK_LONGLONG, TK_ULONGLONG, TK_OCTET,
+            TK_FLOAT, TK_DOUBLE, TK_LONGDOUBLE, TK_CHAR,
+            TK_TYPECODE, TK_PRINCIPAL].include?(native_kind(ntc))
           ## primitive typecode; wrap it
           return TypeCode._wrap_native(ntc)
         else
@@ -158,9 +157,9 @@ module R2CORBA
               rtc = TypeCode::Valuetype.new(ntc)
             end
           when TK_NATIVE
-            raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported',0,CORBA::COMPLETED_NO)
+            raise CORBA::NO_IMPLEMENT.new('typecode #{native_kind(ntc)} not supported', 0, CORBA::COMPLETED_NO)
           else
-            raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]",0,CORBA::COMPLETED_NO)
+            raise CORBA::MARSHAL.new("unknown kind [#{native_kind(ntc)}]", 0, CORBA::COMPLETED_NO)
           end
           return rtc
         end
@@ -310,9 +309,9 @@ module R2CORBA
       def get_type
         @type ||= case self.kind
           when TK_SHORT, TK_LONG, TK_USHORT, TK_ULONG
-            ::Fixnum
+            FIXNUM_KLASS
           when TK_LONGLONG, TK_ULONGLONG
-            ::Bignum
+            BIGNUM_KLASS
           when TK_FLOAT, TK_DOUBLE
             ::Float
           when TK_LONGDOUBLE
@@ -322,7 +321,7 @@ module R2CORBA
           when TK_CHAR, TK_STRING
             ::String
           when TK_WCHAR, TK_OCTET
-            ::Fixnum
+            FIXNUM_KLASS
           when TK_VOID, TK_NULL
             ::NilClass
           when TK_ANY
@@ -343,7 +342,7 @@ module R2CORBA
         when TK_ANY
           return CORBA::Any === val ? val : Any.to_any(val)
         when TK_BOOLEAN
-          return val if ((val.is_a? TrueClass) || (val.is_a? FalseClass))
+          return val if (val.is_a? TrueClass) || (val.is_a? FalseClass)
         when TK_SHORT
           return val.to_int if val.respond_to?(:to_int) && ShortRange === val.to_int
         when TK_LONG
@@ -368,7 +367,7 @@ module R2CORBA
             return val.respond_to?(:to_str) ? val.to_str : val.to_int.chr
           end
         else
-          return val if (val.nil? || val.is_a?(self.get_type))
+          return val if val.nil? || val.is_a?(self.get_type)
         end
         raise CORBA::MARSHAL.new(
           "value does not match type: value = #{val}, value type == #{val.class.name}, type == #{get_type.name}",
@@ -391,7 +390,7 @@ module R2CORBA
       class Recursive < CORBA::TypeCode
 
         def initialize(id)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def recursed_tc
@@ -419,7 +418,7 @@ module R2CORBA
       class String < CORBA::TypeCode
 
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -432,7 +431,7 @@ module R2CORBA
           val = ::String === val ? val : val.to_str
           raise ::CORBA::MARSHAL.new(
             "string size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           val
         end
 
@@ -444,7 +443,7 @@ module R2CORBA
       class WString < CORBA::TypeCode
 
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -465,7 +464,7 @@ module R2CORBA
           end
           raise ::CORBA::MARSHAL.new(
             "widestring size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           raise ::CORBA::MARSHAL.new(
             "invalid widestring element(s)",
             1, ::CORBA::COMPLETED_NO) if val.any? { |el| !(UShortRange === (el.respond_to?(:to_int) ? el.to_int : el)) }
@@ -490,7 +489,7 @@ module R2CORBA
       class Fixed < CORBA::TypeCode
 
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -500,7 +499,7 @@ module R2CORBA
         def validate(val)
           return val if val.nil?
           super(val) unless ::BigDecimal === val || val.respond_to?(:to_str)
-          val = ::BigDecimal === val ? val : BigDecimal.new(val.to_str)
+          val = ::BigDecimal === val ? val : BigDecimal(val.to_str)
           val
         end
 
@@ -512,7 +511,7 @@ module R2CORBA
       class Sequence < CORBA::TypeCode
 
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -539,7 +538,7 @@ module R2CORBA
           end
           raise ::CORBA::MARSHAL.new(
             "sequence size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless (self.length==0 || val.size<=self.length)
+            1, ::CORBA::COMPLETED_NO) unless self.length == 0 || val.size <= self.length
           if ::Array === val
             if val.any? { |e| self.content_type.needs_conversion(e) }
               val.collect { |e| self.content_type.validate(e) }
@@ -560,8 +559,8 @@ module R2CORBA
         end
 
         def inspect
-          "#{self.class.name}: "+
-              "length=#{if self.length.nil? then ""; else  self.length.to_s; end}; "+
+          "#{self.class.name}: " +
+              "length=#{if self.length.nil? then ""; else  self.length.to_s; end}; " +
               "content=#{self.content_type.inspect}"
         end
       end
@@ -569,7 +568,7 @@ module R2CORBA
       class Array < CORBA::TypeCode
 
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -581,10 +580,10 @@ module R2CORBA
           super(val)
           raise ::CORBA::MARSHAL.new(
             "array size exceeds bound: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size<=self.length
+            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size <= self.length
           raise ::CORBA::MARSHAL.new(
             "array size too small: #{self.length.to_s}",
-            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size>=self.length
+            1, ::CORBA::COMPLETED_NO) unless val.nil? || val.size >= self.length
           val.any? { |e| self.content_type.needs_conversion(e) } ? val.collect { |e| self.content_type.validate(e) } : val.each { |e| self.content_type.validate(e) }
         end
 
@@ -602,7 +601,7 @@ module R2CORBA
 
       class Alias < IdentifiedTypeCode
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -624,7 +623,7 @@ module R2CORBA
       class Valuetype < IdentifiedTypeCode
         attr_reader :members
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
         def add_member(name, tc, access)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
@@ -654,7 +653,7 @@ module R2CORBA
           tc.members.each do |nm_, tc_, access_|
             value_type::Intf.module_eval(%Q{attr_accessor :#{nm_}})
             value_type::Intf.__send__(:private, nm_.intern)
-            value_type::Intf.__send__(:private, (nm_+'=').intern)
+            value_type::Intf.__send__(:private, (nm_ + '=').intern)
           end
           value_type
         end
@@ -669,7 +668,7 @@ module R2CORBA
           if needs_conversion(val)
             vorg = val
             val = vorg.class.new
-            @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
+            @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
           else
             @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
           end
@@ -678,24 +677,24 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
-          @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
+          @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
         def member_count
           @members.size
         end
         def member_name(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def member_type(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |n, t| s += "  #{n} = "+t.inspect+"\n" }
+          @members.each { |n, t| s += "  #{n} = " + t.inspect + "\n" }
           s
         end
       end # Valuetype
@@ -705,7 +704,7 @@ module R2CORBA
 
       class Valuebox < IdentifiedTypeCode
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def Valuebox.define_type(tc)
@@ -751,7 +750,7 @@ module R2CORBA
 
       class ObjectRef < IdentifiedTypeCode
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -761,7 +760,7 @@ module R2CORBA
 
       class AbstractInterface < IdentifiedTypeCode
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
 
         def get_type
@@ -772,7 +771,7 @@ module R2CORBA
       class Struct < IdentifiedTypeCode
         attr_reader :members
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
         def add_member(name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
@@ -786,7 +785,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n,t| "@#{n}"}.join(', ')} = param_
+                #{tc.members.collect {|n, t| "@#{n}"}.join(', ')} = param_
               end
             end
             #{tc.name}
@@ -808,7 +807,7 @@ module R2CORBA
           if needs_conversion(val)
             vorg = val
             val = vorg.class.new
-            @members.each { |name, tc| val.__send__((name+'=').intern, tc.validate(vorg.__send__(name.intern))) }
+            @members.each { |name, tc| val.__send__((name + '=').intern, tc.validate(vorg.__send__(name.intern))) }
           else
             @members.each { |name, tc| tc.validate(val.__send__(name.intern)) }
           end
@@ -816,24 +815,24 @@ module R2CORBA
         end
 
         def needs_conversion(val)
-          @members.any? { |name,tc| tc.needs_conversion(val.__send__(name.intern)) }
+          @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
         def member_count
           @members.size
         end
         def member_name(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def member_type(index)
-          raise ::CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |n, t| s += "  #{n} = "+t.inspect+"\n" }
+          @members.each { |n, t| s += "  #{n} = " + t.inspect + "\n" }
           s
         end
       end # Struct
@@ -861,7 +860,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n,t| "@#{n}"}.join(',')} = param_
+                #{tc.members.collect {|n, t| "@#{n}"}.join(',')} = param_
               end
             end
             #{tc.name}
@@ -882,11 +881,11 @@ module R2CORBA
         attr_reader :switchtype
         attr_reader :implicit_default
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
         # because creating the native tc involves creating Any's we postpone until actually needed
         def tc_
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
         def id
           @id
@@ -943,7 +942,7 @@ module R2CORBA
             if needs_conversion(val)
               vorg = val
               val = vorg.class.new
-              val.__send__((@members[@labels[vorg._disc]][1]+'=').intern,
+              val.__send__((@members[@labels[vorg._disc]][1] + '=').intern,
                             @members[@labels[vorg._disc]][2].validate(vorg._value))
             else
               @members[@labels[val._disc]][2].validate(val._value)
@@ -960,15 +959,15 @@ module R2CORBA
           @members.size
         end
         def member_name(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][1]
         end
         def member_type(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][2]
         end
         def member_label(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index][0]
         end
         def discriminator_type
@@ -993,7 +992,7 @@ module R2CORBA
 
         def inspect
           s = "#{self.class.name}: #{name} - #{id}\n"
-          @members.each { |l, n, t| s += "  case #{l.to_s}: #{n} = "+t.inspect+"\n" }
+          @members.each { |l, n, t| s += "  case #{l.to_s}: #{n} = " + t.inspect + "\n" }
           s
         end
       end # Union
@@ -1001,7 +1000,7 @@ module R2CORBA
       class Enum < IdentifiedTypeCode
         attr_reader :members
         def initialize(*args)
-          raise RuntimeError, 'overload required'
+          raise 'overload required'
         end
         def get_type
           ::Integer
@@ -1023,7 +1022,7 @@ module R2CORBA
           @members.size
         end
         def member_name(index)
-          raise CORBA::TypeCode::Bounds.new if (index<0) || (index>=@members.size)
+          raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
           @members[index]
         end
       end # Enum
@@ -1041,7 +1040,7 @@ module R2CORBA
       end
 
       def TypeCode.get_primitive_tc(kind)
-        raise RuntimeError, 'overload required'
+        raise 'overload required'
       end
 
       private
@@ -1110,7 +1109,7 @@ module R2CORBA
 
     class LongDouble
       def to_d(precision)
-        BigDecimal.new(self.to_s(precision))
+        BigDecimal(self.to_s(precision))
       end
       def LongDouble._tc
         CORBA._tc_longdouble