Project

General

Profile

« Previous | Next » 

Revision 95b6f6f5

Added by Cherian Mathew almost 9 years ago

CdmApplicationRemoteController : refactoring code to simplify application context loading and making it performant
CdmModelCacher : removed unused method
CdmRemoteCacheManager : moved cache from disk to memory
httpInvokerServiceClients : lazy initializing all service beans
remotingApplicationContext : merged imported bean definition files into this one
CdmApplicationRemoteControllerTest : test for application controller
RemotingMonitoredGenericApplicationContext, RemotingMonitoredListableBeanFactory : removed since specific monitoring is not required in remoting
remoting_persistence_security.xml, remoting_services_security.xml : merged into remotingApplicationContext

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
4 4
  xmlns:tx="http://www.springframework.org/schema/tx"
5
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
5
  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
6
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"
8
    default-lazy-init="true">
8 9

  
9 10

  
10
  <bean id="agentService" 
11
  <bean id="agentService" lazy-init="true"
11 12
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
12 13
    <property name="serviceUrl">
13 14
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/agent.service</value>
......
21 22
    </property>
22 23
  </bean>
23 24

  
24
  <bean id="annotationService"
25
  <bean id="annotationService" lazy-init="true"
25 26
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
26 27
    <property name="serviceUrl">
27 28
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/annotation.service</value>
......
35 36
    </property>
36 37
  </bean>
37 38

  
38
  <bean id="auditeventService"
39
  <bean id="auditeventService" lazy-init="true"
39 40
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
40 41
    <property name="serviceUrl">
41 42
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/auditevent.service</value>
......
49 50
    </property>
50 51
  </bean>
51 52

  
52
  <bean id="classificationService"
53
  <bean id="classificationService" lazy-init="true"
53 54
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
54 55
    <property name="serviceUrl">
55 56
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/classification.service</value>
......
63 64
    </property>
64 65
  </bean>
65 66

  
66
  <bean id="collectionService"
67
  <bean id="collectionService" lazy-init="true"
67 68
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
68 69
    <property name="serviceUrl">
69 70
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/collection.service</value>
......
77 78
    </property>
78 79
  </bean>
79 80

  
80
  <bean id="commonService"
81
  <bean id="commonService" lazy-init="true"
81 82
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
82 83
    <property name="serviceUrl">
83 84
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/common.service</value>
......
91 92
    </property>
92 93
  </bean>
93 94

  
94
  <bean id="descriptionService"
95
  <bean id="descriptionService" lazy-init="true"
95 96
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
96 97
    <property name="serviceUrl">
97 98
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/description.service</value>
......
105 106
    </property>
106 107
  </bean>
107 108

  
108
  <bean id="editGeoService"
109
  <bean id="editGeoService" lazy-init="true"
109 110
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
110 111
    <property name="serviceUrl">
111 112
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/editgeo.service</value>
......
119 120
    </property>
120 121
  </bean>
121 122

  
122
  <bean id="featureNodeService"
123
  <bean id="featureNodeService" lazy-init="true"
123 124
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
124 125
    <property name="serviceUrl">
125 126
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featurenode.service</value>
......
133 134
    </property>
134 135
  </bean>
135 136

  
136
  <bean id="featureTreeService"
137
  <bean id="featureTreeService" lazy-init="true"
137 138
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
138 139
    <property name="serviceUrl">
139 140
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featuretree.service</value>
......
147 148
    </property>
148 149
  </bean>
149 150

  
150
  <bean id="groupService"
151
  <bean id="groupService" lazy-init="true"
151 152
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
152 153
    <property name="serviceUrl">
153 154
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/group.service</value>
......
161 162
    </property>
162 163
  </bean>
163 164

  
164
  <bean id="identificationKeyService"
165
  <bean id="identificationKeyService" lazy-init="true"
165 166
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
166 167
    <property name="serviceUrl">
167 168
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/identificationkey.service</value>
......
176 177
    </property>
177 178
  </bean>
178 179

  
179
  <bean id="locationService"
180
  <bean id="locationService" lazy-init="true"
180 181
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
181 182
    <property name="serviceUrl">
182 183
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/location.service</value>
......
190 191
    </property>
191 192
  </bean>
192 193

  
193
  <bean id="markerService"
194
  <bean id="markerService" lazy-init="true"
194 195
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
195 196
    <property name="serviceUrl">
196 197
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/marker.service</value>
......
204 205
    </property>
205 206
  </bean>
206 207

  
207
  <bean id="mediaService"
208
  <bean id="mediaService" lazy-init="true"
208 209
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
209 210
    <property name="serviceUrl">
210 211
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/media.service</value>
......
218 219
    </property>
219 220
  </bean>
220 221

  
221
  <bean id="nameService"
222
  <bean id="nameService" lazy-init="true"
222 223
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
223 224
    <property name="serviceUrl">
224 225
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/name.service</value>
......
232 233
    </property>
233 234
  </bean>
234 235

  
235
  <bean id="occurrenceService"
236
  <bean id="occurrenceService" lazy-init="true"
236 237
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
237 238
    <property name="serviceUrl">
238 239
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/occurrence.service</value>
......
246 247
    </property>
247 248
  </bean>
248 249

  
249
  <bean id="polytomousKeyNodeService"
250
  <bean id="polytomousKeyNodeService" lazy-init="true"
250 251
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
251 252
    <property name="serviceUrl">
252 253
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskeynode.service</value>
......
261 262
    </property>
262 263
  </bean>
263 264

  
264
  <bean id="polytomousKeyService"
265
  <bean id="polytomousKeyService" lazy-init="true"
265 266
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
266 267
    <property name="serviceUrl">
267 268
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskey.service</value>
......
275 276
    </property>
276 277
  </bean>
277 278

  
278
  <bean id="referenceService"
279
  <bean id="referenceService" lazy-init="true"
279 280
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
280 281
    <property name="serviceUrl">
281 282
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/reference.service</value>
......
294 295
    </property> <property name="serviceInterface"> <value>eu.etaxonomy.cdm.api.service.IService</value> 
295 296
    </property> </bean> -->
296 297

  
297
  <bean id="taxonNodeService"
298
  <bean id="taxonNodeService" lazy-init="true"
298 299
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
299 300
    <property name="serviceUrl">
300 301
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxonnode.service</value>
......
308 309
    </property>
309 310
  </bean>
310 311

  
311
  <bean id="taxonService"
312
  <bean id="taxonService" lazy-init="true"
312 313
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
313 314
    <property name="serviceUrl">
314 315
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxon.service</value>
......
322 323
    </property>
323 324
  </bean>
324 325

  
325
  <bean id="termService"
326
  <bean id="termService" lazy-init="true"
326 327
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
327 328
    <property name="serviceUrl">
328 329
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/term.service</value>
......
335 336
    </property>
336 337
  </bean>
337 338

  
338
  <bean id="userService"
339
  <bean id="userService" lazy-init="true"
339 340
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
340 341
    <property name="serviceUrl">
341 342
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting-public/user.service</value>
......
349 350
    </property>
350 351
  </bean>
351 352

  
352
  <bean id="vocabularyService"
353
  <bean id="vocabularyService" lazy-init="true"
353 354
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
354 355
    <property name="serviceUrl">
355 356
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/vocabulary.service</value>
......
363 364
    </property>
364 365
  </bean>
365 366

  
366
  <bean id="workingSetService"
367
  <bean id="workingSetService" lazy-init="true"
367 368
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
368 369
    <property name="serviceUrl">
369 370
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/workingset.service</value>
......
377 378
    </property>
378 379
  </bean>
379 380

  
380
  <bean id="grantedAuthorityService"
381
  <bean id="grantedAuthorityService" lazy-init="true"
381 382
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
382 383
    <property name="serviceUrl">
383 384
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/grantedauthority.service</value>
......
392 393
    </property>
393 394
  </bean>
394 395

  
395
  <bean id="databaseService"
396
  <bean id="databaseService" lazy-init="true"
396 397
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
397 398
    <property name="serviceUrl">
398 399
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting-public/database.service</value>
......
406 407
    </property>
407 408
  </bean>
408 409

  
409
  <bean id="lsidAuthorityService"
410
  <bean id="lsidAuthorityService" lazy-init="true"
410 411
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
411 412
    <property name="serviceUrl">
412 413
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidauthoruty.service</value>
......
421 422
    </property>
422 423
  </bean>
423 424

  
424
  <bean id="lsidMetadataService"
425
  <bean id="lsidMetadataService" lazy-init="true"
425 426
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
426 427
    <property name="serviceUrl">
427 428
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidmetadata.service</value>
......
436 437
    </property>
437 438
  </bean>
438 439

  
439
  <bean id="lsiDataService"
440
  <bean id="lsiDataService" lazy-init="true"
440 441
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
441 442
    <property name="serviceUrl">
442 443
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsiddata.service</value>
......
450 451
    </property>
451 452
  </bean>
452 453

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

  
468
  <bean id="primerService"
469
  <bean id="primerService" lazy-init="true"
469 470
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
470 471
    <property name="serviceUrl">
471 472
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/primer.service</value>
......
480 481
    </property>
481 482
  </bean>
482 483

  
483
  <bean id="amplificationService"
484
  <bean id="amplificationService" lazy-init="true"
484 485
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
485 486
    <property name="serviceUrl">
486 487
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/amplification.service</value>
......
495 496
    </property>
496 497
  </bean>
497 498

  
498
  <bean id="sequenceService"
499
  <bean id="sequenceService" lazy-init="true"
499 500
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
500 501
    <property name="serviceUrl">
501 502
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/sequence.service</value>
......
510 511
    </property>
511 512
  </bean>
512 513

  
513
  <bean id="entityValidationService"
514
  <bean id="entityValidationService" lazy-init="true"
514 515
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
515 516
    <property name="serviceUrl">
516 517
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityvalidation.service</value>
......
525 526
    </property>
526 527
  </bean>
527 528

  
528
  <bean id="entityConstraintViolationService"
529
  <bean id="entityConstraintViolationService" lazy-init="true"
529 530
    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">
530 531
    <property name="serviceUrl">
531 532
      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityconstraintviolation.service</value>

Also available in: Unified diff