r2corba 1.5.1-x64-mingw32 → 1.5.5-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 +4 -4
- data/LICENSE +5 -5
- data/README.rdoc +62 -0
- data/THANKS +4 -4
- data/lib/corba.rb +0 -1
- data/lib/corba/cbase/IORMap.rb +0 -1
- data/lib/corba/cbase/ORB.rb +7 -8
- data/lib/corba/cbase/Request.rb +1 -2
- 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 +0 -1
- data/lib/corba/cbase/exception.rb +2 -3
- data/lib/corba/cbase/poa.rb +0 -1
- data/lib/corba/cbase/policies.rb +2 -3
- data/lib/corba/cbase/post_require.rb +1 -2
- data/lib/corba/cbase/require.rb +2 -1
- data/lib/corba/cmds/base.rb +1 -2
- data/lib/corba/cmds/test.rb +0 -1
- data/lib/corba/common/Any.rb +1 -2
- data/lib/corba/common/IDL.rb +5 -9
- data/lib/corba/common/ORB.rb +1 -2
- data/lib/corba/common/Object.rb +4 -2
- data/lib/corba/common/Request.rb +1 -2
- data/lib/corba/common/Servant.rb +0 -1
- data/lib/corba/common/Struct.rb +1 -2
- data/lib/corba/common/Stub.rb +1 -2
- data/lib/corba/common/Typecode.rb +56 -57
- data/lib/corba/common/Union.rb +1 -2
- data/lib/corba/common/Values.rb +1 -2
- data/lib/corba/common/const.rb +2 -3
- data/lib/corba/common/exception.rb +0 -1
- 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 +0 -1
- 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 +24 -25
- data/lib/corba/jbase/IORMap.rb +1 -2
- data/lib/corba/jbase/ORB.rb +3 -4
- data/lib/corba/jbase/Object.rb +0 -1
- data/lib/corba/jbase/Request.rb +6 -7
- data/lib/corba/jbase/Servant.rb +11 -12
- data/lib/corba/jbase/ServerRequest.rb +8 -9
- data/lib/corba/jbase/Streams.rb +4 -5
- data/lib/corba/jbase/Stub.rb +0 -1
- data/lib/corba/jbase/Typecode.rb +14 -15
- data/lib/corba/jbase/Values.rb +0 -1
- data/lib/corba/jbase/exception.rb +1 -2
- data/lib/corba/jbase/poa.rb +3 -4
- data/lib/corba/jbase/policies.rb +4 -5
- data/lib/corba/jbase/post_require.rb +0 -1
- data/lib/corba/jbase/require.rb +1 -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 +64 -67
- data/lib/corba/svcs/ins/ins.rb +24 -25
- data/lib/corba/svcs/ins/naming_service.rb +3 -4
- data/lib/ridlbe/ruby/config.rb +49 -52
- data/lib/ridlbe/ruby/require.rb +0 -1
- data/lib/ridlbe/ruby/walker.rb +38 -38
- data/mkrf_conf_bingem.rb +0 -2
- data/rakelib/bin.rake +2 -3
- data/rakelib/bin.rb +4 -5
- data/rakelib/build.rake +21 -21
- data/rakelib/config.rake +1 -2
- data/rakelib/config.rb +23 -25
- data/rakelib/ext.rake +16 -16
- data/rakelib/ext.rb +17 -56
- data/rakelib/ext_r2tao.rb +34 -24
- data/rakelib/gem.rake +53 -38
- data/rakelib/gem.rb +8 -9
- data/rakelib/package.rake +1 -2
- data/rakelib/test.rake +0 -1
- data/test/BiDirectional/Test.idl +0 -1
- data/test/BiDirectional/client.rb +4 -5
- data/test/BiDirectional/run_test.rb +1 -2
- data/test/BiDirectional/server.rb +4 -6
- data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +5 -6
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +1 -2
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +4 -5
- data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Corbaname/client.rb +3 -4
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +1 -2
- data/test/CORBA_Services/Naming/Corbaname/server.rb +10 -11
- data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
- data/test/CORBA_Services/Naming/Simple/client.rb +4 -5
- data/test/CORBA_Services/Naming/Simple/run_test.rb +1 -2
- data/test/CORBA_Services/Naming/Simple/server.rb +4 -5
- data/test/Collocation/Diamond.idl +0 -1
- data/test/Collocation/run_test.rb +0 -1
- data/test/Collocation/test.rb +2 -3
- data/test/Connect_Timeout/Test.idl +0 -1
- data/test/Connect_Timeout/client.rb +3 -5
- data/test/Connect_Timeout/run_test.rb +0 -1
- data/test/DII/Test.idl +0 -1
- data/test/DII/client.rb +5 -6
- data/test/DII/run_test.rb +1 -2
- data/test/DII/server.rb +3 -4
- data/test/DSI/Test.idl +0 -1
- data/test/DSI/client.rb +3 -4
- data/test/DSI/run_test.rb +1 -2
- data/test/DSI/server.rb +3 -4
- data/test/Exceptions/Test.idl +0 -1
- data/test/Exceptions/client.rb +5 -6
- data/test/Exceptions/run_test.rb +1 -2
- data/test/Exceptions/server.rb +3 -4
- data/test/Hello/Test.idl +0 -1
- data/test/Hello/client.rb +3 -4
- data/test/Hello/run_test.rb +1 -2
- data/test/Hello/server.rb +3 -4
- data/test/IDL_Test/Test.idl +4 -1
- data/test/IDL_Test/client.rb +6 -5
- data/test/IDL_Test/run_test.rb +1 -2
- data/test/IDL_Test/server.rb +8 -4
- data/test/IORMap/Test.idl +0 -1
- data/test/IORMap/client.rb +3 -4
- data/test/IORMap/run_test.rb +1 -2
- data/test/IORMap/server.rb +4 -5
- data/test/IORTable/Test.idl +0 -1
- data/test/IORTable/client.rb +3 -4
- data/test/IORTable/run_test.rb +1 -2
- data/test/IORTable/server.rb +4 -5
- data/test/Implicit_Conversion/Test.idl +0 -1
- data/test/Implicit_Conversion/client.rb +4 -5
- data/test/Implicit_Conversion/run_test.rb +1 -2
- data/test/Implicit_Conversion/server.rb +3 -4
- data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
- data/test/Multi_Threading/Multiple_ORB/client.rb +3 -4
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -3
- data/test/Multi_Threading/Multiple_ORB/server.rb +3 -4
- data/test/Multi_Threading/Simple/Test.idl +0 -1
- data/test/Multi_Threading/Simple/client.rb +4 -5
- data/test/Multi_Threading/Simple/run_test.rb +1 -2
- data/test/Multi_Threading/Simple/server.rb +4 -5
- data/test/Multi_Threading/Threads/Test.idl +0 -4
- data/test/Multi_Threading/Threads/client.rb +10 -13
- data/test/Multi_Threading/Threads/run_test.rb +1 -2
- data/test/Multi_Threading/Threads/server.rb +4 -7
- data/test/Multi_Threading/Threads/watchdog.rb +3 -3
- data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
- data/test/Multiple_Servant_Interfaces/client.rb +3 -4
- data/test/Multiple_Servant_Interfaces/run_test.rb +1 -2
- data/test/Multiple_Servant_Interfaces/server.rb +3 -4
- data/test/Nil/Test.idl +0 -1
- data/test/Nil/run_test.rb +0 -1
- data/test/Nil/test.rb +11 -9
- data/test/OBV/AbstractInterface/client.rb +3 -4
- data/test/OBV/AbstractInterface/run_test.rb +1 -2
- data/test/OBV/AbstractInterface/server.rb +3 -4
- data/test/OBV/AbstractInterface/test.idl +0 -1
- data/test/OBV/Custom/OBV_impl.rb +0 -1
- data/test/OBV/Custom/client.rb +3 -4
- data/test/OBV/Custom/run_test.rb +1 -2
- data/test/OBV/Custom/server.rb +3 -4
- data/test/OBV/Simple/OBV_impl.rb +0 -1
- data/test/OBV/Simple/client.rb +3 -4
- data/test/OBV/Simple/run_test.rb +1 -2
- data/test/OBV/Simple/server.rb +3 -4
- data/test/OBV/Simple_Event/Event_impl.rb +0 -1
- data/test/OBV/Simple_Event/client.rb +3 -4
- data/test/OBV/Simple_Event/run_test.rb +1 -2
- data/test/OBV/Simple_Event/server.rb +3 -4
- data/test/OBV/Supports/client.rb +3 -4
- data/test/OBV/Supports/run_test.rb +1 -2
- data/test/OBV/Supports/server.rb +3 -4
- data/test/OBV/Supports/supports.idl +0 -1
- data/test/OBV/Supports/supports_impl.rb +0 -1
- data/test/OBV/Tree/client.rb +3 -4
- data/test/OBV/Tree/run_test.rb +1 -2
- data/test/OBV/Tree/server.rb +3 -4
- 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 +4 -5
- data/test/OBV/Truncatable/run_test.rb +1 -2
- data/test/OBV/Truncatable/server.rb +3 -4
- data/test/OBV/ValueBox/client.rb +44 -45
- data/test/OBV/ValueBox/run_test.rb +1 -2
- data/test/OBV/ValueBox/server.rb +29 -29
- data/test/Object/Test.idl +0 -1
- data/test/Object/client.rb +4 -5
- data/test/Object/run_test.rb +1 -2
- data/test/Object/server.rb +3 -4
- data/test/POA/run_test.rb +0 -1
- data/test/POA/test.rb +4 -5
- data/test/Param_Test/client.rb +8 -9
- data/test/Param_Test/run_test.rb +1 -2
- data/test/Param_Test/server.rb +7 -8
- data/test/Performance/Simple/Test.idl +0 -1
- data/test/Performance/Simple/client.rb +3 -4
- data/test/Performance/Simple/run_test.rb +1 -2
- data/test/Performance/Simple/server.rb +3 -4
- data/test/Policies/Test.idl +0 -1
- data/test/Policies/run_test.rb +0 -1
- data/test/Policies/test.rb +2 -4
- data/test/Timeout/client.rb +6 -7
- data/test/Timeout/run_test.rb +1 -2
- data/test/Timeout/server.rb +4 -5
- data/test/Timeout/test.idl +0 -1
- data/test/lib/assert.rb +0 -2
- data/test/lib/test.rb +15 -17
- data/test/test_runner.rb +6 -8
- metadata +21 -48
- 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
|
OPTIONS = {
|
@@ -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/OBV/ValueBox/server.rb
CHANGED
@@ -26,13 +26,13 @@ ARGV.options do |opts|
|
|
26
26
|
|
27
27
|
opts.on("--o IORFILE",
|
28
28
|
"Set IOR filename.",
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
29
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
30
30
|
opts.on("--d LVL",
|
31
31
|
"Set ORBDebugLevel value.",
|
32
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
32
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
33
33
|
opts.on("--use-implement",
|
34
34
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
35
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
35
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
36
36
|
|
37
37
|
opts.separator ""
|
38
38
|
|
@@ -55,7 +55,7 @@ class Test_impl < POA::Test
|
|
55
55
|
end
|
56
56
|
|
57
57
|
def ros(s)
|
58
|
-
s.slice(s.size-1,1) << s.slice(0,s.size-1)
|
58
|
+
s.slice(s.size - 1, 1) << s.slice(0, s.size - 1)
|
59
59
|
end
|
60
60
|
|
61
61
|
def basic_op1(p1, p2)
|
@@ -94,25 +94,25 @@ class Test_impl < POA::Test
|
|
94
94
|
end
|
95
95
|
|
96
96
|
def seq_op1(p1, p2)
|
97
|
-
p3 = p2.collect {|e| e*5}
|
98
|
-
p2.collect! {|e| e*3}
|
97
|
+
p3 = p2.collect {|e| e * 5}
|
98
|
+
p2.collect! {|e| e * 3}
|
99
99
|
retval = p1
|
100
100
|
[retval, p2, p3]
|
101
101
|
end
|
102
102
|
|
103
103
|
def seq_op2(p1, p2)
|
104
|
-
p3 = p2.collect {|e| e*5}
|
105
|
-
p2.collect! {|e| e*3}
|
104
|
+
p3 = p2.collect {|e| e * 5}
|
105
|
+
p2.collect! {|e| e * 3}
|
106
106
|
[p2, p3]
|
107
107
|
end
|
108
108
|
|
109
109
|
def struct_op1(p1, p2)
|
110
|
-
p3 = Fixed_Struct1.new(p2.l*5,
|
111
|
-
Fixed_Struct1::Bstruct.new(p2.abstruct.s1*5,
|
112
|
-
p2.abstruct.s2*5))
|
113
|
-
p2.l = p2.l*3
|
114
|
-
p2.abstruct.s1 = p2.abstruct.s1*3
|
115
|
-
p2.abstruct.s2 = p2.abstruct.s2*3
|
110
|
+
p3 = Fixed_Struct1.new(p2.l * 5,
|
111
|
+
Fixed_Struct1::Bstruct.new(p2.abstruct.s1 * 5,
|
112
|
+
p2.abstruct.s2 * 5))
|
113
|
+
p2.l = p2.l * 3
|
114
|
+
p2.abstruct.s1 = p2.abstruct.s1 * 3
|
115
|
+
p2.abstruct.s2 = p2.abstruct.s2 * 3
|
116
116
|
|
117
117
|
retval = p1
|
118
118
|
[retval, p2, p3]
|
@@ -121,9 +121,9 @@ class Test_impl < POA::Test
|
|
121
121
|
def struct_op2(p1, p2)
|
122
122
|
p3 = p1
|
123
123
|
|
124
|
-
p2.l = p2.l*3
|
125
|
-
p2.abstruct.s1 = p2.abstruct.s1*3
|
126
|
-
p2.abstruct.s2 = p2.abstruct.s2*3
|
124
|
+
p2.l = p2.l * 3
|
125
|
+
p2.abstruct.s1 = p2.abstruct.s1 * 3
|
126
|
+
p2.abstruct.s2 = p2.abstruct.s2 * 3
|
127
127
|
|
128
128
|
[p2, p3]
|
129
129
|
end
|
@@ -147,14 +147,14 @@ class Test_impl < POA::Test
|
|
147
147
|
end
|
148
148
|
|
149
149
|
def array_op1(p1, p2)
|
150
|
-
p2.collect! {|e| e*3}
|
150
|
+
p2.collect! {|e| e * 3}
|
151
151
|
p3 = p2
|
152
152
|
retval = p1
|
153
153
|
[retval, p2, p3]
|
154
154
|
end
|
155
155
|
|
156
156
|
def array_op2(p1, p2)
|
157
|
-
p2.collect! {|e| e*3}
|
157
|
+
p2.collect! {|e| e * 3}
|
158
158
|
p3 = p1
|
159
159
|
[p2, p3]
|
160
160
|
end
|
@@ -177,17 +177,17 @@ class Test_impl < POA::Test
|
|
177
177
|
retval = VBfixed_union1.new(Fixed_Union1.new)
|
178
178
|
case p1._disc
|
179
179
|
when 1
|
180
|
-
p3.value.m1 = p1.m1*3
|
181
|
-
retval.value.m1 = p1.m1*3
|
180
|
+
p3.value.m1 = p1.m1 * 3
|
181
|
+
retval.value.m1 = p1.m1 * 3
|
182
182
|
when 2
|
183
|
-
p3.value.m2 = p1.m2*3
|
184
|
-
retval.value.m2 = p1.m2*3
|
183
|
+
p3.value.m2 = p1.m2 * 3
|
184
|
+
retval.value.m2 = p1.m2 * 3
|
185
185
|
end
|
186
186
|
case p2._disc
|
187
187
|
when 1
|
188
|
-
p2.m1 = p2.m1*3
|
188
|
+
p2.m1 = p2.m1 * 3
|
189
189
|
when 2
|
190
|
-
p2.m2 = p2.m2*3
|
190
|
+
p2.m2 = p2.m2 * 3
|
191
191
|
end
|
192
192
|
[retval, p2, p3]
|
193
193
|
end
|
@@ -196,9 +196,9 @@ class Test_impl < POA::Test
|
|
196
196
|
p3 = p1
|
197
197
|
case p2._disc
|
198
198
|
when 1
|
199
|
-
p2.m1 = p2.m1*3
|
199
|
+
p2.m1 = p2.m1 * 3
|
200
200
|
when 2
|
201
|
-
p2.m2 = p2.m2*3
|
201
|
+
p2.m2 = p2.m2 * 3
|
202
202
|
end
|
203
203
|
[p2, p3]
|
204
204
|
end
|
@@ -216,7 +216,7 @@ class Test_impl < POA::Test
|
|
216
216
|
end
|
217
217
|
case p2._disc
|
218
218
|
when 1
|
219
|
-
p2.m1 = p2.m1*3
|
219
|
+
p2.m1 = p2.m1 * 3
|
220
220
|
when 2
|
221
221
|
p2.m2 = ros(p2.m2)
|
222
222
|
end
|
@@ -227,7 +227,7 @@ class Test_impl < POA::Test
|
|
227
227
|
p3 = p1
|
228
228
|
case p2._disc
|
229
229
|
when 1
|
230
|
-
p2.m1 = p2.m1*3
|
230
|
+
p2.m1 = p2.m1 * 3
|
231
231
|
when 2
|
232
232
|
p2.m2 = ros(p2.m2)
|
233
233
|
end
|
data/test/Object/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/Object/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'
|
@@ -28,13 +27,13 @@ ARGV.options do |opts|
|
|
28
27
|
|
29
28
|
opts.on("--k IORFILE",
|
30
29
|
"Set IOR.",
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
32
31
|
opts.on("--d LVL",
|
33
32
|
"Set ORBDebugLevel value.",
|
34
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
35
34
|
opts.on("--use-implement",
|
36
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
37
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
38
37
|
|
39
38
|
opts.separator ""
|
40
39
|
|
@@ -58,7 +57,7 @@ begin
|
|
58
57
|
obj = orb.string_to_object(OPTIONS[:iorfile])
|
59
58
|
|
60
59
|
unless defined?(JRUBY_VERSION) && CORBA::Native::Jacorb::MAJOR_VERSION == 3 &&
|
61
|
-
([4,5].include? CORBA::Native::Jacorb::MINOR_VERSION)
|
60
|
+
([4, 5].include? CORBA::Native::Jacorb::MINOR_VERSION)
|
62
61
|
## JacORB 3.4 introduced an optimization which *requires* use of the Java endorsed dirs
|
63
62
|
## mechanism to replace standard JDK CORBA stubs with the JacORB version in order to
|
64
63
|
## have JacORB process these base methods correctly with DSI servants
|
data/test/Object/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 = {
|
@@ -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/Object/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'
|
@@ -26,13 +25,13 @@ ARGV.options do |opts|
|
|
26
25
|
|
27
26
|
opts.on("--o IORFILE",
|
28
27
|
"Set IOR filename.",
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
30
29
|
opts.on("--d LVL",
|
31
30
|
"Set ORBDebugLevel value.",
|
32
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
33
32
|
opts.on("--use-implement",
|
34
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
35
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
36
35
|
|
37
36
|
opts.separator ""
|
38
37
|
|
data/test/POA/run_test.rb
CHANGED
data/test/POA/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
|
require 'optparse'
|
@@ -28,13 +27,13 @@ ARGV.options do |opts|
|
|
28
27
|
|
29
28
|
opts.on("--o IORFILE",
|
30
29
|
"Set IOR filename.",
|
31
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
32
31
|
opts.on("--d LVL",
|
33
32
|
"Set ORBDebugLevel value.",
|
34
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
35
34
|
opts.on("--use-implement",
|
36
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
37
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
38
37
|
|
39
38
|
opts.separator ""
|
40
39
|
|
@@ -109,4 +108,4 @@ begin
|
|
109
108
|
|
110
109
|
ensure
|
111
110
|
orb.destroy
|
112
|
-
end
|
111
|
+
end
|
data/test/Param_Test/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'
|
@@ -28,13 +27,13 @@ ARGV.options do |opts|
|
|
28
27
|
|
29
28
|
opts.on("--k IORFILE",
|
30
29
|
"Set IOR.",
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
32
31
|
opts.on("--d LVL",
|
33
32
|
"Set ORBDebugLevel value.",
|
34
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
35
34
|
opts.on("--use-implement",
|
36
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
37
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
38
37
|
|
39
38
|
opts.separator ""
|
40
39
|
|
@@ -94,14 +93,14 @@ begin
|
|
94
93
|
nums = hello_obj.numbers
|
95
94
|
|
96
95
|
begin
|
97
|
-
hello_obj.numbers = (0...11).to_a.collect { |i| i*3 }
|
96
|
+
hello_obj.numbers = (0...11).to_a.collect { |i| i * 3 }
|
98
97
|
rescue CORBA::MARSHAL => ex
|
99
98
|
## expected exception since sequence can hold max. 10 elements
|
100
99
|
end
|
101
100
|
|
102
101
|
assert "ERROR numbers attribute changed while it shouldn't", nums == hello_obj.numbers
|
103
102
|
|
104
|
-
hello_obj.numbers = nums.collect { |i| i*3 }
|
103
|
+
hello_obj.numbers = nums.collect { |i| i * 3 }
|
105
104
|
|
106
105
|
assert_not "ERROR numbers attribute did not change while it should have", nums == hello_obj.numbers
|
107
106
|
|
@@ -117,7 +116,7 @@ begin
|
|
117
116
|
sv.m_one += 1
|
118
117
|
sv.m_two += 1.03
|
119
118
|
sv.m_three.upcase!
|
120
|
-
sv.m_four.m_b =
|
119
|
+
sv.m_four.m_b = true
|
121
120
|
sv.m_five = Test::TE_FIRST
|
122
121
|
}
|
123
122
|
|
@@ -213,7 +212,7 @@ begin
|
|
213
212
|
uv3 = hello_obj.unionValue3
|
214
213
|
|
215
214
|
assert_except "ERROR with attribute unionValue3", CORBA::BAD_PARAM do
|
216
|
-
uv3._disc =
|
215
|
+
uv3._disc = false
|
217
216
|
end
|
218
217
|
|
219
218
|
uv3._default # set implicit default
|
@@ -265,7 +264,7 @@ begin
|
|
265
264
|
reslen, resinoutstr, resoutstr = hello_obj.run_test(instr = Test::TString.new("This is instr"), inoutstr = "This is inoutstr")
|
266
265
|
|
267
266
|
assert_not "ERROR with run_test" do
|
268
|
-
reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr+inoutstr)
|
267
|
+
reslen != resoutstr.size || resinoutstr != instr || resoutstr != (instr + inoutstr)
|
269
268
|
end
|
270
269
|
|
271
270
|
hello_obj.shutdown()
|
data/test/Param_Test/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 = {
|
@@ -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/Param_Test/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'
|
@@ -26,13 +25,13 @@ ARGV.options do |opts|
|
|
26
25
|
|
27
26
|
opts.on("--o IORFILE",
|
28
27
|
"Set IOR filename.",
|
29
|
-
"Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
|
28
|
+
"Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
|
30
29
|
opts.on("--d LVL",
|
31
30
|
"Set ORBDebugLevel value.",
|
32
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
31
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
33
32
|
opts.on("--use-implement",
|
34
33
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
35
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
34
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
36
35
|
|
37
36
|
opts.separator ""
|
38
37
|
|
@@ -54,7 +53,7 @@ class MyHello < POA::Test::Hello
|
|
54
53
|
def initialize(orb)
|
55
54
|
@orb = orb
|
56
55
|
@msg = 'message'
|
57
|
-
@nums = Test::TShortSeq.new((0...10).collect { |i| i*2 })
|
56
|
+
@nums = Test::TShortSeq.new((0...10).collect { |i| i * 2 })
|
58
57
|
s1 = Test::S1.new
|
59
58
|
s1.m_one = 123
|
60
59
|
s1.m_two = 2.54
|
@@ -65,7 +64,7 @@ class MyHello < POA::Test::Hello
|
|
65
64
|
@s1seq = Test::S1Seq.new << s1
|
66
65
|
@cube = Test::TLongCube.new((0...3).collect {|x|
|
67
66
|
(0...3).collect {|y|
|
68
|
-
(0...4).collect {|z| x+(y*10)+(z*100) }
|
67
|
+
(0...4).collect {|z| x + (y * 10) + (z * 100) }
|
69
68
|
}
|
70
69
|
})
|
71
70
|
@anysel = 0
|
@@ -85,7 +84,7 @@ class MyHello < POA::Test::Hello
|
|
85
84
|
@u2._disc = Test::U2::ONE
|
86
85
|
@u2.l_ = 12345
|
87
86
|
@u3 = Test::U3.new
|
88
|
-
@u3._disc =
|
87
|
+
@u3._disc = true
|
89
88
|
@u3.lval = 123456
|
90
89
|
@u4 = Test::U4.new
|
91
90
|
@u4._disc = Test::TE_FIRST
|
@@ -196,7 +195,7 @@ class MyHello < POA::Test::Hello
|
|
196
195
|
when 2
|
197
196
|
@s1seq
|
198
197
|
when 3
|
199
|
-
CORBA::Any.to_any([1,2,3,4,5], CORBA::TypeCode::Sequence.new(CORBA._tc_long))
|
198
|
+
CORBA::Any.to_any([1, 2, 3, 4, 5], CORBA::TypeCode::Sequence.new(CORBA._tc_long))
|
200
199
|
else
|
201
200
|
@anysel
|
202
201
|
end
|
@@ -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'
|
@@ -28,13 +27,13 @@ ARGV.options do |opts|
|
|
28
27
|
|
29
28
|
opts.on("--k IORFILE",
|
30
29
|
"Set IOR.",
|
31
|
-
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
|
30
|
+
"Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
|
32
31
|
opts.on("--d LVL",
|
33
32
|
"Set ORBDebugLevel value.",
|
34
|
-
"Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
|
33
|
+
"Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
|
35
34
|
opts.on("--use-implement",
|
36
35
|
"Load IDL through CORBA.implement() instead of precompiled code.",
|
37
|
-
"Default: off") { |v| OPTIONS[:use_implement]=v }
|
36
|
+
"Default: off") { |v| OPTIONS[:use_implement] = v }
|
38
37
|
|
39
38
|
opts.separator ""
|
40
39
|
|