r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

data/lib/corba/jbase/IORMap.rb

@@ -1,36 +1,36 @@
-#--------------------------------------------------------------------
-# iormap.rb - Java/JacORB IORMap definitions
-#
-# Author: Martin Corino
-#
-# 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
-#--------------------------------------------------------------------
-
-module R2CORBA
-  class IORMap
-    def initialize(orb)
-      @orb = orb
-    end
-
-    def map_ior(object_key, ior)
-      begin
-        @orb.orb_.addObjectKey(object_key, ior)
-      rescue ::NativeException
-        CORBA::Exception.native2r($!)
-      end
-    end
-
-    def unmap_ior(object_key)
-      begin
-        @orb.orb_.addObjectKey(object_key, nil)
-      rescue ::NativeException
-        CORBA::Exception.native2r($!)
-      end
-    end
-  end
+#--------------------------------------------------------------------
+# iormap.rb - Java/JacORB IORMap definitions
+#
+# Author: Martin Corino
+#
+# 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
+#--------------------------------------------------------------------
+
+module R2CORBA
+  class IORMap
+    def initialize(orb)
+      @orb = orb
+    end
+
+    def map_ior(object_key, ior)
+      begin
+        @orb.orb_.addObjectKey(object_key, ior)
+      rescue ::NativeException
+        CORBA::Exception.native2r($!)
+      end
+    end
+
+    def unmap_ior(object_key)
+      begin
+        @orb.orb_.addObjectKey(object_key, nil)
+      rescue ::NativeException
+        CORBA::Exception.native2r($!)
+      end
+    end
+  end
 end

data/lib/corba/jbase/ORB.rb

@@ -1,99 +1,112 @@
-#--------------------------------------------------------------------
-# ORB.rb - Java/JacORB CORBA ORB definitions
-#
-# Author: Martin Corino
-#
-# 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
-#--------------------------------------------------------------------
-
-module R2CORBA
-  module CORBA
-
-    module ORB
-
-      ## init() or init(arg1, arg2[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
-      def self.init(*args)
-        n_orb = if args.empty?
-          CORBA::Native::ORB.init
-        else
-          argv = []
-          orb_id = nil
-          prop = nil
-          a1, a2, a3 = args
-          if Array === a1
-            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
-            orb_id = a1
-            prop = a2
-          else
-            argv = args
-          end
-          raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
-          jprop = Java::JavaUtil::Properties.new
-          jprop.setProperty('ORBid', orb_id) if orb_id
-          prop.each { |k,v| jprop.setProperty(k.to_s, v.to_s) } if prop
-          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.to_java(:string), jprop)
-        end
-        @@wrapper_klass.new(n_orb)
-      end
-
-      #str ::String
-      #ret ::CORBA::Object
-      def string_to_object(str)
-        begin
-          begin
-            Object._wrap_native(self.orb_.string_to_object(str))
-          rescue ::NativeException
-            CORBA::Exception.native2r($!)
-          end
-        rescue CORBA::BAD_PARAM ## JacORB throws MARSHAL exception on invalid IORs which is not spec compliant
-          return nil
-        end
-      end
-
-      # boolean wait_for_completion
-      # ret void
-      def shutdown(wait_for_completion = false)
-        if wait_for_completion
-          # need to start this in separate thread otherwise this will lead to deadlock
-          # (JacORB problem)
-          (Thread.new do
-            begin
-              self.orb_.shutdown(wait_for_completion)
-            rescue ::NativeException
-              CORBA::Exception.native2r($!)
-            end
-          end).join()
-        else
-          # need to start a shutdown *with* waiting in a thread because JacORB
-          # occasionally fails with a comm error when #shutdown(false) is called
-          # from within a servant callback
-          Thread.new do
-            begin
-              self.orb_.shutdown(true)
-            rescue ::NativeException
-              CORBA::Exception.native2r($!)
-            end
-          end
-        end
-      end
-
-      # custom R2CORBA extension : IORMap
-
-      def ior_map
-        @iormap ||= R2CORBA::IORMap.new(self)
-      end
-
-    end
-
-  end # CORBA
-end # R2CORBA
+#--------------------------------------------------------------------
+# ORB.rb - Java/JacORB CORBA ORB definitions
+#
+# Author: Martin Corino
+#
+# 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
+#--------------------------------------------------------------------
+
+module R2CORBA
+  module CORBA
+
+    module ORB
+
+      class << self
+        protected
+        def _singleton_orb_init
+          begin
+            CORBA::Native::ORB.init
+          rescue ArgumentError
+            # this will happen if java.endorsed.dirs is used with JacORB
+            # in that case just directly init on the singleton class itself
+            CORBA::Native::ORBSingleton.init
+          end
+        end
+      end
+
+      ## init() or init(arg1, arg2[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
+      def self.init(*args)
+        n_orb = if args.empty?
+          _singleton_orb_init
+        else
+          argv = []
+          orb_id = nil
+          prop = nil
+          a1, a2, a3 = args
+          if Array === a1
+            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
+            orb_id = a1
+            prop = a2
+          else
+            argv = args
+          end
+          raise ArgumentError, "Invalid argument #{prop.class}; expected Hash" unless prop.nil? || Hash === prop
+          jprop = Java::JavaUtil::Properties.new
+          jprop.setProperty('ORBid', orb_id) if orb_id
+          prop.each { |k,v| jprop.setProperty(k.to_s, v.to_s) } if prop
+          @@cached_orb = CORBA::Native::ORB.init(argv.collect {|a| a.to_s }.to_java(:string), jprop)
+        end
+        @@wrapper_klass.new(n_orb)
+      end
+
+      #str ::String
+      #ret ::CORBA::Object
+      def string_to_object(str)
+        begin
+          begin
+            Object._wrap_native(self.orb_.string_to_object(str))
+          rescue ::NativeException
+            CORBA::Exception.native2r($!)
+          end
+        rescue CORBA::BAD_PARAM ## JacORB throws MARSHAL exception on invalid IORs which is not spec compliant
+          return nil
+        end
+      end
+
+      # boolean wait_for_completion
+      # ret void
+      def shutdown(wait_for_completion = false)
+        if wait_for_completion
+          # need to start this in separate thread otherwise this will lead to deadlock
+          # (JacORB problem)
+          (Thread.new do
+            begin
+              self.orb_.shutdown(wait_for_completion)
+            rescue ::NativeException
+              CORBA::Exception.native2r($!)
+            end
+          end).join()
+        else
+          # need to start a shutdown *with* waiting in a thread because JacORB
+          # occasionally fails with a comm error when #shutdown(false) is called
+          # from within a servant callback
+          Thread.new do
+            begin
+              self.orb_.shutdown(true)
+            rescue ::NativeException
+              CORBA::Exception.native2r($!)
+            end
+          end
+        end
+      end
+
+      # custom R2CORBA extension : IORMap
+
+      def ior_map
+        @iormap ||= R2CORBA::IORMap.new(self)
+      end
+
+    end
+
+  end # CORBA
+end # R2CORBA

data/lib/corba/jbase/Object.rb

@@ -1,98 +1,99 @@
-#--------------------------------------------------------------------
-# Object.rb - Java/JacORB CORBA Object definitions
-#
-# Author: Martin Corino
-#
-# 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
-#--------------------------------------------------------------------
-module R2CORBA
-  module CORBA
-
-    module Object
-
-      #ret InterfaceDef
-      def _get_interface()
-        raise ::CORBA::NO_IMPLEMENT
-        #ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
-        #(ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
-      end
-
-      # ::String logical_type_id
-      # ret boolean
-      def _is_a?(logical_type_id)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
-        ## JacORB's LocalObjects throw NO_IMPLEMENT on _is_a?() and _ids() is also not always defined
-        return true if self.objref_.is_a?(CORBA::Native::LocalObject) &&
-                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids().include?(logical_type_id))
-        begin
-          self.objref_._is_a(logical_type_id)
-        rescue ::NativeException
-          CORBA::Exception.native2r($!)
-        end
-      end
-
-      # ret ::String
-      def _repository_id()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
-        ## if this object ref has already been narrowed
-        return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
-        ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
-        req = self._request('_repository_id')
-        req.set_return_type(CORBA._tc_string)
-        return req.invoke
-      end
-
-      #ret ::CORBA::Object
-      def _get_component()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
-        ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
-        req = self._request('_component')
-        req.set_return_type(CORBA._tc_Object)
-        return req.invoke
-      end
-
-      #def PolicyType policy_type
-      # ret Policy
-      def _get_policy(policy_type)
-        raise ::CORBA::NO_IMPLEMENT
-      end
-
-      #PolicyList policies
-      #SetOverrideType set_add
-      #ret ::CORBA::Object
-      def _set_policy_overrides(policies, set_add )
-        raise ::CORBA::NO_IMPLEMENT
-      end
-
-      #int[] types
-      #ret PolicyList
-      def _get_policy_overrides(types)
-        raise ::CORBA::NO_IMPLEMENT
-      end
-
-      #PolicyList inconsistent_policies
-      #ret bool
-      def _validate_connection(inconsistent_policies)
-        raise ::CORBA::NO_IMPLEMENT
-      end
-
-      def _request(operation)
-        begin
-          CORBA::Request._wrap_native(self.objref_._request(operation.to_s), self)
-        rescue ::NativeException
-          CORBA::Exception.native2r($!)
-        end
-      end
-
-    end # Object
-  end # CORBA
-end # R2CORBA
+#--------------------------------------------------------------------
+# Object.rb - Java/JacORB CORBA Object definitions
+#
+# Author: Martin Corino
+#
+# 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
+#--------------------------------------------------------------------
+module R2CORBA
+  module CORBA
+
+    module Object
+
+      #ret InterfaceDef
+      def _get_interface()
+        raise ::CORBA::NO_IMPLEMENT
+        #ifdef_obj = self.objref_._get_interface_def rescue CORBA::Exception.native2r($!)
+        #(ifdef_obj = CORBA::Native::InterfaceDefHelper.narrow(ifdef_obj) rescue CORBA::Exception.native2r($!)) unless ifdef_obj.nil?
+      end
+
+      # ::String logical_type_id
+      # ret boolean
+      def _is_a?(logical_type_id)
+        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        ## JacORB's LocalObjects throw NO_IMPLEMENT on _is_a?() and _ids() is also not always defined
+        return true if self.objref_.is_a?(CORBA::Native::LocalObject) &&
+                        (!self.objref_.respond_to?(:_ids) || self.objref_._ids().include?(logical_type_id))
+        begin
+          self.objref_._is_a(logical_type_id)
+        rescue ::NativeException
+          CORBA::Exception.native2r($!)
+        end
+      end
+
+      # ret ::String
+      def _repository_id()
+        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        ## if this object ref has already been narrowed
+        return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
+        ## ask the remote side
+        ## have to do this ourselves since JacORB only resolves this locally (never calling remote)
+        req = self._request('_repository_id')
+        req.set_return_type(CORBA._tc_string)
+        return req.invoke
+      end
+
+      unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
+        #ret ::CORBA::Object
+        def _get_component()
+          raise CORBA::INV_OBJREF.new if self._is_nil?()
+          ## ask the remote side
+          ## have to do this ourselves since JacORB does not support this remote method on Object
+          ## and we can't use #invoke since this should work without narrowing
+          req = self._request('_component')
+          req.set_return_type(CORBA._tc_Object)
+          return req.invoke
+        end
+      end
+
+      #def PolicyType policy_type
+      # ret Policy
+      def _get_policy(policy_type)
+        raise ::CORBA::NO_IMPLEMENT
+      end
+
+      #PolicyList policies
+      #SetOverrideType set_add
+      #ret ::CORBA::Object
+      def _set_policy_overrides(policies, set_add )
+        raise ::CORBA::NO_IMPLEMENT
+      end
+
+      #int[] types
+      #ret PolicyList
+      def _get_policy_overrides(types)
+        raise ::CORBA::NO_IMPLEMENT
+      end
+
+      #PolicyList inconsistent_policies
+      #ret bool
+      def _validate_connection(inconsistent_policies)
+        raise ::CORBA::NO_IMPLEMENT
+      end
+
+      def _request(operation)
+        begin
+          CORBA::Request._wrap_native(self.objref_._request(operation.to_s), self)
+        rescue ::NativeException
+          CORBA::Exception.native2r($!)
+        end
+      end
+
+    end # Object
+  end # CORBA
+end # R2CORBA