r2corba 1.5.5-x64-mingw32 → 1.6.0-x64-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.
- checksums.yaml +5 -5
- data/lib/corba.rb +1 -1
- data/lib/corba/cbase/ORB.rb +19 -16
- data/lib/corba/cbase/Request.rb +3 -3
- data/lib/corba/cbase/Values.rb +4 -2
- data/lib/corba/cbase/exception.rb +4 -2
- data/lib/corba/cbase/poa.rb +1 -1
- data/lib/corba/cbase/policies.rb +1 -1
- data/lib/corba/cbase/require.rb +8 -1
- data/lib/corba/common/Any.rb +2 -1
- data/lib/corba/common/IDL.rb +1 -1
- data/lib/corba/common/ORB.rb +21 -21
- data/lib/corba/common/Object.rb +14 -13
- data/lib/corba/common/Servant.rb +4 -4
- data/lib/corba/common/Stub.rb +6 -6
- data/lib/corba/common/Typecode.rb +35 -8
- data/lib/corba/common/Union.rb +5 -0
- data/lib/corba/common/Values.rb +1 -0
- data/lib/corba/common/const.rb +1 -1
- data/lib/corba/common/exception.rb +2 -1
- data/lib/corba/common/version.rb +2 -2
- data/lib/corba/idl/IDL.rb +1 -1
- data/lib/corba/jbase/Any.rb +6 -4
- data/lib/corba/jbase/ORB.rb +2 -2
- data/lib/corba/jbase/Object.rb +13 -13
- data/lib/corba/jbase/Request.rb +3 -3
- data/lib/corba/jbase/Streams.rb +64 -0
- data/lib/corba/jbase/Typecode.rb +3 -2
- data/lib/corba/jbase/Values.rb +2 -0
- data/lib/corba/jbase/exception.rb +1 -0
- data/lib/corba/jbase/poa.rb +18 -18
- data/lib/corba/jbase/policies.rb +29 -29
- data/lib/corba/jbase/require.rb +4 -0
- data/lib/corba/svcs/ins/cos_naming.rb +10 -1
- data/lib/corba/svcs/ins/ins.rb +45 -45
- data/lib/corba/svcs/ins/naming_service.rb +6 -6
- data/lib/ridlbe/ruby/config.rb +27 -20
- data/lib/ridlbe/ruby/walker.rb +276 -253
- data/mkrf_conf_bingem.rb +4 -4
- data/rakelib/build.rake +1 -1
- data/rakelib/config.rake +1 -1
- data/rakelib/config.rb +9 -9
- data/rakelib/ext.rake +6 -65
- data/rakelib/ext_r2tao.rb +2 -39
- data/rakelib/gem.rake +20 -20
- data/rakelib/gem.rb +1 -1
- data/rakelib/package.rake +1 -1
- data/test/BiDirectional/client.rb +16 -16
- data/test/BiDirectional/run_test.rb +10 -10
- data/test/BiDirectional/server.rb +20 -20
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +14 -14
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +12 -12
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +17 -17
- data/test/CORBA_Services/Naming/Corbaname/client.rb +14 -14
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +12 -12
- data/test/CORBA_Services/Naming/Corbaname/server.rb +20 -20
- data/test/CORBA_Services/Naming/Simple/client.rb +14 -14
- data/test/CORBA_Services/Naming/Simple/run_test.rb +12 -12
- data/test/CORBA_Services/Naming/Simple/server.rb +17 -17
- data/test/Collocation/run_test.rb +10 -10
- data/test/Collocation/test.rb +26 -19
- data/test/Connect_Timeout/client.rb +15 -15
- data/test/Connect_Timeout/run_test.rb +10 -10
- data/test/DII/client.rb +27 -27
- data/test/DII/run_test.rb +10 -10
- data/test/DII/server.rb +15 -15
- data/test/DSI/client.rb +15 -15
- data/test/DSI/run_test.rb +10 -10
- data/test/DSI/server.rb +16 -16
- data/test/Exceptions/client.rb +19 -19
- data/test/Exceptions/run_test.rb +10 -10
- data/test/Exceptions/server.rb +15 -15
- data/test/Hello/client.rb +15 -15
- data/test/Hello/run_test.rb +10 -10
- data/test/Hello/server.rb +16 -16
- data/test/IDL_Test/client.rb +20 -20
- data/test/IDL_Test/run_test.rb +10 -10
- data/test/IDL_Test/server.rb +18 -18
- data/test/IORMap/client.rb +14 -14
- data/test/IORMap/run_test.rb +10 -10
- data/test/IORMap/server.rb +22 -22
- data/test/IORTable/client.rb +14 -14
- data/test/IORTable/run_test.rb +10 -10
- data/test/IORTable/server.rb +22 -22
- data/test/Implicit_Conversion/client.rb +19 -16
- data/test/Implicit_Conversion/run_test.rb +10 -10
- data/test/Implicit_Conversion/server.rb +15 -15
- data/test/Multi_Threading/Multiple_ORB/client.rb +13 -13
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +10 -10
- data/test/Multi_Threading/Multiple_ORB/server.rb +16 -16
- data/test/Multi_Threading/Simple/client.rb +15 -15
- data/test/Multi_Threading/Simple/run_test.rb +10 -10
- data/test/Multi_Threading/Simple/server.rb +15 -15
- data/test/Multi_Threading/Threads/client.rb +15 -15
- data/test/Multi_Threading/Threads/run_test.rb +10 -10
- data/test/Multi_Threading/Threads/server.rb +17 -17
- data/test/Multi_Threading/Threads/watchdog.rb +15 -15
- data/test/Multiple_Servant_Interfaces/client.rb +13 -13
- data/test/Multiple_Servant_Interfaces/run_test.rb +10 -10
- data/test/Multiple_Servant_Interfaces/server.rb +17 -17
- data/test/Nil/run_test.rb +10 -10
- data/test/Nil/test.rb +13 -13
- data/test/OBV/AbstractInterface/client.rb +13 -13
- data/test/OBV/AbstractInterface/run_test.rb +10 -10
- data/test/OBV/AbstractInterface/server.rb +19 -18
- data/test/OBV/Custom/OBV_impl.rb +2 -0
- data/test/OBV/Custom/client.rb +13 -13
- data/test/OBV/Custom/run_test.rb +10 -10
- data/test/OBV/Custom/server.rb +15 -15
- data/test/OBV/Simple/OBV_impl.rb +1 -0
- data/test/OBV/Simple/client.rb +13 -13
- data/test/OBV/Simple/run_test.rb +10 -10
- data/test/OBV/Simple/server.rb +15 -15
- data/test/OBV/Simple_Event/Event_impl.rb +1 -0
- data/test/OBV/Simple_Event/client.rb +13 -13
- data/test/OBV/Simple_Event/run_test.rb +10 -10
- data/test/OBV/Simple_Event/server.rb +15 -15
- data/test/OBV/Supports/client.rb +18 -18
- data/test/OBV/Supports/run_test.rb +10 -10
- data/test/OBV/Supports/server.rb +14 -14
- data/test/OBV/Supports/supports_impl.rb +3 -0
- data/test/OBV/Tree/client.rb +13 -13
- data/test/OBV/Tree/run_test.rb +10 -10
- data/test/OBV/Tree/server.rb +18 -18
- data/test/OBV/Truncatable/client.rb +56 -56
- data/test/OBV/Truncatable/run_test.rb +10 -10
- data/test/OBV/Truncatable/server.rb +14 -14
- data/test/OBV/ValueBox/client.rb +148 -147
- data/test/OBV/ValueBox/run_test.rb +10 -10
- data/test/OBV/ValueBox/server.rb +15 -15
- data/test/Object/client.rb +13 -13
- data/test/Object/run_test.rb +10 -10
- data/test/Object/server.rb +18 -18
- data/test/POA/run_test.rb +10 -10
- data/test/POA/test.rb +15 -15
- data/test/Param_Test/client.rb +47 -47
- data/test/Param_Test/run_test.rb +10 -10
- data/test/Param_Test/server.rb +55 -55
- data/test/Performance/Simple/client.rb +15 -15
- data/test/Performance/Simple/run_test.rb +10 -10
- data/test/Performance/Simple/server.rb +15 -15
- data/test/Policies/run_test.rb +10 -10
- data/test/Policies/test.rb +23 -23
- data/test/Timeout/client.rb +17 -17
- data/test/Timeout/run_test.rb +10 -10
- data/test/Timeout/server.rb +18 -18
- data/test/lib/test.rb +13 -7
- data/test/test_runner.rb +19 -19
- metadata +8 -8
data/test/Hello/run_test.rb
CHANGED
@@ -20,19 +20,19 @@ ARGV.options do |opts|
|
|
20
20
|
script_name = File.basename($0)
|
21
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
22
22
|
|
23
|
-
opts.separator
|
23
|
+
opts.separator ''
|
24
24
|
|
25
|
-
opts.on(
|
26
|
-
|
27
|
-
|
28
|
-
opts.on(
|
29
|
-
|
30
|
-
|
25
|
+
opts.on('-d',
|
26
|
+
'Run with debugging output.',
|
27
|
+
'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
|
28
|
+
opts.on('--use-stubs',
|
29
|
+
'Use stubs generated by RIDL.',
|
30
|
+
'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
|
31
31
|
|
32
|
-
opts.separator
|
32
|
+
opts.separator ''
|
33
33
|
|
34
|
-
opts.on(
|
35
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
36
36
|
|
37
37
|
opts.parse!
|
38
38
|
end
|
data/test/Hello/server.rb
CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
|
|
21
21
|
script_name = File.basename($0)
|
22
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
23
|
|
24
|
-
opts.separator
|
24
|
+
opts.separator ''
|
25
25
|
|
26
|
-
opts.on(
|
27
|
-
|
26
|
+
opts.on('--o IORFILE',
|
27
|
+
'Set IOR filename.',
|
28
28
|
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
29
|
+
opts.on('--d LVL',
|
30
|
+
'Set ORBDebugLevel value.',
|
31
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
32
|
+
opts.on('--use-implement',
|
33
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
34
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
|
-
opts.separator
|
36
|
+
opts.separator ''
|
37
37
|
|
38
|
-
opts.on(
|
39
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
40
40
|
|
41
41
|
opts.parse!
|
42
42
|
end
|
@@ -54,15 +54,15 @@ class MyHello < POA::Test::Hello
|
|
54
54
|
end
|
55
55
|
|
56
56
|
def get_string()
|
57
|
-
|
57
|
+
'Hello there!'
|
58
58
|
end
|
59
59
|
|
60
60
|
def shutdown()
|
61
61
|
@orb.shutdown()
|
62
62
|
end
|
63
|
-
end #of servant MyHello
|
63
|
+
end # of servant MyHello
|
64
64
|
|
65
|
-
orb = CORBA.ORB_init([
|
65
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
66
66
|
|
67
67
|
obj = orb.resolve_initial_references('RootPOA')
|
68
68
|
|
@@ -83,7 +83,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
83
83
|
}
|
84
84
|
|
85
85
|
Signal.trap('INT') do
|
86
|
-
puts
|
86
|
+
puts 'SIGINT - shutting down ORB...'
|
87
87
|
orb.shutdown()
|
88
88
|
end
|
89
89
|
|
data/test/IDL_Test/client.rb
CHANGED
@@ -23,22 +23,22 @@ ARGV.options do |opts|
|
|
23
23
|
script_name = File.basename($0)
|
24
24
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
25
25
|
|
26
|
-
opts.separator
|
26
|
+
opts.separator ''
|
27
27
|
|
28
|
-
opts.on(
|
29
|
-
|
28
|
+
opts.on('--k IORFILE',
|
29
|
+
'Set IOR.',
|
30
30
|
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
31
|
-
opts.on(
|
32
|
-
|
33
|
-
|
34
|
-
opts.on(
|
35
|
-
|
36
|
-
|
31
|
+
opts.on('--d LVL',
|
32
|
+
'Set ORBDebugLevel value.',
|
33
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
34
|
+
opts.on('--use-implement',
|
35
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
36
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
37
37
|
|
38
|
-
opts.separator
|
38
|
+
opts.separator ''
|
39
39
|
|
40
|
-
opts.on(
|
41
|
-
|
40
|
+
opts.on('-h', '--help',
|
41
|
+
'Show this help message.') { puts opts; exit }
|
42
42
|
|
43
43
|
opts.parse!
|
44
44
|
end
|
@@ -52,27 +52,27 @@ end
|
|
52
52
|
|
53
53
|
# tests to test preprocessor processing
|
54
54
|
|
55
|
-
assert
|
55
|
+
assert 'ERROR: struct Test::S1 not defined (correctly)!' do
|
56
56
|
Test.const_defined?('S1') and Test::S1.ancestors.include?(CORBA::Portable::Struct)
|
57
57
|
end
|
58
58
|
|
59
|
-
assert
|
59
|
+
assert 'ERROR: Test::MyNum constant not defined (correctly)!' do
|
60
60
|
Test.const_defined?('MyNum') and Test::MyNum == 12345
|
61
61
|
end
|
62
62
|
|
63
|
-
assert
|
63
|
+
assert 'ERROR: Test::MyString constant not defined (correctly)!' do
|
64
64
|
Test.const_defined?('MyString') and Test::MyString == 'hello'
|
65
65
|
end
|
66
66
|
|
67
67
|
# test results of 'typeprefix' and 'typeid'
|
68
68
|
|
69
|
-
assert
|
69
|
+
assert 'ERROR: typeprefix not correctly handled', I2::If3._tc.id == 'IDL:MyPrefix/i2/if3:1.0'
|
70
70
|
|
71
|
-
assert
|
71
|
+
assert 'ERROR: typeid not correctly handled', I2::If2._tc.id == 'IDL:MyIF2:0.1'
|
72
72
|
|
73
73
|
# CORBA IDL tests
|
74
74
|
|
75
|
-
orb = CORBA.ORB_init([
|
75
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
76
76
|
|
77
77
|
begin
|
78
78
|
|
@@ -90,11 +90,11 @@ begin
|
|
90
90
|
|
91
91
|
hello_obj.shutdown()
|
92
92
|
|
93
|
-
assert_not
|
93
|
+
assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
|
94
94
|
|
95
95
|
hello_obj._free_ref()
|
96
96
|
|
97
|
-
assert
|
97
|
+
assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
|
98
98
|
|
99
99
|
ensure
|
100
100
|
|
data/test/IDL_Test/run_test.rb
CHANGED
@@ -20,19 +20,19 @@ ARGV.options do |opts|
|
|
20
20
|
script_name = File.basename($0)
|
21
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
22
22
|
|
23
|
-
opts.separator
|
23
|
+
opts.separator ''
|
24
24
|
|
25
|
-
opts.on(
|
26
|
-
|
27
|
-
|
28
|
-
opts.on(
|
29
|
-
|
30
|
-
|
25
|
+
opts.on('-d',
|
26
|
+
'Run with debugging output.',
|
27
|
+
'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
|
28
|
+
opts.on('--use-stubs',
|
29
|
+
'Use stubs generated by RIDL.',
|
30
|
+
'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
|
31
31
|
|
32
|
-
opts.separator
|
32
|
+
opts.separator ''
|
33
33
|
|
34
|
-
opts.on(
|
35
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
36
36
|
|
37
37
|
opts.parse!
|
38
38
|
end
|
data/test/IDL_Test/server.rb
CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
|
|
21
21
|
script_name = File.basename($0)
|
22
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
23
|
|
24
|
-
opts.separator
|
24
|
+
opts.separator ''
|
25
25
|
|
26
|
-
opts.on(
|
27
|
-
|
26
|
+
opts.on('--o IORFILE',
|
27
|
+
'Set IOR filename.',
|
28
28
|
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
29
|
+
opts.on('--d LVL',
|
30
|
+
'Set ORBDebugLevel value.',
|
31
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
32
|
+
opts.on('--use-implement',
|
33
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
34
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
|
-
opts.separator
|
36
|
+
opts.separator ''
|
37
37
|
|
38
|
-
opts.on(
|
39
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
40
40
|
|
41
41
|
opts.parse!
|
42
42
|
end
|
@@ -54,24 +54,24 @@ class MyHello < POA::Test::Hello
|
|
54
54
|
end
|
55
55
|
|
56
56
|
def r_super
|
57
|
-
puts
|
57
|
+
puts 'Server: #super called'
|
58
58
|
end
|
59
59
|
|
60
60
|
def r_self()
|
61
|
-
puts
|
61
|
+
puts 'Server: #self called'
|
62
62
|
[self._this]
|
63
63
|
end
|
64
64
|
|
65
65
|
def get_string()
|
66
|
-
|
66
|
+
'Hello there!'
|
67
67
|
end
|
68
68
|
|
69
69
|
def shutdown()
|
70
70
|
@orb.shutdown()
|
71
71
|
end
|
72
|
-
end #of servant MyHello
|
72
|
+
end # of servant MyHello
|
73
73
|
|
74
|
-
orb = CORBA.ORB_init([
|
74
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
75
75
|
|
76
76
|
obj = orb.resolve_initial_references('RootPOA')
|
77
77
|
|
@@ -92,7 +92,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
92
92
|
}
|
93
93
|
|
94
94
|
Signal.trap('INT') do
|
95
|
-
puts
|
95
|
+
puts 'SIGINT - shutting down ORB...'
|
96
96
|
orb.shutdown()
|
97
97
|
end
|
98
98
|
|
data/test/IORMap/client.rb
CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
|
|
21
21
|
script_name = File.basename($0)
|
22
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
23
|
|
24
|
-
opts.separator
|
24
|
+
opts.separator ''
|
25
25
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
26
|
+
opts.on('--p PORT',
|
27
|
+
'Set server endpoint port.',
|
28
|
+
'Default: 9999') { |v| OPTIONS[:serverport] = v }
|
29
|
+
opts.on('--d LVL',
|
30
|
+
'Set ORBDebugLevel value.',
|
31
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
32
|
+
opts.on('--use-implement',
|
33
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
34
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
|
-
opts.separator
|
36
|
+
opts.separator ''
|
37
37
|
|
38
|
-
opts.on(
|
39
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
40
40
|
|
41
41
|
opts.parse!
|
42
42
|
end
|
@@ -49,7 +49,7 @@ else
|
|
49
49
|
require 'TestC.rb'
|
50
50
|
end
|
51
51
|
|
52
|
-
orb = CORBA.ORB_init([
|
52
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
53
53
|
|
54
54
|
obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello")
|
55
55
|
|
data/test/IORMap/run_test.rb
CHANGED
@@ -20,19 +20,19 @@ ARGV.options do |opts|
|
|
20
20
|
script_name = File.basename($0)
|
21
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
22
22
|
|
23
|
-
opts.separator
|
23
|
+
opts.separator ''
|
24
24
|
|
25
|
-
opts.on(
|
26
|
-
|
27
|
-
|
28
|
-
opts.on(
|
29
|
-
|
30
|
-
|
25
|
+
opts.on('-d',
|
26
|
+
'Run with debugging output.',
|
27
|
+
'Default: false') { OPTIONS[:debug_opt] = '--d 10' }
|
28
|
+
opts.on('--use-stubs',
|
29
|
+
'Use stubs generated by RIDL.',
|
30
|
+
'Default: false (uses embedded IDL)') { OPTIONS[:use_implement] = '' }
|
31
31
|
|
32
|
-
opts.separator
|
32
|
+
opts.separator ''
|
33
33
|
|
34
|
-
opts.on(
|
35
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
36
36
|
|
37
37
|
opts.parse!
|
38
38
|
end
|
data/test/IORMap/server.rb
CHANGED
@@ -22,25 +22,25 @@ ARGV.options do |opts|
|
|
22
22
|
script_name = File.basename($0)
|
23
23
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
24
24
|
|
25
|
-
opts.separator
|
25
|
+
opts.separator ''
|
26
26
|
|
27
|
-
opts.on(
|
28
|
-
|
27
|
+
opts.on('--o IORFILE',
|
28
|
+
'Set IOR filename.',
|
29
29
|
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
|
36
|
-
opts.on(
|
37
|
-
|
38
|
-
|
30
|
+
opts.on('--p PORT',
|
31
|
+
'Set endpoint port.',
|
32
|
+
'Default: 9999') { |v| OPTIONS[:listenport] = v }
|
33
|
+
opts.on('--d LVL',
|
34
|
+
'Set ORBDebugLevel value.',
|
35
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
36
|
+
opts.on('--use-implement',
|
37
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
38
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
39
39
|
|
40
|
-
opts.separator
|
40
|
+
opts.separator ''
|
41
41
|
|
42
|
-
opts.on(
|
43
|
-
|
42
|
+
opts.on('-h', '--help',
|
43
|
+
'Show this help message.') { puts opts; exit }
|
44
44
|
|
45
45
|
opts.parse!
|
46
46
|
end
|
@@ -65,12 +65,12 @@ class MyHello < POA::Test::Hello
|
|
65
65
|
def shutdown()
|
66
66
|
@orb.shutdown()
|
67
67
|
end
|
68
|
-
end #of servant MyHello
|
68
|
+
end # of servant MyHello
|
69
69
|
|
70
70
|
orb = if defined?(JRUBY_VERSION)
|
71
71
|
CORBA.ORB_init('myORB', {'OAAddress' => "iiop://localhost:#{OPTIONS[:listenport]}"})
|
72
72
|
else
|
73
|
-
CORBA.ORB_init([
|
73
|
+
CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel], '-ORBListenEndpoints', "iiop://localhost:#{OPTIONS[:listenport]}"], 'myORB')
|
74
74
|
end
|
75
75
|
|
76
76
|
obj = orb.resolve_initial_references('RootPOA')
|
@@ -81,28 +81,28 @@ poa_man = root_poa.the_POAManager
|
|
81
81
|
|
82
82
|
poa_man.activate
|
83
83
|
|
84
|
-
hello_srv = MyHello.new(orb,
|
84
|
+
hello_srv = MyHello.new(orb, 'Hello')
|
85
85
|
|
86
86
|
hello_obj = hello_srv._this()
|
87
87
|
|
88
88
|
hello_ior = orb.object_to_string(hello_obj)
|
89
89
|
|
90
|
-
orb.ior_map.map_ior(
|
90
|
+
orb.ior_map.map_ior('Hello', hello_ior)
|
91
91
|
|
92
|
-
hello_srv = MyHello.new(orb,
|
92
|
+
hello_srv = MyHello.new(orb, 'Hello2')
|
93
93
|
|
94
94
|
hello_obj = hello_srv._this()
|
95
95
|
|
96
96
|
hello_ior = orb.object_to_string(hello_obj)
|
97
97
|
|
98
|
-
orb.ior_map.map_ior(
|
98
|
+
orb.ior_map.map_ior('Hello2', hello_ior)
|
99
99
|
|
100
100
|
open(OPTIONS[:iorfile], 'w') { |io|
|
101
101
|
io.write hello_ior
|
102
102
|
}
|
103
103
|
|
104
104
|
Signal.trap('INT') do
|
105
|
-
puts
|
105
|
+
puts 'SIGINT - shutting down ORB...'
|
106
106
|
orb.shutdown()
|
107
107
|
end
|
108
108
|
|
data/test/IORTable/client.rb
CHANGED
@@ -21,22 +21,22 @@ ARGV.options do |opts|
|
|
21
21
|
script_name = File.basename($0)
|
22
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
23
|
|
24
|
-
opts.separator
|
24
|
+
opts.separator ''
|
25
25
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
26
|
+
opts.on('--p PORT',
|
27
|
+
'Set server endpoint port.',
|
28
|
+
'Default: 3456') { |v| OPTIONS[:serverport] = v }
|
29
|
+
opts.on('--d LVL',
|
30
|
+
'Set ORBDebugLevel value.',
|
31
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
32
|
+
opts.on('--use-implement',
|
33
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
34
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
35
35
|
|
36
|
-
opts.separator
|
36
|
+
opts.separator ''
|
37
37
|
|
38
|
-
opts.on(
|
39
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
40
40
|
|
41
41
|
opts.parse!
|
42
42
|
end
|
@@ -51,7 +51,7 @@ end
|
|
51
51
|
|
52
52
|
begin STDERR.puts 'Not supported on this platform'; exit(0); end unless defined?(IORTable)
|
53
53
|
|
54
|
-
orb = CORBA.ORB_init([
|
54
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
55
55
|
|
56
56
|
obj = orb.string_to_object("corbaloc:iiop:1.2@localhost:#{OPTIONS[:serverport]}/Hello")
|
57
57
|
|