Project

General

Profile

« Previous | Next » 

Revision 48350

Moving webapp from uoa-users-management project to dnet-openaire-users

View differences:

modules/dnet-openaire-users/trunk/src/main/webapp/WEB-INF/applicationContext.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2

  
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
7
       http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
8
	   http://www.springframework.org/schema/context
9
		   http://www.springframework.org/schema/context/spring-context-4.2.xsd">
10

  
11
    <import resource="classpath*:/eu/dnetlib/openaire/user/springContext-userManagementService.xml" />
12

  
13
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
14
        <property name="order" value="2" />
15
        <property name="ignoreUnresolvablePlaceholders" value="true" />
16
        <property name="properties">
17
            <bean class="eu.dnetlib.conf.WebappContextProperyFactory">
18
                <property name="propertyFetcher">
19
                    <bean class="eu.dnetlib.conf.PropertyFetcher" />
20
                </property>
21
            </bean>
22
        </property>
23
        <property name="locations">
24
            <list>
25
                <value>classpath*:/eu/**/applicationContext*.properties</value>
26
                <value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
27
                <value>classpath*:/eu/**/springContext-userManagementService.properties</value>
28

  
29
                <value>classpath*:/uoa-override.properties</value>
30
                <value>classpath*:/dnet-override.properties</value>
31
            </list>
32
        </property>
33
    </bean>
34

  
35
    <context:annotation-config />
36

  
37
</beans>
modules/dnet-openaire-users/trunk/src/main/webapp/WEB-INF/dispatcher-servlet.xml
1
<beans xmlns="http://www.springframework.org/schema/beans"
2
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
       xsi:schemaLocation="http://www.springframework.org/schema/beans
4
	    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
5

  
6
</beans>
modules/dnet-openaire-users/trunk/src/main/webapp/WEB-INF/security-context.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<beans:beans xmlns="http://www.springframework.org/schema/security"
3
             xmlns:beans="http://www.springframework.org/schema/beans"
4
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
             xmlns:security="http://www.springframework.org/schema/security"
6
             xsi:schemaLocation="
7
    	http://www.springframework.org/schema/beans
8
    	http://www.springframework.org/schema/beans/spring-beans.xsd
9

  
10
        http://www.springframework.org/schema/security
11
        http://www.springframework.org/schema/security/spring-security.xsd">
12

  
13
    <!-- Stateless RESTful services use BASIC authentication -->
14
    <!--<security:http create-session="stateless" pattern="/rest/**">
15
         <security:intercept-url pattern="/**" access="ROLE_REST"/>
16
        <security:http-basic/>
17
    </security:http>
18

  
19

  
20
     <security:authentication-manager>
21
         <security:authentication-provider>
22
             <security:user-service>
23
                 <security:user name="rest" password="rest" authorities="ROLE_REST"/>
24
             </security:user-service>
25
         </security:authentication-provider>
26
     </security:authentication-manager>
27
    -->
28
    <!--
29
    <authentication-manager alias="authenticationManager">
30
        <authentication-provider ref="jwtAuthenticationProvider" />  (8)
31
    </authentication-manager>
32

  
33
    -->
34
</beans:beans>
modules/dnet-openaire-users/trunk/src/main/webapp/WEB-INF/log4j.properties
1
log4j.rootLogger = DEBUG, R
2

  
3
log4j.logger.eu.dnetlib = DEBUG
4
log4j.logger.org.mitre.openid = DEBUG
5
log4j.logger.org.springframework = DEBUG, S
6

  
7
#log4j.additivity.org.springframework = false
8

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

  
16
log4j.appender.S=org.apache.log4j.RollingFileAppender
17
log4j.appender.S.File=/var/log/dnet/user-management/user-management-spring.log
18
log4j.appender.S.MaxFileSize=10MB
19
log4j.appender.S.MaxBackupIndex=10
20
log4j.appender.S.layout=org.apache.log4j.PatternLayout
21
log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
modules/dnet-openaire-users/trunk/src/main/webapp/WEB-INF/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"?>
2
<web-app>
4 3

  
5
<web-app>
6
  <display-name>Archetype Created Web Application</display-name>
7
</web-app>
4
    <display-name>uoa-user-management</display-name>
5
    <context-param>
6
        <param-name>webAppRootKey</param-name>
7
        <param-value>uoa-user-management</param-value>
8
    </context-param>
9
    <context-param>
10
        <param-name>contextConfigLocation</param-name>
11
        <param-value>
12
            /WEB-INF/applicationContext.xml
13
            /WEB-INF/security-context.xml
14
        </param-value>
15
    </context-param>
16
    <context-param>
17
        <param-name>log4jConfigLocation</param-name>
18
        <param-value>/WEB-INF/log4j.properties</param-value>
19
    </context-param>
20

  
21
    <listener>
22
        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
23
    </listener>
24
    <listener>
25
        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
26
    </listener>
27

  
28

  
29
    <servlet>
30
        <servlet-name>User API</servlet-name>
31
        <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
32
        <init-param>
33
            <param-name>com.sun.jersey.config.property.packages</param-name>
34
            <param-value>eu.dnetlib.openaire.user.api.services</param-value>
35
        </init-param>
36
    </servlet>
37
    <servlet-mapping>
38
        <servlet-name>User API</servlet-name>
39
        <url-pattern>/api/*</url-pattern>
40
    </servlet-mapping>
41

  
42

  
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</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
    </filter>
63
    <filter-mapping>
64
        <filter-name>CorsFilter</filter-name>
65
        <url-pattern>/*</url-pattern>
66
    </filter-mapping>
67

  
68
<!--
69
    <filter>
70
        <filter-name>requestContextFilter</filter-name>
71
        <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
72
    </filter>
73

  
74
    <filter-mapping>
75
        <filter-name>requestContextFilter</filter-name>
76
        <url-pattern>/*</url-pattern>
77
    </filter-mapping>
78
-->
79
    <filter>
80
        <filter-name>springSecurityFilterChain</filter-name>
81
        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
82
    </filter>
83

  
84
    <filter-mapping>
85
        <filter-name>springSecurityFilterChain</filter-name>
86
        <url-pattern>/*</url-pattern>
87
    </filter-mapping>
88

  
89
</web-app>
modules/dnet-openaire-users/trunk/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>
......
16 16
	<dependencies>
17 17
		<dependency>
18 18
			<groupId>eu.dnetlib</groupId>
19
			<artifactId>uoa-user-management</artifactId>
20
			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
21
		</dependency>
22
		<dependency>
23
			<groupId>eu.dnetlib</groupId>
19 24
			<artifactId>dnet-runtime</artifactId>
20
			<version>[1.0.0]</version>
25
			<version>[1.0.0, 2.0.0)</version>
21 26
		</dependency>
22 27
		<dependency>
23 28
			<groupId>org.apache.cxf</groupId>

Also available in: Unified diff