From 3f388c8862a4543d8c7f791e5ff47090d533aa0c Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 14:55:17 +0100
Subject: added attribute collector action to protocol and urlrewrite

---
 id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml                 | 4 ++++
 .../java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java | 1 +
 2 files changed, 5 insertions(+)

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 f8fdcaffc..563ee04dd 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -56,6 +56,10 @@
         <from>^/stork2/StartAuthentication$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
     </rule>
+    <rule match-type="regex">
+        <from>^/stork2/ResumeAuthentication$</from>
+        <to type="forward">/dispatcher?mod=id_stork2&amp;action=AttributeCollector&amp;%{query-string}</to>
+    </rule>
     <rule match-type="regex">
         <from>^/stork2/SendPEPSAuthnRequest$</from>
         <to type="forward">/dispatcher?mod=id_stork2&amp;action=AuthenticationRequest&amp;%{query-string}</to>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index 323d9ba8e..318a8fc9c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -43,6 +43,7 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
     static {
 
         actions.put(AUTHENTICATIONREQUEST, new AuthenticationRequest());
+        actions.put(ATTRIBUTE_COLLECTOR, new AttributeCollector());
 
         instance = new STORKProtocol();
     }
-- 
cgit v1.2.3