Project

General

Profile

« Previous | Next » 

Revision 51185

oidc.issuer is loaded from properties + success session check for success.jsp

View differences:

modules/dnet-functionality-services/trunk/src/main/webapp/WEB-INF/applicationContext.xml
54 54
	</bean>
55 55

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

  
58 62
	<import resource="./cxf.xml" />
59 63
</beans>
modules/dnet-functionality-services/trunk/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/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
	
47

  
48

  
49

  
50

  
48 51
	<servlet>
49 52
		<servlet-name>jersey-serlvet</servlet-name>
50 53
		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
......
85 88
		<url-pattern>/*</url-pattern>
86 89
	</filter-mapping>
87 90
	<filter>
88
                <filter-name>encodingFilter</filter-name>
89
                <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
90
                <init-param>
91
                        <param-name>encoding</param-name>
92
                        <param-value>UTF-8</param-value>
93
                </init-param>
94
                <init-param>
95
                        <param-name>forceEncoding</param-name>
96
                        <param-value>true</param-value>
97
                </init-param>
98
        </filter>
99
        <filter-mapping>
100
                <filter-name>encodingFilter</filter-name>
101
                <url-pattern>/*</url-pattern>
102
        </filter-mapping>
91
		<filter-name>encodingFilter</filter-name>
92
		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
93
		<init-param>
94
				<param-name>encoding</param-name>
95
				<param-value>UTF-8</param-value>
96
		</init-param>
97
		<init-param>
98
				<param-name>forceEncoding</param-name>
99
				<param-value>true</param-value>
100
		</init-param>
101
	</filter>
102
	<filter-mapping>
103
			<filter-name>encodingFilter</filter-name>
104
			<url-pattern>/*</url-pattern>
105
	</filter-mapping>
103 106

  
104 107

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

  
113
	<filter-mapping>
114
		<filter-name>headerFilter</filter-name>
115
		<url-pattern>/*</url-pattern>
116
	</filter-mapping>
117

  
105 118
</web-app>

Also available in: Unified diff