Revision 50400
Added by Katerina Iatropoulou about 6 years ago
| modules/dnet-claims-service/branches/redis/src/main/resources/eu/dnetlib/openaire/applicationContext-openaire.properties | ||
|---|---|---|
| 4 | 4 |
ISRegistryService.url=http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isRegistry |
| 5 | 5 |
ISSNService.url= http://node1.t.openaire.research-infrastructures.eu:8280/is/services/isSN |
| 6 | 6 |
A2Service.url= http://node3.integration.driver.research-infrastructures.eu:8180/a2service-ws/A2Service |
| 7 |
registry.host=127.0.0.1 |
|
| 8 |
registry.port=6379 |
|
| 9 |
#registry.password=null |
|
| modules/dnet-claims-service/branches/redis/src/main/webapp/WEB-INF/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> |
| modules/dnet-claims-service/branches/redis/src/main/webapp/WEB-INF/web.xml | ||
|---|---|---|
| 69 | 69 |
<url-pattern>/*</url-pattern> |
| 70 | 70 |
</filter-mapping> |
| 71 | 71 |
|
| 72 |
<filter> |
|
| 73 |
<filter-name>springSessionRepositoryFilter</filter-name> |
|
| 74 |
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> |
|
| 75 |
</filter> |
|
| 76 |
|
|
| 77 |
<filter-mapping> |
|
| 78 |
<filter-name>springSessionRepositoryFilter</filter-name> |
|
| 79 |
<url-pattern>/*</url-pattern> |
|
| 80 |
<dispatcher>REQUEST</dispatcher> |
|
| 81 |
<dispatcher>ERROR</dispatcher> |
|
| 82 |
</filter-mapping> |
|
| 83 |
|
|
| 84 |
<filter> |
|
| 85 |
<filter-name>springSecurityFilterChain</filter-name> |
|
| 86 |
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> |
|
| 87 |
<init-param> |
|
| 88 |
<param-name>contextAttribute</param-name> |
|
| 89 |
<param-value>org.springframework.web.servlet.FrameworkServlet.CONTEXT.springrest</param-value> |
|
| 90 |
</init-param> |
|
| 91 |
</filter> |
|
| 92 |
|
|
| 93 |
<filter-mapping> |
|
| 94 |
<filter-name>springSecurityFilterChain</filter-name> |
|
| 95 |
<url-pattern>/*</url-pattern> |
|
| 96 |
</filter-mapping> |
|
| 97 |
|
|
| 98 |
|
|
| 72 | 99 |
</web-app> |
| modules/dnet-claims-service/branches/redis/pom.xml | ||
|---|---|---|
| 16 | 16 |
<groupId>eu.dnetlib</groupId> |
| 17 | 17 |
<artifactId>uoa-claims-api</artifactId> |
| 18 | 18 |
<version>[2.0.0-SNAPSHOT,3.0.0)</version> |
| 19 |
<exclusions> |
|
| 20 |
<exclusion> |
|
| 21 |
<groupId>eu.dnetlib</groupId> |
|
| 22 |
<artifactId>cnr-service-utils</artifactId> |
|
| 23 |
</exclusion> |
|
| 24 |
</exclusions> |
|
| 19 | 25 |
</dependency> |
| 20 | 26 |
<dependency> |
| 21 | 27 |
<groupId>eu.dnetlib</groupId> |
| 22 | 28 |
<artifactId>uoa-clients</artifactId> |
| 23 | 29 |
<version>[2.0.0-SNAPSHOT,3.0.0)</version> |
| 30 |
<exclusions> |
|
| 31 |
<exclusion> |
|
| 32 |
<groupId>eu.dnetlib</groupId> |
|
| 33 |
<artifactId>cnr-service-utils</artifactId> |
|
| 34 |
</exclusion> |
|
| 35 |
</exclusions> |
|
| 24 | 36 |
</dependency> |
| 25 | 37 |
<dependency> |
| 26 | 38 |
<groupId>eu.dnetlib</groupId> |
| ... | ... | |
| 37 | 49 |
<artifactId>uoa-hcm</artifactId> |
| 38 | 50 |
<version>[1.1.0, 2.0.0)</version> |
| 39 | 51 |
</dependency--> |
| 40 |
<dependency> |
|
| 41 |
<groupId>eu.dnetlib</groupId> |
|
| 42 |
<artifactId>dnet-runtime</artifactId> |
|
| 43 |
<version>[1.0.0, 2.0.0)</version> |
|
| 44 |
</dependency> |
|
| 52 |
<dependency> |
|
| 53 |
<groupId>eu.dnetlib</groupId> |
|
| 54 |
<artifactId>dnet-runtime</artifactId> |
|
| 55 |
<version>[1.0.0, 2.0.0)</version> |
|
| 56 |
</dependency> |
|
| 57 |
<dependency> |
|
| 58 |
<groupId>org.mitre</groupId> |
|
| 59 |
<artifactId>openid-connect-client</artifactId> |
|
| 60 |
<version>1.3.0</version> |
|
| 61 |
</dependency> |
|
| 62 |
<dependency> |
|
| 63 |
<groupId>org.springframework.session</groupId> |
|
| 64 |
<artifactId>spring-session-data-redis</artifactId> |
|
| 65 |
<version>1.3.1.RELEASE</version> |
|
| 66 |
<type>pom</type> |
|
| 67 |
</dependency> |
|
| 68 |
<dependency> |
|
| 69 |
<groupId>biz.paluch.redis</groupId> |
|
| 70 |
<artifactId>lettuce</artifactId> |
|
| 71 |
<version>3.5.0.Final</version> |
|
| 72 |
</dependency> |
|
| 73 |
|
|
| 45 | 74 |
</dependencies> |
| 46 | 75 |
</project> |
Also available in: Unified diff
Changes to achieve redis integration. Conflict in liblraries causin IllegalArgumentException in cnr-service-utils