Merge PVP2 and MOA 2.0

2 files changed, 51 insertions, 104 deletions

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index e403c5ba7..f4e72fea4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.5.2</version>
+	<version>1.9.90-SNAPSHOT</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-			<!--version>${project.version}</version -->
+			<version>${project.version}</version>
 		</dependency>
 		<!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
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 032f06911..d33cae207 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -2,33 +2,29 @@
 <!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 4.0//EN"
         "http://www.tuckey.org/res/dtds/urlrewrite4.0.dtd">
 
-<!--
-
-    Configuration file for UrlRewriteFilter
-    http://www.tuckey.org/urlrewrite/
-
--->
+<!-- Configuration file for UrlRewriteFilter http://www.tuckey.org/urlrewrite/ -->
 <urlrewrite>
 
-    <rule>
-        <note>
-            The rule means that requests to /test/status/ will be redirected to /rewrite-status
-            the url will be rewritten.
-        </note>
-        <from>/test/status/</from>
-        <to type="redirect">%{context-path}/rewrite-status</to>
-    </rule>
+	<rule>
+		<note>
+			The rule means that requests to /test/status/ will be redirected to
+			/rewrite-status
+			the url will be rewritten.
+		</note>
+		<from>/test/status/</from>
+		<to type="redirect">%{context-path}/rewrite-status</to>
+	</rule>
+
+	<!-- Legacy Rules -->
+	<rule match-type="regex">
+		<from>^/StartAuthentication$</from>
+		<to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact</to>
+	</rule>
+	<rule match-type="regex">
+		<from>^/StartAuthentication\?(.*)$</from>
+		<to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact&amp;$1</to>
+	</rule>
 
-    <!-- Legacy Rules -->
-    <rule match-type="regex">
-        <from>^/StartAuthentication$</from>
-        <to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact</to>
-    </rule>
-    <rule match-type="regex">
-        <from>^/StartAuthentication\?(.*)$</from>
-        <to type="forward">/dispatcher?mod=id_saml1&amp;action=GetArtifact&amp;$1</to>
-    </rule>
-    
 	<rule match-type="regex">
 		<from>^/auth/([a-zA-Z0-9]+)/([a-zA-Z0-9]+)$</from>
 		<to type="forward">/dispatcher?mod=$1&amp;action=$2</to>
@@ -39,86 +35,37 @@
 	</rule>
 
 
-    <outbound-rule>
-        <note>
-            The outbound-rule specifies that when response.encodeURL is called (if you are using JSTL c:url)
-            the url /rewrite-status will be rewritten to /test/status/.
-
-            The above rule and this outbound-rule means that end users should never see the
-            url /rewrite-status only /test/status/ both in thier location bar and in hyperlinks
-            in your pages.
-        </note>
-        <from>/rewrite-status</from>
-        <to>/test/status/</to>
-    </outbound-rule>
-
-	<outbound-rule>
-		<from>^/AuthDispatcher?mod=([a-zA-Z0-9]+)&amp;action=([a-zA-Z0-9]+)$</from>
-		<to>/auth/$1/$2</to>
-	</outbound-rule>
+	<rule match-type="regex">
+		<from>^/pvp2/metadata$</from>
+		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Metadata&amp;%{query-string}</to>
+	</rule>
+	<rule match-type="regex">
+		<from>^/pvp2/redirect$</from>
+		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Redirect&amp;%{query-string}</to>
+	</rule>
+	<rule match-type="regex">
+		<from>^/pvp2/post$</from>
+		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Post&amp;%{query-string}</to>
+	</rule>
+	<rule match-type="regex">
+		<from>^/PVP2Soap$</from>
+		<to type="forward">/dispatcher?mod=id_pvp2x&amp;action=Soap</to>
+	</rule>
 
 	<outbound-rule>
-		<from>^/AuthDispatcher?mod=([a-zA-Z0-9]+)&amp;action=([a-zA-Z0-9]+)&amp;(.*)$</from>
-		<to>/auth/$1/$2&amp;$3</to>
+		<note>
+			The outbound-rule specifies that when response.encodeURL is called (if
+			you are using JSTL c:url)
+			the url /rewrite-status will be rewritten to /test/status/.
+
+			The above rule and this outbound-rule means that end users should never
+			see the
+			url /rewrite-status only /test/status/ both in thier location bar and in
+			hyperlinks
+			in your pages.
+		</note>
+		<from>/rewrite-status</from>
+		<to>/test/status/</to>
 	</outbound-rule>
 
-    <!--
-
-    INSTALLATION
-
-        in your web.xml add...
-
-        <filter>
-            <filter-name>UrlRewriteFilter</filter-name>
-            <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
-            <init-param>
-                <param-name>logLevel</param-name>
-                <param-value>WARN</param-value>
-            </init-param>
-        </filter>
-        <filter-mapping>
-            <filter-name>UrlRewriteFilter</filter-name>
-            <url-pattern>/*</url-pattern>
-        </filter-mapping>
-
-     EXAMPLES
-
-     Redirect one url
-        <rule>
-            <from>/some/old/page.html</from>
-            <to type="redirect">/very/new/page.html</to>
-        </rule>
-
-    Redirect a directory
-        <rule>
-            <from>/some/olddir/(.*)</from>
-            <to type="redirect">/very/newdir/$1</to>
-        </rule>
-
-    Clean a url
-        <rule>
-            <from>/products/([0-9]+)</from>
-            <to>/products/index.jsp?product_id=$1</to>
-        </rule>
-    eg, /products/1234 will be passed on to /products/index.jsp?product_id=1234 without the user noticing.
-
-    Browser detection
-        <rule>
-            <condition name="user-agent">Mozilla/[1-4]</condition>
-            <from>/some/page.html</from>
-            <to>/some/page-for-old-browsers.html</to>
-        </rule>
-    eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older
-    browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4.
-
-    Centralised browser detection
-        <rule>
-            <condition name="user-agent">Mozilla/[1-4]</condition>
-            <set type="request" name="browser">moz</set>
-        </rule>
-    eg, all requests will be checked against the condition and if matched
-    request.setAttribute("browser", "moz") will be called.
-
-    -->
-
 </urlrewrite>