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/lib/corba/common/ORB.rb
CHANGED
@@ -8,7 +8,6 @@
|
|
8
8
|
# included with this program.
|
9
9
|
#
|
10
10
|
# Copyright (c) Remedy IT Expertise BV
|
11
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
12
11
|
#--------------------------------------------------------------------
|
13
12
|
|
14
13
|
module R2CORBA
|
@@ -61,8 +60,8 @@ module R2CORBA
|
|
61
60
|
self
|
62
61
|
end
|
63
62
|
|
64
|
-
#obj ::CORBA::Object
|
65
|
-
#ret ::String
|
63
|
+
# obj ::CORBA::Object
|
64
|
+
# ret ::String
|
66
65
|
def object_to_string(obj)
|
67
66
|
raise CORBA::BAD_PARAM.new('CORBA::Object required', 0, CORBA::COMPLETED_NO) unless obj.is_a?(CORBA::Object)
|
68
67
|
begin
|
@@ -72,8 +71,8 @@ module R2CORBA
|
|
72
71
|
end
|
73
72
|
end
|
74
73
|
|
75
|
-
#str ::String
|
76
|
-
#ret ::CORBA::Object
|
74
|
+
# str ::String
|
75
|
+
# ret ::CORBA::Object
|
77
76
|
def string_to_object(str)
|
78
77
|
begin
|
79
78
|
Object._wrap_native(self.orb_.string_to_object(str))
|
@@ -82,41 +81,41 @@ module R2CORBA
|
|
82
81
|
end
|
83
82
|
end
|
84
83
|
|
85
|
-
#str ::Integer
|
86
|
-
#ret ::CORBA::NVList
|
84
|
+
# str ::Integer
|
85
|
+
# ret ::CORBA::NVList
|
87
86
|
def create_list(count)
|
88
87
|
raise CORBA::NO_IMPLEMENT
|
89
88
|
end
|
90
89
|
|
91
|
-
#str OperationDef
|
92
|
-
#ret ::CORBA::NVList
|
90
|
+
# str OperationDef
|
91
|
+
# ret ::CORBA::NVList
|
93
92
|
def create_operation_list(oper)
|
94
93
|
raise CORBA::NO_IMPLEMENT
|
95
94
|
end
|
96
95
|
|
97
|
-
#ret Context
|
96
|
+
# ret Context
|
98
97
|
def get_default_context()
|
99
98
|
raise CORBA::NO_IMPLEMENT
|
100
99
|
end
|
101
100
|
|
102
|
-
#req RequestSeq
|
103
|
-
#ret void
|
101
|
+
# req RequestSeq
|
102
|
+
# ret void
|
104
103
|
def send_multiple_request_oneway(req)
|
105
104
|
raise CORBA::NO_IMPLEMENT
|
106
105
|
end
|
107
106
|
|
108
|
-
#req RequestSeq
|
109
|
-
#ret void
|
107
|
+
# req RequestSeq
|
108
|
+
# ret void
|
110
109
|
def send_multiple_request_deferred(req)
|
111
110
|
raise CORBA::NO_IMPLEMENT
|
112
111
|
end
|
113
112
|
|
114
|
-
#ret boolean
|
113
|
+
# ret boolean
|
115
114
|
def poll_next_response()
|
116
115
|
raise CORBA::NO_IMPLEMENT
|
117
116
|
end
|
118
117
|
|
119
|
-
#ret Request
|
118
|
+
# ret Request
|
120
119
|
def get_next_response()
|
121
120
|
raise CORBA::NO_IMPLEMENT
|
122
121
|
end
|
@@ -209,13 +208,13 @@ module R2CORBA
|
|
209
208
|
|
210
209
|
# Integer bound
|
211
210
|
# ret TypeCode
|
212
|
-
def create_string_tc(bound=nil)
|
211
|
+
def create_string_tc(bound = nil)
|
213
212
|
return CORBA::TypeCode::String.new(bound)
|
214
213
|
end
|
215
214
|
|
216
215
|
# Integer bound
|
217
216
|
# ret TypeCode
|
218
|
-
def create_wstring_tc(bound=nil)
|
217
|
+
def create_wstring_tc(bound = nil)
|
219
218
|
return CORBA::TypeCode::WString.new(bound)
|
220
219
|
end
|
221
220
|
|
@@ -260,7 +259,7 @@ module R2CORBA
|
|
260
259
|
# Identifier name
|
261
260
|
# TypeCode boxed_type
|
262
261
|
# ret TypeCode
|
263
|
-
def create_value_box_tc
|
262
|
+
def create_value_box_tc(id, name, boxed_type)
|
264
263
|
return CORBA::TypeCode::Valuebox.new(id, name, boxed_type)
|
265
264
|
end
|
266
265
|
|
@@ -335,8 +334,8 @@ module R2CORBA
|
|
335
334
|
|
336
335
|
# PolicyType type
|
337
336
|
# any val
|
338
|
-
#ret Policy
|
339
|
-
#raises PolicyError
|
337
|
+
# ret Policy
|
338
|
+
# raises PolicyError
|
340
339
|
def create_policy(type, val)
|
341
340
|
raise ::CORBA::NO_IMPLEMENT
|
342
341
|
end
|
@@ -346,7 +345,7 @@ module R2CORBA
|
|
346
345
|
=end
|
347
346
|
# RepositoryId id
|
348
347
|
# ValueFactory factory
|
349
|
-
#ret ValueFactory
|
348
|
+
# ret ValueFactory
|
350
349
|
def register_value_factory(id, factory)
|
351
350
|
self.orb_().register_value_factory(id, factory)
|
352
351
|
end
|
@@ -358,7 +357,7 @@ module R2CORBA
|
|
358
357
|
end
|
359
358
|
|
360
359
|
# RepositoryId id
|
361
|
-
#ret ValueFactory
|
360
|
+
# ret ValueFactory
|
362
361
|
def lookup_value_factory(id)
|
363
362
|
self.orb_().lookup_value_factory(id)
|
364
363
|
end
|
data/lib/corba/common/Object.rb
CHANGED
@@ -8,7 +8,6 @@
|
|
8
8
|
# included with this program.
|
9
9
|
#
|
10
10
|
# Copyright (c) Remedy IT Expertise BV
|
11
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
12
11
|
#--------------------------------------------------------------------
|
13
12
|
module R2CORBA
|
14
13
|
module CORBA
|
@@ -28,6 +27,7 @@ module R2CORBA
|
|
28
27
|
def initialize(nobj)
|
29
28
|
@objref_ = nobj
|
30
29
|
end
|
30
|
+
|
31
31
|
def _free_ref
|
32
32
|
self._release
|
33
33
|
end
|
@@ -48,6 +48,10 @@ module R2CORBA
|
|
48
48
|
obj
|
49
49
|
end
|
50
50
|
|
51
|
+
def self._tc
|
52
|
+
CORBA._tc_Object
|
53
|
+
end
|
54
|
+
|
51
55
|
#------------------- 4.3 "Object Reference Operations"
|
52
56
|
|
53
57
|
def ==(other)
|
@@ -66,17 +70,17 @@ module R2CORBA
|
|
66
70
|
self
|
67
71
|
end
|
68
72
|
|
69
|
-
#ret InterfaceDef
|
73
|
+
# ret InterfaceDef
|
70
74
|
def _get_interface()
|
71
75
|
raise ::CORBA::NO_IMPLEMENT
|
72
76
|
end
|
73
77
|
|
74
|
-
#ret boolean
|
78
|
+
# ret boolean
|
75
79
|
def _is_nil?()
|
76
80
|
self.objref_.nil? || (self.objref_.respond_to?(:_is_nil) && self.objref_._is_nil)
|
77
81
|
end
|
78
82
|
|
79
|
-
#ret ::CORBA::Object
|
83
|
+
# ret ::CORBA::Object
|
80
84
|
def _duplicate()
|
81
85
|
return nil if self._is_nil?()
|
82
86
|
begin
|
@@ -148,32 +152,32 @@ module R2CORBA
|
|
148
152
|
end
|
149
153
|
end
|
150
154
|
|
151
|
-
#def PolicyType policy_type
|
155
|
+
# def PolicyType policy_type
|
152
156
|
# ret Policy
|
153
157
|
def _get_policy(policy_type)
|
154
158
|
raise ::CORBA::NO_IMPLEMENT
|
155
159
|
end
|
156
160
|
|
157
|
-
#PolicyList policies
|
158
|
-
#SetOverrideType set_add
|
159
|
-
#ret ::CORBA::Object
|
160
|
-
def _set_policy_overrides(policies, set_add
|
161
|
+
# PolicyList policies
|
162
|
+
# SetOverrideType set_add
|
163
|
+
# ret ::CORBA::Object
|
164
|
+
def _set_policy_overrides(policies, set_add)
|
161
165
|
raise ::CORBA::NO_IMPLEMENT
|
162
166
|
end
|
163
167
|
|
164
|
-
#int[] types
|
165
|
-
#ret PolicyList
|
168
|
+
# int[] types
|
169
|
+
# ret PolicyList
|
166
170
|
def _get_policy_overrides(types)
|
167
171
|
raise ::CORBA::NO_IMPLEMENT
|
168
172
|
end
|
169
173
|
|
170
|
-
#PolicyList inconsistent_policies
|
171
|
-
#ret bool
|
174
|
+
# PolicyList inconsistent_policies
|
175
|
+
# ret bool
|
172
176
|
def _validate_connection(inconsistent_policies)
|
173
177
|
raise ::CORBA::NO_IMPLEMENT
|
174
178
|
end
|
175
179
|
|
176
|
-
#ret ::CORBA::Object
|
180
|
+
# ret ::CORBA::Object
|
177
181
|
def _get_component()
|
178
182
|
raise CORBA::INV_OBJREF.new if self._is_nil?()
|
179
183
|
begin
|
@@ -205,4 +209,3 @@ module R2CORBA
|
|
205
209
|
end # Object
|
206
210
|
end # CORBA
|
207
211
|
end # R2CORBA
|
208
|
-
|
data/lib/corba/common/Request.rb
CHANGED
@@ -8,7 +8,6 @@
|
|
8
8
|
# included with this program.
|
9
9
|
#
|
10
10
|
# Copyright (c) Remedy IT Expertise BV
|
11
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
12
11
|
#--------------------------------------------------------------------
|
13
12
|
module R2CORBA
|
14
13
|
module CORBA
|
@@ -17,4 +16,4 @@ module R2CORBA
|
|
17
16
|
end
|
18
17
|
|
19
18
|
end # CORBA
|
20
|
-
end # R2CORBA
|
19
|
+
end # R2CORBA
|
data/lib/corba/common/Servant.rb
CHANGED
@@ -8,7 +8,6 @@
|
|
8
8
|
# included with this program.
|
9
9
|
#
|
10
10
|
# Copyright (c) Remedy IT Expertise BV
|
11
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
12
11
|
#--------------------------------------------------------------------
|
13
12
|
|
14
13
|
module R2CORBA
|
@@ -18,7 +17,7 @@ module R2CORBA
|
|
18
17
|
class Servant
|
19
18
|
|
20
19
|
module Intf
|
21
|
-
Id =
|
20
|
+
Id = 'IDL:omg.org/CORBA/Object:1.0'.freeze
|
22
21
|
Ids = [ Id ].freeze
|
23
22
|
Operations = {}.freeze
|
24
23
|
end
|
@@ -83,9 +82,9 @@ module R2CORBA
|
|
83
82
|
end
|
84
83
|
self.const_set(:TRUNCATABLE_IDS, vt::TRUNCATABLE_IDS)
|
85
84
|
self.const_set(:VT_TC, vt._tc)
|
86
|
-
|
85
|
+
# @@tc_vt_ = vt._tc
|
87
86
|
def self._tc
|
88
|
-
|
87
|
+
# @@tc_vt_
|
89
88
|
self.const_get(:VT_TC)
|
90
89
|
end
|
91
90
|
include vt::Intf
|
@@ -94,7 +93,7 @@ module R2CORBA
|
|
94
93
|
|
95
94
|
class DynamicImplementation < Servant
|
96
95
|
def invoke(request)
|
97
|
-
if self.class.const_defined?(
|
96
|
+
if self.class.const_defined?('OPTABLE') && self.class::OPTABLE.has_key?(request.operation)
|
98
97
|
request.describe(self.class::OPTABLE[request.operation])
|
99
98
|
return self.__send__(request.operation, *request.arguments) { request }
|
100
99
|
else
|
data/lib/corba/common/Struct.rb
CHANGED
@@ -9,7 +9,6 @@
|
|
9
9
|
# included with this program.
|
10
10
|
#
|
11
11
|
# Copyright (c) Remedy IT Expertise BV
|
12
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
13
12
|
#--------------------------------------------------------------------
|
14
13
|
|
15
14
|
module R2CORBA
|
@@ -19,4 +18,4 @@ module R2CORBA
|
|
19
18
|
end
|
20
19
|
end
|
21
20
|
end
|
22
|
-
end
|
21
|
+
end
|
data/lib/corba/common/Stub.rb
CHANGED
@@ -8,7 +8,6 @@
|
|
8
8
|
# included with this program.
|
9
9
|
#
|
10
10
|
# Copyright (c) Remedy IT Expertise BV
|
11
|
-
# Chamber of commerce Rotterdam nr.276339, The Netherlands
|
12
11
|
#--------------------------------------------------------------------
|
13
12
|
module R2CORBA
|
14
13
|
module CORBA
|
@@ -32,12 +31,12 @@ module R2CORBA
|
|
32
31
|
end
|
33
32
|
end
|
34
33
|
|
35
|
-
Id =
|
34
|
+
Id = 'IDL:omg.org/CORBA/Object:1.0'.freeze
|
36
35
|
Ids = [ Id ].freeze
|
37
36
|
|
38
37
|
protected
|
39
38
|
def init_corba_portable_stub()
|
40
|
-
@ids ||= [
|
39
|
+
@ids ||= ['IDL:omg.org/CORBA/Object:1.0']
|
41
40
|
end
|
42
41
|
|
43
42
|
def _ids; @ids; end
|
@@ -48,7 +47,7 @@ module R2CORBA
|
|
48
47
|
|
49
48
|
public
|
50
49
|
def _narrow!(klass)
|
51
|
-
raise CORBA::OBJECT_NOT_EXIST.new(
|
50
|
+
raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
|
52
51
|
raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub) && self._is_a?(klass::Id)
|
53
52
|
self.extend klass
|
54
53
|
_append_ids(*klass::Ids)
|
@@ -56,7 +55,7 @@ module R2CORBA
|
|
56
55
|
end
|
57
56
|
|
58
57
|
def _unchecked_narrow!(klass)
|
59
|
-
raise CORBA::OBJECT_NOT_EXIST.new(
|
58
|
+
raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
|
60
59
|
raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub)
|
61
60
|
self.extend klass
|
62
61
|
_append_ids(*klass::Ids)
|
@@ -68,10 +67,10 @@ module R2CORBA
|
|
68
67
|
end
|
69
68
|
|
70
69
|
def inspect()
|
71
|
-
s =
|
70
|
+
s = ''
|
72
71
|
s << self.class.name.to_s << "\n" <<
|
73
72
|
"type_id: \n" <<
|
74
|
-
|
73
|
+
' ' << @ids.join("\n ") << "\n"
|
75
74
|
end
|
76
75
|
end # Stub
|
77
76
|
end # Portable
|