r2corba 1.6.2-universal-java → 1.7.1-universal-java

data/lib/corba/naming_service.rb

@@ -10,5 +10,5 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba/naming.rb'
+require 'corba/naming'
 require 'corba/idl/CosNamingS'

data/lib/corba/poa.rb

@@ -10,5 +10,5 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba.rb'
+require 'corba'
 require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/poa.rb"

data/lib/corba/policies.rb

@@ -10,8 +10,8 @@
 # Copyright (c) Remedy IT Expertise BV
 #--------------------------------------------------------------------
 
-require 'corba.rb'
-require 'corba/poa.rb'
+require 'corba'
+require 'corba/poa'
 require 'corba/idl/BiDirPolicyC'
 require 'corba/idl/MessagingC'
 require "corba/#{defined?(JRUBY_VERSION) ? 'jbase' : 'cbase'}/policies.rb"

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

@@ -36,6 +36,7 @@ module CosNaming
     # convert stringified name back to NameComponent
     def self.from_string(snc)
       raise CosNaming::NamingContext::InvalidName.new if snc.empty?
+
       esc_ = false
       id_ = ''
       off_ = 0
@@ -46,6 +47,7 @@ module CosNaming
         when '.'
           unless esc_
             raise CosNaming::NamingContext::InvalidName.new if off_ > 0
+
             id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
             off_ = i + 1
           end
@@ -62,7 +64,6 @@ end
 
 module R2CORBA
   module INS
-
     ##
     # Binding iterator servant class
     #
@@ -81,6 +82,7 @@ module R2CORBA
 
       def next_n(how_many)
         raise CORBA::BAD_PARAM.new if how_many < 1
+
         bindings = []
         while how_many > 0 and !@rl.empty?
           reg = @rl.shift
@@ -102,7 +104,6 @@ module R2CORBA
     # Naming context servant class
     #
     class NamingContext < POA::CosNaming::NamingContextExt
-
       # Map type to store bindings.
       # Use synchronized version for multithreading capable implementations.
       #
@@ -113,7 +114,7 @@ module R2CORBA
             @map_ = {}
           end
 
-          def size()
+          def size
             rc = 0
             synchronize do
               rc = @map_.size
@@ -207,6 +208,7 @@ module R2CORBA
       #
       def bind(n, obj)
         raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+
         if n.size > 1
           nc = find_context(n)
           nc.bind(n, obj)
@@ -217,6 +219,7 @@ module R2CORBA
 
       def rebind(n, obj)
         raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+
         if n.size > 1
           nc = find_context(n)
           nc.rebind(n, obj)
@@ -227,6 +230,7 @@ module R2CORBA
 
       def bind_context(n, nc_new)
         raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+
         if n.size > 1
           nc = find_context(n)
           nc.bind_context(n, nc_new)
@@ -237,6 +241,7 @@ module R2CORBA
 
       def rebind_context(n, nc_new)
         raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+
         if n.size > 1
           nc = find_context(n)
           nc.rebind_context(n, nc_new)
@@ -247,24 +252,26 @@ module R2CORBA
 
       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
           nc = find_context(n)
           nc.unbind(n)
         else
           @map.synchronize do
             raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
-                                                         n) if !@map.has_key?(n.first.r_id)
+                                                         n) unless @map.has_key?(n.first.r_id)
             @map.delete(n.last.r_id)
           end
         end
       end
 
-      def new_context()
+      def new_context
         poa = self._default_POA
         naming_srv = NamingContext.new(@orb)
         naming_srv.oid = poa.activate_object(naming_srv)
@@ -273,14 +280,16 @@ module R2CORBA
 
       def bind_new_context(n)
         raise CosNaming::NamingContext::InvalidName.new if n.size < 1
-        nc = self.new_context()
+
+        nc = self.new_context
         self.bind_context(n, nc)
         nc
       end
 
-      def destroy()
+      def destroy
         raise CosNaming::NamingContext::NotEmpty.new if @map.size > 0
         return if self.oid.nil? ## no oid for root context
+
         poa = self._default_POA
         poa.deactivate_object(self.oid)
         @orb = nil
@@ -295,7 +304,7 @@ module R2CORBA
           how_many -= 1
         end
         bi_obj = nil
-        if !reglist.empty?
+        unless reglist.empty?
           bi = INS::NamingContext.alloc_iterator(reglist)
           poa = self._default_POA
           bi.oid = poa.activate_object(bi)
@@ -308,11 +317,13 @@ module R2CORBA
       #
       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 = []
         off_ = 0
         esc_ = false
@@ -336,6 +347,7 @@ module R2CORBA
 
       def to_url(addr, sn)
         raise CosNaming::NamingContext::InvalidName.new if addr.to_s.empty? or sn.to_s.empty?
+
         url = 'corbaname:' + addr + '#'
         sn.scan(/./) do |ch|
           if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
@@ -362,10 +374,11 @@ module R2CORBA
         key_ = name.to_key
         @map.synchronize do
           raise CosNaming::NamingContext::AlreadyBound.new if @map.has_key?(key_)
+
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end
@@ -380,9 +393,9 @@ module R2CORBA
             raise CosNaming::NamingContext::NotFound.new(why, [])
           end
           @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
+            name: full_name,
+            type: type,
+            object: obj
           }
         end
       end
@@ -401,7 +414,7 @@ module R2CORBA
           key_ = n.first.to_key
           @map.synchronize do
             raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
-                                                         n) if !@map.has_key?(key_)
+                                                         n) unless @map.has_key?(key_)
             @map[key_][:object]
           end
         end
@@ -418,15 +431,13 @@ module R2CORBA
         key_ = n.first.to_key
         @map.synchronize do
           raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
-                                                       n) if !@map.has_key?(key_)
+                                                       n) unless @map.has_key?(key_)
           raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Not_context,
                                                        n) if @map[key_][:type] != CosNaming::Ncontext
           n.shift
           @map[key_][:object]
         end
       end
-
     end # of NamingContext servant
-
   end
 end

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

@@ -101,7 +101,7 @@ module R2CORBA
         def stop
           report 'INS - stopping service'
 
-          rc, pid = self.check_pidfile()
+          rc, pid = self.check_pidfile
 
           if pid
             report 'INS - signalling service'
@@ -117,7 +117,7 @@ module R2CORBA
         def status
           report 'INS - retrieving service status'
 
-          rc, pid = self.check_pidfile()
+          rc, pid = self.check_pidfile
 
           if pid
             if rc
@@ -181,14 +181,14 @@ module R2CORBA
             report 'INS - starting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['start'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['start'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -252,16 +252,16 @@ module R2CORBA
           report 'INS - stopping service'
           if @options[:daemon]
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['stop'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
+              app_name: 'rins',
+              ARGV: ['stop'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
             }
 
             Daemons.run_proc('ins.rb', daemon_opt) {}
           else
-            rc, pid = self.check_pidfile()
+            rc, pid = self.check_pidfile
 
             if pid
               report 'INS - signalling service'
@@ -279,14 +279,14 @@ module R2CORBA
             report 'INS - restarting daemon mode'
 
             daemon_opt = {
-              :app_name => 'rins',
-              :ARGV => ['restart'],
-              :dir_mode => :normal,
-              :dir => @options[:piddir],
-              :multiple => true,
-              :log_dir => @options[:logdir] || @options[:piddir],
-              :log_output => true,
-              :stop_proc => Proc.new do
+              app_name: 'rins',
+              ARGV: ['restart'],
+              dir_mode: :normal,
+              dir: @options[:piddir],
+              multiple: true,
+              log_dir: @options[:logdir] || @options[:piddir],
+              log_output: true,
+              stop_proc: Proc.new do
                 report 'INS - shutting down'
                 ins_svc.shutdown
               end
@@ -310,11 +310,11 @@ module R2CORBA
         def status
           report 'INS - retrieving service status'
           daemon_opt = {
-            :app_name => 'rins',
-            :ARGV => ['status'],
-            :dir_mode => :normal,
-            :dir => @options[:piddir],
-            :multiple => true,
+            app_name: 'rins',
+            ARGV: ['status'],
+            dir_mode: :normal,
+            dir: @options[:piddir],
+            multiple: true,
           }
 
           Daemons.run_proc('ins.rb', daemon_opt) {}
@@ -351,13 +351,13 @@ module R2CORBA
     end
 
     OPTIONS = {
-      :piddir => Dir.getwd,
-      :iorfile => 'ins.ior',
-      :debug => 0,
-      :logdir => nil,
-      :threads => 5,
-      :orbprop => {},
-      :port => 0,
+      piddir: Dir.getwd,
+      iorfile: 'ins.ior',
+      debug: 0,
+      logdir: nil,
+      threads: 5,
+      orbprop: {},
+      port: 0,
     }
 
     COMMANDS = [
@@ -384,7 +384,7 @@ module R2CORBA
 
     def INS.parse_arg
       script_name = File.basename($0, '.bat')
-      if not script_name =~ /rins/
+      unless script_name =~ /rins/
         script_name = 'ruby ' + $0
       end
 
@@ -511,7 +511,7 @@ module R2CORBA
     end
 
     def INS.run
-      self.parse_arg()
+      self.parse_arg
 
       Controller.new(OPTIONS).send(self.command)
     end

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

@@ -18,11 +18,11 @@ module R2CORBA
     class Service
       # default options
       OPTIONS = {
-        :iorfile => 'ins.ior',
-        :debug => 0,
-        :threads => 5,
-        :orbprop => {},
-        :port => 0
+        iorfile: 'ins.ior',
+        debug: 0,
+        threads: 5,
+        orbprop: {},
+        port: 0
       }
 
       def initialize(options = {})
@@ -76,7 +76,7 @@ module R2CORBA
         #
         @naming_srv = INS::NamingContext.new(@orb)
 
-        naming_obj = @naming_srv._this()
+        naming_obj = @naming_srv._this
 
         naming_ior = @orb.object_to_string(naming_obj)
 

data/lib/corba.rb

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

data/lib/ridlbe/ruby/config.rb

@@ -11,9 +11,8 @@
 #--------------------------------------------------------------------
 
 module IDL
-
   class StrOStream
-    def initialize()
+    def initialize
       @str = ''
     end
 
@@ -114,7 +113,7 @@ module IDL
 
         # ruby specific option switches
 
-        unless ridl_params[:preprocess]   # same switch defined for IDL preprocessing mode
+        unless ridl_params[:preprocess] # same switch defined for IDL preprocessing mode
           optlist.for_switch '--output=FILE', :type => String,
               :description => ['Specifies filename to generate output in.',
                                'Default: File.basename(idlfile, \'.idl\')+<postfix>+<ext>'] do |swcfg|
@@ -260,7 +259,6 @@ module IDL
     end
 
     module LeafMixin
-
       RESERVED_RUBY_CONST = %w(Array Bignum Binding Class Continuation Dir Exception FalseClass File
           Fixnum Float Hash Integer IO MatchData Method Module NilClass Numeric Object Proc Process
           Range Regexp String Struct Symbol Thread ThreadGroup Time TrueClass UnboundMethod Comparable
@@ -319,7 +317,6 @@ module IDL
     end
 
     module ScannerMixin
-
       RUBYKW = %w(__FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo
           super until BEGIN break do false next rescue then when END case else for nil retry true while
           alias class elsif if not return undef yield).collect! { |w| w.to_sym }
@@ -328,13 +325,10 @@ module IDL
         # prefix Ruby keywords with 'r_'
         RUBYKW.include?(ident.to_sym) ? 'r_' + ident : ident
       end
-
     end # module ScannerMixin
 
     IDL::Scanner.class_eval do
       include ScannerMixin
     end
-
   end # module Ruby
-
 end # module IDL