From 5d83525a967b66e74b4bd868de7f9805d5d52f84 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 16 Dec 2015 08:07:12 +0100
Subject: add empty eIDAS module

---
 id/server/auth/pom.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 665c97964..10e031ac4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -132,17 +132,25 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-        <dependency>
+		
+		<!-- Adding eIDAS module dependency automatically adds eIDAS protocol capabilities. -->
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-eIDAS</artifactId>
+		</dependency>
+		
+		
+<!--         <dependency>
             <groupId>eu.stork</groupId>
             <artifactId>oasis-dss-api</artifactId>
             <version>1.0.0-RELEASE</version>
-        </dependency>
+        </dependency> -->
         
-        <!-- Adding stork module dependency automatically adds stork capabilities. -->
+<!--         Adding stork module dependency automatically adds stork capabilities.
 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
-		</dependency>
+		</dependency> -->
 		
 		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
 		<dependency>
-- 
cgit v1.2.3


From 5abe951ec537b63b0cf70c4be203d96b308e5985 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 18 Dec 2015 12:59:33 +0100
Subject: fix broken STORK depentencies

---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 10e031ac4..ed809aee9 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -146,11 +146,11 @@
             <version>1.0.0-RELEASE</version>
         </dependency> -->
         
-<!--         Adding stork module dependency automatically adds stork capabilities.
+ <!--         Adding stork module dependency automatically adds stork capabilities.  -->
 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
-		</dependency> -->
+		</dependency>
 		
 		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
 		<dependency>
-- 
cgit v1.2.3


From 05e959fac7cca57540a768afb81fb06c3a0ae121 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 12 Jan 2016 10:44:45 +0100
Subject: remove STORK authentication module from build process

---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index ed809aee9..3a84ca37d 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -147,10 +147,10 @@
         </dependency> -->
         
  <!--         Adding stork module dependency automatically adds stork capabilities.  -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
-		</dependency>
+		</dependency> -->
 		
 		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
 		<dependency>
-- 
cgit v1.2.3


From 1d65e35ef38e8a7405ec25def325080b7da2ab4d Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 13 Jan 2016 16:47:05 +0100
Subject: moa learned how to receive eidas node requests

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index 8f01ca22b..c3cf396b3 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -93,6 +93,10 @@
         <from>^/stork2/RetrieveMandate$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=MandateRetrievalRequest&amp;%{query-string}</to>
     </rule>
+    <rule match-type="regex">
+        <from>^/eidas/ColleagueRequest$</from>
+        <to type="forward">/dispatcher?mod=eidas&amp;action=AuthenticationRequest&amp;%{query-string}</to>
+    </rule>
 
 
     <rule match-type="regex">
-- 
cgit v1.2.3