From 6ecff7923df638155ce8c005bfd314fa7fcc5d0e Mon Sep 17 00:00:00 2001
From: Katerina Iatropoulou <kiatrop@di.uoa.gr>
Date: Wed, 5 Jul 2017 11:01:25 +0000
Subject: [PATCH] Moving webapp from uoa-users-management project to
 dnet-openaire-users

---
 pom.xml                                       |  9 +-
 .../webapp/WEB-INF/applicationContext.xml     | 37 ++++++++
 .../webapp/WEB-INF/dispatcher-servlet.xml     |  6 ++
 src/main/webapp/WEB-INF/log4j.properties      | 21 +++++
 src/main/webapp/WEB-INF/security-context.xml  | 34 +++++++
 src/main/webapp/WEB-INF/web.xml               | 94 +++++++++++++++++--
 6 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/applicationContext.xml
 create mode 100644 src/main/webapp/WEB-INF/dispatcher-servlet.xml
 create mode 100644 src/main/webapp/WEB-INF/log4j.properties
 create mode 100644 src/main/webapp/WEB-INF/security-context.xml

diff --git a/pom.xml b/pom.xml
index 0600364..f945aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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">
 	<parent>
 		<groupId>eu.dnetlib</groupId>
-		<artifactId>dnet-container-parent</artifactId>
+		<artifactId>dnet45-container-parent</artifactId>
 		<version>1.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -14,10 +14,15 @@
                 <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/dnet-openaire-users/trunk</developerConnection>
         </scm>
 	<dependencies>
+		<dependency>
+			<groupId>eu.dnetlib</groupId>
+			<artifactId>uoa-user-management</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
+		</dependency>
 		<dependency>
 			<groupId>eu.dnetlib</groupId>
 			<artifactId>dnet-runtime</artifactId>
-			<version>[1.0.0]</version>
+			<version>[1.0.0, 2.0.0)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000..944e6dc
--- /dev/null
+++ b/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+	   http://www.springframework.org/schema/context
+		   http://www.springframework.org/schema/context/spring-context-4.2.xsd">
+
+    <import resource="classpath*:/eu/dnetlib/openaire/user/springContext-userManagementService.xml" />
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="order" value="2" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+        <property name="properties">
+            <bean class="eu.dnetlib.conf.WebappContextProperyFactory">
+                <property name="propertyFetcher">
+                    <bean class="eu.dnetlib.conf.PropertyFetcher" />
+                </property>
+            </bean>
+        </property>
+        <property name="locations">
+            <list>
+                <value>classpath*:/eu/**/applicationContext*.properties</value>
+                <value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>
+                <value>classpath*:/eu/**/springContext-userManagementService.properties</value>
+
+                <value>classpath*:/uoa-override.properties</value>
+                <value>classpath*:/dnet-override.properties</value>
+            </list>
+        </property>
+    </bean>
+
+    <context:annotation-config />
+
+</beans>
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
new file mode 100644
index 0000000..4a4405f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -0,0 +1,6 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+</beans>
diff --git a/src/main/webapp/WEB-INF/log4j.properties b/src/main/webapp/WEB-INF/log4j.properties
new file mode 100644
index 0000000..ff817af
--- /dev/null
+++ b/src/main/webapp/WEB-INF/log4j.properties
@@ -0,0 +1,21 @@
+log4j.rootLogger = DEBUG, R
+
+log4j.logger.eu.dnetlib = DEBUG
+log4j.logger.org.mitre.openid = DEBUG
+log4j.logger.org.springframework = DEBUG, S
+
+#log4j.additivity.org.springframework = false
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/dnet/user-management/user-management.log
+log4j.appender.R.MaxFileSize=10MB
+log4j.appender.R.MaxBackupIndex=10
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
+
+log4j.appender.S=org.apache.log4j.RollingFileAppender
+log4j.appender.S.File=/var/log/dnet/user-management/user-management-spring.log
+log4j.appender.S.MaxFileSize=10MB
+log4j.appender.S.MaxBackupIndex=10
+log4j.appender.S.layout=org.apache.log4j.PatternLayout
+log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/security-context.xml b/src/main/webapp/WEB-INF/security-context.xml
new file mode 100644
index 0000000..649c702
--- /dev/null
+++ b/src/main/webapp/WEB-INF/security-context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+             xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:security="http://www.springframework.org/schema/security"
+             xsi:schemaLocation="
+    	http://www.springframework.org/schema/beans
+    	http://www.springframework.org/schema/beans/spring-beans.xsd
+
+        http://www.springframework.org/schema/security
+        http://www.springframework.org/schema/security/spring-security.xsd">
+
+    <!-- Stateless RESTful services use BASIC authentication -->
+    <!--<security:http create-session="stateless" pattern="/rest/**">
+         <security:intercept-url pattern="/**" access="ROLE_REST"/>
+        <security:http-basic/>
+    </security:http>
+
+
+     <security:authentication-manager>
+         <security:authentication-provider>
+             <security:user-service>
+                 <security:user name="rest" password="rest" authorities="ROLE_REST"/>
+             </security:user-service>
+         </security:authentication-provider>
+     </security:authentication-manager>
+    -->
+    <!--
+    <authentication-manager alias="authenticationManager">
+        <authentication-provider ref="jwtAuthenticationProvider" />  (8)
+    </authentication-manager>
+
+    -->
+</beans:beans>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9f88c1f..d67f1d1 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,89 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
+<?xml version="1.0" encoding="UTF-8"?>
 <web-app>
-  <display-name>Archetype Created Web Application</display-name>
-</web-app>
+
+    <display-name>uoa-user-management</display-name>
+    <context-param>
+        <param-name>webAppRootKey</param-name>
+        <param-value>uoa-user-management</param-value>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+            /WEB-INF/applicationContext.xml
+            /WEB-INF/security-context.xml
+        </param-value>
+    </context-param>
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>/WEB-INF/log4j.properties</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+
+    <servlet>
+        <servlet-name>User API</servlet-name>
+        <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
+        <init-param>
+            <param-name>com.sun.jersey.config.property.packages</param-name>
+            <param-value>eu.dnetlib.openaire.user.api.services</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>User API</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
+
+
+    <filter>
+        <filter-name>CorsFilter</filter-name>
+        <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+        <init-param>
+            <param-name>cors.allowed.origins</param-name>
+            <param-value>*</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.allowed.methods</param-name>
+            <param-value>GET, POST</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.exposed.headers</param-name>
+            <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials,Access-Control-Allow-Methods</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.support.credentials</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>CorsFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+<!--
+    <filter>
+        <filter-name>requestContextFilter</filter-name>
+        <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>requestContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+-->
+    <filter>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+</web-app>
\ No newline at end of file