Project

General

Profile

« Previous | Next » 

Revision 19d5d18b

Added by Andreas Müller over 3 years ago

ref #9204 adapt all spring application context xml configuration files to spring schema version 4.3

View differences:

cdmlib-ext/src/main/resources/eu/etaxonomy/cdm/httpInvokerExtServices.xml
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 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10

  
11 11
  <!-- The beans for the implementation classes are declared with the @Service 
cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
    xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    ">
......
38 38
        <constructor-arg>
39 39
            <list>
40 40
                <bean class="org.springframework.security.authentication.TestingAuthenticationProvider"/>
41
                <ref local="daoAuthenticationProvider"/>
41
                <ref bean="daoAuthenticationProvider"/>
42 42
            </list>
43 43
        </constructor-arg>
44 44
    </bean>
cdmlib-io/src/main/resources/eu/etaxonomy/cdm/defaultIoApplicationContext.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5
  xmlns:security="http://www.springframework.org/schema/security"
6
  
5 7
  xsi:schemaLocation=
6
      "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
8

  
9
    <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
8
      "http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
9
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10
       http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd">
11
    
12
  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
10 13

  
11 14
  <!-- TODO move to defaultApplicationContext in ext -->
12 15
  <!-- includes external services beans e.g. my/cdm/ext/geo/IGeoServiceAreaMapping  -->
cdmlib-io/src/main/resources/eu/etaxonomy/cdm/httpInvokerIOServices.xml
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 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10

  
11 11
  
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
<!--     <context:property-override location="classpath:override.properties"/> -->
11 11

  
......
34 34
        <constructor-arg>
35 35
            <list>
36 36
                <bean class="org.springframework.security.authentication.TestingAuthenticationProvider"/>
37
                <ref local="daoAuthenticationProvider"/>
37
                <ref bean="daoAuthenticationProvider"/>
38 38
            </list>
39 39
        </constructor-arg>
40 40
    </bean>
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-4.0.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
<!-- JDBC datasource pattern example -->
11 11
<!--  	<bean id="defaultDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">-->
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/h2-datasource.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-4.0.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
    <bean id="dataSource" lazy-init="true" init-method="init"
11 11
        class="eu.etaxonomy.cdm.database.LocalH2" >
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hsql-datasource.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-4.0.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
    <bean id="dataSource" 
11 11
        lazy-init="true"
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/persistence.xml
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" xmlns:aop="http://www.springframework.org/schema/aop"
5 5
  xsi:schemaLocation="
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
10 10
    ">
11 11

  
12 12
  <bean class="eu.etaxonomy.cdm.config.ConfigFileUtil" scope="singleton" />
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/persistence_security.xml
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" xmlns:aop="http://www.springframework.org/schema/aop"
5 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
10 10
    ">
11 11

  
12 12
   <import resource="classpath:/eu/etaxonomy/cdm/persistence.xml"/>
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/spelling.xml
5 5
    xmlns:tx="http://www.springframework.org/schema/tx"
6 6
    xmlns:aop="http://www.springframework.org/schema/aop"
7 7
    xsi:schemaLocation="http://www.springframework.org/schema/beans 
8
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
10
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
11
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
8
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
11
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
12 12
    ">
13 13
    
14 14
<!--         We do not use spelling suggestions anymore. This one relates to springmodules which is -->
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/config/configFileUtil-app-context.xml
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" xmlns:aop="http://www.springframework.org/schema/aop"
5 5
  xsi:schemaLocation="
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
10 10
    ">
11 11
    <bean class="eu.etaxonomy.cdm.config.ConfigFileUtil" />
12 12
</beans>
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
  xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx
11
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <!-- requires at least spring 2.5.4 <context:property-override location="classpath:eu/etaxonomy/cdm/persistence/override.properties"/>-->
14 14

  
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
  xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx
11
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <!-- requires at least spring 2.5.4 
14 14
    <context:property-override location="classpath:eu/etaxonomy/cdm/persistence/override.properties"/>
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xmlns:tx="http://www.springframework.org/schema/tx"
6 6
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
7
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx 
11
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <!-- requires at least spring 2.5.4 -->
14 14
    <context:property-override location="classpath:eu/etaxonomy/cdm/persistence/override.properties-testPersistentDataSource"/>
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testWithConfigurableNameCacheStrategyGenerators.xml
5 5
	xmlns:tx="http://www.springframework.org/schema/tx"
6 6
	xmlns:aop="http://www.springframework.org/schema/aop"
7 7
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
8
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
8
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
9 9
    http://www.springframework.org/schema/context
10
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
10
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
11 11
    http://www.springframework.org/schema/tx 
12
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
12
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
13 13
    http://www.springframework.org/schema/aop 
14
    http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
14
    http://www.springframework.org/schema/aop/spring-aop-4.3.xsd">
15 15
    
16 16
    <context:spring-configured/>
17 17
    <context:annotation-config/>
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
6
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-4.0.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
  	<bean id="defaultDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
11 11
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>
cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xmlns:tx="http://www.springframework.org/schema/tx"
5 5
    xmlns:context="http://www.springframework.org/schema/context"
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10

  
11 11
  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>
cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
4 4
  xmlns:tx="http://www.springframework.org/schema/tx"
5 5
  xmlns:context="http://www.springframework.org/schema/context"
6
  xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
  xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
">
10 10
    
11 11
  <!-- 
cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml
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 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10
  <!-- 
11 11
    NOTE: 
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
    <bean class="eu.etaxonomy.cdm.opt.config.DataSourceConfigurer" >
11 11
    </bean>
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
    <bean id="dataSource"  lazy-init="true" class="eu.etaxonomy.cdm.database.UpdatableRoutingDataSource">
11 11
    	<property name="targetDataSources">
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9

  
10 10
    <bean id="dataSource"  lazy-init="true" class="eu.etaxonomy.cdm.database.UpdatableRoutingDataSource">
11 11
    	<property name="targetDataSources">
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
3 3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xsi:schemaLocation="http://www.springframework.org/schema/beans
6
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
6
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7 7
    http://www.springframework.org/schema/context
8
    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
8
    http://www.springframework.org/schema/context/spring-context-4.3.xsd">
9 9
    
10 10
    
11 11
    <bean id="dataSource"  lazy-init="true" class="eu.etaxonomy.cdm.database.SelectableDataSource">
cdmlib-remote-webapp/src/main/webapp/WEB-INF/json-views.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xsi:schemaLocation="http://www.springframework.org/schema/beans
5
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
6 6

  
7 7
    <!--
8 8
        ===============================================================
cdmlib-remote-webapp/src/main/webapp/WEB-INF/kml-views.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xsi:schemaLocation="http://www.springframework.org/schema/beans
5
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
6 6

  
7 7
    <!--
8 8
        ===============================================================
cdmlib-remote-webapp/src/main/webapp/WEB-INF/oai-views.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xsi:schemaLocation="http://www.springframework.org/schema/beans
5
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
6 6

  
7 7
    <!--
8 8
        ===============================================================
cdmlib-remote-webapp/src/main/webapp/WEB-INF/rdf-views.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xsi:schemaLocation="http://www.springframework.org/schema/beans
5
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
6 6

  
7 7
    <!--
8 8
        ===============================================================
cdmlib-remote-webapp/src/main/webapp/WEB-INF/xml-views.xml
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xsi:schemaLocation="http://www.springframework.org/schema/beans
5
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
6 6

  
7 7
    <!--
8 8
        ===============================================================
cdmlib-remote-webapp/src/test/resources/datasources.xml
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xmlns:tx="http://www.springframework.org/schema/tx"
5 5
    xmlns:context="http://www.springframework.org/schema/context"
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10

  
11 11
    <!--
cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
  xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
8
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
9
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
9
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
10 10
    ">
11 11
    
12 12
  <!-- This xml configuration may be replaced by eu.etaxonomy.cdm.remote.config.CdmRemoteConfiguration in future -->
cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xmlns:tx="http://www.springframework.org/schema/tx"
5 5
    xmlns:context="http://www.springframework.org/schema/context"
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10

  
11 11
    <bean id="genericApiCardinalityPropertyFilter" class="eu.etaxonomy.cdm.remote.json.util.CardinalityPropertyFilter">
cdmlib-remote/src/test/resources/applicationContext.xml
3 3
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
    xmlns:tx="http://www.springframework.org/schema/tx"
5 5
    xmlns:context="http://www.springframework.org/schema/context"
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
6
    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9 9
    ">
10 10
    
11 11
    <import resource="classpath:/eu/etaxonomy/cdm/services.xml"/>
cdmlib-remote/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xmlns:tx="http://www.springframework.org/schema/tx"
6 6
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
7
    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-3.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx 
11
    http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <context:property-override location="classpath:eu/etaxonomy/cdm/override.properties"/>
14 14
   
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:security="http://www.springframework.org/schema/security"
6 6
  xsi:schemaLocation="
7
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10
    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.3.xsd"
7
    http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8
    http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-4.3.xsd
10
    http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd"
11 11
    >
12 12

  
13 13
    <import resource="classpath:/eu/etaxonomy/cdm/persistence_security.xml"/>
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security_base.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:security="http://www.springframework.org/schema/security"
6 6
  xsi:schemaLocation="
7
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10
    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd"
7
    http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8
    http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-4.3.xsd
10
    http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd"
11 11
    >
12 12

  
13 13
    <!--
......
42 42
    <bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
43 43
        <constructor-arg>
44 44
            <list>
45
                <ref local="daoAuthenticationProvider"/>
45
                <ref bean="daoAuthenticationProvider"/>
46 46
            </list>
47 47
        </constructor-arg>
48 48
    </bean>
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml
5 5
    xmlns:tx="http://www.springframework.org/schema/tx"
6 6
    xmlns:security="http://www.springframework.org/schema/security"
7 7
    xsi:schemaLocation="http://www.springframework.org/schema/beans
8
        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
9
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
10
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
11
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd
8
        https://www.springframework.org/schema/beans/spring-beans-4.3.xsd
9
        http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-4.3.xsd
10
        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-4.3.xsd
11
        http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-4.2.xsd
12 12
     ">
13 13

  
14 14
    <import resource="classpath:/eu/etaxonomy/cdm/applicationContext-test.xml" />
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
    xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    ">
11 11

  
12 12
   <context:property-override location="classpath:override.properties"/>
......
39 39
        <constructor-arg>
40 40
            <list>
41 41
                <bean class="org.springframework.security.authentication.TestingAuthenticationProvider"/>
42
                <ref local="daoAuthenticationProvider"/>
42
                <ref bean="daoAuthenticationProvider"/>
43 43
            </list>
44 44
        </constructor-arg>
45 45
    </bean>
cdmlib-test/src/main/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
  xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx
11
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <!--
14 14
        ========================================================================================
cdmlib-test/src/main/resources/eu/etaxonomy/cdm/services_base_test.xml
3 3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xsi:schemaLocation="
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8 8
    ">
9 9

  
10 10
    <!--
cdmlib-test/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml
4 4
  xmlns:context="http://www.springframework.org/schema/context"
5 5
  xmlns:tx="http://www.springframework.org/schema/tx"
6 6
  xsi:schemaLocation="http://www.springframework.org/schema/beans
7
    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
8 8
    http://www.springframework.org/schema/context
9
    http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
    http://www.springframework.org/schema/context/spring-context-4.3.xsd
10 10
    http://www.springframework.org/schema/tx
11
    http://www.springframework.org/schema/tx/spring-tx-4.0.xsd">
11
    http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
12 12

  
13 13
    <!--  CURRENTLY we do not have tests testing cdmlib-test functionality
14 14
    but only offer functionality for testing other packages.
cdmlib-test/src/test/resources/eu/etaxonomy/cdm/persistence_test.xml
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" xmlns:aop="http://www.springframework.org/schema/aop"
5 5
  xsi:schemaLocation="
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
6
    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
7
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
8
    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
9
    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
10 10
    ">
11 11

  
12 12
  <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">

Also available in: Unified diff