r2corba 1.5.1-universal-java → 1.6.1-universal-java

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

@@ -1,21 +1,18 @@
 #--------------------------------------------------------------------
 # 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'
-if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
   require 'monitor'
 end
 
@@ -26,15 +23,17 @@ module CosNaming
     def to_key
       "#{self.r_id}|#{self.kind}"
     end
+
     # convert NameComponent to stringified format according to spec
     def to_string
       s = ''
-      s = self.r_id.gsub(/([\/\.\\])/,'\\\1') unless self.r_id.to_s.empty?
+      s = self.r_id.gsub(/([\/\.\\])/, '\\\1') unless self.r_id.to_s.empty?
       s << '.' if s.empty? or !self.kind.to_s.empty?
-      s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
+      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
@@ -46,9 +45,9 @@ module CosNaming
           esc_ = !esc_
         when '.'
           unless esc_
-            raise CosNaming::NamingContext::InvalidName.new if off_>0
+            raise CosNaming::NamingContext::InvalidName.new if off_ > 0
             id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
-            off_ = i+1
+            off_ = i + 1
           end
           esc_ = false
         else
@@ -63,7 +62,7 @@ end
 
 module R2CORBA
   module INS
-    
+
     ##
     # Binding iterator servant class
     #
@@ -72,25 +71,25 @@ 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 = []
-        while how_many>0 and !@rl.empty?
+        while how_many > 0 and !@rl.empty?
           reg = @rl.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
         end
         [!bindings.empty?, bindings]
       end
-    
+
       def destroy
         poa = self._default_POA
         poa.deactivate_object(self.oid)
@@ -103,16 +102,17 @@ module R2CORBA
     # Naming context servant class
     #
     class NamingContext < POA::CosNaming::NamingContextExt
-      
+
       # Map type to store bindings.
       # Use synchronized version for multithreading capable implementations.
       #
-      if (defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+      if defined?(JRUBY_VERSION) or R2CORBA::TAO::RUBY_THREAD_SUPPORT
         MAP_TYPE = Class.new(Monitor) do
           def initialize
             super
             @map_ = {}
           end
+
           def size()
             rc = 0
             synchronize do
@@ -120,6 +120,7 @@ module R2CORBA
             end
             return rc
           end
+
           def has_key?(key)
             rc = false
             synchronize do
@@ -127,6 +128,7 @@ module R2CORBA
             end
             return rc
           end
+
           def [](key)
             rc = nil
             synchronize do
@@ -134,12 +136,14 @@ module R2CORBA
             end
             return rc
           end
+
           def []=(key, value)
             synchronize do
               @map_[key] = value
             end
             value
           end
+
           def delete(key)
             rc = nil
             synchronize do
@@ -147,6 +151,7 @@ module R2CORBA
             end
             return rc
           end
+
           def values
             rc = nil
             synchronize do
@@ -154,6 +159,7 @@ module R2CORBA
             end
             return rc
           end
+
           def each(&block)
             synchronize do
               @map_.each &block
@@ -167,18 +173,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,64 +195,64 @@ 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)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
-        if n.size>1
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind(n, obj)
         else
           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
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind(n, obj)
         else
           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
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.bind_context(n, nc_new)
         else
           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
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.rebind_context(n, nc_new)
         else
           reregister_object(n.first, n, CosNaming::Ncontext, nc_new)
         end
       end
-    
+
       def resolve(n)
-        raise CosNaming::NamingContext::InvalidName.new if n.size<1
+        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
+        raise CosNaming::NamingContext::InvalidName.new if n.size < 1
+        if n.size > 1
           nc = find_context(n)
           nc.unbind(n)
         else
@@ -257,33 +263,33 @@ 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
+        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
+        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
       end
-    
+
       def list(how_many)
         reglist = @map.values
         bindings = []
-        while how_many>0 and !reglist.empty?
+        while how_many > 0 and !reglist.empty?
           reg = reglist.shift
           bindings << CosNaming::Binding.new(reg[:name], reg[:type])
           how_many -= 1
@@ -297,27 +303,27 @@ 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
+        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
         sn.size.times do |i|
-          case sn[i,1]
+          case sn[i, 1]
           when '\\'
-            esc_ = !esc_ 
+            esc_ = !esc_
           when '/'
             unless esc_
-              snc_arr << sn[off_, i-off_]
-              off_ = i+1
+              snc_arr << sn[off_, i - off_]
+              off_ = i + 1
             end
             esc_ = false
           else
@@ -327,10 +333,10 @@ 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+'#'
+        url = 'corbaname:' + addr + '#'
         sn.scan(/./) do |ch|
           if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
             url << ch
@@ -340,7 +346,7 @@ module R2CORBA
         end
         url
       end
-    
+
       def resolve_str(sn)
         self.resolve(self.to_name(sn).first)
       end
@@ -348,7 +354,7 @@ module R2CORBA
       # Helper methods
       #
       protected
-    
+
       # register the object reference for a certain NameComponent id
       # no reregistering or duplicates allowed
       #
@@ -363,7 +369,7 @@ module R2CORBA
           }
         end
       end
-    
+
       # reregister the object reference for a certain NameComponent id
       #
       def reregister_object(name, full_name, type, obj)
@@ -380,7 +386,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
@@ -388,7 +394,7 @@ module R2CORBA
       # resolving the context levels
       #
       def find_object(n)
-        if n.size>1
+        if n.size > 1
           nc = find_context(n)
           nc.resolve(n)
         else
@@ -400,7 +406,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 +425,8 @@ module R2CORBA
           @map[key_][:object]
         end
       end
-    
-    end #of NamingContext servant
-    
+
+    end # of NamingContext servant
+
   end
 end

data/lib/corba/svcs/ins/ins.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/svcs/ins/naming_service'
@@ -16,12 +15,12 @@ require 'optparse'
 
 module R2CORBA
   module INS
-    INS_VERSION_MAJOR = 0.freeze
-    INS_VERSION_MINOR = 1.freeze
-    INS_VERSION_RELEASE = 1.freeze
-    INS_COPYRIGHT = 'Copyright (c) 2011-2013 Remedy IT Expertise BV, The Netherlands'.freeze
+    INS_VERSION_MAJOR = 0
+    INS_VERSION_MINOR = 1
+    INS_VERSION_RELEASE = 1
+    INS_COPYRIGHT = "Copyright (c) 2011-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 
-    IS_WIN32 = (RUBY_PLATFORM =~ /win32/ || RUBY_PLATFORM =~ /mingw32/ || ENV['OS'] =~ /windows/i) ? true : false
+    IS_WIN32 = (RUBY_PLATFORM =~ /win32/ || RUBY_PLATFORM =~ /mingw/ || ENV['OS'] =~ /windows/i) ? true : false
     IS_JRUBY = defined?(JRUBY_VERSION)
 
     @@daemons_installed = false
@@ -66,7 +65,7 @@ module R2CORBA
           end
 
           begin
-            File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+            File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
               f.write Process.pid
             end
             report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -136,7 +135,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile
@@ -218,7 +217,7 @@ module R2CORBA
             end
 
             begin
-              File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+              File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
                 f.write Process.pid
               end
               report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -303,7 +302,7 @@ module R2CORBA
               report 'INS - stopped'
             end
           else
-            STDERR.puts "INS - restart command is only functional in daemon mode"
+            STDERR.puts 'INS - restart command is only functional in daemon mode'
             exit 1
           end
         end
@@ -327,7 +326,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile
@@ -386,12 +385,12 @@ module R2CORBA
     def INS.parse_arg
       script_name = File.basename($0, '.bat')
       if not script_name =~ /rins/
-        script_name = "ruby "+$0
+        script_name = 'ruby ' + $0
       end
 
       @@command = ARGV.shift.to_sym unless ARGV.empty?
       unless COMMANDS.include?(@@command)
-        STDERR.puts "ERROR: Invalid command [#{command}]!\n"+
+        STDERR.puts "ERROR: Invalid command [#{command}]!\n" +
                     "Usage: #{script_name} #{COMMANDS.join('|')} [options]\n"
         exit 1
       end
@@ -418,7 +417,7 @@ module R2CORBA
         puts "          provides help for the specified command\n\n"
         exit
       when :version
-        puts "R2CORBA Interoprable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
+        puts "R2CORBA Interoperable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}"
         puts INS_COPYRIGHT
         puts ''
         exit
@@ -426,51 +425,51 @@ module R2CORBA
         ARGV.options do |opts|
             opts.banner = "Usage: #{script_name} start [options]"
 
-            opts.separator ""
+            opts.separator ''
 
-            opts.on("-i FILE", "--ior=FILE", String,
-                    "Specifies filename (incl. path) to write IOR to.",
-                    "Default: ./ins.ior") { |v| OPTIONS[:iorfile]=v }
+            opts.on('-i FILE', '--ior=FILE', String,
+                    'Specifies filename (incl. path) to write IOR to.',
+                    'Default: ./ins.ior') { |v| OPTIONS[:iorfile] = v }
             unless IS_WIN32
-              opts.on("-p DIR", "--pid=DIR", String,
-                      "Specifies path to write pidfile to.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+              opts.on('-p DIR', '--pid=DIR', String,
+                      'Specifies path to write pidfile to.',
+                      'Default: ./') { |v| OPTIONS[:piddir] = v }
               unless IS_JRUBY
-                opts.on("-o DIR", "--output=DIR", String,
-                        "Specifies filename to write logfile to.",
-                        "Default: <piddir>") { |v| OPTIONS[:logdir]=v }
+                opts.on('-o DIR', '--output=DIR', String,
+                        'Specifies filename to write logfile to.',
+                        'Default: <piddir>') { |v| OPTIONS[:logdir] = v }
               end
             else
-              opts.on("-o DIR", "--output=DIR", String,
-                      "Specifies path to write logfile to.",
-                      "Default: ./") { |v| OPTIONS[:logdir]=v }
+              opts.on('-o DIR', '--output=DIR', String,
+                      'Specifies path to write logfile to.',
+                      'Default: ./') { |v| OPTIONS[:logdir] = v }
             end
-            opts.on("-l PORTNUM", "--listen=PORTNUM", Integer,
-                    "Specifies port number for service endpoint.",
-                    "Default: none") { |v| OPTIONS[:port]=v }
-            if (IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
-              opts.on("-t THREADNUM", "--threads=THREADNUM", Integer,
-                      "Specifies (minimum) number of threads for service.",
-                      "Default: 5") { |v| OPTIONS[:threads]=v }
+            opts.on('-l PORTNUM', '--listen=PORTNUM', Integer,
+                    'Specifies port number for service endpoint.',
+                    'Default: none') { |v| OPTIONS[:port] = v }
+            if IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT
+              opts.on('-t THREADNUM', '--threads=THREADNUM', Integer,
+                      'Specifies (minimum) number of threads for service.',
+                      'Default: 5') { |v| OPTIONS[:threads] = v }
             end
 
             unless IS_JRUBY || !INS.daemons_installed
-              opts.on("-d", "--daemon",
-                      "Run as daemon.",
-                      "Default: off") { |v| OPTIONS[:daemon]=v }
+              opts.on('-d', '--daemon',
+                      'Run as daemon.',
+                      'Default: off') { |v| OPTIONS[:daemon] = v }
             end
-            opts.on("-v", "--verbose",
-                    "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+            opts.on('-v', '--verbose',
+                    'Run verbose.',
+                    'Default: off') { |v| OPTIONS[:verbose] = v }
 
-            opts.on("--debug=LVL", Integer,
-                    "Specifies debug level.",
-                    "Default: 0") { |v| OPTIONS[:debug]=v }
+            opts.on('--debug=LVL', Integer,
+                    'Specifies debug level.',
+                    'Default: 0') { |v| OPTIONS[:debug] = v }
 
-            opts.separator ""
+            opts.separator ''
 
-            opts.on("-h", "--help",
-                    "Show this help message.") { puts opts; puts; exit }
+            opts.on('-h', '--help',
+                    'Show this help message.') { puts opts; puts; exit }
 
             opts.parse!
         end
@@ -479,28 +478,28 @@ module R2CORBA
         ARGV.options do |opts|
             opts.banner = "Usage: #{script_name} stop [options]"
 
-            opts.separator ""
+            opts.separator ''
 
             unless IS_WIN32
-              opts.on("-p DIR", "--pid=DIR", String,
-                      "Specifies path where pidfile is stored.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+              opts.on('-p DIR', '--pid=DIR', String,
+                      'Specifies path where pidfile is stored.',
+                      'Default: ./') { |v| OPTIONS[:piddir] = v }
             end
 
             unless @@command == 'status'
               OPTIONS[:daemon] = true unless IS_JRUBY || !INS.daemons_installed
-              opts.on("--[no-]daemon",
-                      "Do not run in daemon mode.",
-                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon]=v }
+              opts.on('--[no-]daemon',
+                      'Do not run in daemon mode.',
+                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon] = v }
             end
-            opts.on("-v", "--verbose",
-                    "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+            opts.on('-v', '--verbose',
+                    'Run verbose.',
+                    'Default: off') { |v| OPTIONS[:verbose] = v }
 
-            opts.separator ""
+            opts.separator ''
 
-            opts.on("-h", "--help",
-                    "Show this help message.") { puts opts; puts; exit }
+            opts.on('-h', '--help',
+                    'Show this help message.') { puts opts; puts; exit }
 
             opts.parse!
         end