RubyGems - r2corba - Versions diffs - 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (254) hide show

checksums.yaml +7 -7
data/CHANGES +173 -159
data/LICENSE +59 -59
data/README +62 -62
data/THANKS +54 -52
data/bin/r2corba +1 -1
data/bin/ridlc +1 -1
data/bin/rins +1 -1
data/lib/corba.rb +16 -16
data/lib/corba/cbase/IORMap.rb +33 -33
data/lib/corba/cbase/ORB.rb +237 -231
data/lib/corba/cbase/Request.rb +133 -133
data/lib/corba/cbase/Streams.rb +129 -129
data/lib/corba/cbase/Stub.rb +19 -19
data/lib/corba/cbase/Typecode.rb +441 -441
data/lib/corba/cbase/Values.rb +129 -129
data/lib/corba/cbase/exception.rb +66 -66
data/lib/corba/cbase/poa.rb +23 -23
data/lib/corba/cbase/policies.rb +77 -77
data/lib/corba/cbase/post_require.rb +13 -13
data/lib/corba/cbase/require.rb +28 -28
data/lib/corba/cmds/base.rb +85 -85
data/lib/corba/cmds/test.rb +30 -30
data/lib/corba/common/Any.rb +91 -91
data/lib/corba/common/IDL.rb +104 -104
data/lib/corba/common/ORB.rb +368 -368
data/lib/corba/common/Object.rb +208 -208
data/lib/corba/common/Request.rb +19 -19
data/lib/corba/common/Servant.rb +108 -108
data/lib/corba/common/Struct.rb +21 -21
data/lib/corba/common/Stub.rb +79 -79
data/lib/corba/common/Typecode.rb +1121 -1121
data/lib/corba/common/Union.rb +55 -55
data/lib/corba/common/Values.rb +91 -91
data/lib/corba/common/const.rb +22 -22
data/lib/corba/common/exception.rb +68 -68
data/lib/corba/common/require.rb +27 -27
data/lib/corba/common/version.rb +22 -22
data/lib/corba/idl/IDL.rb +21 -21
data/lib/corba/idl/IORTable.pidl +62 -62
data/lib/corba/idl/TAO_Ext.pidl +46 -46
data/lib/corba/idl/require.rb +20 -20
data/lib/corba/jbase/Any.rb +273 -273
data/lib/corba/jbase/IORMap.rb +35 -35
data/lib/corba/jbase/ORB.rb +112 -99
data/lib/corba/jbase/Object.rb +99 -98
data/lib/corba/jbase/Request.rb +225 -225
data/lib/corba/jbase/Servant.rb +247 -246
data/lib/corba/jbase/ServerRequest.rb +127 -127
data/lib/corba/jbase/Streams.rb +670 -670
data/lib/corba/jbase/Stub.rb +38 -38
data/lib/corba/jbase/Typecode.rb +520 -520
data/lib/corba/jbase/Values.rb +173 -173
data/lib/corba/jbase/exception.rb +106 -106
data/lib/corba/jbase/poa.rb +228 -228
data/lib/corba/jbase/policies.rb +299 -299
data/lib/corba/jbase/post_require.rb +14 -14
data/lib/corba/jbase/require.rb +89 -86
data/lib/corba/naming.rb +14 -14
data/lib/corba/naming_service.rb +15 -15
data/lib/corba/poa.rb +15 -15
data/lib/corba/policies.rb +18 -18
data/lib/corba/require.rb +17 -17
data/lib/corba/svcs/ins/cos_naming.rb +426 -426
data/lib/corba/svcs/ins/ins.rb +526 -526
data/lib/corba/svcs/ins/naming_service.rb +119 -119
data/lib/ridlbe/ruby/config.rb +336 -336
data/lib/ridlbe/ruby/orb.pidlc +0 -0
data/lib/ridlbe/ruby/require.rb +16 -16
data/lib/ridlbe/ruby/walker.rb +1582 -1582
data/mkrf_conf_bingem.rb +151 -101
data/rakelib/bin.rake +80 -80
data/rakelib/bin.rb +145 -145
data/rakelib/build.rake +87 -87
data/rakelib/config.rake +51 -51
data/rakelib/config.rb +543 -449
data/rakelib/ext.rake +242 -242
data/rakelib/ext.rb +316 -308
data/rakelib/ext_r2tao.rb +235 -232
data/rakelib/gem.rake +235 -211
data/rakelib/gem.rb +145 -145
data/rakelib/package.rake +26 -26
data/rakelib/test.rake +23 -23
data/test/BiDirectional/Test.idl +34 -34
data/test/BiDirectional/client.rb +131 -131
data/test/BiDirectional/run_test.rb +68 -68
data/test/BiDirectional/server.ior +1 -1
data/test/BiDirectional/server.rb +169 -169
data/test/CORBA_Services/Naming/BindingIterator/Test.idl +27 -27
data/test/CORBA_Services/Naming/BindingIterator/client.rb +121 -121
data/test/CORBA_Services/Naming/BindingIterator/ins.ior +1 -1
data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +82 -82
data/test/CORBA_Services/Naming/BindingIterator/server.rb +109 -109
data/test/CORBA_Services/Naming/Corbaname/Test.idl +27 -27
data/test/CORBA_Services/Naming/Corbaname/client.rb +85 -85
data/test/CORBA_Services/Naming/Corbaname/ins.ior +1 -1
data/test/CORBA_Services/Naming/Corbaname/run_test.rb +88 -88
data/test/CORBA_Services/Naming/Corbaname/server.rb +135 -135
data/test/CORBA_Services/Naming/Simple/Test.idl +27 -27
data/test/CORBA_Services/Naming/Simple/client.rb +84 -84
data/test/CORBA_Services/Naming/Simple/ins.ior +1 -1
data/test/CORBA_Services/Naming/Simple/run_test.rb +82 -82
data/test/CORBA_Services/Naming/Simple/server.rb +109 -109
data/test/Collocation/Diamond.idl +39 -39
data/test/Collocation/run_test.rb +52 -52
data/test/Collocation/test.rb +195 -195
data/test/Connect_Timeout/Test.idl +27 -27
data/test/Connect_Timeout/client.rb +111 -111
data/test/Connect_Timeout/run_test.rb +52 -52
data/test/DII/Test.idl +27 -27
data/test/DII/client.rb +115 -115
data/test/DII/run_test.rb +69 -69
data/test/DII/server.ior +1 -1
data/test/DII/server.rb +95 -95
data/test/DSI/Test.idl +27 -27
data/test/DSI/client.rb +66 -66
data/test/DSI/run_test.rb +69 -69
data/test/DSI/server.ior +1 -1
data/test/DSI/server.rb +106 -106
data/test/Exceptions/Test.idl +48 -48
data/test/Exceptions/client.rb +117 -117
data/test/Exceptions/run_test.rb +69 -69
data/test/Exceptions/server.ior +1 -1
data/test/Exceptions/server.rb +131 -131
data/test/Hello/Test.idl +27 -27
data/test/Hello/client.rb +78 -78
data/test/Hello/run_test.rb +71 -71
data/test/Hello/server.rb +95 -95
data/test/IDL_Test/Test.idl +113 -113
data/test/IDL_Test/Test_inc.idl +17 -17
data/test/IDL_Test/client.rb +102 -102
data/test/IDL_Test/run_test.rb +69 -69
data/test/IDL_Test/server.ior +1 -1
data/test/IDL_Test/server.rb +99 -99
data/test/IORMap/Test.idl +27 -27
data/test/IORMap/client.rb +73 -73
data/test/IORMap/run_test.rb +69 -69
data/test/IORMap/server.ior +1 -1
data/test/IORMap/server.rb +114 -114
data/test/IORTable/Test.idl +27 -27
data/test/IORTable/client.rb +75 -75
data/test/IORTable/run_test.rb +69 -69
data/test/IORTable/server.ior +1 -1
data/test/IORTable/server.rb +130 -130
data/test/Implicit_Conversion/Test.idl +31 -31
data/test/Implicit_Conversion/client.rb +110 -110
data/test/Implicit_Conversion/run_test.rb +69 -69
data/test/Implicit_Conversion/server.ior +1 -1
data/test/Implicit_Conversion/server.rb +99 -99
data/test/Multi_Threading/Multiple_ORB/Test.idl +27 -27
data/test/Multi_Threading/Multiple_ORB/client.rb +82 -82
data/test/Multi_Threading/Multiple_ORB/run_test.rb +71 -71
data/test/Multi_Threading/Multiple_ORB/server.rb +108 -108
data/test/Multi_Threading/Multiple_ORB/server0.ior +1 -1
data/test/Multi_Threading/Multiple_ORB/server1.ior +1 -1
data/test/Multi_Threading/Simple/Test.idl +27 -27
data/test/Multi_Threading/Simple/client.rb +93 -88
data/test/Multi_Threading/Simple/run_test.rb +69 -69
data/test/Multi_Threading/Simple/server.ior +1 -1
data/test/Multi_Threading/Simple/server.rb +117 -117
data/test/Multi_Threading/Threads/Test.idl +31 -31
data/test/Multi_Threading/Threads/client.rb +80 -80
data/test/Multi_Threading/Threads/run_test.rb +76 -76
data/test/Multi_Threading/Threads/server.ior +1 -1
data/test/Multi_Threading/Threads/server.rb +119 -119
data/test/Multi_Threading/Threads/watchdog.ior +1 -1
data/test/Multi_Threading/Threads/watchdog.rb +87 -87
data/test/Multiple_Servant_Interfaces/Test.idl +34 -34
data/test/Multiple_Servant_Interfaces/client.rb +70 -70
data/test/Multiple_Servant_Interfaces/run_test.rb +69 -69
data/test/Multiple_Servant_Interfaces/server.ior +1 -1
data/test/Multiple_Servant_Interfaces/server.rb +102 -102
data/test/Nil/Test.idl +27 -27
data/test/Nil/run_test.rb +52 -52
data/test/Nil/test.rb +78 -78
data/test/OBV/AbstractInterface/client.rb +179 -179
data/test/OBV/AbstractInterface/run_test.rb +69 -69
data/test/OBV/AbstractInterface/server.ior +1 -1
data/test/OBV/AbstractInterface/server.rb +149 -149
data/test/OBV/AbstractInterface/test.idl +53 -53
data/test/OBV/Custom/OBV.idl +18 -18
data/test/OBV/Custom/OBV_impl.rb +40 -40
data/test/OBV/Custom/client.rb +86 -86
data/test/OBV/Custom/run_test.rb +69 -69
data/test/OBV/Custom/server.ior +1 -1
data/test/OBV/Custom/server.rb +100 -100
data/test/OBV/Simple/OBV.idl +15 -15
data/test/OBV/Simple/OBV_impl.rb +26 -26
data/test/OBV/Simple/client.rb +86 -86
data/test/OBV/Simple/run_test.rb +69 -69
data/test/OBV/Simple/server.ior +1 -1
data/test/OBV/Simple/server.rb +100 -100
data/test/OBV/Simple_Event/Event.idl +15 -15
data/test/OBV/Simple_Event/Event_impl.rb +26 -26
data/test/OBV/Simple_Event/client.rb +86 -86
data/test/OBV/Simple_Event/run_test.rb +69 -69
data/test/OBV/Simple_Event/server.ior +1 -1
data/test/OBV/Simple_Event/server.rb +100 -100
data/test/OBV/Supports/client.rb +116 -116
data/test/OBV/Supports/run_test.rb +69 -69
data/test/OBV/Supports/server.ior +1 -1
data/test/OBV/Supports/server.rb +103 -103
data/test/OBV/Supports/supports.idl +33 -33
data/test/OBV/Supports/supports_impl.rb +57 -57
data/test/OBV/Tree/client.rb +116 -116
data/test/OBV/Tree/run_test.rb +69 -69
data/test/OBV/Tree/server.ior +1 -1
data/test/OBV/Tree/server.rb +117 -117
data/test/OBV/Tree/test.idl +32 -32
data/test/OBV/Truncatable/Extra.idl +27 -27
data/test/OBV/Truncatable/Truncatable.idl +105 -105
data/test/OBV/Truncatable/Truncatable_impl.rb +86 -86
data/test/OBV/Truncatable/client.rb +279 -279
data/test/OBV/Truncatable/run_test.rb +69 -69
data/test/OBV/Truncatable/server.ior +1 -1
data/test/OBV/Truncatable/server.rb +89 -89
data/test/OBV/ValueBox/client.rb +497 -497
data/test/OBV/ValueBox/run_test.rb +69 -69
data/test/OBV/ValueBox/server.ior +1 -1
data/test/OBV/ValueBox/server.rb +271 -271
data/test/OBV/ValueBox/valuebox.idl +101 -101
data/test/OBV/ValueBox/vb_basic.idl +75 -75
data/test/OBV/ValueBox/vb_struct.idl +68 -68
data/test/OBV/ValueBox/vb_union.idl +21 -21
data/test/Object/Test.idl +27 -27
data/test/Object/client.rb +112 -103
data/test/Object/run_test.rb +69 -69
data/test/Object/server.ior +1 -1
data/test/Object/server.rb +126 -126
data/test/POA/Test.idl +27 -27
data/test/POA/run_test.rb +52 -52
data/test/POA/test.rb +111 -111
data/test/Param_Test/Test.idl +182 -182
data/test/Param_Test/client.rb +277 -277
data/test/Param_Test/run_test.rb +69 -69
data/test/Param_Test/server.ior +1 -1
data/test/Param_Test/server.rb +296 -296
data/test/Performance/Simple/Test.idl +27 -27
data/test/Performance/Simple/client.rb +90 -90
data/test/Performance/Simple/run_test.rb +69 -69
data/test/Performance/Simple/server.ior +1 -1
data/test/Performance/Simple/server.rb +95 -95
data/test/Policies/Test.idl +27 -27
data/test/Policies/run_test.rb +52 -52
data/test/Policies/test.rb +144 -144
data/test/Timeout/client.rb +207 -207
data/test/Timeout/run_test.rb +69 -69
data/test/Timeout/server.ior +1 -1
data/test/Timeout/server.rb +109 -109
data/test/Timeout/test.idl +19 -19
data/test/lib/assert.rb +43 -43
data/test/lib/test.rb +542 -542
data/test/test_runner.rb +193 -193
metadata +141 -137

data/lib/corba/jbase/post_require.rb CHANGED Viewed

@@ -1,14 +1,14 @@
-#--------------------------------------------------------------------
-# require.rb - R2CORBA loader finalizer
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba/jbase/IORMap'
+#--------------------------------------------------------------------
+# require.rb - R2CORBA loader finalizer
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba/jbase/IORMap'

data/lib/corba/jbase/require.rb CHANGED Viewed

@@ -1,86 +1,89 @@
-#--------------------------------------------------------------------
-# require.rb - R2CORBA loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'rbconfig'
-require 'java'
-module R2CORBA
-  if ENV['JACORB_HOME'] && File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar'))
-    JACORB_HOME = ENV['JACORB_HOME']
-  else
-    # find jacorb.jar in library search path
-    JACORB_HOME = File.dirname(($:.find { |path| File.exists?(File.join(path, 'jacorb.jar')) }).to_s)
-  end
-  $LOAD_PATH << File.join(JACORB_HOME, 'lib')
-  module JavaLang
-    include_package 'java.lang'
-    prop = System.getProperties['java.endorsed.dirs']
-    System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
-    System.setProperty('jacorb.home', "#{R2CORBA::JACORB_HOME}")
-    System.setProperty('org.omg.CORBA.ORBClass', 'org.jacorb.orb.ORB')
-    System.setProperty('org.omg.CORBA.ORBSingletonClass', 'org.jacorb.orb.ORBSingleton')
-    System.setProperty('jacorb.orb.print_version', $VERBOSE ? 'on' : 'off')
-    System.setProperty('jacorb.log.default.verbosity', $VERBOSE ? '3' : '1')
-  end
-end
-# add required JAR files for JacORB from searchpath
-Dir.glob(File.join(R2CORBA::JACORB_HOME, 'lib', '*.jar')).each do |jar|
-  require File.basename(jar)
-end
-module R2CORBA
-  module CORBA
-    module Native
-      # first include CORBA::Object separately to avoid 'Object' replacement warnings
-      java_import 'org.omg.CORBA.Object'
-      include_package 'org.omg.CORBA'
-      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
-        end
-        VERSION = Util::Version.version
-        va = VERSION.split('.')
-        MAJOR_VERSION = va.shift.to_i
-        MINOR_VERSION = va.shift.to_i
-        RELEASE_NR = va.shift.to_i
-      end
-    end
-  end
-end
-[ 'exception',
-  'Object',
-  'ORB',
-  'Request',
-  'Stub',
-  'Typecode',
-  'Any',
-  'Values',
-  'Streams'
-].each { |f| require "corba/jbase/#{f}.rb" }
+#--------------------------------------------------------------------
+# require.rb - R2CORBA loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'rbconfig'
+require 'java'
+module R2CORBA
+  if ENV['JACORB_HOME'] &&
+      (File.exists?(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
+    # find jacorb.jar in library search path
+    JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/} }).to_s)
+  end
+  $LOAD_PATH << File.join(JACORB_HOME, 'lib')
+  module JavaLang
+    include_package 'java.lang'
+    ## Only works if passed as Java commandline arg
+    # prop = System.getProperties['java.endorsed.dirs']
+    # System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
+    System.setProperty('jacorb.home', "#{R2CORBA::JACORB_HOME}")
+    System.setProperty('org.omg.CORBA.ORBClass', 'org.jacorb.orb.ORB')
+    System.setProperty('org.omg.CORBA.ORBSingletonClass', 'org.jacorb.orb.ORBSingleton')
+    System.setProperty('jacorb.orb.print_version', $VERBOSE ? 'on' : 'off')
+    System.setProperty('jacorb.log.default.verbosity', $VERBOSE ? '3' : '1')
+  end
+end
+# add required JAR files for JacORB from searchpath
+Dir.glob(File.join(R2CORBA::JACORB_HOME, 'lib', '*.jar')).each do |jar|
+  require File.basename(jar)
+end
+module R2CORBA
+  module CORBA
+    module Native
+      # first include CORBA::Object separately to avoid 'Object' replacement warnings
+      java_import 'org.omg.CORBA.Object'
+      include_package 'org.omg.CORBA'
+      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
+        end
+        VERSION = Util::Version.version
+        va = VERSION.split('.')
+        MAJOR_VERSION = va.shift.to_i
+        MINOR_VERSION = va.shift.to_i
+        RELEASE_NR = va.shift.to_i
+      end
+    end
+  end
+end
+[ 'exception',
+  'Object',
+  'ORB',
+  'Request',
+  'Stub',
+  'Typecode',
+  'Any',
+  'Values',
+  'Streams'
+].each { |f| require "corba/jbase/#{f}.rb" }

data/lib/corba/naming.rb CHANGED Viewed

@@ -1,14 +1,14 @@
-#--------------------------------------------------------------------
-# naming.rb - R2CORBA CosNaming client definitions loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba/idl/CosNamingC'
+#--------------------------------------------------------------------
+# naming.rb - R2CORBA CosNaming client definitions loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba/idl/CosNamingC'

data/lib/corba/naming_service.rb CHANGED Viewed

@@ -1,15 +1,15 @@
-#--------------------------------------------------------------------
-# naming_service.rb - R2CORBA CosNaming server definitions loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba/naming.rb'
-require 'corba/idl/CosNamingS'
+#--------------------------------------------------------------------
+# naming_service.rb - R2CORBA CosNaming server definitions loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba/naming.rb'
+require 'corba/idl/CosNamingS'

data/lib/corba/poa.rb CHANGED Viewed

@@ -1,15 +1,15 @@
-#--------------------------------------------------------------------
-# poa.rb - R2CORBA POA loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba.rb'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/poa.rb"
+#--------------------------------------------------------------------
+# poa.rb - R2CORBA POA loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba.rb'
+require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/poa.rb"

data/lib/corba/policies.rb CHANGED Viewed

@@ -1,18 +1,18 @@
-#--------------------------------------------------------------------
-# policies.rb - R2CORBA Policy support loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba.rb'
-require 'corba/poa.rb'
-require 'corba/idl/BiDirPolicyC'
-require 'corba/idl/MessagingC'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/policies.rb"
+#--------------------------------------------------------------------
+# policies.rb - R2CORBA Policy support loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba.rb'
+require 'corba/poa.rb'
+require 'corba/idl/BiDirPolicyC'
+require 'corba/idl/MessagingC'
+require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/policies.rb"

data/lib/corba/require.rb CHANGED Viewed

@@ -1,17 +1,17 @@
-#--------------------------------------------------------------------
-# require.rb - R2CORBA loader
-#
-# 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
-#--------------------------------------------------------------------
-require 'corba/common/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/require"
-require 'corba/idl/require'
-require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/post_require"
+#--------------------------------------------------------------------
+# require.rb - R2CORBA loader
+#
+# 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
+#--------------------------------------------------------------------
+require 'corba/common/require'
+require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/require"
+require 'corba/idl/require'
+require "corba/#{defined?(JRUBY_VERSION)?'jbase':'cbase'}/post_require"

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

@@ -1,426 +1,426 @@
-#--------------------------------------------------------------------
-# cos_naming.rb - Implementation of CosNaming servants
-#                 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)
-  require 'monitor'
-end
-module CosNaming
-  # add some useful methods to CosNaming::NameComponent
-  class NameComponent
-    # create key value for registering in context map
-    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 << '.' if s.empty? or !self.kind.to_s.empty?
-      s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
-      s
-    end
-    # convert stringified name back to NameComponent
-    def self.from_string(snc)
-      raise CosNaming::NamingContext::InvalidName.new if snc.empty?
-      esc_ = false
-      id_ = ''
-      off_ = 0
-      snc.size.times do |i|
-        case snc[i, 1]
-        when '\\'
-          esc_ = !esc_
-        when '.'
-          unless esc_
-            raise CosNaming::NamingContext::InvalidName.new if off_>0
-            id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
-            off_ = i+1
-          end
-          esc_ = false
-        else
-          esc_ = false
-        end
-      end
-      kind_ = snc[off_, snc.size].gsub(/\\(\.|\\)/, '\1')
-      self.new(id_, kind_)
-    end
-  end
-end
-module R2CORBA
-  module INS
-    ##
-    # Binding iterator servant class
-    #
-    class BindingIterator < POA::CosNaming::BindingIterator
-      def initialize(reglist, iterator_id)
-        @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?
-          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)
-        @rl.clear
-        INS::NamingContext.clear_iterator(@id)
-      end
-    end
-    ##
-    # 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)
-        MAP_TYPE = Class.new(Monitor) do
-          def initialize
-            super
-            @map_ = {}
-          end
-          def size()
-            rc = 0
-            synchronize do
-              rc = @map_.size
-            end
-            return rc
-          end
-          def has_key?(key)
-            rc = false
-            synchronize do
-              rc = @map_.has_key?(key)
-            end
-            return rc
-          end
-          def [](key)
-            rc = nil
-            synchronize do
-              rc = @map_[key]
-            end
-            return rc
-          end
-          def []=(key, value)
-            synchronize do
-              @map_[key] = value
-            end
-            value
-          end
-          def delete(key)
-            rc = nil
-            synchronize do
-              rc = @map_.delete(key)
-            end
-            return rc
-          end
-          def values
-            rc = nil
-            synchronize do
-              rc = @map_.values
-            end
-            return rc
-          end
-          def each(&block)
-            synchronize do
-              @map_.each &block
-            end
-          end
-        end
-      else
-        MAP_TYPE = Class.new(::Hash) do
-          def synchronize(&block)
-            yield
-          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)
-      end
-      def self.alloc_iterator(reglist)
-        @@iterators.synchronize do
-          unless @@iterators.size < @@iterator_max
-            oldest_id, oldest_it = @iterators.min
-            oldest_it.destroy
-          end
-          itid = Time.now
-          return (@@iterators[itid] = INS::BindingIterator.new(reglist, itid))
-        end
-      end
-      def initialize(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
-          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
-          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
-          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
-          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
-        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)
-            @map.delete(n.last.r_id)
-          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
-        nc = self.new_context()
-        self.bind_context(n, nc)
-        nc
-      end
-      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
-      end
-      def list(how_many)
-        reglist = @map.values
-        bindings = []
-        while how_many>0 and !reglist.empty?
-          reg = reglist.shift
-          bindings << CosNaming::Binding.new(reg[:name], reg[:type])
-          how_many -= 1
-        end
-        bi_obj = nil
-        if !reglist.empty?
-          bi = INS::NamingContext.alloc_iterator(reglist)
-          poa = self._default_POA
-          bi.oid = poa.activate_object(bi)
-          bi_obj = poa.id_to_reference(bi.oid)
-        end
-        [bindings, CosNaming::BindingIterator._narrow(bi_obj)]
-      end
-      # CosNaming::NamingContextExt methods
-      #
-      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
-        sn.size.times do |i|
-          case sn[i,1]
-          when '\\'
-            esc_ = !esc_
-          when '/'
-            unless esc_
-              snc_arr << sn[off_, i-off_]
-              off_ = i+1
-            end
-            esc_ = false
-          else
-            esc_ = false
-          end
-        end
-        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+'#'
-        sn.scan(/./) do |ch|
-          if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
-            url << ch
-          else
-            url << '%' << ch.unpack('H2').first
-          end
-        end
-        url
-      end
-      def resolve_str(sn)
-        self.resolve(self.to_name(sn).first)
-      end
-      # Helper methods
-      #
-      protected
-      # register the object reference for a certain NameComponent id
-      # no reregistering or duplicates allowed
-      #
-      def register_object(name, full_name, type, obj)
-        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
-          }
-        end
-      end
-      # reregister the object reference for a certain NameComponent id
-      #
-      def reregister_object(name, full_name, type, obj)
-        key_ = name.to_key
-        @map.synchronize do
-          if @map.has_key?(key_) and @map[key_][:type] != type
-            why = (type == CosNaming::Nobject ? CosNaming::NamingContext::Not_object : CosNaming::NamingContext::Not_context)
-            raise CosNaming::NamingContext::NotFound.new(why, [])
-          end
-          @map[key_] = {
-            :name => full_name,
-            :type => type,
-            :object => obj
-          }
-        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
-      # which will automatically shift the segments of Name 1 level while
-      # resolving the context levels
-      #
-      def find_object(n)
-        if n.size>1
-          nc = find_context(n)
-          nc.resolve(n)
-        else
-          key_ = n.first.to_key
-          @map.synchronize do
-            raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
-                                                         n) if !@map.has_key?(key_)
-            @map[key_][:object]
-          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
-      # NOTE that #shift is used to get AND remove the first Name segment
-      # if the naming context is found so that after this call the
-      # first segment of the Name is shifted one level
-      #
-      def find_context(n)
-        key_ = n.first.to_key
-        @map.synchronize do
-          raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
-                                                       n) if !@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
+#--------------------------------------------------------------------
+# cos_naming.rb - Implementation of CosNaming servants
+#                 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)
+  require 'monitor'
+end
+module CosNaming
+  # add some useful methods to CosNaming::NameComponent
+  class NameComponent
+    # create key value for registering in context map
+    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 << '.' if s.empty? or !self.kind.to_s.empty?
+      s << self.kind.gsub(/([\/\.\\])/,'\\\1') unless self.kind.to_s.empty?
+      s
+    end
+    # convert stringified name back to NameComponent
+    def self.from_string(snc)
+      raise CosNaming::NamingContext::InvalidName.new if snc.empty?
+      esc_ = false
+      id_ = ''
+      off_ = 0
+      snc.size.times do |i|
+        case snc[i, 1]
+        when '\\'
+          esc_ = !esc_
+        when '.'
+          unless esc_
+            raise CosNaming::NamingContext::InvalidName.new if off_>0
+            id_ = snc[0, i].gsub(/\\(\.|\\)/, '\1')
+            off_ = i+1
+          end
+          esc_ = false
+        else
+          esc_ = false
+        end
+      end
+      kind_ = snc[off_, snc.size].gsub(/\\(\.|\\)/, '\1')
+      self.new(id_, kind_)
+    end
+  end
+end
+module R2CORBA
+  module INS
+    ##
+    # Binding iterator servant class
+    #
+    class BindingIterator < POA::CosNaming::BindingIterator
+      def initialize(reglist, iterator_id)
+        @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?
+          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)
+        @rl.clear
+        INS::NamingContext.clear_iterator(@id)
+      end
+    end
+    ##
+    # 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)
+        MAP_TYPE = Class.new(Monitor) do
+          def initialize
+            super
+            @map_ = {}
+          end
+          def size()
+            rc = 0
+            synchronize do
+              rc = @map_.size
+            end
+            return rc
+          end
+          def has_key?(key)
+            rc = false
+            synchronize do
+              rc = @map_.has_key?(key)
+            end
+            return rc
+          end
+          def [](key)
+            rc = nil
+            synchronize do
+              rc = @map_[key]
+            end
+            return rc
+          end
+          def []=(key, value)
+            synchronize do
+              @map_[key] = value
+            end
+            value
+          end
+          def delete(key)
+            rc = nil
+            synchronize do
+              rc = @map_.delete(key)
+            end
+            return rc
+          end
+          def values
+            rc = nil
+            synchronize do
+              rc = @map_.values
+            end
+            return rc
+          end
+          def each(&block)
+            synchronize do
+              @map_.each &block
+            end
+          end
+        end
+      else
+        MAP_TYPE = Class.new(::Hash) do
+          def synchronize(&block)
+            yield
+          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)
+      end
+      def self.alloc_iterator(reglist)
+        @@iterators.synchronize do
+          unless @@iterators.size < @@iterator_max
+            oldest_id, oldest_it = @iterators.min
+            oldest_it.destroy
+          end
+          itid = Time.now
+          return (@@iterators[itid] = INS::BindingIterator.new(reglist, itid))
+        end
+      end
+      def initialize(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
+          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
+          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
+          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
+          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
+        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)
+            @map.delete(n.last.r_id)
+          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
+        nc = self.new_context()
+        self.bind_context(n, nc)
+        nc
+      end
+      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
+      end
+      def list(how_many)
+        reglist = @map.values
+        bindings = []
+        while how_many>0 and !reglist.empty?
+          reg = reglist.shift
+          bindings << CosNaming::Binding.new(reg[:name], reg[:type])
+          how_many -= 1
+        end
+        bi_obj = nil
+        if !reglist.empty?
+          bi = INS::NamingContext.alloc_iterator(reglist)
+          poa = self._default_POA
+          bi.oid = poa.activate_object(bi)
+          bi_obj = poa.id_to_reference(bi.oid)
+        end
+        [bindings, CosNaming::BindingIterator._narrow(bi_obj)]
+      end
+      # CosNaming::NamingContextExt methods
+      #
+      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
+        sn.size.times do |i|
+          case sn[i,1]
+          when '\\'
+            esc_ = !esc_
+          when '/'
+            unless esc_
+              snc_arr << sn[off_, i-off_]
+              off_ = i+1
+            end
+            esc_ = false
+          else
+            esc_ = false
+          end
+        end
+        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+'#'
+        sn.scan(/./) do |ch|
+          if /[a-zA-Z0-9;\/:\?@=+\$,\-_\.!~*\'\(\)]/ =~ ch
+            url << ch
+          else
+            url << '%' << ch.unpack('H2').first
+          end
+        end
+        url
+      end
+      def resolve_str(sn)
+        self.resolve(self.to_name(sn).first)
+      end
+      # Helper methods
+      #
+      protected
+      # register the object reference for a certain NameComponent id
+      # no reregistering or duplicates allowed
+      #
+      def register_object(name, full_name, type, obj)
+        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
+          }
+        end
+      end
+      # reregister the object reference for a certain NameComponent id
+      #
+      def reregister_object(name, full_name, type, obj)
+        key_ = name.to_key
+        @map.synchronize do
+          if @map.has_key?(key_) and @map[key_][:type] != type
+            why = (type == CosNaming::Nobject ? CosNaming::NamingContext::Not_object : CosNaming::NamingContext::Not_context)
+            raise CosNaming::NamingContext::NotFound.new(why, [])
+          end
+          @map[key_] = {
+            :name => full_name,
+            :type => type,
+            :object => obj
+          }
+        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
+      # which will automatically shift the segments of Name 1 level while
+      # resolving the context levels
+      #
+      def find_object(n)
+        if n.size>1
+          nc = find_context(n)
+          nc.resolve(n)
+        else
+          key_ = n.first.to_key
+          @map.synchronize do
+            raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
+                                                         n) if !@map.has_key?(key_)
+            @map[key_][:object]
+          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
+      # NOTE that #shift is used to get AND remove the first Name segment
+      # if the naming context is found so that after this call the
+      # first segment of the Name is shifted one level
+      #
+      def find_context(n)
+        key_ = n.first.to_key
+        @map.synchronize do
+          raise CosNaming::NamingContext::NotFound.new(CosNaming::NamingContext::Missing_node,
+                                                       n) if !@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