Project

General

Profile

« Previous | Next » 

Revision 44acc7e5

Added by Cherian Mathew almost 9 years ago

#5028,#5032 Add implementation and use of new test service and Set http invoker read timeout to 0 (never )

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
23 23
import org.springframework.core.io.ClassPathResource;
24 24
import org.springframework.core.io.Resource;
25 25

  
26
import eu.etaxonomy.cdm.api.service.ITestService;
26 27
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
27 28
import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
28 29
import eu.etaxonomy.taxeditor.remoting.cache.CdmRemoteCacheManager;
......
202 203
    public ICdmEntitySessionManager getCdmEntitySessionManager() {
203 204
        return ((CdmApplicationRemoteConfiguration)configuration).getCdmEntitySessionManager();
204 205
    }
206

  
207

  
208
    public ITestService getTestService(){
209
        return (ITestService) getBean("testService");
210
    }
205 211
}
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
7 7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
8 8

  
9 9

  
10
  <bean id="agentService" lazy-init="true" 
10
  <bean id="agentService" lazy-init="true"
11 11
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
12 12
    <property name="serviceUrl">
13
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/agent.service</value>
13
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/agent.service
14
      </value>
14 15
    </property>
15 16
    <property name="serviceInterface">
16 17
      <value>eu.etaxonomy.cdm.api.service.IAgentService</value>
17 18
    </property>
18 19
    <property name="httpInvokerRequestExecutor">
19
      <bean
20
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
20
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
21
        <property name="readTimeout" value="0" />
22
      </bean>
21 23
    </property>
22 24
  </bean>
23 25

  
24
  <bean id="annotationService" lazy-init="true" 
26
  <bean id="annotationService" lazy-init="true"
25 27
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
26 28
    <property name="serviceUrl">
27
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/annotation.service</value>
29
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/annotation.service
30
      </value>
28 31
    </property>
29 32
    <property name="serviceInterface">
30 33
      <value>eu.etaxonomy.cdm.api.service.IAnnotationService</value>
31 34
    </property>
32 35
    <property name="httpInvokerRequestExecutor">
33
      <bean
34
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
36
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
37
        <property name="readTimeout" value="0" />
38
      </bean>
35 39
    </property>
36 40
  </bean>
37 41

  
38
  <bean id="auditeventService" lazy-init="true" 
42
  <bean id="auditeventService" lazy-init="true"
39 43
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
40 44
    <property name="serviceUrl">
41
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/auditevent.service</value>
45
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/auditevent.service
46
      </value>
42 47
    </property>
43 48
    <property name="serviceInterface">
44 49
      <value>eu.etaxonomy.cdm.api.service.IAuditEventService</value>
45 50
    </property>
46 51
    <property name="httpInvokerRequestExecutor">
47
      <bean
48
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
52
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
53
        <property name="readTimeout" value="0" />
54
      </bean>
49 55
    </property>
50 56
  </bean>
51 57

  
52
  <bean id="classificationService" lazy-init="true" 
58
  <bean id="classificationService" lazy-init="true"
53 59
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
54 60
    <property name="serviceUrl">
55
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/classification.service</value>
61
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/classification.service
62
      </value>
56 63
    </property>
57 64
    <property name="serviceInterface">
58 65
      <value>eu.etaxonomy.cdm.api.service.IClassificationService</value>
59 66
    </property>
60 67
    <property name="httpInvokerRequestExecutor">
61
      <bean
62
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
68
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
69
        <property name="readTimeout" value="0" />
70
      </bean>
63 71
    </property>
64 72
  </bean>
65 73

  
66
  <bean id="collectionService" lazy-init="true" 
74
  <bean id="collectionService" lazy-init="true"
67 75
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
68 76
    <property name="serviceUrl">
69
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/collection.service</value>
77
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/collection.service
78
      </value>
70 79
    </property>
71 80
    <property name="serviceInterface">
72 81
      <value>eu.etaxonomy.cdm.api.service.ICollectionService</value>
73 82
    </property>
74 83
    <property name="httpInvokerRequestExecutor">
75
      <bean
76
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
84
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
85
        <property name="readTimeout" value="0" />
86
      </bean>
77 87
    </property>
78 88
  </bean>
79 89

  
80
  <bean id="commonService" lazy-init="true" 
90
  <bean id="commonService" lazy-init="true"
81 91
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
82 92
    <property name="serviceUrl">
83
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/common.service</value>
93
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/common.service
94
      </value>
84 95
    </property>
85 96
    <property name="serviceInterface">
86 97
      <value>eu.etaxonomy.cdm.api.service.ICommonService</value>
87 98
    </property>
88 99
    <property name="httpInvokerRequestExecutor">
89
      <bean
90
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
100
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
101
        <property name="readTimeout" value="0" />
102
      </bean>
91 103
    </property>
92 104
  </bean>
93 105

  
94
  <bean id="descriptionService" lazy-init="true" 
106
  <bean id="descriptionService" lazy-init="true"
95 107
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
96 108
    <property name="serviceUrl">
97
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/description.service</value>
109
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/description.service
110
      </value>
98 111
    </property>
99 112
    <property name="serviceInterface">
100 113
      <value>eu.etaxonomy.cdm.api.service.IDescriptionService</value>
101 114
    </property>
102 115
    <property name="httpInvokerRequestExecutor">
103
      <bean
104
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
116
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
117
        <property name="readTimeout" value="0" />
118
      </bean>
105 119
    </property>
106 120
  </bean>
107 121

  
108
  <bean id="editGeoService" lazy-init="true" 
122
  <bean id="editGeoService" lazy-init="true"
109 123
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
110 124
    <property name="serviceUrl">
111
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/editgeo.service</value>
125
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/editgeo.service
126
      </value>
112 127
    </property>
113 128
    <property name="serviceInterface">
114 129
      <value>eu.etaxonomy.cdm.ext.geo.IEditGeoService</value>
115 130
    </property>
116 131
    <property name="httpInvokerRequestExecutor">
117
      <bean
118
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
132
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
133
        <property name="readTimeout" value="0" />
134
      </bean>
119 135
    </property>
120 136
  </bean>
121 137

  
122
  <bean id="featureNodeService" lazy-init="true" 
138
  <bean id="featureNodeService" lazy-init="true"
123 139
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
124 140
    <property name="serviceUrl">
125
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featurenode.service</value>
141
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featurenode.service
142
      </value>
126 143
    </property>
127 144
    <property name="serviceInterface">
128 145
      <value>eu.etaxonomy.cdm.api.service.IFeatureNodeService</value>
129 146
    </property>
130 147
    <property name="httpInvokerRequestExecutor">
131
      <bean
132
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
148
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
149
        <property name="readTimeout" value="0" />
150
      </bean>
133 151
    </property>
134 152
  </bean>
135 153

  
136
  <bean id="featureTreeService" lazy-init="true" 
154
  <bean id="featureTreeService" lazy-init="true"
137 155
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
138 156
    <property name="serviceUrl">
139
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featuretree.service</value>
157
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featuretree.service
158
      </value>
140 159
    </property>
141 160
    <property name="serviceInterface">
142 161
      <value>eu.etaxonomy.cdm.api.service.IFeatureTreeService</value>
143 162
    </property>
144 163
    <property name="httpInvokerRequestExecutor">
145
      <bean
146
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
164
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
165
        <property name="readTimeout" value="0" />
166
      </bean>
147 167
    </property>
148 168
  </bean>
149 169

  
150
  <bean id="groupService" lazy-init="true" 
170
  <bean id="groupService" lazy-init="true"
151 171
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
152 172
    <property name="serviceUrl">
153
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/group.service</value>
173
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/group.service
174
      </value>
154 175
    </property>
155 176
    <property name="serviceInterface">
156 177
      <value>eu.etaxonomy.cdm.api.service.IGroupService</value>
157 178
    </property>
158 179
    <property name="httpInvokerRequestExecutor">
159
      <bean
160
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
180
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
181
        <property name="readTimeout" value="0" />
182
      </bean>
161 183
    </property>
162 184
  </bean>
163 185

  
164
  <bean id="identificationKeyService" lazy-init="true" 
186
  <bean id="identificationKeyService" lazy-init="true"
165 187
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
166 188
    <property name="serviceUrl">
167
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/identificationkey.service</value>
189
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/identificationkey.service
190
      </value>
168 191
    </property>
169 192
    <property name="serviceInterface">
170 193
      <value>eu.etaxonomy.cdm.api.service.IIdentificationKeyService
171 194
      </value>
172 195
    </property>
173 196
    <property name="httpInvokerRequestExecutor">
174
      <bean
175
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
197
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
198
        <property name="readTimeout" value="0" />
199
      </bean>
176 200
    </property>
177 201
  </bean>
178 202

  
179
  <bean id="locationService" lazy-init="true" 
203
  <bean id="locationService" lazy-init="true"
180 204
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
181 205
    <property name="serviceUrl">
182
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/location.service</value>
206
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/location.service
207
      </value>
183 208
    </property>
184 209
    <property name="serviceInterface">
185 210
      <value>eu.etaxonomy.cdm.api.service.ILocationService</value>
186 211
    </property>
187 212
    <property name="httpInvokerRequestExecutor">
188
      <bean
189
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
213
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
214
        <property name="readTimeout" value="0" />
215
      </bean>
190 216
    </property>
191 217
  </bean>
192 218

  
193
  <bean id="markerService" lazy-init="true" 
219
  <bean id="markerService" lazy-init="true"
194 220
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
195 221
    <property name="serviceUrl">
196
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/marker.service</value>
222
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/marker.service
223
      </value>
197 224
    </property>
198 225
    <property name="serviceInterface">
199 226
      <value>eu.etaxonomy.cdm.api.service.IMarkerService</value>
200 227
    </property>
201 228
    <property name="httpInvokerRequestExecutor">
202
      <bean
203
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
229
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
230
        <property name="readTimeout" value="0" />
231
      </bean>
204 232
    </property>
205 233
  </bean>
206 234

  
207
  <bean id="mediaService" lazy-init="true" 
235
  <bean id="mediaService" lazy-init="true"
208 236
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
209 237
    <property name="serviceUrl">
210
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/media.service</value>
238
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/media.service
239
      </value>
211 240
    </property>
212 241
    <property name="serviceInterface">
213 242
      <value>eu.etaxonomy.cdm.api.service.IMediaService</value>
214 243
    </property>
215 244
    <property name="httpInvokerRequestExecutor">
216
      <bean
217
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
245
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
246
        <property name="readTimeout" value="0" />
247
      </bean>
218 248
    </property>
219 249
  </bean>
220 250

  
221
  <bean id="nameService" lazy-init="true" 
251
  <bean id="nameService" lazy-init="true"
222 252
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
223 253
    <property name="serviceUrl">
224
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/name.service</value>
254
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/name.service
255
      </value>
225 256
    </property>
226 257
    <property name="serviceInterface">
227 258
      <value>eu.etaxonomy.cdm.api.service.INameService</value>
228 259
    </property>
229 260
    <property name="httpInvokerRequestExecutor">
230
      <bean
231
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
261
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
262
        <property name="readTimeout" value="0" />
263
      </bean>
232 264
    </property>
233 265
  </bean>
234 266

  
235
  <bean id="occurrenceService" lazy-init="true" 
267
  <bean id="occurrenceService" lazy-init="true"
236 268
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
237 269
    <property name="serviceUrl">
238
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/occurrence.service</value>
270
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/occurrence.service
271
      </value>
239 272
    </property>
240 273
    <property name="serviceInterface">
241 274
      <value>eu.etaxonomy.cdm.api.service.IOccurrenceService</value>
242 275
    </property>
243 276
    <property name="httpInvokerRequestExecutor">
244
      <bean
245
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
277
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
278
        <property name="readTimeout" value="0" />
279
      </bean>
246 280
    </property>
247 281
  </bean>
248 282

  
249
  <bean id="polytomousKeyNodeService" lazy-init="true" 
283
  <bean id="polytomousKeyNodeService" lazy-init="true"
250 284
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
251 285
    <property name="serviceUrl">
252
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskeynode.service</value>
286
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskeynode.service
287
      </value>
253 288
    </property>
254 289
    <property name="serviceInterface">
255 290
      <value>eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService
256 291
      </value>
257 292
    </property>
258 293
    <property name="httpInvokerRequestExecutor">
259
      <bean
260
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
294
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
295
        <property name="readTimeout" value="0" />
296
      </bean>
261 297
    </property>
262 298
  </bean>
263 299

  
264
  <bean id="polytomousKeyService" lazy-init="true" 
300
  <bean id="polytomousKeyService" lazy-init="true"
265 301
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
266 302
    <property name="serviceUrl">
267
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskey.service</value>
303
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskey.service
304
      </value>
268 305
    </property>
269 306
    <property name="serviceInterface">
270 307
      <value>eu.etaxonomy.cdm.api.service.IPolytomousKeyService</value>
271 308
    </property>
272 309
    <property name="httpInvokerRequestExecutor">
273
      <bean
274
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
310
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
311
        <property name="readTimeout" value="0" />
312
      </bean>
275 313
    </property>
276 314
  </bean>
277 315

  
278
  <bean id="referenceService" lazy-init="true" 
316
  <bean id="referenceService" lazy-init="true"
279 317
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
280 318
    <property name="serviceUrl">
281
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/reference.service</value>
319
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/reference.service
320
      </value>
282 321
    </property>
283 322
    <property name="serviceInterface">
284 323
      <value>eu.etaxonomy.cdm.api.service.IReferenceService</value>
285 324
    </property>
286 325
    <property name="httpInvokerRequestExecutor">
287
      <bean
288
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
326
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
327
        <property name="readTimeout" value="0" />
328
      </bean>
289 329
    </property>
290 330
  </bean>
291 331

  
292
  <!-- <bean id="serviceService" lazy-init="true" class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean"> 
293
    <property name="serviceUrl"> <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/service.service</value> 
294
    </property> <property name="serviceInterface"> <value>eu.etaxonomy.cdm.api.service.IService</value> 
295
    </property> </bean> -->
296

  
297
  <bean id="taxonNodeService" lazy-init="true" 
332
  <bean id="taxonNodeService" lazy-init="true"
298 333
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
299 334
    <property name="serviceUrl">
300
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxonnode.service</value>
335
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxonnode.service
336
      </value>
301 337
    </property>
302 338
    <property name="serviceInterface">
303 339
      <value>eu.etaxonomy.cdm.api.service.ITaxonNodeService</value>
304 340
    </property>
305 341
    <property name="httpInvokerRequestExecutor">
306
      <bean
307
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
342
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
343
        <property name="readTimeout" value="0" />
344
      </bean>
308 345
    </property>
309 346
  </bean>
310 347

  
311
  <bean id="taxonService" lazy-init="true" 
348
  <bean id="taxonService" lazy-init="true"
312 349
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
313 350
    <property name="serviceUrl">
314
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxon.service</value>
351
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxon.service
352
      </value>
315 353
    </property>
316 354
    <property name="serviceInterface">
317 355
      <value>eu.etaxonomy.cdm.api.service.ITaxonService</value>
318 356
    </property>
319 357
    <property name="httpInvokerRequestExecutor">
320
      <bean
321
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
358
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
359
        <property name="readTimeout" value="0" />
360
      </bean>
322 361
    </property>
323 362
  </bean>
324 363

  
325
  <bean id="termService" lazy-init="true" 
364
  <bean id="termService" lazy-init="true"
326 365
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
327 366
    <property name="serviceUrl">
328
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/term.service</value>
367
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/term.service
368
      </value>
329 369
    </property>
330 370
    <property name="serviceInterface">
331 371
      <value>eu.etaxonomy.cdm.api.service.ITermService</value>
332 372
    </property>
333 373
    <property name="httpInvokerRequestExecutor">
334
      <bean class="eu.etaxonomy.taxeditor.service.TermServiceRequestExecutor" />
374
      <bean class="eu.etaxonomy.taxeditor.service.TermServiceRequestExecutor">
375
        <property name="readTimeout" value="0" />
376
      </bean>
335 377
    </property>
336 378
  </bean>
337 379

  
338
  <bean id="userService" lazy-init="true" 
380
  <bean id="userService" lazy-init="true"
339 381
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
340 382
    <property name="serviceUrl">
341
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting-public/user.service</value>
383
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting-public/user.service
384
      </value>
342 385
    </property>
343 386
    <property name="serviceInterface">
344 387
      <value>eu.etaxonomy.cdm.api.service.IUserService</value>
345 388
    </property>
346 389
    <property name="httpInvokerRequestExecutor">
347 390
      <bean
348
        class="org.springframework.remoting.httpinvoker.SimpleHttpInvokerRequestExecutor" />
391
        class="org.springframework.remoting.httpinvoker.SimpleHttpInvokerRequestExecutor">
392
        <property name="readTimeout" value="0" />
393
      </bean>
349 394
    </property>
350 395
  </bean>
351 396

  
352
  <bean id="vocabularyService" lazy-init="true" 
397
  <bean id="vocabularyService" lazy-init="true"
353 398
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
354 399
    <property name="serviceUrl">
355
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/vocabulary.service</value>
400
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/vocabulary.service
401
      </value>
356 402
    </property>
357 403
    <property name="serviceInterface">
358 404
      <value>eu.etaxonomy.cdm.api.service.IVocabularyService</value>
359 405
    </property>
360 406
    <property name="httpInvokerRequestExecutor">
361
      <bean
362
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
407
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
408
        <property name="readTimeout" value="0" />
409
      </bean>
363 410
    </property>
364 411
  </bean>
365 412

  
366
  <bean id="workingSetService" lazy-init="true" 
413
  <bean id="workingSetService" lazy-init="true"
367 414
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
368 415
    <property name="serviceUrl">
369
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/workingset.service</value>
416
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/workingset.service
417
      </value>
370 418
    </property>
371 419
    <property name="serviceInterface">
372 420
      <value>eu.etaxonomy.cdm.api.service.IWorkingSetService</value>
373 421
    </property>
374 422
    <property name="httpInvokerRequestExecutor">
375
      <bean
376
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
423
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
424
        <property name="readTimeout" value="0" />
425
      </bean>
377 426
    </property>
378 427
  </bean>
379 428

  
380
  <bean id="grantedAuthorityService" lazy-init="true" 
429
  <bean id="grantedAuthorityService" lazy-init="true"
381 430
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
382 431
    <property name="serviceUrl">
383
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/grantedauthority.service</value>
432
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/grantedauthority.service
433
      </value>
384 434
    </property>
385 435
    <property name="serviceInterface">
386 436
      <value>eu.etaxonomy.cdm.api.service.IGrantedAuthorityService
387 437
      </value>
388 438
    </property>
389 439
    <property name="httpInvokerRequestExecutor">
390
      <bean
391
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
440
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
441
        <property name="readTimeout" value="0" />
442
      </bean>
392 443
    </property>
393 444
  </bean>
394 445

  
395
  <bean id="databaseService" lazy-init="true" 
446
  <bean id="databaseService" lazy-init="true"
396 447
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
397 448
    <property name="serviceUrl">
398
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/database.service</value>
449
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/database.service
450
      </value>
399 451
    </property>
400 452
    <property name="serviceInterface">
401 453
      <value>eu.etaxonomy.cdm.api.service.IDatabaseService</value>
402 454
    </property>
403 455
    <property name="httpInvokerRequestExecutor">
404
      <bean
405
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
456
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
457
        <property name="readTimeout" value="0" />
458
      </bean>
406 459
    </property>
407 460
  </bean>
408 461

  
409
  <bean id="lsidAuthorityService" lazy-init="true" 
462
  <bean id="lsidAuthorityService" lazy-init="true"
410 463
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
411 464
    <property name="serviceUrl">
412
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidauthoruty.service</value>
465
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidauthoruty.service
466
      </value>
413 467
    </property>
414 468
    <property name="serviceInterface">
415 469
      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDAuthorityService
416 470
      </value>
417 471
    </property>
418 472
    <property name="httpInvokerRequestExecutor">
419
      <bean
420
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
473
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
474
        <property name="readTimeout" value="0" />
475
      </bean>
421 476
    </property>
422 477
  </bean>
423 478

  
424
  <bean id="lsidMetadataService" lazy-init="true" 
479
  <bean id="lsidMetadataService" lazy-init="true"
425 480
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
426 481
    <property name="serviceUrl">
427
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidmetadata.service</value>
482
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidmetadata.service
483
      </value>
428 484
    </property>
429 485
    <property name="serviceInterface">
430 486
      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDMetadataService
431 487
      </value>
432 488
    </property>
433 489
    <property name="httpInvokerRequestExecutor">
434
      <bean
435
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
490
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
491
        <property name="readTimeout" value="0" />
492
      </bean>
436 493
    </property>
437 494
  </bean>
438 495

  
439
  <bean id="lsiDataService" lazy-init="true" 
496
  <bean id="lsiDataService" lazy-init="true"
440 497
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
441 498
    <property name="serviceUrl">
442
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsiddata.service</value>
499
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsiddata.service
500
      </value>
443 501
    </property>
444 502
    <property name="serviceInterface">
445 503
      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDDataService</value>
446 504
    </property>
447 505
    <property name="httpInvokerRequestExecutor">
448
      <bean
449
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
506
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
507
        <property name="readTimeout" value="0" />
508
      </bean>
450 509
    </property>
451 510
  </bean>
452 511

  
453
<!--   <bean id="providerManager" -->
454
<!--     class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean"> -->
455
<!--     <property name="serviceUrl"> -->
456
<!--       <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/authenticationManager.service</value> -->
457
<!--     </property> -->
458
<!--     <property name="serviceInterface"> -->
459
<!--       <value>org.springframework.security.authentication.AuthenticationManager -->
460
<!--       </value> -->
461
<!--     </property> -->
462
<!--     <property name="httpInvokerRequestExecutor"> -->
463
<!--       <bean -->
464
<!--         class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" /> -->
465
<!--     </property> -->
466
<!--   </bean> -->
467 512

  
468
  <bean id="primerService" lazy-init="true" 
513

  
514
  <bean id="primerService" lazy-init="true"
469 515
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
470 516
    <property name="serviceUrl">
471
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/primer.service</value>
517
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/primer.service
518
      </value>
472 519
    </property>
473 520
    <property name="serviceInterface">
474 521
      <value>eu.etaxonomy.cdm.api.service.molecular.IPrimerService
475 522
      </value>
476 523
    </property>
477 524
    <property name="httpInvokerRequestExecutor">
478
      <bean
479
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
525
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
526
        <property name="readTimeout" value="0" />
527
      </bean>
480 528
    </property>
481 529
  </bean>
482 530

  
483
  <bean id="amplificationService" lazy-init="true" 
531
  <bean id="amplificationService" lazy-init="true"
484 532
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
485 533
    <property name="serviceUrl">
486
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/amplification.service</value>
534
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/amplification.service
535
      </value>
487 536
    </property>
488 537
    <property name="serviceInterface">
489 538
      <value>eu.etaxonomy.cdm.api.service.molecular.IAmplificationService
490 539
      </value>
491 540
    </property>
492 541
    <property name="httpInvokerRequestExecutor">
493
      <bean
494
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
542
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
543
        <property name="readTimeout" value="0" />
544
      </bean>
495 545
    </property>
496 546
  </bean>
497 547

  
498
  <bean id="sequenceService" lazy-init="true" 
548
  <bean id="sequenceService" lazy-init="true"
499 549
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
500 550
    <property name="serviceUrl">
501
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/sequence.service</value>
551
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/sequence.service
552
      </value>
502 553
    </property>
503 554
    <property name="serviceInterface">
504 555
      <value>eu.etaxonomy.cdm.api.service.molecular.ISequenceService
505 556
      </value>
506 557
    </property>
507 558
    <property name="httpInvokerRequestExecutor">
508
      <bean
509
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
559
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
560
        <property name="readTimeout" value="0" />
561
      </bean>
510 562
    </property>
511 563
  </bean>
512 564

  
513
  <bean id="entityValidationService" lazy-init="true" 
565
  <bean id="entityValidationService" lazy-init="true"
514 566
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
515 567
    <property name="serviceUrl">
516
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityvalidation.service</value>
568
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityvalidation.service
569
      </value>
517 570
    </property>
518 571
    <property name="serviceInterface">
519 572
      <value>eu.etaxonomy.cdm.api.service.IEntityValidationService
520 573
      </value>
521 574
    </property>
522 575
    <property name="httpInvokerRequestExecutor">
523
      <bean
524
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
576
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
577
        <property name="readTimeout" value="0" />
578
      </bean>
525 579
    </property>
526 580
  </bean>
527 581

  
528
  <bean id="entityConstraintViolationService" lazy-init="true" 
582
  <bean id="entityConstraintViolationService" lazy-init="true"
529 583
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
530 584
    <property name="serviceUrl">
531
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityconstraintviolation.service</value>
585
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityconstraintviolation.service
586
      </value>
532 587
    </property>
533 588
    <property name="serviceInterface">
534 589
      <value>eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService
535 590
      </value>
536 591
    </property>
537 592
    <property name="httpInvokerRequestExecutor">
538
      <bean
539
        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" />
593
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
594
        <property name="readTimeout" value="0" />
595
      </bean>
540 596
    </property>
541 597
  </bean>
542 598

  
599
  <bean id="testService" lazy-init="true"
600
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
601
    <property name="serviceUrl">
602
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/test.service
603
      </value>
604
    </property>
605
    <property name="serviceInterface">
606
      <value>eu.etaxonomy.cdm.api.service.ITestService
607
      </value>
608
    </property>
609
    <property name="httpInvokerRequestExecutor">
610
      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">
611
        <property name="readTimeout" value="0" />
612
      </bean>
613
    </property>
614

  
615
  </bean>
616

  
543 617

  
544 618

  
545 619
</beans>
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/HttpInvokerServicesTest.java
10 10

  
11 11
import org.apache.log4j.Logger;
12 12
import org.junit.Assert;
13
import org.junit.Ignore;
13 14
import org.junit.Test;
14 15

  
16
import eu.etaxonomy.cdm.api.service.ITestService;
15 17
import eu.etaxonomy.cdm.config.CdmSourceException;
16 18
import eu.etaxonomy.cdm.model.description.PolytomousKey;
17 19

  
......
22 24
public class HttpInvokerServicesTest extends BaseRemotingTest {
23 25
    private static final Logger logger = Logger.getLogger(HttpInvokerServicesTest.class);
24 26

  
27
    ITestService testService =  getRemoteApplicationController().getTestService();
25 28

  
26 29
    @Test
27 30
    public void whenCallingMethodsOnRemoteServicesThenSucceed() {
......
39 42
        getRemoteApplicationController().getPolytomousKeyService().list(PolytomousKey.class, null, null, null, null);
40 43
    }
41 44

  
45
    // should be kept at ignore and only used for manual testing
46
    // otherwise tests will take too much time
47
    @Ignore
48
    @Test
49
    public void testDisableReadTimeout() throws InterruptedException  {
50
        testService.waitFor((long) 120000.0);
51
    }
52

  
42 53
}
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ITestService.java
1
package eu.etaxonomy.taxeditor.service;
2

  
3
public interface ITestService {
4

  
5
	public String test(String arg);
6
	public String test(Object arg);
7
	public String notest();
8
}
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/TargetTestService.java
1
package eu.etaxonomy.taxeditor.service;
2

  
3

  
4
public class TargetTestService {
5
	
6
	public static String test(String arg) {
7
		//String value = testService.test(arg);
8
		return "Overridden " + arg;
9
	}
10
	
11
	public static String test(Object arg) {
12
		//String value = testService.test(arg);
13
		return "Overridden " + arg;
14
	}
15
}
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/TestService.java
1
package eu.etaxonomy.taxeditor.service;
2

  
3
public class TestService implements ITestService {
4

  
5
	@Override
6
	public String test(String arg) {
7
		return "String : " + arg;
8
	}
9

  
10
	@Override
11
	public String test(Object arg) {
12
		return "Object : " + arg.toString();
13
	}
14

  
15
	@Override
16
	public String notest() {		
17
		return "No Test";
18
	}
19

  
20
}

Also available in: Unified diff