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
|
data/test/Collocation/test.rb
CHANGED
@@ -36,19 +36,19 @@ ARGV.options do |opts|
|
|
36
36
|
script_name = File.basename($0)
|
37
37
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
38
38
|
|
39
|
-
opts.separator
|
39
|
+
opts.separator ''
|
40
40
|
|
41
|
-
opts.on(
|
42
|
-
|
43
|
-
|
44
|
-
opts.on(
|
45
|
-
|
46
|
-
|
41
|
+
opts.on('--d LVL',
|
42
|
+
'Set ORBDebugLevel value.',
|
43
|
+
'Default: 0') { |dlvl| ORB_ARG << '-ORBDebugLevel' << dlvl }
|
44
|
+
opts.on('--use-implement',
|
45
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
46
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
47
47
|
|
48
|
-
opts.separator
|
48
|
+
opts.separator ''
|
49
49
|
|
50
|
-
opts.on(
|
51
|
-
|
50
|
+
opts.on('-h', '--help',
|
51
|
+
'Show this help message.') { puts opts; exit }
|
52
52
|
|
53
53
|
opts.parse!
|
54
54
|
end
|
@@ -63,26 +63,29 @@ end
|
|
63
63
|
|
64
64
|
class Top < POA::Diamond::Top
|
65
65
|
def shape
|
66
|
-
|
66
|
+
'a point.'
|
67
67
|
end
|
68
68
|
end
|
69
69
|
|
70
70
|
class Left < POA::Diamond::Left
|
71
71
|
def shape
|
72
|
-
|
72
|
+
'the left line'
|
73
73
|
end
|
74
|
+
|
74
75
|
def color
|
75
|
-
|
76
|
+
'black'
|
76
77
|
end
|
77
78
|
end
|
78
79
|
|
79
80
|
class Right < POA::Diamond::Right
|
80
81
|
def shape
|
81
|
-
|
82
|
+
'the right line'
|
82
83
|
end
|
84
|
+
|
83
85
|
def color
|
84
|
-
|
86
|
+
'red'
|
85
87
|
end
|
88
|
+
|
86
89
|
def width
|
87
90
|
0
|
88
91
|
end
|
@@ -90,17 +93,21 @@ end
|
|
90
93
|
|
91
94
|
class Buttom < POA::Diamond::Buttom
|
92
95
|
def shape
|
93
|
-
|
96
|
+
'a diamond'
|
94
97
|
end
|
98
|
+
|
95
99
|
def color
|
96
|
-
|
100
|
+
'translucent'
|
97
101
|
end
|
102
|
+
|
98
103
|
def name
|
99
|
-
|
104
|
+
'Jubilee'
|
100
105
|
end
|
106
|
+
|
101
107
|
def width
|
102
108
|
100
|
103
109
|
end
|
110
|
+
|
104
111
|
def area(unit)
|
105
112
|
case unit
|
106
113
|
when Diamond::Buttom::MM
|
@@ -125,7 +132,7 @@ class Collocation_Test
|
|
125
132
|
end
|
126
133
|
|
127
134
|
def init(args = [])
|
128
|
-
@orb = CORBA.ORB_init([
|
135
|
+
@orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
129
136
|
|
130
137
|
obj = @orb.resolve_initial_references('RootPOA')
|
131
138
|
|
@@ -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 IOR',
|
29
|
+
'Set IOR.',
|
30
30
|
"Default: 'corbaloc:iiop:192.3.47/10007/RandomObject'") { |v| OPTIONS[:ior] = 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
|
@@ -63,7 +63,7 @@ def test_timeout(object)
|
|
63
63
|
# First connection happens here..
|
64
64
|
hello = Test::Hello._narrow(object)
|
65
65
|
|
66
|
-
assert_not
|
66
|
+
assert_not 'Nil Test::Hello reference', CORBA::is_nil(hello)
|
67
67
|
|
68
68
|
the_string = hello.get_string()
|
69
69
|
|
@@ -85,12 +85,12 @@ def test_timeout(object)
|
|
85
85
|
end
|
86
86
|
|
87
87
|
|
88
|
-
orb = CORBA.ORB_init([
|
88
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
89
89
|
|
90
90
|
begin
|
91
91
|
tmp = orb.string_to_object(OPTIONS[:ior])
|
92
92
|
|
93
|
-
object = orb.resolve_initial_references(
|
93
|
+
object = orb.resolve_initial_references('PolicyCurrent')
|
94
94
|
|
95
95
|
policy_current = CORBA::PolicyCurrent::_narrow(object)
|
96
96
|
|
@@ -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/DII/client.rb
CHANGED
@@ -23,39 +23,39 @@ 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
|
45
45
|
|
46
46
|
require 'corba'
|
47
47
|
|
48
|
-
orb = CORBA.ORB_init([
|
48
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
49
49
|
|
50
50
|
begin
|
51
51
|
|
52
52
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
53
53
|
|
54
|
-
puts
|
55
|
-
req = obj._request(
|
54
|
+
puts '***** Synchronous twoway DII'
|
55
|
+
req = obj._request('echo')
|
56
56
|
req.arguments = [
|
57
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
58
|
-
['message', CORBA::ARG_IN, CORBA::_tc_string,
|
57
|
+
['method', CORBA::ARG_IN, CORBA::_tc_string, 'sync twoway'],
|
58
|
+
['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
|
59
59
|
]
|
60
60
|
req.set_return_type(CORBA::_tc_string)
|
61
61
|
|
@@ -64,11 +64,11 @@ begin
|
|
64
64
|
puts "string returned <#{the_string}>"
|
65
65
|
puts
|
66
66
|
|
67
|
-
puts
|
68
|
-
req = obj._request(
|
67
|
+
puts '***** Deferred twoway DII (using get_response())'
|
68
|
+
req = obj._request('echo')
|
69
69
|
req.arguments = [
|
70
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
71
|
-
['message', CORBA::ARG_IN, CORBA::_tc_string,
|
70
|
+
['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (1)'],
|
71
|
+
['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
|
72
72
|
]
|
73
73
|
req.set_return_type(CORBA::_tc_string)
|
74
74
|
|
@@ -84,11 +84,11 @@ begin
|
|
84
84
|
(TAO::MAJOR_VERSION == 1 &&
|
85
85
|
(TAO::MINOR_VERSION > 5 ||
|
86
86
|
(TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION > 9)))
|
87
|
-
puts
|
88
|
-
req = obj._request(
|
87
|
+
puts '***** Deferred twoway DII (using poll_response())'
|
88
|
+
req = obj._request('echo')
|
89
89
|
req.arguments = [
|
90
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
91
|
-
['message', CORBA::ARG_IN, CORBA::_tc_string,
|
90
|
+
['method', CORBA::ARG_IN, CORBA::_tc_string, 'deferred twoway (2)'],
|
91
|
+
['message', CORBA::ARG_IN, CORBA::_tc_string, 'Hello world!']
|
92
92
|
]
|
93
93
|
req.set_return_type(CORBA::_tc_string)
|
94
94
|
|
@@ -103,8 +103,8 @@ begin
|
|
103
103
|
puts
|
104
104
|
end
|
105
105
|
|
106
|
-
puts
|
107
|
-
req = obj._request(
|
106
|
+
puts '***** Oneway shutdown'
|
107
|
+
req = obj._request('shutdown')
|
108
108
|
req.send_oneway()
|
109
109
|
|
110
110
|
ensure
|
data/test/DII/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/DII/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
|
@@ -60,9 +60,9 @@ class MyHello < POA::Test::Hello
|
|
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/DSI/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
|
-
|
26
|
+
opts.on('--k IORFILE',
|
27
|
+
'Set IOR.',
|
28
28
|
"Default: 'file://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
|
@@ -48,15 +48,15 @@ else
|
|
48
48
|
require 'TestC.rb'
|
49
49
|
end
|
50
50
|
|
51
|
-
orb = CORBA.ORB_init([
|
51
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
52
52
|
|
53
|
-
|
53
|
+
# #s = open(OPTIONS[:iorfile], 'r').read
|
54
54
|
|
55
55
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
56
56
|
|
57
57
|
hello_obj = Test::Hello._narrow(obj)
|
58
58
|
|
59
|
-
the_string, the_length = hello_obj.echo(
|
59
|
+
the_string, the_length = hello_obj.echo('Hello world!')
|
60
60
|
|
61
61
|
puts "string returned <#{the_string}>; length = #{the_length}"
|
62
62
|
|