r2corba 1.5.5-universal-java → 1.6.0-universal-java
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 +4 -4
- 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/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 +6 -6
@@ -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
|
@@ -42,7 +42,7 @@ include TestUtil
|
|
42
42
|
|
43
43
|
def do_exit(rc)
|
44
44
|
ins_stop = Test.new
|
45
|
-
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
45
|
+
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
|
46
46
|
ins_stop.wait(50)
|
47
47
|
exit(rc)
|
48
48
|
end
|
@@ -53,7 +53,7 @@ TestUtil.remove_file(ior_file)
|
|
53
53
|
|
54
54
|
ins = Test.new
|
55
55
|
|
56
|
-
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
56
|
+
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start')
|
57
57
|
|
58
58
|
do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
|
59
59
|
|
@@ -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 INS IOR filename.',
|
30
30
|
"Default: 'file://ins.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
|
@@ -57,23 +57,23 @@ class MyHello < POA::Test::Hello
|
|
57
57
|
end
|
58
58
|
|
59
59
|
def get_string()
|
60
|
-
|
60
|
+
'Hello there!'
|
61
61
|
end
|
62
62
|
|
63
63
|
def shutdown()
|
64
64
|
@orb.shutdown()
|
65
65
|
end
|
66
|
-
end #of servant MyHello
|
66
|
+
end # of servant MyHello
|
67
67
|
|
68
68
|
# initialize ORB
|
69
|
-
orb = CORBA.ORB_init([
|
69
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
70
70
|
|
71
71
|
# resolve NamingContext
|
72
72
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
73
73
|
|
74
74
|
nc = CosNaming::NamingContextExt._narrow(obj)
|
75
75
|
|
76
|
-
assert_not
|
76
|
+
assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
|
77
77
|
|
78
78
|
# initialize POA
|
79
79
|
obj = orb.resolve_initial_references('RootPOA')
|
@@ -96,7 +96,7 @@ end
|
|
96
96
|
|
97
97
|
# initialize signal handling
|
98
98
|
Signal.trap('INT') do
|
99
|
-
puts
|
99
|
+
puts 'SIGINT - shutting down ORB...'
|
100
100
|
orb.shutdown()
|
101
101
|
end
|
102
102
|
|
@@ -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 file.',
|
30
30
|
"Default: 'corbaname.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
|
@@ -51,7 +51,7 @@ else
|
|
51
51
|
end
|
52
52
|
require 'corba/naming'
|
53
53
|
|
54
|
-
orb = CORBA.ORB_init([
|
54
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
55
55
|
|
56
56
|
begin
|
57
57
|
|
@@ -69,7 +69,7 @@ begin
|
|
69
69
|
# narrow object ref and call
|
70
70
|
hello_obj = Test::Hello._narrow(obj)
|
71
71
|
|
72
|
-
assert_not
|
72
|
+
assert_not 'ERROR: corbaname resolved to nil object!', CORBA::is_nil(hello_obj)
|
73
73
|
|
74
74
|
the_string = hello_obj.get_string()
|
75
75
|
|
@@ -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
|
@@ -42,7 +42,7 @@ include TestUtil
|
|
42
42
|
|
43
43
|
def do_exit(rc)
|
44
44
|
ins_stop = Test.new
|
45
|
-
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
45
|
+
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
|
46
46
|
ins_stop.wait(50)
|
47
47
|
exit(rc)
|
48
48
|
end
|
@@ -56,7 +56,7 @@ TestUtil.remove_file(corbaname_file)
|
|
56
56
|
|
57
57
|
ins = Test.new
|
58
58
|
|
59
|
-
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
59
|
+
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start -l 2345')
|
60
60
|
|
61
61
|
do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
|
62
62
|
|
@@ -24,25 +24,25 @@ ARGV.options do |opts|
|
|
24
24
|
script_name = File.basename($0)
|
25
25
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
26
26
|
|
27
|
-
opts.separator
|
27
|
+
opts.separator ''
|
28
28
|
|
29
|
-
opts.on(
|
30
|
-
|
29
|
+
opts.on('--o FILENAME',
|
30
|
+
'Set corbaname IOR filename.',
|
31
31
|
"Default: 'corbaname.ior'") { |v| OPTIONS[:iorfile] = v }
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
35
|
-
opts.on(
|
36
|
-
|
37
|
-
|
38
|
-
opts.on(
|
39
|
-
|
40
|
-
|
32
|
+
opts.on('--d LVL',
|
33
|
+
'Set ORBDebugLevel value.',
|
34
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
35
|
+
opts.on('--p PORT', Integer,
|
36
|
+
'INS port number.',
|
37
|
+
'Default: 2345') { |v| OPTIONS[:ins_port] = v }
|
38
|
+
opts.on('--use-implement',
|
39
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
40
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
41
41
|
|
42
|
-
opts.separator
|
42
|
+
opts.separator ''
|
43
43
|
|
44
|
-
opts.on(
|
45
|
-
|
44
|
+
opts.on('-h', '--help',
|
45
|
+
'Show this help message.') { puts opts; exit }
|
46
46
|
|
47
47
|
opts.parse!
|
48
48
|
end
|
@@ -61,16 +61,16 @@ class MyHello < POA::Test::Hello
|
|
61
61
|
end
|
62
62
|
|
63
63
|
def get_string()
|
64
|
-
|
64
|
+
'Hello there!'
|
65
65
|
end
|
66
66
|
|
67
67
|
def shutdown()
|
68
68
|
@orb.shutdown()
|
69
69
|
end
|
70
|
-
end #of servant MyHello
|
70
|
+
end # of servant MyHello
|
71
71
|
|
72
72
|
# initialize ORB
|
73
|
-
orb = CORBA.ORB_init([
|
73
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
74
74
|
|
75
75
|
# create NameService corbaloc
|
76
76
|
ins_url = "iiop:localhost:#{OPTIONS[:ins_port]}/NamingService"
|
@@ -90,7 +90,7 @@ full_name = [CosNaming::NameComponent.new('', 'root'),
|
|
90
90
|
nc_new = nc.bind_new_context(full_name[0, 1])
|
91
91
|
nc_new = nc_new.bind_new_context(full_name[1, 1])
|
92
92
|
|
93
|
-
assert_not
|
93
|
+
assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
|
94
94
|
|
95
95
|
# initialize POA
|
96
96
|
obj = orb.resolve_initial_references('RootPOA')
|
@@ -122,7 +122,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
122
122
|
|
123
123
|
# initialize signal handling
|
124
124
|
Signal.trap('INT') do
|
125
|
-
puts
|
125
|
+
puts 'SIGINT - shutting down ORB...'
|
126
126
|
orb.shutdown()
|
127
127
|
end
|
128
128
|
|
@@ -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://ins.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
|
@@ -51,7 +51,7 @@ else
|
|
51
51
|
end
|
52
52
|
require 'corba/naming'
|
53
53
|
|
54
|
-
orb = CORBA.ORB_init([
|
54
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
55
55
|
|
56
56
|
begin
|
57
57
|
|
@@ -60,7 +60,7 @@ begin
|
|
60
60
|
|
61
61
|
nc = CosNaming::NamingContextExt._narrow(obj)
|
62
62
|
|
63
|
-
assert_not
|
63
|
+
assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
|
64
64
|
|
65
65
|
# retrieve object reference for servant from Naming service
|
66
66
|
name = [CosNaming::NameComponent.new('Hello', 'ior')]
|
@@ -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
|
@@ -42,7 +42,7 @@ include TestUtil
|
|
42
42
|
|
43
43
|
def do_exit(rc)
|
44
44
|
ins_stop = Test.new
|
45
|
-
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
45
|
+
ins_stop.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- stop --no-daemon')
|
46
46
|
ins_stop.wait(50)
|
47
47
|
exit(rc)
|
48
48
|
end
|
@@ -53,7 +53,7 @@ TestUtil.remove_file(ior_file)
|
|
53
53
|
|
54
54
|
ins = Test.new
|
55
55
|
|
56
|
-
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'",
|
56
|
+
exit(255) if !ins.run("-e \'require \"corba/svcs/ins/ins.rb\"\' -e \'R2CORBA::INS.run\'", '-- start')
|
57
57
|
|
58
58
|
do_exit(255) if !TestUtil.wait_for_file(ior_file, 400)
|
59
59
|
|
@@ -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 INS IOR filename.',
|
30
30
|
"Default: 'file://ins.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
|
@@ -57,23 +57,23 @@ class MyHello < POA::Test::Hello
|
|
57
57
|
end
|
58
58
|
|
59
59
|
def get_string()
|
60
|
-
|
60
|
+
'Hello there!'
|
61
61
|
end
|
62
62
|
|
63
63
|
def shutdown()
|
64
64
|
@orb.shutdown()
|
65
65
|
end
|
66
|
-
end #of servant MyHello
|
66
|
+
end # of servant MyHello
|
67
67
|
|
68
68
|
# initialize ORB
|
69
|
-
orb = CORBA.ORB_init([
|
69
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
70
70
|
|
71
71
|
# resolve NamingContext
|
72
72
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
73
73
|
|
74
74
|
nc = CosNaming::NamingContextExt._narrow(obj)
|
75
75
|
|
76
|
-
assert_not
|
76
|
+
assert_not 'ERROR: INS IOR resolved to nil object!', CORBA::is_nil(nc)
|
77
77
|
|
78
78
|
# initialize POA
|
79
79
|
obj = orb.resolve_initial_references('RootPOA')
|
@@ -96,7 +96,7 @@ nc.bind(name, hello_obj)
|
|
96
96
|
|
97
97
|
# initialize signal handling
|
98
98
|
Signal.trap('INT') do
|
99
|
-
puts
|
99
|
+
puts 'SIGINT - shutting down ORB...'
|
100
100
|
orb.shutdown()
|
101
101
|
end
|
102
102
|
|