blob: 76e27509848a423138d9e40f8eb8bfdd99a6f315 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
<?xml version="1.0"?>
<!-- Pluggable Messaging Specializations:
* When the concrete pluggable messaging is selected,
* this specialization removes the need for the Pluggable
* messaging interface completely from within TAO.
*
* @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
* $Id$
-->
<transform>
<!-- Define the module where there are multiple files -->
<module name="TAO/tao">
<file name="tao.mpc">
<!-- Remove Pluggable messaging include altogether -->
<substitute>
<search>GIOP_Message_Lite.cpp</search>
<replace>// GIOP_Message_Lite.cpp </replace>
</substitute>
<substitute>
<search>GIOP_Message_Lite.h</search>
<replace>// GIOP_Message_Lite.h</replace>
</substitute>
<substitute>
<search>Pluggable_Messaging.h</search>
<replace>// Pluggable_Messaging.h</replace>
</substitute>
<substitute>
<search>Pluggable_Messaging.cpp</search>
<replace>// Pluggable_Messaging.cpp</replace>
</substitute>
</file>
<file name="GIOP_Message_Base.h">
<!-- Remove Pluggable Messaging include directive -->
<remove>#include "tao/Pluggable_Messaging.h"</remove>
<!-- Remove all occurences of virtual keyword -->
<remove>virtual</remove>
<!-- Remove inheritance from Pluggable Messaging replace with
concrete class
-->
<remove>: public TAO_Pluggable_Messaging</remove>
<!-- Typedef the concrete type, GIOP_Message_Base as the
underlying pluggable messaging type
-->
<add>
<hook>MESSAGING_SPL_EXTERN_ADD_HOOK</hook>
<data>typedef TAO_GIOP_Message_Base TAO_Pluggable_Messaging;</data>
</add>
<!-- The method is_ready_for_bi_directional_giop is procted, this
should be made public -->
<substitute match-line="yes">
<!-- Operation signature -->
<search>int is_ready_for_bidirectional \(TAO_OutputCDR &msg\);</search>
<replace>
public:
int is_ready_for_bidirectional (TAO_OutputCDR &msg);
protected:
</replace>
</substitute>
</file>
<file name="IIOP_Connection_Handler.h">
<!-- remove forward decls -->
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="IIOP_Transport.h">
<!-- remove forward decls -->
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="TAO_Server_Request.h">
<!-- Remove Pluggable messaging include altogether -->
<substitute match-line="yes">
<search>class TAO_Pluggable_Messaging;</search>
<replace>#include "tao/GIOP_Message_Base.h"</replace>
</substitute>
</file>
<file name="TAO_Server_Request.cpp">
<!-- Remove Pluggable messaging include altogether -->
<remove>#include "Pluggable_Messaging.h"</remove>
</file>
<file name="Transport.h">
<!-- Remove Pluggable messaging include altogether -->
<substitute match-line="yes">
<search>class TAO_Pluggable_Messaging;</search>
<replace>#include "tao/GIOP_Message_Base.h"</replace>
</substitute>
</file>
<file name="Transport.cpp">
<remove>#include "Pluggable_Messaging.h"</remove>
</file>
</module>
<!-- Transformations to the Messaging Directory -->
<module name="TAO/tao/Messaging">
<file name="AMH_Response_Handler.h">
<substitute match-line="yes">
<search>class TAO_Pluggable_Messaging;</search>
<replace>#include "tao/GIOP_Message_Base.h"</replace>
</substitute>
</file>
<file name="AMH_Response_Handler.cpp">
<remove>#include "tao/Pluggable_Messaging.h"</remove>
</file>
<file name="AMH_Response_Handler.cpp">
<substitute match-line="yes">
<search>#include "tao/Pluggable_Messaging.h"</search>
<replace>#include "tao/GIOP_Message_Base.h"</replace>
</substitute>
</file>
<file name="Asynch_Invocation.cpp">
<remove>#include "tao/Pluggable_Messaging.h"</remove>
</file>
</module>
<module name="TAO/tao/Strategies">
<file name="DIOP_Connection_Handler.h">
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="DIOP_Transport.h">
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="DIOP_Transport.cpp">
<!-- Replace GIOP_Lite with GIOP -->
<comment>
<start-hook>MESSAGING_SPL_COMMENT_HOOK_START</start-hook>
<end-hook>MESSAGING_SPL_COMMENT_HOOK_END</end-hook>
</comment>
<add>
<hook>MESSAGING_SPL_COMMENT_HOOK_END</hook>
<data>
ACE_NEW (this->messaging_object_,
TAO_GIOP_Message_Base (orb_core,
ACE_MAX_DGRAM_SIZE));
</data>
</add>
<remove>#include "tao/GIOP_Message_Lite.h"</remove>
</file>
<file name="SHMIOP_Transport.h">
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="SHMIOP_Transport.cpp">
<remove>#include "tao/GIOP_Message_Lite.h"</remove>
<!-- Replace GIOP_Lite with GIOP -->
<comment>
<start-hook>MESSAGING_SPL_COMMENT_HOOK_START</start-hook>
<end-hook>MESSAGING_SPL_COMMENT_HOOK_END</end-hook>
</comment>
<add>
<hook>MESSAGING_SPL_COMMENT_HOOK_END</hook>
<data>
ACE_NEW (this->messaging_object_,
TAO_GIOP_Message_Base (orb_core,
ACE_MAX_DGRAM_SIZE));
</data>
</add>
</file>
<file name="UIOP_Connection_Handler.h">
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="UIOP_Connection_Handler.cpp">
<remove>#include "tao/GIOP_Message_Lite.h"</remove>
</file>
<file name="UIOP_Transport.h">
<remove>class TAO_Pluggable_Messaging;</remove>
</file>
<file name="UIOP_Transport.cpp">
<!-- Replace GIOP_Lite with GIOP -->
<comment>
<start-hook>MESSAGING_SPL_COMMENT_HOOK_START</start-hook>
<end-hook>MESSAGING_SPL_COMMENT_HOOK_END</end-hook>
</comment>
<add>
<hook>MESSAGING_SPL_COMMENT_HOOK_END</hook>
<data>
ACE_NEW (this->messaging_object_,
TAO_GIOP_Message_Base (orb_core,
ACE_MAX_DGRAM_SIZE));
</data>
</add>
<remove>#include "tao/GIOP_Message_Lite.h"</remove>
</file>
</module>
<module name="TAO/tao/DynamicInterface">
<file name="DII_Invocation_Adapter.cpp">
<substitute match-line="yes">
<search>#include "tao/Pluggable_Messaging.h"</search>
<replace>#include "tao/GIOP_Message_Base.h"</replace>
</substitute>
</file>
</module>
</transform>
|
