Project

General

Profile

« Previous | Next » 

Revision 50505

Added by Stefanos Gatsios about 6 years ago

fixed property error by overriding the propertyholder

View differences:

web.xml
1
<!DOCTYPE web-app PUBLIC
2
 "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
3
 "http://java.sun.com/dtd/web-app_2_3.dtd" >
1
<?xml version="1.0" encoding="UTF-8"?>
4 2
<web-app>
5
	<display-name>DNet-2.0 container web app</display-name>
6
	<context-param>
7
		<param-name>contextConfigLocation</param-name>
8
		<param-value>/WEB-INF/applicationContext.xml</param-value>
9
	</context-param>
3
    <display-name>DNet-2.0 container web app</display-name>
10 4
    <context-param>
5
        <param-name>contextConfigLocation</param-name>
6
        <param-value>/WEB-INF/applicationContext.xml</param-value>
7
    </context-param>
8
    <context-param>
11 9
        <param-name>log4jConfigLocation</param-name>
12 10
        <param-value>/WEB-INF/log4j.properties</param-value>
13 11
    </context-param>
14 12
    <listener>
15 13
        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
16 14
    </listener>
17
	<listener>
18
		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
19
	</listener>
20
	<listener>
21
		<listener-class>eu.dnetlib.data.emailSender.EmailScheduler</listener-class>
22
	</listener>
15
    <listener>
16
        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
17
    </listener>
18
    <listener>
19
        <listener-class>eu.dnetlib.data.emailSender.EmailScheduler</listener-class>
20
    </listener>
23 21

  
24 22

  
23
    <servlet>
24
        <servlet-name>jersey-serlvet</servlet-name>
25
        <!--<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>-->
26
        <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
27
        <init-param>
28
            <!--<param-name>com.sun.jersey.config.property.packages</param-name>-->
29
            <param-name>com.sun.jersey.config.property.packages</param-name>
30
            <param-value>eu.dnetlib.openaire.rest</param-value>
31
        </init-param>
32
        <load-on-startup>1</load-on-startup>
33
    </servlet>
25 34

  
26
	<servlet>
27
		<servlet-name>jersey-serlvet</servlet-name>
28
		<!--<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>-->
29
		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
30
		<init-param>
31
			<!--<param-name>com.sun.jersey.config.property.packages</param-name>-->
32
			<param-name>com.sun.jersey.config.property.packages</param-name>
33
			<param-value>eu.dnetlib.openaire.rest</param-value>
34
		</init-param>
35
		<load-on-startup>1</load-on-startup>
36
	</servlet>
35
    <servlet-mapping>
36
        <servlet-name>jersey-serlvet</servlet-name>
37
        <url-pattern>/rest/*</url-pattern>
38
    </servlet-mapping>
37 39

  
38
	<servlet-mapping>
39
		<servlet-name>jersey-serlvet</servlet-name>
40
		<url-pattern>/rest/*</url-pattern>
41
	</servlet-mapping>
40
    <filter>
41
        <filter-name>CorsFilter</filter-name>
42
        <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
43
        <init-param>
44
            <param-name>cors.allowed.origins</param-name>
45
            <param-value>*</param-value>
46
        </init-param>
47
        <init-param>
48
            <param-name>cors.allowed.methods</param-name>
49
            <param-value>GET,POST,HEAD,OPTIONS,DELETE</param-value>
50
        </init-param>
51
        <init-param>
52
            <param-name>cors.exposed.headers</param-name>
53
            <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials,Access-Control-Allow-Methods
54
            </param-value>
55
        </init-param>
56
        <init-param>
57
            <param-name>cors.support.credentials</param-name>
58
            <param-value>true</param-value>
59
        </init-param>
60
        <init-param>
61
            <param-name>cors.allowed.headers</param-name>
62
            <param-value>
63
                Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,X-XSRF-TOKEN,withcredentials
64
            </param-value>
65
        </init-param>
66
    </filter>
67
    <filter-mapping>
68
        <filter-name>CorsFilter</filter-name>
69
        <url-pattern>/*</url-pattern>
70
    </filter-mapping>
42 71

  
43
	<filter>
44
		<filter-name>CorsFilter</filter-name>
45
		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
46
		<init-param>
47
			<param-name>cors.allowed.origins</param-name>
48
			<param-value>*</param-value>
49
		</init-param>
50
		<init-param>
51
			<param-name>cors.allowed.methods</param-name>
52
			<param-value>GET,POST,HEAD,OPTIONS,DELETE</param-value>
53
		</init-param>
54
		<init-param>
55
			<param-name>cors.exposed.headers</param-name>
56
			<param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials,Access-Control-Allow-Methods</param-value>
57
		</init-param>
58
		<init-param>
59
			<param-name>cors.support.credentials</param-name>
60
			<param-value>true</param-value>
61
		</init-param>
62
		<init-param>
63
			<param-name>cors.allowed.headers</param-name>
64
			<param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,X-XSRF-TOKEN,withcredentials</param-value>
65
		</init-param>
66
	</filter>
67
	<filter-mapping>
68
		<filter-name>CorsFilter</filter-name>
69
		<url-pattern>/*</url-pattern>
70
	</filter-mapping>
72
    <filter>
73
        <filter-name>springSessionRepositoryFilter</filter-name>
74
        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
75
    </filter>
71 76

  
72
	<filter>
73
		<filter-name>springSessionRepositoryFilter</filter-name>
74
		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
75
	</filter>
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>
76 83

  
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>
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>
83 92

  
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>
93
    <filter-mapping>
94
        <filter-name>springSecurityFilterChain</filter-name>
95
        <url-pattern>/*</url-pattern>
96
    </filter-mapping>
92 97

  
93
	<filter-mapping>
94
		<filter-name>springSecurityFilterChain</filter-name>
95
		<url-pattern>/*</url-pattern>
96
	</filter-mapping>
97 98

  
98

  
99 99
</web-app>

Also available in: Unified diff