Project

General

Profile

« Previous | Next » 

Revision 56218

SNAPSHOT version removed from dnet-container-parent and specific version for uoa-search module is added.

View differences:

modules/dnet-functionality-services/branches/prod/src/main/webapp/WEB-INF/applicationContext.xml
22 22
	<import resource="classpath*:/eu/dnetlib/data/search/springContext-transformation.xml" />
23 23
	<import resource="classpath*:/eu/dnetlib/data/search/springContext-searchService.xml" />
24 24

  
25
	<!--<import resource="classpath*:/eu/dnetlib/data/statsmanager/springContext-statsManager.xml" />-->
26

  
27 25
	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
28 26
		<property name="order" value="2" />
29 27
		<property name="ignoreUnresolvablePlaceholders" value="true" />
......
55 53
	</bean>
56 54

  
57 55
	<context:annotation-config />
56
	<context:component-scan base-package="eu.dnetlib.data.search">
57
		<context:include-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice" />
58
	</context:component-scan>
59

  
58 60
	<import resource="./cxf.xml" />
59 61
</beans>
modules/dnet-functionality-services/branches/prod/src/main/webapp/WEB-INF/log4j.properties
8 8
log4j.additivity.org.springframework = false
9 9

  
10 10
log4j.appender.R=org.apache.log4j.RollingFileAppender
11
log4j.appender.R.File=/var/log/dnet/search/search-8480.log
11
log4j.appender.R.File=/var/log/dnet/search/search.log
12 12
log4j.appender.R.MaxFileSize=100MB
13 13
log4j.appender.R.MaxBackupIndex=10
14 14
log4j.appender.R.layout=org.apache.log4j.PatternLayout
15 15
log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
16 16

  
17 17
log4j.appender.S=org.apache.log4j.RollingFileAppender
18
log4j.appender.S.File=/var/log/dnet/search/search-8480-spring.log
18
log4j.appender.S.File=/var/log/dnet/search/search-spring.log
19 19
log4j.appender.S.MaxFileSize=10MB
20 20
log4j.appender.S.MaxBackupIndex=10
21 21
log4j.appender.S.layout=org.apache.log4j.PatternLayout
modules/dnet-functionality-services/branches/prod/src/main/webapp/WEB-INF/web.xml
45 45
		<url-pattern>/</url-pattern>
46 46
	</servlet-mapping>
47 47
	
48
	<servlet>
49
		<servlet-name>jersey-serlvet</servlet-name>
50
		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
51
		<init-param>
52
			<param-name>com.sun.jersey.config.property.packages</param-name>
53
			<param-value>eu.dnetlib.data.search.web.api</param-value>
54
		</init-param>
55
		<load-on-startup>1</load-on-startup>
56
	</servlet>
57
	<servlet-mapping>
58
		<servlet-name>jersey-serlvet</servlet-name>
59
		<url-pattern>/rest/*</url-pattern>
60
	</servlet-mapping>
61

  
48 62
	<filter>
63
		<filter-name>CorsFilter</filter-name>
64
		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
65
		<init-param>
66
			<param-name>cors.allowed.origins</param-name>
67
			<param-value>*</param-value>
68
		</init-param>
69
		<init-param>
70
			<param-name>cors.allowed.methods</param-name>
71
			<param-value>GET,POST,HEAD,OPTIONS,DELETE</param-value>
72
		</init-param>
73
		<init-param>
74
			<param-name>cors.exposed.headers</param-name>
75
			<param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials,Access-Control-Allow-Methods</param-value>
76
		</init-param>
77
		<init-param>
78
			<param-name>cors.support.credentials</param-name>
79
			<param-value>true</param-value>
80
		</init-param>
81
	</filter>
82

  
83
	<filter-mapping>
84
		<filter-name>CorsFilter</filter-name>
85
		<url-pattern>/*</url-pattern>
86
	</filter-mapping>
87
	<filter>
49 88
                <filter-name>encodingFilter</filter-name>
50 89
                <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
51 90
                <init-param>
......
64 103
        </filter-mapping>
65 104

  
66 105

  
106
	<filter>
107
		<filter-name>headerFilter</filter-name>
108
		<filter-class>eu.dnetlib.data.search.HeaderFilter</filter-class>
109
	</filter>
110

  
111
	<filter-mapping>
112
		<filter-name>headerFilter</filter-name>
113
		<url-pattern>/*</url-pattern>
114
	</filter-mapping>
115

  
67 116
</web-app>
modules/dnet-functionality-services/branches/prod/pom.xml
2 2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 3
	<parent>
4 4
		<groupId>eu.dnetlib</groupId>
5
		<artifactId>dnet-container-parent</artifactId>
5
		<artifactId>dnet45-container-parent</artifactId>
6 6
		<version>1.0.0</version>
7 7
	</parent>
8 8
	<modelVersion>4.0.0</modelVersion>
9 9
	<groupId>eu.dnetlib</groupId>
10 10
	<artifactId>dnet-functionality-services</artifactId>
11 11
	<packaging>war</packaging>
12
	<version>1.2.0-SNAPSHOT</version>
12
	<version>2.0.0-SNAPSHOT</version>
13 13
  	<scm>
14
                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-functionality-services/trunk</developerConnection>
14
                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-functionality-services/trunk</developerConnection>
15 15
        </scm>
16 16
	<dependencies>
17 17
		<dependency>
18 18
			<groupId>eu.dnetlib</groupId>
19 19
			<artifactId>uoa-search</artifactId>
20
			<version>[1.4.0]</version>
21
			<exclusions> <!-- already included in tomcat7 -->
22
				<exclusion>
23
					<groupId>javax.servlet</groupId>
24
					<artifactId>javax.servlet-api</artifactId>
25
				</exclusion>
26
				<exclusion>
27
					<groupId>eu.dnetlib</groupId>
28
					<artifactId>cnr-service-common</artifactId>
29
				</exclusion>
30
			</exclusions>
20
			<version>[3.5.0]</version>
31 21
		</dependency>
32 22
		<dependency>
33 23
			<groupId>eu.dnetlib</groupId>
34 24
			<artifactId>uoa-clients</artifactId>
35
			<version>[1.1.0, 2.0.0)</version>
25
			<version>[2.0.0, 3.0.0)</version>
36 26
			<exclusions>
37 27
				<exclusion>
38 28
					<groupId>cglib</groupId>
39 29
					<artifactId>cglib</artifactId>
40 30
				</exclusion>
41
				<exclusion>
42
					<groupId>eu.dnetlib</groupId>
43
					<artifactId>cnr-service-common</artifactId>
44
				</exclusion>
45
				<exclusion>
46
					<groupId>eu.dnetlib</groupId>
47
					<artifactId>cnr-cql-utils</artifactId>
48
				</exclusion>
49 31
			</exclusions>
50 32
		</dependency>
51 33
		<dependency>
52 34
			<groupId>eu.dnetlib</groupId>
53 35
			<artifactId>uoa-hcm</artifactId>
54
			<version>[1.1.0, 2.0.0)</version>
36
			<version>[2.0.0, 3.0.0)</version>
55 37
		</dependency>
56 38
		<dependency>
57 39
			<groupId>eu.dnetlib</groupId>
58 40
			<artifactId>dnet-runtime</artifactId>
59
			<version>[1.0.0]</version>
41
			<version>[1.0.0,2.0.0)</version>
60 42
		</dependency>
61 43
		<dependency>
62 44
			<groupId>cglib</groupId>
......
87 69
		<dependency>
88 70
			<groupId>eu.dnetlib</groupId>
89 71
			<artifactId>cnr-service-common</artifactId>
90
			<version>1.0.0-hotfix</version>
72
			<version>[2.1.6-SNAPSHOT, 3.0.0)</version>
73
			<exclusions>
74
				<exclusion>
75
					<groupId>xml-apis</groupId>
76
					<artifactId>xml-apis</artifactId>
77
				</exclusion>
78
			</exclusions>
91 79
		</dependency>
80

  
81
		<!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
82
		<dependency>
83
			<groupId>xml-apis</groupId>
84
			<artifactId>xml-apis</artifactId>
85
			<version>1.4.01</version>
86
		</dependency>
87

  
92 88
	</dependencies>
93 89

  
94 90
</project>

Also available in: Unified diff