r2corba 1.5.1 → 1.5.2

data/lib/corba/common/Union.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
@@ -53,4 +52,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/common/Values.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
@@ -89,4 +88,4 @@ module R2CORBA
     PUBLIC_MEMBER = 1
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/common/const.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/common/exception.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/require.rb

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

data/lib/corba/common/version.rb

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module R2CORBA
 
-  R2CORBA_MAJOR = 1.freeze
-  R2CORBA_MINOR = 5.freeze
-  R2CORBA_RELEASE = '1'.freeze
+  R2CORBA_MAJOR = 1
+  R2CORBA_MINOR = 5
+  R2CORBA_RELEASE = 2
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
 

data/lib/corba/idl/IDL.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/idl/IORTable.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_IORTABLE_IORTABLE_PIDL
 #define R2TAO_IORTABLE_IORTABLE_PIDL

data/lib/corba/idl/TAO_Ext.pidl

@@ -1,5 +1,4 @@
 // -*- IDL -*-
-// $Id$
 
 #ifndef R2TAO_TAO_EXT_IDL
 #define R2TAO_TAO_EXT_IDL

data/lib/corba/idl/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/idl/IDL.rb'

data/lib/corba/jbase/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
@@ -192,7 +191,7 @@ module R2CORBA
             when TK_LONGDOUBLE
               raise CORBA::NO_IMPLEMENT.new('LongDouble not supported',0,CORBA::COMPLETED_NO)
             when TK_FIXED
-              rval = BigDecimal.new(jany.extract_fixed().toString())
+              rval = BigDecimal(jany.extract_fixed().toString())
             when TK_CHAR
               rval = jany.extract_char().chr
             when TK_STRING

data/lib/corba/jbase/IORMap.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
@@ -33,4 +32,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/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

data/lib/corba/jbase/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

data/lib/corba/jbase/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
@@ -223,4 +222,4 @@ module R2CORBA
     end
 
   end # CORBA
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/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
@@ -245,4 +244,4 @@ module R2CORBA
 
   end # PortableServer
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/ServerRequest.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
@@ -125,4 +124,4 @@ module R2CORBA
 
   end # CORBA
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/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
@@ -668,4 +667,4 @@ module R2CORBA
       end
     end
   end
-end
+end

data/lib/corba/jbase/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/jbase/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 "corba/jbase/Any.rb"
 require 'bigdecimal'

data/lib/corba/jbase/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

data/lib/corba/jbase/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

data/lib/corba/jbase/poa.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
@@ -226,4 +225,4 @@ module R2CORBA
       end # get_state
     end # POAManager
   end
-end
+end

data/lib/corba/jbase/policies.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
@@ -297,4 +296,4 @@ module R2CORBA
 
   end # BiDirPolicy
 
-end # R2CORBA
+end # R2CORBA

data/lib/corba/jbase/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/jbase/IORMap'

data/lib/corba/jbase/require.rb

@@ -8,14 +8,13 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 require 'rbconfig'
 require 'java'
 
 module R2CORBA
   if ENV['JACORB_HOME'] &&
-      (File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
+      (File.exist?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
        Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb\-\d\.\d\.jar\Z/})
     JACORB_HOME = ENV['JACORB_HOME']
   else

data/lib/corba/naming.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/CosNamingC'

data/lib/corba/naming_service.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/naming.rb'

data/lib/corba/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.rb'

data/lib/corba/policies.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.rb'

data/lib/corba/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/common/require'

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

@@ -1,17 +1,14 @@
 #--------------------------------------------------------------------
 # cos_naming.rb - Implementation of CosNaming servants
-#                 for full featured naming service 
+#                 for full featured naming service
 #
 # Author: Martin Corino
 #
-# $Id: $
-#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the R2CORBA LICENSE which is
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/naming_service'
@@ -34,7 +31,7 @@ module CosNaming
       s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
       s
     end
-    # convert stringified name back to NameComponent 
+    # convert stringified name back to NameComponent
     def self.from_string(snc)
       raise CosNaming::NamingContext::InvalidName.new if snc.empty?
       esc_ = false
@@ -63,7 +60,7 @@ end
 
 module R2CORBA
   module INS
-    
+
     ##
     # Binding iterator servant class
     #
@@ -72,14 +69,14 @@ module R2CORBA
         @rl = reglist
         @id = iterator_id
       end
-    
+
       attr_accessor :oid
-    
+
       def next_one
         reg = @rl.shift
         [!reg.nil?, reg ? CosNaming::Binding.new(reg[:name], reg[:type]) : nil]
       end
-    
+
       def next_n(how_many)
         raise CORBA::BAD_PARAM.new if how_many < 1
         bindings = []
@@ -90,7 +87,7 @@ module R2CORBA
         end
         [!bindings.empty?, bindings]
       end
-    
+
       def destroy
         poa = self._default_POA
         poa.deactivate_object(self.oid)
@@ -103,7 +100,7 @@ module R2CORBA
     # Naming context servant class
     #
     class NamingContext < POA::CosNaming::NamingContextExt
-      
+
       # Map type to store bindings.
       # Use synchronized version for multithreading capable implementations.
       #
@@ -167,18 +164,18 @@ module R2CORBA
           end
         end
       end
-            
+
       @@iterators = MAP_TYPE.new
       @@iterator_max = 100
-      
+
       def self.set_iterator_max(max)
         @@iterator_max = max.to_i
       end
-      
+
       def self.clear_iterator(id)
-        @@iterators.delete(id) 
+        @@iterators.delete(id)
       end
-      
+
       def self.alloc_iterator(reglist)
         @@iterators.synchronize do
           unless @@iterators.size < @@iterator_max
@@ -189,14 +186,14 @@ module R2CORBA
           return (@@iterators[itid] = INS::BindingIterator.new(reglist, itid))
         end
       end
-      
+
       def initialize(orb)
-        @orb = orb        
+        @orb = orb
         @map = MAP_TYPE.new
       end
-    
+
       attr_accessor :oid
-    
+
       # CosNaming::NamingContext methods
       #
       def bind(n, obj)
@@ -208,7 +205,7 @@ module R2CORBA
           register_object(n.first, n, CosNaming::Nobject, obj)
         end
       end
-    
+
       def rebind(n, obj)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         if n.size>1
@@ -218,7 +215,7 @@ module R2CORBA
           reregister_object(n.first, n, CosNaming::Nobject, obj)
         end
       end
-    
+
       def bind_context(n, nc_new)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         if n.size>1
@@ -228,7 +225,7 @@ module R2CORBA
           register_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       end
-    
+
       def rebind_context(n, nc_new)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         if n.size>1
@@ -238,12 +235,12 @@ module R2CORBA
           reregister_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       end
-    
+
       def resolve(n)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         find_object(n)
       end
-    
+
       def unbind(n)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         if n.size>1
@@ -257,21 +254,21 @@ module R2CORBA
           end
         end
       end
-    
+
       def new_context()
         poa = self._default_POA
         naming_srv = NamingContext.new(@orb)
         naming_srv.oid = poa.activate_object(naming_srv)
         ::CosNaming::NamingContextExt::_narrow(poa.id_to_reference(naming_srv.oid))
       end
-    
+
       def bind_new_context(n)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         nc = self.new_context()
         self.bind_context(n, nc)
         nc
       end
-    
+
       def destroy()
         raise CosNaming::NamingContext::NotEmpty.new if @map.size>0
         return if self.oid.nil? ## no oid for root context
@@ -279,7 +276,7 @@ module R2CORBA
         poa.deactivate_object(self.oid)
         @orb = nil
       end
-    
+
       def list(how_many)
         reglist = @map.values
         bindings = []
@@ -297,14 +294,14 @@ module R2CORBA
         end
         [bindings, CosNaming::BindingIterator._narrow(bi_obj)]
       end
-    
+
       # CosNaming::NamingContextExt methods
       #
       def to_string(n)
         raise CosNaming::NamingContext::InvalidName.new if n.size<1
         n.collect { |nc| nc.to_string }.join('/')
       end
-    
+
       def to_name(sn)
         raise CosNaming::NamingContext::InvalidName.new if sn.to_s.empty?
         snc_arr = []
@@ -313,7 +310,7 @@ module R2CORBA
         sn.size.times do |i|
           case sn[i,1]
           when '\\'
-            esc_ = !esc_ 
+            esc_ = !esc_
           when '/'
             unless esc_
               snc_arr << sn[off_, i-off_]
@@ -327,7 +324,7 @@ module R2CORBA
         snc_arr << sn[off_, sn.size]
         [snc_arr.collect { |snc| CosNaming::NameComponent.from_string(snc) }]
       end
-    
+
       def to_url(addr, sn)
         raise CosNaming::NamingContext::InvalidName.new if addr.to_s.empty? or sn.to_s.empty?
         url = 'corbaname:'+addr+'#'
@@ -340,7 +337,7 @@ module R2CORBA
         end
         url
       end
-    
+
       def resolve_str(sn)
         self.resolve(self.to_name(sn).first)
       end
@@ -348,7 +345,7 @@ module R2CORBA
       # Helper methods
       #
       protected
-    
+
       # register the object reference for a certain NameComponent id
       # no reregistering or duplicates allowed
       #
@@ -363,7 +360,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # reregister the object reference for a certain NameComponent id
       #
       def reregister_object(name, full_name, type, obj)
@@ -380,7 +377,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # walk all segments of the given CosNaming::Name to find the object
       # bound by this full name
       # NOTE that #find_context is used when the Name contains > 1 level
@@ -400,7 +397,7 @@ module R2CORBA
           end
         end
       end
-    
+
       # check if there exists a naming context in the current context
       # with the id from the first segment of the given CosNaming::Name
       # return the object reference to the naming context if found
@@ -419,8 +416,8 @@ module R2CORBA
           @map[key_][:object]
         end
       end
-    
+
     end #of NamingContext servant
-    
+
   end
 end