r2corba 1.5.4 → 1.5.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (152) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +2 -1
  3. data/ext/extload/extload.c +5 -6
  4. data/ext/libr2tao/object.cpp +4 -4
  5. data/ext/libr2tao/orb.cpp +8 -8
  6. data/ext/libr2tao/r2tao_ext.h +0 -12
  7. data/ext/libr2tao/required.cpp +2 -2
  8. data/ext/libr2tao/required.h +9 -11
  9. data/ext/libr2tao/values.cpp +5 -5
  10. data/ext/libr2tao/values.h +19 -19
  11. data/ext/librpoa/iortable.cpp +3 -3
  12. data/ext/librpoa/poa.cpp +7 -7
  13. data/ext/librpoa/servant.cpp +15 -90
  14. data/ext/librpoa/servant.h +13 -35
  15. data/lib/corba/cbase/ORB.rb +7 -7
  16. data/lib/corba/cbase/Streams.rb +2 -2
  17. data/lib/corba/cbase/Typecode.rb +6 -6
  18. data/lib/corba/cbase/exception.rb +2 -2
  19. data/lib/corba/cbase/policies.rb +1 -1
  20. data/lib/corba/cmds/base.rb +1 -1
  21. data/lib/corba/common/Any.rb +1 -1
  22. data/lib/corba/common/ORB.rb +1 -1
  23. data/lib/corba/common/Object.rb +0 -1
  24. data/lib/corba/common/Stub.rb +1 -1
  25. data/lib/corba/common/Typecode.rb +34 -34
  26. data/lib/corba/common/const.rb +2 -2
  27. data/lib/corba/common/version.rb +1 -1
  28. data/lib/corba/jbase/Any.rb +23 -23
  29. data/lib/corba/jbase/ORB.rb +3 -3
  30. data/lib/corba/jbase/Request.rb +5 -5
  31. data/lib/corba/jbase/Servant.rb +10 -10
  32. data/lib/corba/jbase/ServerRequest.rb +7 -7
  33. data/lib/corba/jbase/Streams.rb +3 -3
  34. data/lib/corba/jbase/Typecode.rb +14 -14
  35. data/lib/corba/jbase/exception.rb +1 -1
  36. data/lib/corba/jbase/poa.rb +2 -2
  37. data/lib/corba/jbase/policies.rb +3 -3
  38. data/lib/corba/poa.rb +1 -1
  39. data/lib/corba/policies.rb +1 -1
  40. data/lib/corba/require.rb +2 -2
  41. data/lib/corba/svcs/ins/cos_naming.rb +27 -27
  42. data/lib/corba/svcs/ins/ins.rb +17 -17
  43. data/lib/corba/svcs/ins/naming_service.rb +2 -2
  44. data/lib/ridlbe/ruby/config.rb +10 -10
  45. data/lib/ridlbe/ruby/walker.rb +21 -21
  46. data/mkrf_conf_srcgem.rb +5 -5
  47. data/rakelib/bin.rake +1 -1
  48. data/rakelib/bin.rb +3 -3
  49. data/rakelib/build.rake +15 -15
  50. data/rakelib/config.rb +13 -13
  51. data/rakelib/ext.rake +3 -5
  52. data/rakelib/ext.rb +13 -13
  53. data/rakelib/ext_r2tao.rb +12 -18
  54. data/rakelib/gem.rake +5 -5
  55. data/rakelib/gem.rb +5 -5
  56. data/test/BiDirectional/client.rb +3 -3
  57. data/test/BiDirectional/run_test.rb +1 -1
  58. data/test/BiDirectional/server.rb +4 -5
  59. data/test/CORBA_Services/Naming/BindingIterator/client.rb +5 -5
  60. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +1 -1
  61. data/test/CORBA_Services/Naming/BindingIterator/server.rb +4 -4
  62. data/test/CORBA_Services/Naming/Corbaname/client.rb +3 -3
  63. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +1 -1
  64. data/test/CORBA_Services/Naming/Corbaname/server.rb +10 -10
  65. data/test/CORBA_Services/Naming/Simple/client.rb +4 -4
  66. data/test/CORBA_Services/Naming/Simple/run_test.rb +1 -1
  67. data/test/CORBA_Services/Naming/Simple/server.rb +4 -4
  68. data/test/Collocation/test.rb +2 -2
  69. data/test/Connect_Timeout/client.rb +3 -4
  70. data/test/DII/client.rb +5 -5
  71. data/test/DII/run_test.rb +1 -1
  72. data/test/DII/server.rb +3 -3
  73. data/test/DSI/client.rb +3 -3
  74. data/test/DSI/run_test.rb +1 -1
  75. data/test/DSI/server.rb +3 -3
  76. data/test/Exceptions/client.rb +4 -4
  77. data/test/Exceptions/run_test.rb +1 -1
  78. data/test/Exceptions/server.rb +3 -3
  79. data/test/Hello/client.rb +3 -3
  80. data/test/Hello/run_test.rb +1 -1
  81. data/test/Hello/server.rb +3 -3
  82. data/test/IDL_Test/client.rb +3 -3
  83. data/test/IDL_Test/run_test.rb +1 -1
  84. data/test/IDL_Test/server.rb +3 -3
  85. data/test/IORMap/client.rb +3 -3
  86. data/test/IORMap/run_test.rb +1 -1
  87. data/test/IORMap/server.rb +4 -4
  88. data/test/IORTable/client.rb +3 -3
  89. data/test/IORTable/run_test.rb +1 -1
  90. data/test/IORTable/server.rb +4 -4
  91. data/test/Implicit_Conversion/client.rb +4 -4
  92. data/test/Implicit_Conversion/run_test.rb +1 -1
  93. data/test/Implicit_Conversion/server.rb +3 -3
  94. data/test/Multi_Threading/Multiple_ORB/client.rb +3 -3
  95. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
  96. data/test/Multi_Threading/Multiple_ORB/server.rb +3 -3
  97. data/test/Multi_Threading/Simple/client.rb +4 -4
  98. data/test/Multi_Threading/Simple/run_test.rb +1 -1
  99. data/test/Multi_Threading/Simple/server.rb +3 -3
  100. data/test/Multi_Threading/Threads/client.rb +3 -3
  101. data/test/Multi_Threading/Threads/run_test.rb +1 -1
  102. data/test/Multi_Threading/Threads/server.rb +4 -4
  103. data/test/Multi_Threading/Threads/watchdog.rb +3 -3
  104. data/test/Multiple_Servant_Interfaces/client.rb +3 -3
  105. data/test/Multiple_Servant_Interfaces/run_test.rb +1 -1
  106. data/test/Multiple_Servant_Interfaces/server.rb +3 -3
  107. data/test/Nil/test.rb +3 -4
  108. data/test/OBV/AbstractInterface/client.rb +3 -3
  109. data/test/OBV/AbstractInterface/run_test.rb +1 -1
  110. data/test/OBV/AbstractInterface/server.rb +3 -3
  111. data/test/OBV/Custom/client.rb +3 -3
  112. data/test/OBV/Custom/run_test.rb +1 -1
  113. data/test/OBV/Custom/server.rb +3 -3
  114. data/test/OBV/Simple/client.rb +3 -3
  115. data/test/OBV/Simple/run_test.rb +1 -1
  116. data/test/OBV/Simple/server.rb +3 -3
  117. data/test/OBV/Simple_Event/client.rb +3 -3
  118. data/test/OBV/Simple_Event/run_test.rb +1 -1
  119. data/test/OBV/Simple_Event/server.rb +3 -3
  120. data/test/OBV/Supports/client.rb +3 -3
  121. data/test/OBV/Supports/run_test.rb +1 -1
  122. data/test/OBV/Supports/server.rb +3 -3
  123. data/test/OBV/Tree/client.rb +3 -3
  124. data/test/OBV/Tree/run_test.rb +1 -1
  125. data/test/OBV/Tree/server.rb +3 -3
  126. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -1
  127. data/test/OBV/Truncatable/client.rb +4 -4
  128. data/test/OBV/Truncatable/run_test.rb +1 -1
  129. data/test/OBV/Truncatable/server.rb +3 -3
  130. data/test/OBV/ValueBox/client.rb +44 -44
  131. data/test/OBV/ValueBox/run_test.rb +1 -1
  132. data/test/OBV/ValueBox/server.rb +29 -29
  133. data/test/Object/client.rb +4 -4
  134. data/test/Object/run_test.rb +1 -1
  135. data/test/Object/server.rb +3 -3
  136. data/test/POA/test.rb +3 -3
  137. data/test/Param_Test/client.rb +6 -6
  138. data/test/Param_Test/run_test.rb +1 -1
  139. data/test/Param_Test/server.rb +6 -6
  140. data/test/Performance/Simple/client.rb +3 -3
  141. data/test/Performance/Simple/run_test.rb +1 -1
  142. data/test/Performance/Simple/server.rb +3 -3
  143. data/test/Policies/test.rb +2 -3
  144. data/test/Timeout/client.rb +6 -6
  145. data/test/Timeout/run_test.rb +1 -1
  146. data/test/Timeout/server.rb +4 -4
  147. data/test/lib/assert.rb +0 -1
  148. data/test/lib/test.rb +14 -15
  149. data/test/test_runner.rb +5 -6
  150. metadata +4 -6
  151. data/ext/librpoa/srvreq_fix.cpp +0 -282
  152. data/ext/librpoa/srvreq_fix.h +0 -148
data/ext/librpoa/srvreq_fix.h DELETED
@@ -1,148 +0,0 @@
1
- /*--------------------------------------------------------------------
2
- # srvreq_fix.h - R2TAO CORBA Servant support
3
- #
4
- # Author: Martin Corino
5
- #
6
- # This program is free software; you can redistribute it and/or
7
- # modify it under the terms of the R2CORBA LICENSE which is
8
- # included with this program.
9
- #
10
- # Copyright (c) Remedy IT Expertise BV
11
- #------------------------------------------------------------------*/
12
-
13
- #ifndef __SRVREQ_FIX_H__
14
- #define __SRVREQ_FIX_H__
15
-
16
- #include "tao/TAO_Server_Request.h"
17
- #include "tao/CDR.h"
18
- #include "ace/Atomic_Op.h"
19
-
20
- namespace R2CORBA
21
- {
22
- class ServerRequest;
23
- typedef ServerRequest *ServerRequest_ptr;
24
-
25
- typedef TAO_Pseudo_Var_T<ServerRequest> ServerRequest_var;
26
- typedef TAO_Pseudo_Out_T<ServerRequest> ServerRequest_out;
27
-
28
- /**
29
- * @class ServerRequest
30
- *
31
- * @brief Class representing the CORBA ServerRequest pseudo-object.
32
- *
33
- * R2CORBA fixed version for older (< 6.0.2) TAO versions
34
- */
35
- class ServerRequest
36
- {
37
- public:
38
- ServerRequest (TAO_ServerRequest &orb_server_request);
39
-
40
- ~ServerRequest (void);
41
-
42
- void arguments (CORBA::NVList_ptr &list);
43
-
44
- void set_result (const CORBA::Any &value);
45
-
46
- void set_exception (const CORBA::Any &value);
47
-
48
- void dsi_marshal (void);
49
-
50
- CORBA::Context_ptr ctx (void) const;
51
-
52
- void ctx (CORBA::Context_ptr);
53
-
54
- const char *operation (void) const;
55
-
56
- static ServerRequest_ptr _duplicate (ServerRequest_ptr);
57
- static ServerRequest_ptr _nil (void);
58
-
59
- CORBA::ULong _incr_refcount (void);
60
- CORBA::ULong _decr_refcount (void);
61
-
62
- void _tao_lazy_evaluation (bool lazy_evaluation);
63
-
64
- int _tao_incoming_byte_order (void) const;
65
-
66
- void _tao_reply_byte_order (int byte_order);
67
-
68
- TAO_ServerRequest & _tao_server_request (void);
69
-
70
- void gateway_exception_reply (ACE_CString &raw_exception);
71
-
72
- typedef R2CORBA::ServerRequest_ptr _ptr_type;
73
- typedef R2CORBA::ServerRequest_var _var_type;
74
- typedef R2CORBA::ServerRequest_out _out_type;
75
-
76
- private:
77
- bool lazy_evaluation_;
78
- CORBA::Context_ptr ctx_;
79
- CORBA::NVList_ptr params_;
80
- CORBA::Any_ptr retval_;
81
- CORBA::Any_ptr exception_;
82
- ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
83
- TAO_ServerRequest &orb_server_request_;
84
- bool sent_gateway_exception_;
85
- };
86
- } // End R2CORBA namespace
87
-
88
- inline R2CORBA::ServerRequest_ptr
89
- R2CORBA::ServerRequest::_duplicate (R2CORBA::ServerRequest_ptr x)
90
- {
91
- if (x != 0)
92
- {
93
- x->_incr_refcount ();
94
- }
95
-
96
- return x;
97
- }
98
-
99
- inline R2CORBA::ServerRequest_ptr
100
- R2CORBA::ServerRequest::_nil (void)
101
- {
102
- return static_cast <R2CORBA::ServerRequest_ptr>(0);
103
- }
104
-
105
- inline CORBA::Context_ptr
106
- R2CORBA::ServerRequest::ctx (void) const
107
- {
108
- return this->ctx_;
109
- }
110
-
111
- inline void
112
- R2CORBA::ServerRequest::ctx (CORBA::Context_ptr ctx)
113
- {
114
- this->ctx_ = ctx;
115
- }
116
-
117
- inline const char *
118
- R2CORBA::ServerRequest::operation (void) const
119
- {
120
- return this->orb_server_request_.operation ();
121
- }
122
-
123
- inline void
124
- R2CORBA::ServerRequest::_tao_lazy_evaluation (bool lazy_evaluation)
125
- {
126
- this->lazy_evaluation_ = lazy_evaluation;
127
- }
128
-
129
- inline int
130
- R2CORBA::ServerRequest::_tao_incoming_byte_order (void) const
131
- {
132
- return this->orb_server_request_.incoming ()->byte_order ();
133
- }
134
-
135
- inline void
136
- R2CORBA::ServerRequest::_tao_reply_byte_order (int byte_order)
137
- {
138
- this->orb_server_request_.outgoing ()->reset_byte_order (byte_order);
139
- }
140
-
141
-
142
- inline TAO_ServerRequest &
143
- R2CORBA::ServerRequest::_tao_server_request (void)
144
- {
145
- return this->orb_server_request_;
146
- }
147
-
148
- #endif