From d60ceb70869148deb9f85751c63460fa245a8c7f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 12:14:18 +0100
Subject: split moa-id-auth in a final- and an edjucation- version

---
 .../auth-edu/src/main/webapp/META-INF/MANIFEST.MF  |  2 +
 id/server/auth-edu/src/main/webapp/WEB-INF/web.xml | 47 ++++++++++++++++++++++
 id/server/auth-edu/src/main/webapp/index.html      |  0
 3 files changed, 49 insertions(+)
 create mode 100644 id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF
 create mode 100644 id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
 create mode 100644 id/server/auth-edu/src/main/webapp/index.html

(limited to 'id/server/auth-edu/src/main/webapp')

diff --git a/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..59499bce4
--- /dev/null
+++ b/id/server/auth-edu/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..9ad651d42
--- /dev/null
+++ b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
+	<display-name>MOA ID Auth</display-name>
+	<description>MOA ID Authentication Service</description>
+
+	<filter>
+		<filter-name>characterEncodingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>forceEncoding</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>characterEncodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	
+	<welcome-file-list>
+   <welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+	
+	<session-config>
+		<session-timeout>5</session-timeout>
+	</session-config>
+	
+	<error-page>
+		<error-code>500</error-code>
+		<location>/errorpage.jsp</location>
+	</error-page>
+	
+	<login-config>
+		<auth-method>BASIC</auth-method>
+		<realm-name>UserDatabase</realm-name>
+	</login-config>
+	<security-role>
+		<description>The role that is required to log in to the moa Application</description>
+		<role-name>moa-admin</role-name>
+	</security-role>
+
+</web-app>
diff --git a/id/server/auth-edu/src/main/webapp/index.html b/id/server/auth-edu/src/main/webapp/index.html
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From 4372ee1611fd6f9542febcf38163bf784e473c5e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 13:17:01 +0100
Subject: change to WebServlet API 3.0

---
 id/server/auth-edu/src/main/webapp/WEB-INF/web.xml   | 4 ++--
 id/server/auth-final/src/main/webapp/WEB-INF/web.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'id/server/auth-edu/src/main/webapp')

diff --git a/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
index 9ad651d42..64b6ffcdd 100644
--- a/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth-edu/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
 
diff --git a/id/server/auth-final/src/main/webapp/WEB-INF/web.xml b/id/server/auth-final/src/main/webapp/WEB-INF/web.xml
index 9ad651d42..64b6ffcdd 100644
--- a/id/server/auth-final/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth-final/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
 	<display-name>MOA ID Auth</display-name>
 	<description>MOA ID Authentication Service</description>
 
-- 
cgit v1.2.3