Project

General

Profile

« Previous | Next » 

Revision 50400

Changes to achieve redis integration. Conflict in liblraries causin IllegalArgumentException in cnr-service-utils

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
	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
8
		   http://www.springframework.org/schema/context/spring-context-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
	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
9
	http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
9 10

  
10 11
	<import resource="classpath:META-INF/cxf/cxf.xml" />
11 12
<!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> -->
......
26 27
	<import resource="classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.xml" /> -->
27 28

  
28 29
	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
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>
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" />
37 36
				</property>
38
				<property name="locations">
37
			</bean>
38
		</property>
39
		<property name="locations">
39 40
						<list>
40 41
							<value>classpath*:/eu/**/applicationContext*.properties</value>
41 42
							<value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
......
67 68

  
68 69
	<context:annotation-config />
69 70
	<context:component-scan base-package="eu.dnetlib.openaire.rest"/>
71
	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
72

  
73

  
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>
79

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

  
85
	<!-- Enable SPEL annotation-->
86
	<security:global-method-security pre-post-annotations="enabled" proxy-target-class="true"
87
									 authentication-manager-ref="authenticationManager"/>
88

  
89
	<security:http auto-config="false" use-expressions="true"
90
				   disable-url-rewriting="true" entry-point-ref="authenticationEntryPoint"
91
				   pattern="/**">
92
	</security:http>
93

  
94
	<!--Disable authentication from this service-->
95
	<bean id="authenticationEntryPoint"
96
		  class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
97
	<security:authentication-manager alias="authenticationManager"/>
98

  
70 99
<!--
71 100
	<context:component-scan base-package="eu.dnetlib.api.enabling"/>
72 101
-->
73 102

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

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

  
78 108
</beans>

Also available in: Unified diff