*update Assembly script

*move demoOA to moa.id.demoOA
*change name of moa-id configuration-tool

8 files changed, 96 insertions, 104 deletions

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 5d74fd8a9..ae8b62645 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -7,7 +7,7 @@
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.id</groupId>
-  <artifactId>ConfigurationInterface</artifactId>
+  <artifactId>moa-id-configuration</artifactId>
   <version>0.9.8-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>MOA-ID 2.0 Configuration Tool</name>
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 276c17e7e..9fa082ac2 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -3,8 +3,8 @@
 	

 	<formats>

 		<format>dir</format>

-		<format>zip</format>

-		<format>tar.gz</format>

+<!-- 		<format>zip</format>

+		<format>tar.gz</format> -->

 	</formats>

 

 	<baseDirectory>moa-id-auth-${project.version}</baseDirectory>

@@ -14,7 +14,6 @@
 			<directory>${basedir}/id/server/data/deploy</directory>

 			<outputDirectory>/</outputDirectory>

 			<excludes>

-				<!-- <exclude>**/conf/moa-id/oa/**</exclude>-->

 				<exclude>**/conf/Catalina/**</exclude>

 			</excludes>

 		</fileSet>

@@ -63,9 +62,9 @@
 				<include>MOA.id.server:moa-id-auth</include>

 			</includes>

 			<binaries>

-				<includeDependencies>false</includeDependencies>

+				<includeDependencies>true</includeDependencies>

 				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

+				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

 				<dependencySets>

 					<dependencySet>

 						<includes>

@@ -103,17 +102,46 @@
 				<unpack>true</unpack>

 			</binaries>

 		</moduleSet>

-		<!-- <moduleSet>

+

+		<moduleSet>

 			<includes>

-				<include>MOA.id:moa-id-templates</include>

+				<include>MOA.id:moa-id-configuration</include>

 			</includes>

 			<binaries>

 				<includeDependencies>false</includeDependencies>

-				<outputFileNameMapping>moaid-templates.war</outputFileNameMapping>

-				<outputDirectory>/templates</outputDirectory>

+				<outputDirectory>/</outputDirectory>

+				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

 				<unpack>false</unpack>

 			</binaries>

-		</moduleSet>-->

+		</moduleSet>

+		

+		<moduleSet>

+			<includes>

+				<include>MOA.id:moa-id-oa</include>

+			</includes>

+			<sources>

+			   <useDefaultExcludes>true</useDefaultExcludes>

+			   <outputDirectory>../</outputDirectory>

+			   <includeModuleDirectory>true</includeModuleDirectory>

+			   <outputDirectoryMapping>/source/${module.artifactId}/src</outputDirectoryMapping>

+			   <excludes>			           

+         		<exclude>**/target/**</exclude>

+         		<exclude>**/bin/**</exclude>

+      			<exclude>**/.settings/**</exclude>

+			      <exclude>.*</exclude>

+			   </excludes>

+			   <includes>

+						<include>pom.xml</include>

+					</includes>

+			</sources>

+			<binaries>

+				<includeDependencies>false</includeDependencies>

+				<outputDirectory>/</outputDirectory>

+				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

+				<unpack>false</unpack>

+			</binaries>

+		</moduleSet>

+

 	</moduleSets>

 

 	<componentDescriptors>

diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index bf8fa1140..3f70474b6 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -51,7 +51,7 @@
 			<binaries>

 				<includeDependencies>true</includeDependencies>

 				<outputDirectory>/</outputDirectory>

-				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

+				<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

 				<dependencySets>

 					<dependencySet>

 						<includes>

@@ -61,7 +61,7 @@
 							<include>xalan-bin-dist:serializer</include>

 						</includes>

 						<outputDirectory>/endorsed</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

+						<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

 					</dependencySet>

 					<dependencySet>

 						<includes>

@@ -71,13 +71,13 @@
 							<include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>

 						</includes>

 						<outputDirectory>/ext</outputDirectory>

-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

+						<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>

 					</dependencySet>

 				</dependencySets>

 				<unpack>false</unpack>

 			</binaries>

 		</moduleSet>

-		<moduleSet>

+<!-- 		<moduleSet>

 			<includes>

 				<include>MOA:moa-id-oa</include>

 			</includes>

@@ -87,7 +87,7 @@
 				<outputFileNameMapping>oa.${extension}</outputFileNameMapping>

 				<unpack>false</unpack>

 			</binaries>

-		</moduleSet>

+		</moduleSet> -->

 		<moduleSet>

 			<includes>

 				<include>MOA.id.server:moa-id-lib</include>

diff --git a/id/oa/bin/src/main/resources/templates/pvp_postbinding_template.html b/id/oa/bin/src/main/resources/templates/pvp_postbinding_template.html
deleted file mode 100644
index 1215c2b58..000000000
--- a/id/oa/bin/src/main/resources/templates/pvp_postbinding_template.html
+++ /dev/null
@@ -1,51 +0,0 @@
-##
-## Velocity Template for SAML 2 HTTP-POST binding
-##
-## Velocity context may contain the following properties
-## action - String - the action URL for the form
-## RelayState - String - the relay state for the message
-## SAMLRequest - String - the Base64 encoded SAML Request
-## SAMLResponse - String - the Base64 encoded SAML Response
- 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- 
-    <body onload="document.forms[0].submit()">
-        <noscript>
-            <p>
-                <strong>Note:</strong> Since your browser does not support JavaScript,
-                you must press the Continue button once to proceed.
-            </p>
-        </noscript>
- 
- 
-       <div id="alert">Your login is being processed. Thank you for waiting.</div>
- 
-       <style type="text/css">
-       <!--
-       #alert {
-       margin:100px 250px;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size:14px;
-       font-weight:normal;
-       }
-       -->
-       </style>
-         
-        <form action="${action}" method="post">
-            <div>
-                #if($RelayState)<input type="hidden" name="RelayState" value="${RelayState}"/>#end
-                 
-                #if($SAMLRequest)<input type="hidden" name="SAMLRequest" value="${SAMLRequest}"/>#end
-                 
-                #if($SAMLResponse)<input type="hidden" name="SAMLResponse" value="${SAMLResponse}"/>#end
-                 
-            </div>
-            <noscript>
-                <div>
-                    <input type="submit" value="Continue"/>
-                </div>
-            </noscript>
-        </form>
-         
-    </body>
-</html>
\ No newline at end of file
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index adb372bd0..c5664c281 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -1,8 +1,14 @@
 <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>MOA</groupId>
+    	<artifactId>id</artifactId>
+    	<version>1.9.98-SNAPSHOT</version>
+  	</parent>
+    
     <modelVersion>4.0.0</modelVersion>
-    <groupId>MOA</groupId>
+    <groupId>MOA.id</groupId>
     <artifactId>moa-id-oa</artifactId>
     <packaging>war</packaging>
     <version>2.0.0</version>
@@ -34,7 +40,6 @@
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
-				<version>2.4</version>
 				<scope>provided</scope>
 			</dependency>        
         
@@ -75,7 +80,6 @@
   		<dependency>
 				<groupId>MOA</groupId>
 				<artifactId>moa-common</artifactId>
-				<version>2.0</version>
 				<type>jar</type>
 			</dependency>
   		
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 93009173d..987ae1951 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -79,6 +79,7 @@
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
 		</dependency>
+		
 		<!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
 			<groupId>iaik.prod</groupId>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9b2711249..b137fa7ca 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -60,15 +60,12 @@
 			<artifactId>webservices-tools</artifactId>

 			<version>2.0.1</version>

 		</dependency>

-		<dependency>

+ 		<dependency>

 			<groupId>com.sun</groupId>

 			<artifactId>webservices-rt</artifactId>

 			<version>2.0.1</version>

 		</dependency>

-		<!--<dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> 

-			</dependency> -->

-

-

+		

 		<dependency>

 			<groupId>javax.mail</groupId>

 			<artifactId>mail</artifactId>

@@ -78,22 +75,45 @@
 			<artifactId>servlet-api</artifactId>

 			<scope>provided</scope>

 		</dependency>

-		<dependency>

-			<groupId>xerces</groupId>

-			<artifactId>xercesImpl</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>xalan-bin-dist</groupId>

-			<artifactId>xml-apis</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>xalan-bin-dist</groupId>

-			<artifactId>xalan</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>xalan-bin-dist</groupId>

-			<artifactId>serializer</artifactId>

-		</dependency>

+		

+        <dependency>

+            <groupId>xalan-bin-dist</groupId>

+            <artifactId>xalan</artifactId>

+            <!-- should be provided by the container or jre -->

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>xerces</groupId>

+            <artifactId>xercesImpl</artifactId>

+            <!-- should be provided by the container or jre -->

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>xalan-bin-dist</groupId>

+            <artifactId>xml-apis</artifactId>

+            <!-- should be provided by the container or jre -->

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>xalan-bin-dist</groupId>

+            <artifactId>serializer</artifactId>

+            <!-- should be provided by the container or jre -->

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>iaik.prod</groupId>

+            <artifactId>iaik_jce_full</artifactId>

+            <!-- should be in the ext directory of the jre -->

+            <scope>provided</scope>

+        </dependency>

+        <dependency>

+            <groupId>iaik.prod</groupId>

+            <artifactId>iaik_ecc</artifactId>

+            <!-- should be in the ext directory of the jre -->

+            <scope>provided</scope>

+        </dependency>

+		

+		

 		<dependency>

 			<groupId>junit</groupId>

 			<artifactId>junit</artifactId>

@@ -129,15 +149,6 @@
 		</dependency>

 		<dependency>

 			<groupId>iaik.prod</groupId>

-			<artifactId>iaik_ecc</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>iaik.prod</groupId>

-			<artifactId>iaik_jce_full</artifactId>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>iaik.prod</groupId>

 			<artifactId>iaik_ixsil</artifactId>

 		</dependency>

 		<dependency>

@@ -161,10 +172,7 @@
 			<groupId>regexp</groupId>

 			<artifactId>regexp</artifactId>

 		</dependency>

-		<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 

-			</dependency> -->

-		<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId> 

-			<version>1.1</version> </dependency> -->

+

 		<dependency>

 			<groupId>commons-lang</groupId>

 			<artifactId>commons-lang</artifactId>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index 93f17dd70..9a13129d8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 import javax.servlet.http.HttpSession;

+import javax.xml.bind.JAXBContext;

 

 import org.opensaml.saml2.core.Assertion;

 import org.opensaml.saml2.core.StatusCode;

@@ -52,6 +53,7 @@ import at.gv.egovernment.moa.id.util.HTTPUtils;
 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.DOMUtils;

 import at.gv.egovernment.moa.util.StringUtils;

+import at.gv.util.xsd.xmldsig.SignatureType;

 import eu.stork.mw.messages.saml.STORKAuthnRequest;

 import eu.stork.mw.messages.saml.STORKResponse;

 import eu.stork.vidp.messages.util.XMLUtil;