Project

General

Profile

« Previous | Next » 

Revision 50505

Added by Stefanos Gatsios about 5 years ago

fixed property error by overriding the propertyholder

View differences:

applicationContext.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2

  
3 3
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
	   xmlns:context="http://www.springframework.org/schema/context"
5
	   xmlns="http://www.springframework.org/schema/beans"
6
	   xmlns:security="http://www.springframework.org/schema/security"
7
	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
4
       xmlns:context="http://www.springframework.org/schema/context"
5
       xmlns="http://www.springframework.org/schema/beans"
6
       xmlns:security="http://www.springframework.org/schema/security"
7
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
8 8
	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
9 9
	http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
10 10

  
11
	<import resource="classpath:META-INF/cxf/cxf.xml" />
12
<!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> -->
13
<!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" /> -->
14
<!-- 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" /> -->
11
    <import resource="classpath:META-INF/cxf/cxf.xml"/>
12
    <!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> -->
13
    <!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" /> -->
14
    <!-- 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" /> -->
15 15

  
16
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-commons.xml" />
17
	<import resource="classpath*:/gr/uoa/di/driver/util/springContext-locators.xml" />
18
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml" />
19
	<import resource="classpath*:/eu/dnetlib/clients/ws/springContext-locatorFactory.xml" />
20
	<import resource="classpath*:/eu/dnetlib/soap/cxf/applicationContext-eprbuilders.xml"/>
21
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.xml" />
22
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupClients.xml" />
23
	<import resource="classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml" />
24
	<import resource="classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.xml"/>
25
	<import resource="classpath*:/eu/dnetlib/openaire/rest/springContext-claims-authorization.xml"/>
26
	<!--
27
	<import resource="classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.xml" /> -->
16
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-commons.xml"/>
17
    <import resource="classpath*:/gr/uoa/di/driver/util/springContext-locators.xml"/>
18
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>
19
    <import resource="classpath*:/eu/dnetlib/clients/ws/springContext-locatorFactory.xml"/>
20
    <import resource="classpath*:/eu/dnetlib/soap/cxf/applicationContext-eprbuilders.xml"/>
21
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.xml"/>
22
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupClients.xml"/>
23
    <import resource="classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml"/>
24
    <import resource="classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.xml"/>
25
    <import resource="classpath*:/eu/dnetlib/openaire/rest/springContext-claims-authorization.xml"/>
26
    <!--
27
    <import resource="classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.xml" /> -->
28
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertySourcesPlaceholderConfigurer">
29
        <property name="order" value="2"/>
30
        <property name="ignoreUnresolvablePlaceholders" value="true"/>
31
        <property name="properties">
32
            <bean class="eu.dnetlib.conf.WebappContextProperyFactory">
33
                <property name="propertyFetcher">
34
                    <bean class="eu.dnetlib.conf.PropertyFetcher"/>
35
                </property>
36
            </bean>
37
        </property>
38
        <property name="locations">
39
            <list>
40
                <value>classpath*:/eu/**/applicationContext*.properties</value>
41
                <value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
42
                <value>classpath*:/gr/**/springContext-commons.properties</value>
43
                <value>classpath*:/gr/**/springContext-registrator.properties</value>
44
                <value>classpath*:/gr/**/springContext-locators.properties</value>
28 45

  
29
	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
30
		<property name="order" value="2" />
31
		<property name="ignoreUnresolvablePlaceholders" value="true" />
32
		<property name="properties">
33
			<bean class="eu.dnetlib.conf.WebappContextProperyFactory">
34
				<property name="propertyFetcher">
35
					<bean class="eu.dnetlib.conf.PropertyFetcher" />
36
				</property>
37
			</bean>
38
		</property>
39
		<property name="locations">
40
						<list>
41
							<value>classpath*:/eu/**/applicationContext*.properties</value>
42
							<value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
43
							<value>classpath*:/gr/**/springContext-commons.properties</value>
44
								<value>classpath*:/gr/**/springContext-registrator.properties</value>
45
								<value>classpath*:/gr/**/springContext-locators.properties</value>
46
                <value>classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.properties</value>
47
                <value>classpath*:/eu/dnetlib/openaire/rest/springContext-claims-authorization.properties</value>
48
                <value>classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.properties</value>
49
                <value>classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.properties</value>
46 50

  
47
								<value>classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.properties</value>
48
								<value>classpath*:/eu/dnetlib/openaire/rest/springContext-claims-authorization.properties</value>
49
								<value>classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.properties</value>
50
								<value>classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.properties</value>
51
                <value>classpath*:/eu/dnetlib/openaire/applicationContext-openaire.properties</value>
52
                <value>classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.properties</value>
51 53

  
52
								<value>classpath*:/eu/dnetlib/openaire/applicationContext-openaire.properties</value>
53
								<value>classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.properties</value>
54 54

  
55
                <value>classpath*:dnet-site-override.properties</value>
56
                <value>classpath*:dnet-dnet-openaire-connector-wizard.properties</value>
57
                <value>classpath*:dnet-dnet-openaire-connector-override.properties</value>
55 58

  
56
								<value>classpath*:dnet-site-override.properties</value>
57
								<value>classpath*:dnet-dnet-openaire-connector-wizard.properties</value>
58
								<value>classpath*:dnet-dnet-openaire-connector-override.properties</value>
59
                <value>classpath*:/uoa-override.properties</value>
60
                <value>classpath*:/dnet-override.properties</value>
59 61

  
60
								<value>classpath*:/uoa-override.properties</value>
61
								<value>classpath*:/dnet-override.properties</value>
62
                <value>classpath*:dnet-force-override.properties</value>
62 63

  
63
								<value>classpath*:dnet-force-override.properties</value>
64
            </list>
65
        </property>
66
    </bean>
64 67

  
65
						</list>
66
				</property>
67
			</bean>
68
    <context:annotation-config/>
69
    <context:component-scan base-package="eu.dnetlib.openaire.rest"/>
68 70

  
69
	<context:annotation-config />
70
	<context:component-scan base-package="eu.dnetlib.openaire.rest"/>
71
	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
71
    <bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
72
    <bean class="org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory">
73
        <constructor-arg value="83.212.101.85"/>
74
        <constructor-arg value="6379"/>
75
        <!--<property name="password" value="${redis.password:#{null}}"/>-->
76
    </bean>
72 77

  
78
    <bean class="org.springframework.session.web.http.DefaultCookieSerializer">
79
        <property name="cookieName" value="SESSION"/>
80
        <property name="cookiePath" value="/"/>
81
    </bean>
73 82

  
74
	<bean class="org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory">
75
		<constructor-arg value="127.0.0.1" />
76
		<constructor-arg value="6379" />
77
		<!--<property name="password" value="${redis.password:#{null}}"/>-->
78
	</bean>
83
    <!-- Enable SPEL annotation-->
84
    <security:global-method-security pre-post-annotations="enabled" proxy-target-class="true"
85
                                     authentication-manager-ref="authenticationManager"/>
79 86

  
80
	<bean class="org.springframework.session.web.http.DefaultCookieSerializer">
81
		<property name="cookieName" value="SESSION"/>
82
		<property name="cookiePath" value="/"/>
83
	</bean>
87
    <security:http auto-config="false" use-expressions="true"
88
                   disable-url-rewriting="true" entry-point-ref="authenticationEntryPoint"
89
                   pattern="/**">
90
    </security:http>
84 91

  
85
	<!-- Enable SPEL annotation-->
86
	<security:global-method-security pre-post-annotations="enabled" proxy-target-class="true"
87
									 authentication-manager-ref="authenticationManager"/>
92
    <!--Disable authentication from this service-->
93
    <bean id="authenticationEntryPoint"
94
          class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
95
    <security:authentication-manager alias="authenticationManager"/>
88 96

  
89
	<security:http auto-config="false" use-expressions="true"
90
				   disable-url-rewriting="true" entry-point-ref="authenticationEntryPoint"
91
				   pattern="/**">
92
	</security:http>
97
    <!--
98
        <context:component-scan base-package="eu.dnetlib.api.enabling"/>
99
    -->
93 100

  
94
	<!--Disable authentication from this service-->
95
	<bean id="authenticationEntryPoint"
96
		  class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
97
	<security:authentication-manager alias="authenticationManager"/>
101
    <!-- if the following import is not the last one, something overrides bus
102
        configuration disabling logging and any other customized feature. -->
98 103

  
99
<!--
100
	<context:component-scan base-package="eu.dnetlib.api.enabling"/>
101
-->
104
    <import resource="./cxf.xml"/>
102 105

  
103
	<!-- if the following import is not the last one, something overrides bus
104
		configuration disabling logging and any other customized feature. -->
105

  
106
	<import resource="./cxf.xml" />
107

  
108 106
</beans>

Also available in: Unified diff