r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

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
@@ -37,11 +36,11 @@ module R2CORBA
     module POA
       def destroy(etherealize_objects, wait_for_completion)
         begin
-          self.objref_.destroy(etherealize_objects!=false, wait_for_completion!=false)
+          self.objref_.destroy(etherealize_objects != false, wait_for_completion != false)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation destroy
+      end # of operation destroy
 
       def the_name()
         begin
@@ -49,7 +48,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_name
+      end # of attribute get_the_name
 
       def the_POAManager()
         begin
@@ -57,7 +56,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_POAManager
+      end # of attribute get_the_POAManager
 
       def the_parent()
         begin
@@ -65,7 +64,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_parent
+      end # of attribute get_the_parent
 
       def the_children()
         begin
@@ -73,7 +72,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_the_children
+      end # of attribute get_the_children
 
       def activate_object(p_servant)
         begin
@@ -81,7 +80,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation activate_object
+      end # of operation activate_object
 
       def activate_object_with_id(r_id, p_servant)
         begin
@@ -89,7 +88,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation activate_object_with_id
+      end # of operation activate_object_with_id
 
       def deactivate_object(oid)
         begin
@@ -97,7 +96,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation deactivate_object
+      end # of operation deactivate_object
 
       def create_reference(intf)
         begin
@@ -105,7 +104,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_reference
+      end # of operation create_reference
 
       def create_reference_with_id(oid, intf)
         begin
@@ -113,7 +112,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_reference_with_id
+      end # of operation create_reference_with_id
 
       def servant_to_id(p_servant)
         begin
@@ -121,7 +120,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation servant_to_id
+      end # of operation servant_to_id
 
       def servant_to_reference(p_servant)
         begin
@@ -129,7 +128,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation servant_to_reference
+      end # of operation servant_to_reference
 
       def reference_to_servant(reference)
         begin
@@ -137,7 +136,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation reference_to_servant
+      end # of operation reference_to_servant
 
       def reference_to_id(reference)
         begin
@@ -145,7 +144,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation reference_to_id
+      end # of operation reference_to_id
 
       def id_to_servant(oid)
         begin
@@ -153,7 +152,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation id_to_servant
+      end # of operation id_to_servant
 
       def id_to_reference(oid)
         begin
@@ -161,19 +160,19 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation id_to_reference
+      end # of operation id_to_reference
 
       def create_POA(adapter_name, a_POAManager, policies)
         raise CORBA::BAD_PARAM.new('expected POAManager', 0, CORBA::COMPLETED_NO) unless a_POAManager.is_a?(PortableServer::POAManager)
         CORBA::PolicyList._tc.validate(policies) unless policies.nil? || policies.empty?
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.nil? ? 0 : policies.size)
-        policies.each_with_index {|p,i| jpolicies[i] = p.objref_ } unless policies.nil?
+        policies.each_with_index {|p, i| jpolicies[i] = p.objref_ } unless policies.nil?
         begin
           PortableServer::POA._narrow(CORBA::Object._wrap_native(self.objref_.create_POA(adapter_name, a_POAManager.objref_, jpolicies)))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_POA
+      end # of operation create_POA
 
       def find_POA(adapter_name, activate_it)
         begin
@@ -181,7 +180,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation find_POA
+      end # of operation find_POA
     end # POA
 
     module POAManager
@@ -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
@@ -17,7 +16,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
           Policy._wrap_native(self.orb_.create_policy(type.to_i, val.to_java(self.orb_)))
         rescue ::NativeException
@@ -54,12 +53,12 @@ module R2CORBA
           end
           jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
         end
-      end #of operation get_policy_overrides
+      end # of operation get_policy_overrides
 
       def _set_policy_overrides(policies, set_add)
         raise CORBA::INV_OBJREF.new if self._is_nil?()
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           obj = self.objref_._set_policy_override(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
@@ -92,7 +91,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_policy_type
+      end # of attribute get_policy_type
 
       def copy()
         begin
@@ -100,7 +99,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation copy
+      end # of operation copy
 
       def destroy()
         begin
@@ -109,7 +108,7 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
         @objref_ = nil
-      end #of operation destroy
+      end # of operation destroy
     end # Policy
 
     module PolicyManager
@@ -122,17 +121,17 @@ module R2CORBA
           CORBA::Exception.native2r($!)
         end
         jpolicies.collect {|jpol| Policy._wrap_native(jpol) }
-      end #of operation get_policy_overrides
+      end # of operation get_policy_overrides
 
       def set_policy_overrides(policies, set_add)
         jpolicies = CORBA::Native::Reflect::Array.newInstance(CORBA::Native::Policy.java_class, policies.size)
-        policies.each_with_index {|e,i| jpolicies[i] = e.objref_ }
+        policies.each_with_index {|e, i| jpolicies[i] = e.objref_ }
         begin
           self.objref_.set_policy_overrides(jpolicies, Native::SetOverrideType.from_int(set_add))
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation set_policy_overrides
+      end # of operation set_policy_overrides
     end # Policy
 
   end # CORBA
@@ -148,7 +147,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_thread_policy
+      end # of operation create_thread_policy
 
       def create_lifespan_policy(value)
         begin
@@ -158,7 +157,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_lifespan_policy
+      end # of operation create_lifespan_policy
 
       def create_id_uniqueness_policy(value)
         begin
@@ -168,7 +167,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_id_uniqueness_policy
+      end # of operation create_id_uniqueness_policy
 
       def create_id_assignment_policy(value)
         begin
@@ -178,7 +177,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_id_assignment_policy
+      end # of operation create_id_assignment_policy
 
       def create_implicit_activation_policy(value)
         begin
@@ -188,7 +187,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_implicit_activation_policy
+      end # of operation create_implicit_activation_policy
 
       def create_servant_retention_policy(value)
         begin
@@ -198,7 +197,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_servant_retention_policy
+      end # of operation create_servant_retention_policy
 
       def create_request_processing_policy(value)
         begin
@@ -208,7 +207,7 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of operation create_request_processing_policy
+      end # of operation create_request_processing_policy
     end # POA
 
     module ThreadPolicy  ## interface
@@ -218,8 +217,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface ThreadPolicy
+      end # of attribute get_value
+    end # of interface ThreadPolicy
 
     module LifespanPolicy  ## interface
       def value()
@@ -228,8 +227,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface LifespanPolicy
+      end # of attribute get_value
+    end # of interface LifespanPolicy
 
     module IdUniquenessPolicy  ## interface
       def value()
@@ -238,8 +237,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface IdUniquenessPolicy
+      end # of attribute get_value
+    end # of interface IdUniquenessPolicy
 
     module IdAssignmentPolicy  ## interface
       def value()
@@ -248,8 +247,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface IdAssignmentPolicy
+      end # of attribute get_value
+    end # of interface IdAssignmentPolicy
 
     module ImplicitActivationPolicy  ## interface
       def value()
@@ -258,8 +257,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface ImplicitActivationPolicy
+      end # of attribute get_value
+    end # of interface ImplicitActivationPolicy
 
     module ServantRetentionPolicy  ## interface
       def value()
@@ -268,8 +267,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface RequestProcessingPolicy
+      end # of attribute get_value
+    end # of interface RequestProcessingPolicy
 
     module RequestProcessingPolicy  ## interface
       def value()
@@ -278,8 +277,8 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface RequestProcessingPolicy
+      end # of attribute get_value
+    end # of interface RequestProcessingPolicy
 
   end # PortableServer
 
@@ -292,9 +291,9 @@ module R2CORBA
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
-      end #of attribute get_value
-    end #of interface BidirectionalPolicy
+      end # of attribute get_value
+    end # of interface BidirectionalPolicy
 
   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
@@ -51,18 +50,22 @@ module R2CORBA
       module Portable
         include_package 'org.omg.CORBA.portable'
       end
+
       module V2_3
         include_package 'org.omg.CORBA_2_3'
         module Portable
           include_package 'org.omg.CORBA.portable'
         end
       end
+
       module V2_5
         include_package 'org.omg.CORBA_2_5'
       end
+
       module V3_0
         include_package 'org.omg.CORBA_3_0'
       end
+
       module Jacorb
         module Util
           java_import org.jacorb.util.Version

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,8 +8,7 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba.rb'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/poa.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/poa.rb"

data/lib/corba/policies.rb

@@ -8,11 +8,10 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba.rb'
 require 'corba/poa.rb'
 require 'corba/idl/BiDirPolicyC'
 require 'corba/idl/MessagingC'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/policies.rb"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/policies.rb"

data/lib/corba/require.rb

@@ -8,10 +8,9 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/common/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/require"
 require 'corba/idl/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/post_require"
+require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/post_require"