r2corba 1.5.1-x64-mingw32 → 1.6.1-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/LICENSE +5 -5
- data/README.rdoc +62 -0
- data/THANKS +4 -4
- data/lib/corba/cbase/IORMap.rb +0 -1
- data/lib/corba/cbase/ORB.rb +26 -24
- data/lib/corba/cbase/Request.rb +4 -5
- data/lib/corba/cbase/Streams.rb +2 -3
- data/lib/corba/cbase/Stub.rb +0 -1
- data/lib/corba/cbase/Typecode.rb +6 -7
- data/lib/corba/cbase/Values.rb +4 -3
- data/lib/corba/cbase/exception.rb +6 -5
- data/lib/corba/cbase/poa.rb +1 -2
- data/lib/corba/cbase/policies.rb +3 -4
- data/lib/corba/cbase/post_require.rb +1 -2
- data/lib/corba/cbase/require.rb +10 -2
- data/lib/corba/cmds/base.rb +1 -2
- data/lib/corba/cmds/test.rb +0 -1
- data/lib/corba/common/Any.rb +3 -3
- data/lib/corba/common/IDL.rb +6 -10
- data/lib/corba/common/ORB.rb +22 -23
- data/lib/corba/common/Object.rb +18 -15
- data/lib/corba/common/Request.rb +1 -2
- data/lib/corba/common/Servant.rb +4 -5
- data/lib/corba/common/Struct.rb +1 -2
- data/lib/corba/common/Stub.rb +6 -7
- data/lib/corba/common/Typecode.rb +91 -65
- data/lib/corba/common/Union.rb +6 -2
- data/lib/corba/common/Values.rb +2 -2
- data/lib/corba/common/const.rb +2 -3
- data/lib/corba/common/exception.rb +2 -2
- data/lib/corba/common/require.rb +8 -1
- data/lib/corba/common/version.rb +3 -4
- data/lib/corba/idl/BiDirPolicyC.rb +2 -3
- data/lib/corba/idl/CosNamingC.rb +4 -5
- data/lib/corba/idl/CosNamingS.rb +2 -3
- data/lib/corba/idl/IDL.rb +1 -2
- data/lib/corba/idl/IORTable.pidl +0 -1
- data/lib/corba/idl/IORTableC.rb +2 -3
- data/lib/corba/idl/MessagingC.rb +2 -3
- data/lib/corba/idl/POAC.rb +10 -11
- data/lib/corba/idl/TAO_Ext.pidl +0 -1
- data/lib/corba/idl/TAO_ExtC.rb +2 -3
- data/lib/corba/idl/r2c_orb.rb +5 -6
- data/lib/corba/idl/require.rb +0 -1
- data/lib/corba/jbase/Any.rb +29 -28
- data/lib/corba/jbase/IORMap.rb +1 -2
- data/lib/corba/jbase/ORB.rb +5 -6
- data/lib/corba/jbase/Object.rb +13 -14
- data/lib/corba/jbase/Request.rb +9 -10
- data/lib/corba/jbase/Servant.rb +11 -12
- data/lib/corba/jbase/ServerRequest.rb +8 -9
- data/lib/corba/jbase/Streams.rb +68 -5
- data/lib/corba/jbase/Stub.rb +0 -1
- data/lib/corba/jbase/Typecode.rb +17 -17
- data/lib/corba/jbase/Values.rb +2 -1
- data/lib/corba/jbase/exception.rb +2 -2
- data/lib/corba/jbase/poa.rb +21 -22
- data/lib/corba/jbase/policies.rb +33 -34
- data/lib/corba/jbase/post_require.rb +0 -1
- data/lib/corba/jbase/require.rb +5 -2
- data/lib/corba/naming.rb +0 -1
- data/lib/corba/naming_service.rb +0 -1
- data/lib/corba/poa.rb +1 -2
- data/lib/corba/policies.rb +1 -2
- data/lib/corba/require.rb +2 -3
- data/lib/corba/svcs/ins/cos_naming.rb +74 -68
- data/lib/corba/svcs/ins/ins.rb +58 -59
- data/lib/corba/svcs/ins/naming_service.rb +9 -10
- data/lib/corba.rb +1 -2
- data/lib/ridlbe/ruby/config.rb +78 -74
- data/lib/ridlbe/ruby/require.rb +0 -1
- data/lib/ridlbe/ruby/walker.rb +311 -288
- data/mkrf_conf_bingem.rb +4 -6
- data/rakelib/bin.rake +2 -3
- data/rakelib/bin.rb +4 -5
- data/rakelib/build.rake +22 -22
- data/rakelib/config.rake +2 -3
- data/rakelib/config.rb +32 -34
- data/rakelib/ext.rake +18 -77
- data/rakelib/ext.rb +19 -58
- data/rakelib/ext_r2tao.rb +33 -60
- data/rakelib/gem.rake +53 -38
- data/rakelib/gem.rb +9 -10
- data/rakelib/package.rake +2 -3
- data/rakelib/test.rake +0 -1
- data/test/BiDirectional/Test.idl +0 -1
- data/test/BiDirectional/client.rb +18 -19
- data/test/BiDirectional/run_test.rb +11 -12
- data/test/BiDirectional/server.rb +21 -23
- data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +17 -18
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +19 -20
- data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Corbaname/client.rb +15 -16
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/Corbaname/server.rb +27 -28
- data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Simple/client.rb +16 -17
- data/test/CORBA_Services/Naming/Simple/run_test.rb +13 -14
- data/test/CORBA_Services/Naming/Simple/server.rb +19 -20
- data/test/Collocation/Diamond.idl +0 -1
- data/test/Collocation/run_test.rb +10 -11
- data/test/Collocation/test.rb +27 -21
- data/test/Connect_Timeout/Test.idl +0 -1
- data/test/Connect_Timeout/client.rb +16 -18
- data/test/Connect_Timeout/run_test.rb +10 -11
- data/test/DII/Test.idl +0 -1
- data/test/DII/client.rb +30 -31
- data/test/DII/run_test.rb +11 -12
- data/test/DII/server.rb +16 -17
- data/test/DSI/Test.idl +0 -1
- data/test/DSI/client.rb +16 -17
- data/test/DSI/run_test.rb +11 -12
- data/test/DSI/server.rb +17 -18
- data/test/Exceptions/Test.idl +0 -1
- data/test/Exceptions/client.rb +22 -23
- data/test/Exceptions/run_test.rb +11 -12
- data/test/Exceptions/server.rb +16 -17
- data/test/Hello/Test.idl +0 -1
- data/test/Hello/client.rb +16 -17
- data/test/Hello/run_test.rb +11 -12
- data/test/Hello/server.rb +17 -18
- data/test/IDL_Test/Test.idl +4 -1
- data/test/IDL_Test/client.rb +24 -23
- data/test/IDL_Test/run_test.rb +11 -12
- data/test/IDL_Test/server.rb +23 -19
- data/test/IORMap/Test.idl +0 -1
- data/test/IORMap/client.rb +14 -15
- data/test/IORMap/run_test.rb +11 -12
- data/test/IORMap/server.rb +23 -24
- data/test/IORTable/Test.idl +0 -1
- data/test/IORTable/client.rb +14 -15
- data/test/IORTable/run_test.rb +11 -12
- data/test/IORTable/server.rb +23 -24
- data/test/Implicit_Conversion/Test.idl +0 -1
- data/test/Implicit_Conversion/client.rb +20 -18
- data/test/Implicit_Conversion/run_test.rb +11 -12
- data/test/Implicit_Conversion/server.rb +16 -17
- data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
- data/test/Multi_Threading/Multiple_ORB/client.rb +14 -15
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +12 -13
- data/test/Multi_Threading/Multiple_ORB/server.rb +17 -18
- data/test/Multi_Threading/Simple/Test.idl +0 -1
- data/test/Multi_Threading/Simple/client.rb +17 -18
- data/test/Multi_Threading/Simple/run_test.rb +11 -12
- data/test/Multi_Threading/Simple/server.rb +17 -18
- data/test/Multi_Threading/Threads/Test.idl +0 -4
- data/test/Multi_Threading/Threads/client.rb +23 -26
- data/test/Multi_Threading/Threads/run_test.rb +11 -12
- data/test/Multi_Threading/Threads/server.rb +19 -22
- data/test/Multi_Threading/Threads/watchdog.rb +16 -16
- data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
- data/test/Multiple_Servant_Interfaces/client.rb +14 -15
- data/test/Multiple_Servant_Interfaces/run_test.rb +11 -12
- data/test/Multiple_Servant_Interfaces/server.rb +18 -19
- data/test/Nil/Test.idl +0 -1
- data/test/Nil/run_test.rb +10 -11
- data/test/Nil/test.rb +22 -20
- data/test/OBV/AbstractInterface/client.rb +14 -15
- data/test/OBV/AbstractInterface/run_test.rb +11 -12
- data/test/OBV/AbstractInterface/server.rb +20 -20
- data/test/OBV/AbstractInterface/test.idl +0 -1
- data/test/OBV/Custom/OBV_impl.rb +2 -1
- data/test/OBV/Custom/client.rb +14 -15
- data/test/OBV/Custom/run_test.rb +11 -12
- data/test/OBV/Custom/server.rb +16 -17
- data/test/OBV/Simple/OBV_impl.rb +1 -1
- data/test/OBV/Simple/client.rb +14 -15
- data/test/OBV/Simple/run_test.rb +11 -12
- data/test/OBV/Simple/server.rb +16 -17
- data/test/OBV/Simple_Event/Event_impl.rb +1 -1
- data/test/OBV/Simple_Event/client.rb +14 -15
- data/test/OBV/Simple_Event/run_test.rb +11 -12
- data/test/OBV/Simple_Event/server.rb +16 -17
- data/test/OBV/Supports/client.rb +19 -20
- data/test/OBV/Supports/run_test.rb +11 -12
- data/test/OBV/Supports/server.rb +15 -16
- data/test/OBV/Supports/supports.idl +0 -1
- data/test/OBV/Supports/supports_impl.rb +3 -1
- data/test/OBV/Tree/client.rb +14 -15
- data/test/OBV/Tree/run_test.rb +11 -12
- data/test/OBV/Tree/server.rb +19 -20
- data/test/OBV/Tree/test.idl +0 -1
- data/test/OBV/Truncatable/Extra.idl +0 -1
- data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
- data/test/OBV/Truncatable/client.rb +57 -58
- data/test/OBV/Truncatable/run_test.rb +11 -12
- data/test/OBV/Truncatable/server.rb +15 -16
- data/test/OBV/ValueBox/client.rb +154 -154
- data/test/OBV/ValueBox/run_test.rb +11 -12
- data/test/OBV/ValueBox/server.rb +42 -42
- data/test/Object/Test.idl +0 -1
- data/test/Object/client.rb +15 -16
- data/test/Object/run_test.rb +11 -12
- data/test/Object/server.rb +19 -20
- data/test/POA/run_test.rb +10 -11
- data/test/POA/test.rb +17 -18
- data/test/Param_Test/client.rb +53 -54
- data/test/Param_Test/run_test.rb +11 -12
- data/test/Param_Test/server.rb +60 -61
- data/test/Performance/Simple/Test.idl +0 -1
- data/test/Performance/Simple/client.rb +16 -17
- data/test/Performance/Simple/run_test.rb +11 -12
- data/test/Performance/Simple/server.rb +16 -17
- data/test/Policies/Test.idl +0 -1
- data/test/Policies/run_test.rb +10 -11
- data/test/Policies/test.rb +23 -25
- data/test/Timeout/client.rb +21 -22
- data/test/Timeout/run_test.rb +11 -12
- data/test/Timeout/server.rb +19 -20
- data/test/Timeout/test.idl +0 -1
- data/test/lib/assert.rb +0 -2
- data/test/lib/test.rb +29 -25
- data/test/test_runner.rb +22 -24
- metadata +24 -52
- data/README +0 -62
- data/test/BiDirectional/server.ior +0 -1
- data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
- data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
- data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
- data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
- data/test/DII/server.ior +0 -1
- data/test/DSI/server.ior +0 -1
- data/test/Exceptions/server.ior +0 -1
- data/test/IDL_Test/server.ior +0 -1
- data/test/IORMap/server.ior +0 -1
- data/test/IORTable/server.ior +0 -1
- data/test/Implicit_Conversion/server.ior +0 -1
- data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
- data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
- data/test/Multi_Threading/Simple/server.ior +0 -1
- data/test/Multi_Threading/Threads/server.ior +0 -1
- data/test/Multi_Threading/Threads/watchdog.ior +0 -1
- data/test/Multiple_Servant_Interfaces/server.ior +0 -1
- data/test/OBV/AbstractInterface/server.ior +0 -1
- data/test/OBV/Custom/server.ior +0 -1
- data/test/OBV/Simple/server.ior +0 -1
- data/test/OBV/Simple_Event/server.ior +0 -1
- data/test/OBV/Supports/server.ior +0 -1
- data/test/OBV/Tree/server.ior +0 -1
- data/test/OBV/Truncatable/server.ior +0 -1
- data/test/OBV/ValueBox/server.ior +0 -1
- data/test/Object/server.ior +0 -1
- data/test/Param_Test/server.ior +0 -1
- data/test/Performance/Simple/server.ior +0 -1
- data/test/Timeout/server.ior +0 -1
data/test/DII/client.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -24,39 +23,39 @@ ARGV.options do |opts|
|
|
24
23
|
script_name = File.basename($0)
|
25
24
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
26
25
|
|
27
|
-
opts.separator
|
26
|
+
opts.separator ''
|
28
27
|
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
35
|
-
opts.on(
|
36
|
-
|
37
|
-
|
28
|
+
opts.on('--k IORFILE',
|
29
|
+
'Set IOR.',
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
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 }
|
38
37
|
|
39
|
-
opts.separator
|
38
|
+
opts.separator ''
|
40
39
|
|
41
|
-
opts.on(
|
42
|
-
|
40
|
+
opts.on('-h', '--help',
|
41
|
+
'Show this help message.') { puts opts; exit }
|
43
42
|
|
44
43
|
opts.parse!
|
45
44
|
end
|
46
45
|
|
47
46
|
require 'corba'
|
48
47
|
|
49
|
-
orb = CORBA.ORB_init([
|
48
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
50
49
|
|
51
50
|
begin
|
52
51
|
|
53
52
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
54
53
|
|
55
|
-
puts
|
56
|
-
req = obj._request(
|
54
|
+
puts '***** Synchronous twoway DII'
|
55
|
+
req = obj._request('echo')
|
57
56
|
req.arguments = [
|
58
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
59
|
-
['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!']
|
60
59
|
]
|
61
60
|
req.set_return_type(CORBA::_tc_string)
|
62
61
|
|
@@ -65,11 +64,11 @@ begin
|
|
65
64
|
puts "string returned <#{the_string}>"
|
66
65
|
puts
|
67
66
|
|
68
|
-
puts
|
69
|
-
req = obj._request(
|
67
|
+
puts '***** Deferred twoway DII (using get_response())'
|
68
|
+
req = obj._request('echo')
|
70
69
|
req.arguments = [
|
71
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
72
|
-
['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!']
|
73
72
|
]
|
74
73
|
req.set_return_type(CORBA::_tc_string)
|
75
74
|
|
@@ -81,15 +80,15 @@ begin
|
|
81
80
|
puts
|
82
81
|
|
83
82
|
### DOESN'T WORK WITH TAO <= 1.5.9 BECAUSE OF BUG IN TAO
|
84
|
-
if !defined?(TAO) || TAO::MAJOR_VERSION>1 ||
|
83
|
+
if !defined?(TAO) || TAO::MAJOR_VERSION > 1 ||
|
85
84
|
(TAO::MAJOR_VERSION == 1 &&
|
86
85
|
(TAO::MINOR_VERSION > 5 ||
|
87
|
-
(TAO::MINOR_VERSION == 5 && TAO::
|
88
|
-
puts
|
89
|
-
req = obj._request(
|
86
|
+
(TAO::MINOR_VERSION == 5 && TAO::MICRO_VERSION > 9)))
|
87
|
+
puts '***** Deferred twoway DII (using poll_response())'
|
88
|
+
req = obj._request('echo')
|
90
89
|
req.arguments = [
|
91
|
-
['method', CORBA::ARG_IN, CORBA::_tc_string,
|
92
|
-
['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!']
|
93
92
|
]
|
94
93
|
req.set_return_type(CORBA::_tc_string)
|
95
94
|
|
@@ -104,8 +103,8 @@ begin
|
|
104
103
|
puts
|
105
104
|
end
|
106
105
|
|
107
|
-
puts
|
108
|
-
req = obj._request(
|
106
|
+
puts '***** Oneway shutdown'
|
107
|
+
req = obj._request('shutdown')
|
109
108
|
req.send_oneway()
|
110
109
|
|
111
110
|
ensure
|
data/test/DII/run_test.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
OPTIONS = {
|
@@ -21,19 +20,19 @@ ARGV.options do |opts|
|
|
21
20
|
script_name = File.basename($0)
|
22
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
22
|
|
24
|
-
opts.separator
|
23
|
+
opts.separator ''
|
25
24
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
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] = '' }
|
32
31
|
|
33
|
-
opts.separator
|
32
|
+
opts.separator ''
|
34
33
|
|
35
|
-
opts.on(
|
36
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
37
36
|
|
38
37
|
opts.parse!
|
39
38
|
end
|
@@ -60,7 +59,7 @@ end
|
|
60
59
|
|
61
60
|
exrc = clt.wait(400)
|
62
61
|
|
63
|
-
if exrc ==0
|
62
|
+
if exrc == 0
|
64
63
|
srv.wait(400)
|
65
64
|
else
|
66
65
|
srv.wait_term(400)
|
data/test/DII/server.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -22,22 +21,22 @@ ARGV.options do |opts|
|
|
22
21
|
script_name = File.basename($0)
|
23
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
24
23
|
|
25
|
-
opts.separator
|
24
|
+
opts.separator ''
|
26
25
|
|
27
|
-
opts.on(
|
28
|
-
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
|
26
|
+
opts.on('--o IORFILE',
|
27
|
+
'Set IOR filename.',
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = 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 }
|
36
35
|
|
37
|
-
opts.separator
|
36
|
+
opts.separator ''
|
38
37
|
|
39
|
-
opts.on(
|
40
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
41
40
|
|
42
41
|
opts.parse!
|
43
42
|
end
|
@@ -61,9 +60,9 @@ class MyHello < POA::Test::Hello
|
|
61
60
|
def shutdown()
|
62
61
|
@orb.shutdown()
|
63
62
|
end
|
64
|
-
end #of servant MyHello
|
63
|
+
end # of servant MyHello
|
65
64
|
|
66
|
-
orb = CORBA.ORB_init([
|
65
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
67
66
|
|
68
67
|
obj = orb.resolve_initial_references('RootPOA')
|
69
68
|
|
@@ -84,7 +83,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
84
83
|
}
|
85
84
|
|
86
85
|
Signal.trap('INT') do
|
87
|
-
puts
|
86
|
+
puts 'SIGINT - shutting down ORB...'
|
88
87
|
orb.shutdown()
|
89
88
|
end
|
90
89
|
|
data/test/DSI/Test.idl
CHANGED
@@ -6,7 +6,6 @@
|
|
6
6
|
* included with this program.
|
7
7
|
*
|
8
8
|
* Copyright (c) Remedy IT Expertise BV
|
9
|
-
* Chamber of commerce Rotterdam nr.276339, The Netherlands
|
10
9
|
*--------------------------------------------------------------------*/
|
11
10
|
|
12
11
|
/// Put the interfaces in a module, to avoid global namespace pollution
|
data/test/DSI/client.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -22,22 +21,22 @@ ARGV.options do |opts|
|
|
22
21
|
script_name = File.basename($0)
|
23
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
24
23
|
|
25
|
-
opts.separator
|
24
|
+
opts.separator ''
|
26
25
|
|
27
|
-
opts.on(
|
28
|
-
|
29
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
|
26
|
+
opts.on('--k IORFILE',
|
27
|
+
'Set IOR.',
|
28
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = 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 }
|
36
35
|
|
37
|
-
opts.separator
|
36
|
+
opts.separator ''
|
38
37
|
|
39
|
-
opts.on(
|
40
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
41
40
|
|
42
41
|
opts.parse!
|
43
42
|
end
|
@@ -49,15 +48,15 @@ else
|
|
49
48
|
require 'TestC.rb'
|
50
49
|
end
|
51
50
|
|
52
|
-
orb = CORBA.ORB_init([
|
51
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
53
52
|
|
54
|
-
|
53
|
+
# #s = open(OPTIONS[:iorfile], 'r').read
|
55
54
|
|
56
55
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
57
56
|
|
58
57
|
hello_obj = Test::Hello._narrow(obj)
|
59
58
|
|
60
|
-
the_string, the_length = hello_obj.echo(
|
59
|
+
the_string, the_length = hello_obj.echo('Hello world!')
|
61
60
|
|
62
61
|
puts "string returned <#{the_string}>; length = #{the_length}"
|
63
62
|
|
data/test/DSI/run_test.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
OPTIONS = {
|
@@ -21,19 +20,19 @@ ARGV.options do |opts|
|
|
21
20
|
script_name = File.basename($0)
|
22
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
22
|
|
24
|
-
opts.separator
|
23
|
+
opts.separator ''
|
25
24
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
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] = '' }
|
32
31
|
|
33
|
-
opts.separator
|
32
|
+
opts.separator ''
|
34
33
|
|
35
|
-
opts.on(
|
36
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
37
36
|
|
38
37
|
opts.parse!
|
39
38
|
end
|
@@ -60,7 +59,7 @@ end
|
|
60
59
|
|
61
60
|
exrc = clt.wait(400)
|
62
61
|
|
63
|
-
if exrc ==0
|
62
|
+
if exrc == 0
|
64
63
|
srv.wait(400)
|
65
64
|
else
|
66
65
|
srv.wait_term(400)
|
data/test/DSI/server.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -22,22 +21,22 @@ ARGV.options do |opts|
|
|
22
21
|
script_name = File.basename($0)
|
23
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
24
23
|
|
25
|
-
opts.separator
|
24
|
+
opts.separator ''
|
26
25
|
|
27
|
-
opts.on(
|
28
|
-
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
|
26
|
+
opts.on('--o IORFILE',
|
27
|
+
'Set IOR filename.',
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = 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 }
|
36
35
|
|
37
|
-
opts.separator
|
36
|
+
opts.separator ''
|
38
37
|
|
39
|
-
opts.on(
|
40
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
41
40
|
|
42
41
|
opts.parse!
|
43
42
|
end
|
@@ -55,7 +54,7 @@ class MyHello < PortableServer::DynamicImplementation
|
|
55
54
|
:result_type => CORBA._tc_string,
|
56
55
|
:arg_list => [
|
57
56
|
['message', CORBA::ARG_IN, CORBA._tc_string],
|
58
|
-
['msglen', CORBA::ARG_OUT, CORBA._tc_long]
|
57
|
+
['msglen', CORBA::ARG_OUT, CORBA._tc_long]] }
|
59
58
|
}
|
60
59
|
|
61
60
|
Id = 'IDL:Test/Hello:1.0'
|
@@ -72,9 +71,9 @@ class MyHello < PortableServer::DynamicImplementation
|
|
72
71
|
def shutdown()
|
73
72
|
@orb.shutdown()
|
74
73
|
end
|
75
|
-
end #of servant MyHello
|
74
|
+
end # of servant MyHello
|
76
75
|
|
77
|
-
orb = CORBA.ORB_init([
|
76
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
78
77
|
|
79
78
|
obj = orb.resolve_initial_references('RootPOA')
|
80
79
|
|
@@ -95,7 +94,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
95
94
|
}
|
96
95
|
|
97
96
|
Signal.trap('INT') do
|
98
|
-
puts
|
97
|
+
puts 'SIGINT - shutting down ORB...'
|
99
98
|
orb.shutdown()
|
100
99
|
end
|
101
100
|
|
data/test/Exceptions/Test.idl
CHANGED
@@ -6,7 +6,6 @@
|
|
6
6
|
* included with this program.
|
7
7
|
*
|
8
8
|
* Copyright (c) Remedy IT Expertise BV
|
9
|
-
* Chamber of commerce Rotterdam nr.276339, The Netherlands
|
10
9
|
*--------------------------------------------------------------------*/
|
11
10
|
|
12
11
|
/// Put the interfaces in a module, to avoid global namespace pollution
|
data/test/Exceptions/client.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -24,22 +23,22 @@ ARGV.options do |opts|
|
|
24
23
|
script_name = File.basename($0)
|
25
24
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
26
25
|
|
27
|
-
opts.separator
|
26
|
+
opts.separator ''
|
28
27
|
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
32
|
-
opts.on(
|
33
|
-
|
34
|
-
|
35
|
-
opts.on(
|
36
|
-
|
37
|
-
|
28
|
+
opts.on('--k IORFILE',
|
29
|
+
'Set IOR.',
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
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 }
|
38
37
|
|
39
|
-
opts.separator
|
38
|
+
opts.separator ''
|
40
39
|
|
41
|
-
opts.on(
|
42
|
-
|
40
|
+
opts.on('-h', '--help',
|
41
|
+
'Show this help message.') { puts opts; exit }
|
43
42
|
|
44
43
|
opts.parse!
|
45
44
|
end
|
@@ -51,7 +50,7 @@ else
|
|
51
50
|
require 'TestC.rb'
|
52
51
|
end
|
53
52
|
|
54
|
-
orb = CORBA.ORB_init([
|
53
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
55
54
|
|
56
55
|
begin
|
57
56
|
|
@@ -63,19 +62,19 @@ begin
|
|
63
62
|
begin
|
64
63
|
hello_obj.test_exception
|
65
64
|
rescue Test::ExOne => ex1
|
66
|
-
assert
|
67
|
-
(i % 3) == 0 && ex1.code == (i+1)
|
65
|
+
assert 'ERROR: got exception Test::ExOne when not expected' do
|
66
|
+
(i % 3) == 0 && ex1.code == (i + 1)
|
68
67
|
end
|
69
68
|
puts "Caught expected exception Test::ExOne{why=#{ex1.why},code=#{ex1.code})"
|
70
69
|
rescue CORBA::UNKNOWN => exu
|
71
|
-
assert
|
70
|
+
assert 'ERROR: got unexpected unknown userexception' do
|
72
71
|
(i % 3) == 1
|
73
72
|
end
|
74
|
-
puts
|
73
|
+
puts 'Caught expected unknown userexception'
|
75
74
|
rescue Exception => ex
|
76
75
|
assert "ERROR: unknown exception caught\n#{ex}", false
|
77
76
|
else
|
78
|
-
assert_not
|
77
|
+
assert_not 'ERROR: no exception caught where one was expected' do
|
79
78
|
(i % 3) != 2
|
80
79
|
end
|
81
80
|
end
|
@@ -105,14 +104,14 @@ begin
|
|
105
104
|
|
106
105
|
hello_obj.shutdown()
|
107
106
|
|
108
|
-
assert_not
|
107
|
+
assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
|
109
108
|
|
110
109
|
hello_obj._free_ref()
|
111
110
|
|
112
|
-
assert
|
111
|
+
assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
|
113
112
|
|
114
113
|
ensure
|
115
114
|
|
116
115
|
orb.destroy()
|
117
116
|
|
118
|
-
end
|
117
|
+
end
|
data/test/Exceptions/run_test.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
OPTIONS = {
|
@@ -21,19 +20,19 @@ ARGV.options do |opts|
|
|
21
20
|
script_name = File.basename($0)
|
22
21
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
23
22
|
|
24
|
-
opts.separator
|
23
|
+
opts.separator ''
|
25
24
|
|
26
|
-
opts.on(
|
27
|
-
|
28
|
-
|
29
|
-
opts.on(
|
30
|
-
|
31
|
-
|
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] = '' }
|
32
31
|
|
33
|
-
opts.separator
|
32
|
+
opts.separator ''
|
34
33
|
|
35
|
-
opts.on(
|
36
|
-
|
34
|
+
opts.on('-h', '--help',
|
35
|
+
'Show this help message.') { puts opts; exit }
|
37
36
|
|
38
37
|
opts.parse!
|
39
38
|
end
|
@@ -60,7 +59,7 @@ end
|
|
60
59
|
|
61
60
|
exrc = clt.wait(400)
|
62
61
|
|
63
|
-
if exrc ==0
|
62
|
+
if exrc == 0
|
64
63
|
srv.wait(400)
|
65
64
|
else
|
66
65
|
srv.wait_term(400)
|
data/test/Exceptions/server.rb
CHANGED
@@ -7,7 +7,6 @@
|
|
7
7
|
# included with this program.
|
8
8
|
#
|
9
9
|
# Copyright (c) Remedy IT Expertise BV
|
10
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
11
10
|
#--------------------------------------------------------------------
|
12
11
|
|
13
12
|
require 'optparse'
|
@@ -22,22 +21,22 @@ ARGV.options do |opts|
|
|
22
21
|
script_name = File.basename($0)
|
23
22
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
24
23
|
|
25
|
-
opts.separator
|
24
|
+
opts.separator ''
|
26
25
|
|
27
|
-
opts.on(
|
28
|
-
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
|
26
|
+
opts.on('--o IORFILE',
|
27
|
+
'Set IOR filename.',
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = 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 }
|
36
35
|
|
37
|
-
opts.separator
|
36
|
+
opts.separator ''
|
38
37
|
|
39
|
-
opts.on(
|
40
|
-
|
38
|
+
opts.on('-h', '--help',
|
39
|
+
'Show this help message.') { puts opts; exit }
|
41
40
|
|
42
41
|
opts.parse!
|
43
42
|
end
|
@@ -95,9 +94,9 @@ class MyHello < POA::Test::Hello
|
|
95
94
|
def shutdown()
|
96
95
|
@orb.shutdown()
|
97
96
|
end
|
98
|
-
end #of servant MyHello
|
97
|
+
end # of servant MyHello
|
99
98
|
|
100
|
-
orb = CORBA.ORB_init([
|
99
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
101
100
|
|
102
101
|
obj = orb.resolve_initial_references('RootPOA')
|
103
102
|
|
@@ -118,7 +117,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
118
117
|
}
|
119
118
|
|
120
119
|
Signal.trap('INT') do
|
121
|
-
puts
|
120
|
+
puts 'SIGINT - shutting down ORB...'
|
122
121
|
orb.shutdown()
|
123
122
|
end
|
124
123
|
|
data/test/Hello/Test.idl
CHANGED
@@ -6,7 +6,6 @@
|
|
6
6
|
* included with this program.
|
7
7
|
*
|
8
8
|
* Copyright (c) Remedy IT Expertise BV
|
9
|
-
* Chamber of commerce Rotterdam nr.276339, The Netherlands
|
10
9
|
*--------------------------------------------------------------------*/
|
11
10
|
|
12
11
|
/// Put the interfaces in a module, to avoid global namespace pollution
|