Project

General

Profile

« Previous | Next » 

Revision 51141

AAI/Redis configuration ready.

View differences:

applicationContext.xml
3 3
<beans xmlns="http://www.springframework.org/schema/beans"
4 4
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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-4.0.xsd
7
	    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
6
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
7
		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
8
       >
8 9

  
9 10

  
10 11

  
......
24 25
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>
25 26
    <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>
26 27
    <import resource="classpath*:/eu/dnetlib/gwt/**/springContext-widgets.xml"/>
28
    <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>
27 29

  
30

  
28 31
    <import resource="classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager.xml"/>
29
    <!--<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/aai-security.xml"/>
30
-->
31
    <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>
32
    <!--<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager-config.xml"/>-->
33
    <import resource="classpath*:/eu/dnetlib/repo/manager/server/config/aai-security.xml"/>
34

  
35

  
32 36
    <import resource="classpath*:application-context.xml" />
33 37

  
38
    <context:annotation-config/>
34 39
    <context:component-scan base-package="eu.dnetlib.repo.manager.server"/>
35 40
    <context:component-scan base-package="eu.dnetlib.repo.manager.service.controllers"/>
36 41
    <!--<context:component-scan base-package="gr.uoa.di.driver"/>-->
37
    <context:annotation-config/>
38 42

  
39 43

  
40 44
    <bean class="eu.dnetlib.repo.manager.server.config.CascadingPropertyLoader"
......
53 57
                <value>classpath*:/gr/**/springContext-*.properties</value>
54 58
                <value>classpath*:/eu/**/springContext-*.properties</value>
55 59

  
56

  
57 60
                <value>classpath*:/eu/dnetlib/repo/manager/server/email-texts.properties</value>
58 61

  
59

  
60 62
                <value>classpath*:dnet-site-wizard.properties</value>
61 63
                <value>classpath*:dnet-site-override.properties</value>
62 64
                <value>classpath*:dnet-wizard.properties</value>
......
71 73
            </list>
72 74
        </property>
73 75
    </bean>
74

  
75 76
</beans>

Also available in: Unified diff