Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-services/src/main/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml
8 8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
9 9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
10 10

  
11
    <import resource="classpath:/eu/etaxonomy/cdm/services.xml"/> 
11
  <import resource="classpath:/eu/etaxonomy/cdm/services.xml"/> 
12 12
	<import resource="classpath:/eu/etaxonomy/cdm/defaultSecurityContext.xml"/>
13
 <!-- <import resource="classpath:/eu/etaxonomy/cdm/spelling.xml"/> -->
13
  <!-- <import resource="classpath:/eu/etaxonomy/cdm/spelling.xml"/> -->
14 14

  
15 15
	
16 16
	<!-- includes service beans e.g. in eu/etaxonomy/cdm/api -->
17
	<context:component-scan base-package="eu/etaxonomy/cdm/api/service"/>
18
<!--	 	<context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.service\.UserService"/>-->
19
<!--    </context:component-scan>-->
17
	<context:component-scan base-package="eu/etaxonomy/cdm/api/service" >
18
	<!--  <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.api\.service\.UserService"/> -->
19
    </context:component-scan>
20 20
	<context:component-scan base-package="eu/etaxonomy/cdm/api/application"/>
21 21
	
22 22
	<!-- EditGeoService was moved to ext. Therefore it will not be found by the default component scan.
......
28 28
	<!-- TODO move to io -->
29 29
	<context:component-scan base-package="eu/etaxonomy/cdm/io"/>
30 30

  
31
    <!-- enable the configuration of transactional behavior based on annotations -->
32
    <tx:annotation-driven transaction-manager="transactionManager"/>
31
  <!-- enable the configuration of transactional behavior based on annotations -->
32
  <tx:annotation-driven transaction-manager="transactionManager"/>
33 33
 
34 34
</beans>

Also available in: Unified diff