Project

General

Profile

« Previous | Next » 

Revision 22759920

Added by Cherian Mathew about 10 years ago

CdmApplicationRemoteConfiguration : added GeoService and @Component bean name
remotingApplicationContext : exclude CdmApplicationDefaultConfiguration from comp scan
remoting_services_security : cosmetic
httpInvokerServiceClients : added editGeoService
config.properties : corrected context path
localApplicationContext.xml : new config file to ease remoting switch
editorApplicationContext : simplified switch to remoting and back

View differences:

eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
7 7
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
8 8
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
9 9

  
10
  <!-- Default application context and term initializer -->
11
  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
12
  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
13
    <property name="omit" value="false" />
14
  </bean>
10
  <!-- Local application context and term initializer -->
11
  <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>
15 12
  
16 13
  <!-- Remote application context and term initializer -->
17
  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
18
<!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->
19
  
20
    
21
  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>
22
  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>
23
  
24
  <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>
25
  
26
  <context:component-scan base-package="eu/etaxonomy/cdm/remote">
27
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.DataSourceConfigurer" />
28
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.LoggingConfigurer" />
29
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.view\.PatternViewResolver" />
30
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.vaadin\..*" />
31
    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" /> 
32
  </context:component-scan>
33
  
14
<!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
34 15
  
35 16
</beans>

Also available in: Unified diff