Project

General

Profile

« Previous | Next » 

Revision 47591

finalizing migration to java8 and dnet45

View differences:

modules/dnet-shadow-functionality-services/trunk/src/main/webapp/WEB-INF/applicationContext.xml
51 51
	</bean>
52 52

  
53 53
	<context:annotation-config />
54
	<context:component-scan base-package="eu.dnetlib.data.search.web.api" />
54 55
	<import resource="./cxf.xml" />
55 56
</beans>
modules/dnet-shadow-functionality-services/trunk/src/main/webapp/WEB-INF/web.xml
44 44
		<servlet-name>dispatcher</servlet-name>
45 45
		<url-pattern>/</url-pattern>
46 46
	</servlet-mapping>
47
	<servlet>
48
		<servlet-name>jersey-serlvet</servlet-name>
49
		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
50
		<init-param>
51
			<param-name>com.sun.jersey.config.property.packages</param-name>
52
			<param-value>eu.dnetlib.data.search.web.api</param-value>
53
		</init-param>
54
		<load-on-startup>1</load-on-startup>
55
	</servlet>
56
	<servlet-mapping>
57
		<servlet-name>jersey-serlvet</servlet-name>
58
		<url-pattern>/rest/*</url-pattern>
59
	</servlet-mapping>
60

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

  
82
	<filter-mapping>
83
		<filter-name>CorsFilter</filter-name>
84
		<url-pattern>/*</url-pattern>
85
	</filter-mapping>
86
	<filter>
48 87
                <filter-name>encodingFilter</filter-name>
49 88
                <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
50 89
                <init-param>
modules/dnet-shadow-functionality-services/trunk/pom.xml
3 3
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4 4
	<parent>
5 5
		<groupId>eu.dnetlib</groupId>
6
		<artifactId>dnet-parent</artifactId>
6
		<artifactId>dnet45-container-parent</artifactId>
7 7
		<version>1.0.0-SNAPSHOT</version>
8 8
	</parent>
9 9
	<modelVersion>4.0.0</modelVersion>
10 10
	<groupId>eu.dnetlib</groupId>
11 11
	<artifactId>dnet-shadow-functionality-services</artifactId>
12 12
	<packaging>war</packaging>
13
	<version>1.0.0-SNAPSHOT</version>
13
	<version>2.0.0-SNAPSHOT</version>
14
  	<scm>
15
                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-shadow-functionality-services/trunk</developerConnection>
16
        </scm>
14 17
	<dependencies>
15 18
		<dependency>
16 19
			<groupId>eu.dnetlib</groupId>
17 20
			<artifactId>uoa-search</artifactId>
18
			<version>[2.0.0-SNAPSHOT,)</version>
19
			<exclusions> <!-- already included in tomcat7 -->
20
				<exclusion>
21
					<groupId>javax.servlet</groupId>
22
					<artifactId>javax.servlet-api</artifactId>
23
				</exclusion>
24
				<exclusion>
25
					<groupId>eu.dnetlib</groupId>
26
					<artifactId>cnr-service-common</artifactId>
27
				</exclusion>
28
			</exclusions>
21
			<version>[3.0.0-SNAPSHOT, 4.0.0)</version>
29 22
		</dependency>
30
<dependency>
31

  
23
		<dependency>
32 24
			<groupId>eu.dnetlib</groupId>
33 25
			<artifactId>uoa-clients</artifactId>
34
			<version>[1.1.0, 1.3.0-SNAPSHOT)</version>
26
			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
35 27
			<exclusions>
36 28
				<exclusion>
37 29
					<groupId>cglib</groupId>
38 30
					<artifactId>cglib</artifactId>
39 31
				</exclusion>
40
				<exclusion>
41
					<groupId>eu.dnetlib</groupId>
42
					<artifactId>cnr-service-common</artifactId>
43
				</exclusion>
44
				<exclusion>
45
					<groupId>eu.dnetlib</groupId>
46
					<artifactId>cnr-cql-utils</artifactId>
47
				</exclusion>
48 32
			</exclusions>
49 33
		</dependency>
50 34
		<dependency>
51 35
			<groupId>eu.dnetlib</groupId>
52 36
			<artifactId>uoa-hcm</artifactId>
53
			<version>[1.1.0, 1.3.0-SNAPSHOT)</version>
37
			<version>[1.1.0, 2.0.0)</version>
54 38
		</dependency>
55 39
		<dependency>
56 40
			<groupId>eu.dnetlib</groupId>
57 41
			<artifactId>dnet-runtime</artifactId>
58
			<version>[1.0.0]</version>
42
			<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
59 43
		</dependency>
60 44
		<dependency>
61 45
			<groupId>cglib</groupId>
......
72 56
            <artifactId>jstl</artifactId>
73 57
            <version>1.2</version>
74 58
        </dependency>
59
		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-nop -->
75 60
		<dependency>
61
			<groupId>org.slf4j</groupId>
62
			<artifactId>slf4j-nop</artifactId>
63
			<version>1.7.21</version>
64
		</dependency>
65
		<dependency>
66
			<groupId>org.slf4j</groupId>
67
			<artifactId>slf4j-log4j12</artifactId>
68
			<version>1.7.5</version>
69
        </dependency>
70
		<dependency>
76 71
			<groupId>eu.dnetlib</groupId>
77 72
			<artifactId>cnr-service-common</artifactId>
78
			<version>1.0.0-hotfix</version>
73
			<version>[2.1.6-SNAPSHOT, 3.0.0)</version>
74
			<exclusions>
75
				<exclusion>
76
					<groupId>xml-apis</groupId>
77
					<artifactId>xml-apis</artifactId>
78
				</exclusion>
79
			</exclusions>
79 80
		</dependency>
80 81

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

  
81 89
    </dependencies>
82 90

  
83 91
<build>

Also available in: Unified diff