r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- 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
@@ -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
|
|
@@ -60,7 +59,7 @@ begin
|
|
60
59
|
hello_obj = Test::Hello._narrow(obj)
|
61
60
|
|
62
61
|
unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
|
63
|
-
([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
|
62
|
+
([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
|
64
63
|
## JacORB 3.4 introduced a bug which prevents this test from succeeding
|
65
64
|
## JacORB 3.6 will be released with a fix for this
|
66
65
|
clt_trds = (0..1).collect do |i|
|
@@ -80,11 +79,11 @@ begin
|
|
80
79
|
|
81
80
|
hello_obj.shutdown()
|
82
81
|
|
83
|
-
assert_not
|
82
|
+
assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
|
84
83
|
|
85
84
|
hello_obj._free_ref()
|
86
85
|
|
87
|
-
assert
|
86
|
+
assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
|
88
87
|
|
89
88
|
ensure
|
90
89
|
|
@@ -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)
|
@@ -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
|
|
@@ -115,4 +114,4 @@ else
|
|
115
114
|
end
|
116
115
|
|
117
116
|
orb_trds.each {|t| t.join }
|
118
|
-
end
|
117
|
+
end
|
@@ -2,14 +2,11 @@
|
|
2
2
|
#
|
3
3
|
# Author: Martin Corino
|
4
4
|
#
|
5
|
-
# $Id: client.rb 279 2011-02-08 09:53:28Z martin $
|
6
|
-
#
|
7
5
|
# This program is free software; you can redistribute it and/or
|
8
6
|
# modify it under the terms of the R2CORBA LICENSE which is
|
9
7
|
# included with this program.
|
10
8
|
#
|
11
9
|
# Copyright (c) Remedy IT Expertise BV
|
12
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
13
10
|
#--------------------------------------------------------------------
|
14
11
|
|
15
12
|
require 'optparse'
|
@@ -26,22 +23,22 @@ ARGV.options do |opts|
|
|
26
23
|
script_name = File.basename($0)
|
27
24
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
28
25
|
|
29
|
-
opts.separator
|
26
|
+
opts.separator ''
|
30
27
|
|
31
|
-
opts.on(
|
32
|
-
|
33
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
34
|
-
opts.on(
|
35
|
-
|
36
|
-
|
37
|
-
opts.on(
|
38
|
-
|
39
|
-
|
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 }
|
40
37
|
|
41
|
-
opts.separator
|
38
|
+
opts.separator ''
|
42
39
|
|
43
|
-
opts.on(
|
44
|
-
|
40
|
+
opts.on('-h', '--help',
|
41
|
+
'Show this help message.') { puts opts; exit }
|
45
42
|
|
46
43
|
opts.parse!
|
47
44
|
end
|
@@ -53,28 +50,28 @@ else
|
|
53
50
|
require 'TestC.rb'
|
54
51
|
end
|
55
52
|
|
56
|
-
orb = CORBA.ORB_init([
|
53
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
57
54
|
|
58
55
|
begin
|
59
|
-
|
56
|
+
|
60
57
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
61
|
-
|
58
|
+
|
62
59
|
hello_obj = Test::Hello._narrow(obj)
|
63
|
-
|
60
|
+
|
64
61
|
hello_strings = (1..10000).map {hello_obj.get_string}
|
65
62
|
|
66
63
|
puts "Client - got #{hello_strings.length} strings."
|
67
64
|
|
68
65
|
hello_obj.shutdown()
|
69
|
-
|
70
|
-
assert_not
|
71
|
-
|
66
|
+
|
67
|
+
assert_not 'ERROR: Object is reported nil!', CORBA::is_nil(hello_obj)
|
68
|
+
|
72
69
|
hello_obj._free_ref()
|
73
|
-
|
74
|
-
assert
|
70
|
+
|
71
|
+
assert 'ERROR: Object is reported non-nil!', CORBA::is_nil(hello_obj)
|
75
72
|
|
76
73
|
ensure
|
77
|
-
|
74
|
+
|
78
75
|
orb.destroy()
|
79
76
|
|
80
77
|
end
|
@@ -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
|
@@ -67,7 +66,7 @@ end
|
|
67
66
|
|
68
67
|
exrc = clt.wait(400)
|
69
68
|
|
70
|
-
if exrc ==0
|
69
|
+
if exrc == 0
|
71
70
|
srv.wait(400)
|
72
71
|
else
|
73
72
|
srv.wait_term(400)
|
@@ -2,14 +2,11 @@
|
|
2
2
|
#
|
3
3
|
# Author: Martin Corino
|
4
4
|
#
|
5
|
-
# $Id: server.rb 279 2011-02-08 09:53:28Z martin $
|
6
|
-
#
|
7
5
|
# This program is free software; you can redistribute it and/or
|
8
6
|
# modify it under the terms of the R2CORBA LICENSE which is
|
9
7
|
# included with this program.
|
10
8
|
#
|
11
9
|
# Copyright (c) Remedy IT Expertise BV
|
12
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
13
10
|
#--------------------------------------------------------------------
|
14
11
|
|
15
12
|
require 'optparse'
|
@@ -25,25 +22,25 @@ ARGV.options do |opts|
|
|
25
22
|
script_name = File.basename($0)
|
26
23
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
27
24
|
|
28
|
-
opts.separator
|
25
|
+
opts.separator ''
|
29
26
|
|
30
|
-
opts.on(
|
31
|
-
|
32
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
33
|
-
opts.on(
|
34
|
-
|
35
|
-
"Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_iorfile]=v }
|
36
|
-
opts.on(
|
37
|
-
|
38
|
-
|
39
|
-
opts.on(
|
40
|
-
|
41
|
-
|
27
|
+
opts.on('--o IORFILE',
|
28
|
+
'Set IOR filename.',
|
29
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
30
|
+
opts.on('--w IORFILE',
|
31
|
+
'Set Watchdog IOR filename.',
|
32
|
+
"Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_iorfile] = v }
|
33
|
+
opts.on('--d LVL',
|
34
|
+
'Set ORBDebugLevel value.',
|
35
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
36
|
+
opts.on('--use-implement',
|
37
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
38
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
42
39
|
|
43
|
-
opts.separator
|
40
|
+
opts.separator ''
|
44
41
|
|
45
|
-
opts.on(
|
46
|
-
|
42
|
+
opts.on('-h', '--help',
|
43
|
+
'Show this help message.') { puts opts; exit }
|
47
44
|
|
48
45
|
opts.parse!
|
49
46
|
end
|
@@ -81,9 +78,9 @@ class MyHello < POA::Test::Hello
|
|
81
78
|
puts %Q{Server - pinged watchdog #{@count} times.}
|
82
79
|
@orb.shutdown()
|
83
80
|
end
|
84
|
-
end #of servant MyHello
|
81
|
+
end # of servant MyHello
|
85
82
|
|
86
|
-
orb = CORBA.ORB_init([
|
83
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
87
84
|
|
88
85
|
obj = orb.resolve_initial_references('RootPOA')
|
89
86
|
|
@@ -108,7 +105,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
108
105
|
}
|
109
106
|
|
110
107
|
Signal.trap('INT') do
|
111
|
-
puts
|
108
|
+
puts 'SIGINT - shutting down ORB...'
|
112
109
|
orb.shutdown()
|
113
110
|
end
|
114
111
|
|
@@ -12,22 +12,22 @@ ARGV.options do |opts|
|
|
12
12
|
script_name = File.basename($0)
|
13
13
|
opts.banner = "Usage: ruby #{script_name} [options]"
|
14
14
|
|
15
|
-
opts.separator
|
15
|
+
opts.separator ''
|
16
16
|
|
17
|
-
opts.on(
|
18
|
-
|
19
|
-
"Default: 'watchdog.ior'") { |v| OPTIONS[:iorfile]=v }
|
20
|
-
opts.on(
|
21
|
-
|
22
|
-
|
23
|
-
opts.on(
|
24
|
-
|
25
|
-
|
17
|
+
opts.on('--o IORFILE',
|
18
|
+
'Set IOR filename.',
|
19
|
+
"Default: 'watchdog.ior'") { |v| OPTIONS[:iorfile] = v }
|
20
|
+
opts.on('--d LVL',
|
21
|
+
'Set ORBDebugLevel value.',
|
22
|
+
'Default: 0') { |v| OPTIONS[:orb_debuglevel] = v }
|
23
|
+
opts.on('--use-implement',
|
24
|
+
'Load IDL through CORBA.implement() instead of precompiled code.',
|
25
|
+
'Default: off') { |v| OPTIONS[:use_implement] = v }
|
26
26
|
|
27
|
-
opts.separator
|
27
|
+
opts.separator ''
|
28
28
|
|
29
|
-
opts.on(
|
30
|
-
|
29
|
+
opts.on('-h', '--help',
|
30
|
+
'Show this help message.') { puts opts; exit }
|
31
31
|
|
32
32
|
opts.parse!
|
33
33
|
end
|
@@ -53,9 +53,9 @@ class MyWatchdog < POA::Test::Watchdog
|
|
53
53
|
puts %Q{Watchdog - received #{@count} pings}
|
54
54
|
@orb.shutdown()
|
55
55
|
end
|
56
|
-
end #of servant MyWatchdog
|
56
|
+
end # of servant MyWatchdog
|
57
57
|
|
58
|
-
orb = CORBA.ORB_init([
|
58
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
59
59
|
|
60
60
|
obj = orb.resolve_initial_references('RootPOA')
|
61
61
|
|
@@ -76,7 +76,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
76
76
|
}
|
77
77
|
|
78
78
|
Signal.trap('INT') do
|
79
|
-
puts
|
79
|
+
puts 'SIGINT - shutting down ORB...'
|
80
80
|
orb.shutdown()
|
81
81
|
end
|
82
82
|
|
@@ -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
|
@@ -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,7 +48,7 @@ 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
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
55
54
|
|
@@ -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)
|
@@ -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
|
@@ -58,19 +57,19 @@ class MyHello < PortableServer::Servant
|
|
58
57
|
end
|
59
58
|
|
60
59
|
def get_string()
|
61
|
-
|
60
|
+
'Hello there!'
|
62
61
|
end
|
63
62
|
|
64
63
|
def get_string_2()
|
65
|
-
|
64
|
+
'Hello there! (2nd edition)'
|
66
65
|
end
|
67
66
|
|
68
67
|
def shutdown()
|
69
68
|
@orb.shutdown()
|
70
69
|
end
|
71
|
-
end #of servant MyHello
|
70
|
+
end # of servant MyHello
|
72
71
|
|
73
|
-
orb = CORBA.ORB_init([
|
72
|
+
orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB')
|
74
73
|
|
75
74
|
obj = orb.resolve_initial_references('RootPOA')
|
76
75
|
|
@@ -91,7 +90,7 @@ open(OPTIONS[:iorfile], 'w') { |io|
|
|
91
90
|
}
|
92
91
|
|
93
92
|
Signal.trap('INT') do
|
94
|
-
puts
|
93
|
+
puts 'SIGINT - shutting down ORB...'
|
95
94
|
orb.shutdown()
|
96
95
|
end
|
97
96
|
|