r2corba 1.5.2 → 1.6.0

data/ext/librpoa/servant.h

@@ -10,50 +10,33 @@
 # Copyright (c) Remedy IT Expertise BV
 #------------------------------------------------------------------*/
 
-#if ((TAO_MAJOR_VERSION < 2) || (TAO_MAJOR_VERSION == 2 && TAO_MINOR_VERSION == 0 && TAO_BETA_VERSION <= 1))
-# define RPOA_NEED_DSI_FIX  1
-
-# include "srvreq_fix.h"
-
-# define R2CORBA_ServerRequest  R2CORBA::ServerRequest
-# define R2CORBA_ServerRequest_ptr  R2CORBA::ServerRequest_ptr
-#else
-# define R2CORBA_ServerRequest  CORBA::ServerRequest
-# define R2CORBA_ServerRequest_ptr  CORBA::ServerRequest_ptr
-#endif
-
 //-------------------------------------------------------------------
 //  R2TAO Servant class
 //
 //===================================================================
-
 class DSI_Servant : public PortableServer::DynamicImplementation
 {
 public:
+  /// ctor
+  DSI_Servant () = delete;
   DSI_Servant (VALUE rbServant);
-  // ctor
-  virtual ~DSI_Servant ();
-  // dtor
+  ~DSI_Servant () override;
 
-  virtual void invoke (CORBA::ServerRequest_ptr request);
-      //ACE_THROW_SPEC ((CORBA::SystemException));
-#if RPOA_NEED_DSI_FIX
-  void invoke_fix (R2CORBA::ServerRequest_ptr request);
-#endif
+  void invoke (CORBA::ServerRequest_ptr request) override;
 
-  virtual CORBA::RepositoryId _primary_interface (
+  CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa);
+      PortableServer::POA_ptr poa) override;
 
-  virtual CORBA::Boolean _is_a (const char *logical_type_id);
+  CORBA::Boolean _is_a (const char *logical_type_id) override;
 
-  virtual CORBA::Boolean _non_existent (void);
+  CORBA::Boolean _non_existent () override;
 
-  //virtual CORBA::InterfaceDef_ptr _get_interface (void);
+  //virtual CORBA::InterfaceDef_ptr _get_interface ();
 
-  virtual CORBA::Object_ptr _get_component (void);
+  CORBA::Object_ptr _get_component () override;
 
-  virtual char * _repository_id (void);
+  char * _repository_id () override;
 
   enum METHOD {
     NONE,
@@ -73,12 +56,7 @@ public:
   void activate_servant ();
 
 protected:
-  virtual const char *_interface_repository_id (void) const;
-
-#if RPOA_NEED_DSI_FIX
-  /// Turns around and calls invoke.
-  virtual void _dispatch (TAO_ServerRequest &request, void *context);
-#endif
+  const char *_interface_repository_id () const override;
 
   void register_with_servant ();
 
@@ -87,26 +65,26 @@ protected:
 
   METHOD  method_id (const char* method);
 
-  virtual void inner_invoke (R2CORBA_ServerRequest_ptr request);
+  void inner_invoke (CORBA::ServerRequest_ptr request);
 
-  void invoke_SI (R2CORBA_ServerRequest_ptr request);
-  void invoke_DSI (R2CORBA_ServerRequest_ptr request);
+  void invoke_SI (CORBA::ServerRequest_ptr request);
+  void invoke_DSI (CORBA::ServerRequest_ptr request);
 
   static VALUE _invoke_implementation(VALUE args);
 
 private:
+  /// The Ruby Servant
   VALUE rbServant_;
-  // The Ruby Servant
 
   CORBA::String_var repo_id_;
 
   struct ThreadSafeArg
   {
     ThreadSafeArg (DSI_Servant* srv,
-                   R2CORBA_ServerRequest_ptr req)
+                   CORBA::ServerRequest_ptr req)
       : servant_(srv), request_(req) {}
     DSI_Servant* servant_;
-    R2CORBA_ServerRequest_ptr request_;
+    CORBA::ServerRequest_ptr request_;
   };
 
   static void* thread_safe_invoke (void * arg);

data/lib/corba.rb

@@ -10,6 +10,6 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require "corba/require.rb"
+require 'corba/require.rb'
 
 include R2CORBA

data/lib/corba/cbase/ORB.rb

@@ -41,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
@@ -54,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
@@ -98,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?
@@ -144,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
@@ -186,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
@@ -210,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
@@ -222,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

@@ -14,17 +14,17 @@ module R2CORBA
 
     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

data/lib/corba/cbase/Streams.rb

@@ -42,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
@@ -98,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/Typecode.rb

@@ -118,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
@@ -196,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],
@@ -213,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],
@@ -321,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
@@ -335,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
@@ -356,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

@@ -21,6 +21,7 @@ module R2CORBA
         end
       end
     end
+
     module ValueBase
       def self.included(mod)
         mod.module_eval do
@@ -30,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?
@@ -97,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

@@ -39,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
@@ -53,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

@@ -15,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

@@ -12,7 +12,7 @@
 require 'corba/idl/TAO_ExtC'
 
 begin
-  require RUBY_PLATFORM =~ /mingw32/ ? "librpolw" : "librpol"
+  require 'librpol'
 rescue LoadError
   $stderr.puts $!.to_s if $VERBOSE
   raise
@@ -24,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

data/lib/corba/cbase/require.rb

@@ -13,7 +13,14 @@
 begin
   _ext_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../../ext'))
   $: << _ext_dir unless $:.include?(_ext_dir) || !File.directory?(_ext_dir)
-  require RUBY_PLATFORM =~ /mingw32/ ? "libr2taow" : "libr2tao"
+  if RUBY_PLATFORM =~ /mingw32/
+    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

@@ -48,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/common/Any.rb

@@ -58,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
@@ -72,6 +72,7 @@ module R2CORBA
       def _tc
         @__tc
       end
+
       def _value
         @__value
       end