r2corba 1.6.1-x64-mingw32 → 1.7.0-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +5 -5
- data/lib/corba/cbase/Request.rb +6 -6
- data/lib/corba/cmds/base.rb +1 -1
- data/lib/corba/common/Any.rb +1 -1
- data/lib/corba/common/Values.rb +4 -4
- data/lib/corba/common/version.rb +2 -2
- data/lib/corba/jbase/Servant.rb +4 -4
- data/lib/corba/svcs/ins/cos_naming.rb +6 -6
- data/lib/corba/svcs/ins/ins.rb +33 -33
- data/lib/corba/svcs/ins/naming_service.rb +5 -5
- data/rakelib/config.rb +9 -6
- data/rakelib/gem.rake +11 -11
- data/test/BiDirectional/client.rb +7 -7
- data/test/BiDirectional/run_test.rb +2 -2
- data/test/BiDirectional/server.rb +13 -13
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +9 -9
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +6 -6
- data/test/CORBA_Services/Naming/Corbaname/client.rb +6 -6
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/Corbaname/server.rb +8 -8
- data/test/CORBA_Services/Naming/Simple/client.rb +6 -6
- data/test/CORBA_Services/Naming/Simple/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/Simple/server.rb +6 -6
- data/test/Collocation/run_test.rb +2 -2
- data/test/Collocation/test.rb +1 -1
- data/test/Connect_Timeout/client.rb +7 -7
- data/test/Connect_Timeout/run_test.rb +2 -2
- data/test/DII/client.rb +10 -10
- data/test/DII/run_test.rb +2 -2
- data/test/DII/server.rb +7 -7
- data/test/DSI/client.rb +6 -6
- data/test/DSI/run_test.rb +2 -2
- data/test/DSI/server.rb +9 -9
- data/test/Exceptions/client.rb +6 -6
- data/test/Exceptions/run_test.rb +2 -2
- data/test/Exceptions/server.rb +7 -7
- data/test/Hello/client.rb +7 -7
- data/test/Hello/run_test.rb +2 -2
- data/test/Hello/server.rb +7 -7
- data/test/IDL_Test/client.rb +9 -9
- data/test/IDL_Test/run_test.rb +2 -2
- data/test/IDL_Test/server.rb +7 -7
- data/test/IORMap/client.rb +7 -7
- data/test/IORMap/run_test.rb +2 -2
- data/test/IORMap/server.rb +9 -9
- data/test/IORTable/client.rb +7 -7
- data/test/IORTable/run_test.rb +2 -2
- data/test/IORTable/server.rb +10 -10
- data/test/Implicit_Conversion/client.rb +5 -5
- data/test/Implicit_Conversion/run_test.rb +2 -2
- data/test/Implicit_Conversion/server.rb +7 -7
- data/test/Multi_Threading/Multiple_ORB/client.rb +6 -6
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
- data/test/Multi_Threading/Multiple_ORB/server.rb +5 -5
- data/test/Multi_Threading/Simple/client.rb +6 -6
- data/test/Multi_Threading/Simple/run_test.rb +2 -2
- data/test/Multi_Threading/Simple/server.rb +8 -8
- data/test/Multi_Threading/Threads/client.rb +6 -6
- data/test/Multi_Threading/Threads/run_test.rb +2 -2
- data/test/Multi_Threading/Threads/server.rb +9 -9
- data/test/Multi_Threading/Threads/watchdog.rb +7 -7
- data/test/Multiple_Servant_Interfaces/client.rb +7 -7
- data/test/Multiple_Servant_Interfaces/run_test.rb +2 -2
- data/test/Multiple_Servant_Interfaces/server.rb +7 -7
- data/test/Nil/run_test.rb +2 -2
- data/test/Nil/test.rb +4 -4
- data/test/OBV/AbstractInterface/client.rb +9 -9
- data/test/OBV/AbstractInterface/run_test.rb +2 -2
- data/test/OBV/AbstractInterface/server.rb +7 -7
- data/test/OBV/Custom/client.rb +5 -5
- data/test/OBV/Custom/run_test.rb +2 -2
- data/test/OBV/Custom/server.rb +7 -7
- data/test/OBV/Simple/client.rb +5 -5
- data/test/OBV/Simple/run_test.rb +2 -2
- data/test/OBV/Simple/server.rb +7 -7
- data/test/OBV/Simple_Event/client.rb +5 -5
- data/test/OBV/Simple_Event/run_test.rb +2 -2
- data/test/OBV/Simple_Event/server.rb +7 -7
- data/test/OBV/Supports/client.rb +17 -17
- data/test/OBV/Supports/run_test.rb +2 -2
- data/test/OBV/Supports/server.rb +7 -7
- data/test/OBV/Tree/client.rb +6 -6
- data/test/OBV/Tree/run_test.rb +2 -2
- data/test/OBV/Tree/server.rb +7 -7
- data/test/OBV/Truncatable/client.rb +5 -5
- data/test/OBV/Truncatable/run_test.rb +2 -2
- data/test/OBV/Truncatable/server.rb +6 -6
- data/test/OBV/ValueBox/client.rb +20 -20
- data/test/OBV/ValueBox/run_test.rb +2 -2
- data/test/OBV/ValueBox/server.rb +8 -8
- data/test/Object/client.rb +6 -6
- data/test/Object/run_test.rb +2 -2
- data/test/Object/server.rb +9 -9
- data/test/POA/run_test.rb +2 -2
- data/test/POA/test.rb +4 -4
- data/test/Param_Test/client.rb +6 -6
- data/test/Param_Test/run_test.rb +2 -2
- data/test/Param_Test/server.rb +6 -6
- data/test/Performance/Simple/client.rb +6 -6
- data/test/Performance/Simple/run_test.rb +2 -2
- data/test/Performance/Simple/server.rb +7 -7
- data/test/Policies/run_test.rb +2 -2
- data/test/Policies/test.rb +4 -4
- data/test/Timeout/client.rb +11 -11
- data/test/Timeout/run_test.rb +2 -2
- data/test/Timeout/server.rb +9 -9
- data/test/lib/test.rb +5 -5
- data/test/test_runner.rb +8 -7
- metadata +6 -5
data/test/OBV/Tree/run_test.rb
CHANGED
data/test/OBV/Tree/server.rb
CHANGED
@@ -12,9 +12,9 @@
|
|
12
12
|
require 'optparse'
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -75,7 +75,7 @@ class Passer_i < POA::Passer
|
|
75
75
|
end
|
76
76
|
|
77
77
|
def shutdown ()
|
78
|
-
@orb.shutdown
|
78
|
+
@orb.shutdown
|
79
79
|
end
|
80
80
|
end # of servant Passer_i
|
81
81
|
|
@@ -96,17 +96,17 @@ poa_man.activate
|
|
96
96
|
|
97
97
|
passer = Passer_i.new(orb)
|
98
98
|
|
99
|
-
obj = passer._this
|
99
|
+
obj = passer._this
|
100
100
|
|
101
101
|
ior = orb.object_to_string(obj)
|
102
102
|
|
103
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
103
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
104
104
|
io.write ior
|
105
105
|
}
|
106
106
|
|
107
107
|
Signal.trap('INT') do
|
108
108
|
puts 'SIGINT - shutting down ORB...'
|
109
|
-
orb.shutdown
|
109
|
+
orb.shutdown
|
110
110
|
end
|
111
111
|
|
112
112
|
if Signal.list.has_key?('USR2')
|
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'file://server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -269,10 +269,10 @@ begin
|
|
269
269
|
|
270
270
|
# shutdown tester service
|
271
271
|
|
272
|
-
tester.shutdown
|
272
|
+
tester.shutdown
|
273
273
|
|
274
274
|
ensure
|
275
275
|
|
276
|
-
orb.destroy
|
276
|
+
orb.destroy
|
277
277
|
|
278
278
|
end
|
@@ -12,9 +12,9 @@
|
|
12
12
|
require 'optparse'
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -68,17 +68,17 @@ poa_man.activate
|
|
68
68
|
|
69
69
|
tester = Test_impl.new(orb)
|
70
70
|
|
71
|
-
obj = tester._this
|
71
|
+
obj = tester._this
|
72
72
|
|
73
73
|
ior = orb.object_to_string(obj)
|
74
74
|
|
75
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
75
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
76
76
|
io.write ior
|
77
77
|
}
|
78
78
|
|
79
79
|
Signal.trap('INT') do
|
80
80
|
puts 'SIGINT - shutting down ORB...'
|
81
|
-
orb.shutdown
|
81
|
+
orb.shutdown
|
82
82
|
end
|
83
83
|
|
84
84
|
if Signal.list.has_key?('USR2')
|
data/test/OBV/ValueBox/client.rb
CHANGED
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'file://server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -189,13 +189,13 @@ module Test
|
|
189
189
|
retval = nil
|
190
190
|
retval, p2_out, p3_out = test.seq_op1(p1, p2)
|
191
191
|
|
192
|
-
p2.value
|
192
|
+
p2.value.each_with_index do |e, i|
|
193
193
|
assert 'boxed_sequence_invocations:2 failed', (p2_out[i] == e * 3)
|
194
194
|
end
|
195
|
-
p2.value
|
195
|
+
p2.value.each_with_index do |e, i|
|
196
196
|
assert 'boxed_sequence_invocations:2 failed', (p3_out[i] == e * 5)
|
197
197
|
end
|
198
|
-
p1.value
|
198
|
+
p1.value.each_with_index do |e, i|
|
199
199
|
assert 'boxed_sequence_invocations:2 failed', (retval[i] == e)
|
200
200
|
end
|
201
201
|
|
@@ -204,10 +204,10 @@ module Test
|
|
204
204
|
p3_out = nil
|
205
205
|
p2_out, p3_out = test.seq_op2(p1.value, p2.value)
|
206
206
|
|
207
|
-
p2.value
|
207
|
+
p2.value.each_with_index do |e, i|
|
208
208
|
assert 'boxed_sequence_invocations:3 failed', (p2_out[i] == e * 3)
|
209
209
|
end
|
210
|
-
p2.value
|
210
|
+
p2.value.each_with_index do |e, i|
|
211
211
|
assert 'boxed_sequence_invocations:3 failed', (p3_out[i] == e * 5)
|
212
212
|
end
|
213
213
|
end
|
@@ -312,13 +312,13 @@ module Test
|
|
312
312
|
retval = nil
|
313
313
|
retval, p2_out, p3_out = test.array_op1(p1, p2)
|
314
314
|
|
315
|
-
p2.value
|
315
|
+
p2.value.each_with_index do |e, i|
|
316
316
|
assert 'boxed_array_invocations:2 failed', (p2_out[i] == e * 3)
|
317
317
|
end
|
318
|
-
p2.value
|
318
|
+
p2.value.each_with_index do |e, i|
|
319
319
|
assert 'boxed_array_invocations:2 failed', (p3_out[i] == e * 3)
|
320
320
|
end
|
321
|
-
p1.value
|
321
|
+
p1.value.each_with_index do |e, i|
|
322
322
|
assert 'boxed_array_invocations:2 failed', (retval[i] == e)
|
323
323
|
end
|
324
324
|
|
@@ -327,10 +327,10 @@ module Test
|
|
327
327
|
p3_out = nil
|
328
328
|
p2_out, p3_out = test.array_op2(p1.value, p2.value)
|
329
329
|
|
330
|
-
p2.value
|
330
|
+
p2.value.each_with_index do |e, i|
|
331
331
|
assert 'boxed_array_invocations:3 failed', (p2_out[i] == e * 3)
|
332
332
|
end
|
333
|
-
p1.value
|
333
|
+
p1.value.each_with_index do |e, i|
|
334
334
|
assert 'boxed_array_invocations:3 failed', (p3_out[i] == e)
|
335
335
|
end
|
336
336
|
|
@@ -345,13 +345,13 @@ module Test
|
|
345
345
|
retval = nil
|
346
346
|
retval, p2_out, p3_out = test.array_op3(p1, p2)
|
347
347
|
|
348
|
-
p2.value
|
348
|
+
p2.value.each_with_index do |e, i|
|
349
349
|
assert 'boxed_array_invocations:5 failed', (p2_out[i] == '1inout string')
|
350
350
|
end
|
351
|
-
p2.value
|
351
|
+
p2.value.each_with_index do |e, i|
|
352
352
|
assert 'boxed_array_invocations:5 failed', (p3_out[i] == '1inout string')
|
353
353
|
end
|
354
|
-
p1.value
|
354
|
+
p1.value.each_with_index do |e, i|
|
355
355
|
assert 'boxed_array_invocations:5 failed', (retval[i] == e)
|
356
356
|
end
|
357
357
|
|
@@ -360,10 +360,10 @@ module Test
|
|
360
360
|
p3_out = nil
|
361
361
|
p2_out, p3_out = test.array_op4(p1.value, p2.value)
|
362
362
|
|
363
|
-
p2.value
|
363
|
+
p2.value.each_with_index do |e, i|
|
364
364
|
assert 'boxed_array_invocations:6 failed', (p2_out[i] == '1inout string')
|
365
365
|
end
|
366
|
-
p1.value
|
366
|
+
p1.value.each_with_index do |e, i|
|
367
367
|
assert 'boxed_array_invocations:6 failed', (p3_out[i] == e)
|
368
368
|
end
|
369
369
|
end
|
@@ -488,10 +488,10 @@ begin
|
|
488
488
|
|
489
489
|
# shutdown test service
|
490
490
|
|
491
|
-
test.shutdown
|
491
|
+
test.shutdown
|
492
492
|
|
493
493
|
ensure
|
494
494
|
|
495
|
-
orb.destroy
|
495
|
+
orb.destroy
|
496
496
|
|
497
497
|
end
|
data/test/OBV/ValueBox/server.rb
CHANGED
@@ -13,9 +13,9 @@
|
|
13
13
|
require 'optparse'
|
14
14
|
|
15
15
|
OPTIONS = {
|
16
|
-
:
|
17
|
-
:
|
18
|
-
:
|
16
|
+
use_implement: false,
|
17
|
+
orb_debuglevel: 0,
|
18
|
+
iorfile: 'server.ior'
|
19
19
|
}
|
20
20
|
|
21
21
|
ARGV.options do |opts|
|
@@ -61,7 +61,7 @@ class Test_impl < POA::Test
|
|
61
61
|
def basic_op1(p1, p2)
|
62
62
|
p3 = p2 * 5
|
63
63
|
p2 = p2 * 3
|
64
|
-
retval = p1.nil?
|
64
|
+
retval = p1.nil? ? nil : p1 * 3
|
65
65
|
[retval, p2, p3]
|
66
66
|
end
|
67
67
|
|
@@ -235,7 +235,7 @@ class Test_impl < POA::Test
|
|
235
235
|
end
|
236
236
|
|
237
237
|
def shutdown()
|
238
|
-
@orb.shutdown
|
238
|
+
@orb.shutdown
|
239
239
|
end
|
240
240
|
end # of servant Test_impl
|
241
241
|
|
@@ -251,17 +251,17 @@ poa_man.activate
|
|
251
251
|
|
252
252
|
test_srv = Test_impl.new(orb)
|
253
253
|
|
254
|
-
test_obj = test_srv._this
|
254
|
+
test_obj = test_srv._this
|
255
255
|
|
256
256
|
ior = orb.object_to_string(test_obj)
|
257
257
|
|
258
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
258
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
259
259
|
io.write ior
|
260
260
|
}
|
261
261
|
|
262
262
|
Signal.trap('INT') do
|
263
263
|
puts 'SIGINT - shutting down ORB...'
|
264
|
-
orb.shutdown
|
264
|
+
orb.shutdown
|
265
265
|
end
|
266
266
|
|
267
267
|
if Signal.list.has_key?('USR2')
|
data/test/Object/client.rb
CHANGED
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'file://server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -76,7 +76,7 @@ begin
|
|
76
76
|
|
77
77
|
assert 'incorrect repository id returned (2)', id == Test::Hello._tc.id
|
78
78
|
|
79
|
-
the_string = hello_obj.get_string
|
79
|
+
the_string = hello_obj.get_string
|
80
80
|
|
81
81
|
puts "string returned <#{the_string}>"
|
82
82
|
|
@@ -102,10 +102,10 @@ begin
|
|
102
102
|
hello2_obj = Test::Hello._narrow(obj)
|
103
103
|
end
|
104
104
|
|
105
|
-
hello2_obj.shutdown
|
105
|
+
hello2_obj.shutdown
|
106
106
|
|
107
107
|
ensure
|
108
108
|
|
109
|
-
orb.destroy
|
109
|
+
orb.destroy
|
110
110
|
|
111
111
|
end
|
data/test/Object/run_test.rb
CHANGED
data/test/Object/server.rb
CHANGED
@@ -12,9 +12,9 @@
|
|
12
12
|
require 'optparse'
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def shutdown()
|
61
|
-
@orb.shutdown
|
61
|
+
@orb.shutdown
|
62
62
|
end
|
63
63
|
|
64
64
|
## overrides for standard CORBA::Object methods
|
@@ -67,7 +67,7 @@ class MyHello < POA::Test::Hello
|
|
67
67
|
# create second servant and
|
68
68
|
hello_srv = MyHello2.new(@orb)
|
69
69
|
# activate and return object ref
|
70
|
-
hello_srv._this
|
70
|
+
hello_srv._this
|
71
71
|
end
|
72
72
|
end # of servant MyHello
|
73
73
|
|
@@ -81,7 +81,7 @@ class MyHello2 < POA::Test::Hello
|
|
81
81
|
end
|
82
82
|
|
83
83
|
def shutdown()
|
84
|
-
@orb.shutdown
|
84
|
+
@orb.shutdown
|
85
85
|
end
|
86
86
|
|
87
87
|
## overrides for standard CORBA::Object methods
|
@@ -105,17 +105,17 @@ poa_man.activate
|
|
105
105
|
|
106
106
|
hello_srv = MyHello.new(orb)
|
107
107
|
|
108
|
-
hello_obj = hello_srv._this
|
108
|
+
hello_obj = hello_srv._this
|
109
109
|
|
110
110
|
hello_ior = orb.object_to_string(hello_obj)
|
111
111
|
|
112
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
112
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
113
113
|
io.write hello_ior
|
114
114
|
}
|
115
115
|
|
116
116
|
Signal.trap('INT') do
|
117
117
|
puts 'SIGINT - shutting down ORB...'
|
118
|
-
orb.shutdown
|
118
|
+
orb.shutdown
|
119
119
|
end
|
120
120
|
|
121
121
|
if Signal.list.has_key?('USR2')
|
data/test/POA/run_test.rb
CHANGED
data/test/POA/test.rb
CHANGED
@@ -14,9 +14,9 @@ require 'lib/assert'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -60,7 +60,7 @@ class MyHello < POA::Test::Hello
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def shutdown()
|
63
|
-
@orb.shutdown
|
63
|
+
@orb.shutdown
|
64
64
|
end
|
65
65
|
end # of servant MyHello
|
66
66
|
|
data/test/Param_Test/client.rb
CHANGED
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'file://server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -80,7 +80,7 @@ begin
|
|
80
80
|
|
81
81
|
## string test
|
82
82
|
|
83
|
-
str = hello_obj.get_string
|
83
|
+
str = hello_obj.get_string
|
84
84
|
|
85
85
|
msg = hello_obj.message
|
86
86
|
|
@@ -267,10 +267,10 @@ begin
|
|
267
267
|
reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr + inoutstr)
|
268
268
|
end
|
269
269
|
|
270
|
-
hello_obj.shutdown
|
270
|
+
hello_obj.shutdown
|
271
271
|
|
272
272
|
ensure
|
273
273
|
|
274
|
-
orb.destroy
|
274
|
+
orb.destroy
|
275
275
|
|
276
276
|
end
|
data/test/Param_Test/run_test.rb
CHANGED
data/test/Param_Test/server.rb
CHANGED
@@ -12,9 +12,9 @@
|
|
12
12
|
require 'optparse'
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -256,7 +256,7 @@ class MyHello < POA::Test::Hello
|
|
256
256
|
end
|
257
257
|
|
258
258
|
def shutdown()
|
259
|
-
@orb.shutdown
|
259
|
+
@orb.shutdown
|
260
260
|
end
|
261
261
|
end # of servant Hello
|
262
262
|
|
@@ -279,13 +279,13 @@ hello_obj = root_poa.id_to_reference(hello_oid)
|
|
279
279
|
|
280
280
|
hello_ior = orb.object_to_string(hello_obj)
|
281
281
|
|
282
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
282
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
283
283
|
io.write hello_ior
|
284
284
|
}
|
285
285
|
|
286
286
|
Signal.trap('INT') do
|
287
287
|
puts 'SIGINT - shutting down ORB...'
|
288
|
-
orb.shutdown
|
288
|
+
orb.shutdown
|
289
289
|
end
|
290
290
|
|
291
291
|
if Signal.list.has_key?('USR2')
|
@@ -14,9 +14,9 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0,
|
19
|
+
iorfile: 'file://server.ior'
|
20
20
|
}
|
21
21
|
|
22
22
|
ARGV.options do |opts|
|
@@ -74,16 +74,16 @@ begin
|
|
74
74
|
|
75
75
|
STDERR.puts "*** Avg turnaround time per invocation = #{'%.2f' % (t_diff / 10)} msec"
|
76
76
|
|
77
|
-
hello_obj.shutdown
|
77
|
+
hello_obj.shutdown
|
78
78
|
|
79
79
|
assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
|
80
80
|
|
81
|
-
hello_obj._free_ref
|
81
|
+
hello_obj._free_ref
|
82
82
|
|
83
83
|
assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
|
84
84
|
|
85
85
|
ensure
|
86
86
|
|
87
|
-
orb.destroy
|
87
|
+
orb.destroy
|
88
88
|
|
89
89
|
end
|
@@ -12,9 +12,9 @@
|
|
12
12
|
require 'optparse'
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -58,7 +58,7 @@ class MyHello < POA::Test::Hello
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def shutdown()
|
61
|
-
@orb.shutdown
|
61
|
+
@orb.shutdown
|
62
62
|
end
|
63
63
|
end # of servant MyHello
|
64
64
|
|
@@ -74,17 +74,17 @@ poa_man.activate
|
|
74
74
|
|
75
75
|
hello_srv = MyHello.new(orb)
|
76
76
|
|
77
|
-
hello_obj = hello_srv._this
|
77
|
+
hello_obj = hello_srv._this
|
78
78
|
|
79
79
|
hello_ior = orb.object_to_string(hello_obj)
|
80
80
|
|
81
|
-
open(OPTIONS[:iorfile], 'w') { |io|
|
81
|
+
File.open(OPTIONS[:iorfile], 'w') { |io|
|
82
82
|
io.write hello_ior
|
83
83
|
}
|
84
84
|
|
85
85
|
Signal.trap('INT') do
|
86
86
|
puts 'SIGINT - shutting down ORB...'
|
87
|
-
orb.shutdown
|
87
|
+
orb.shutdown
|
88
88
|
end
|
89
89
|
|
90
90
|
if Signal.list.has_key?('USR2')
|
data/test/Policies/run_test.rb
CHANGED
data/test/Policies/test.rb
CHANGED
@@ -14,8 +14,8 @@ require 'lib/assert.rb'
|
|
14
14
|
include TestUtil::Assertions
|
15
15
|
|
16
16
|
OPTIONS = {
|
17
|
-
:
|
18
|
-
:
|
17
|
+
use_implement: false,
|
18
|
+
orb_debuglevel: 0
|
19
19
|
}
|
20
20
|
|
21
21
|
ARGV.options do |opts|
|
@@ -57,7 +57,7 @@ class MyHello < POA::Test::Hello
|
|
57
57
|
end
|
58
58
|
|
59
59
|
def shutdown()
|
60
|
-
@orb.shutdown
|
60
|
+
@orb.shutdown
|
61
61
|
end
|
62
62
|
end # of servant MyHello
|
63
63
|
|
@@ -138,5 +138,5 @@ begin
|
|
138
138
|
obj._get_policy_overrides([BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE]).size == 1
|
139
139
|
|
140
140
|
ensure
|
141
|
-
orb.destroy
|
141
|
+
orb.destroy
|
142
142
|
end
|