From 09cc9a356b945822ba5d8e939c30ca104967d278 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 12 Aug 2011 09:40:12 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1213
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java  | 3 ++-
 .../egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java | 2 +-
 .../gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java | 4 ++--
 .../moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java  | 2 +-
 spss/pom.xml                                                          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
index f0dc8293f..48ca083c5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParser.java
@@ -47,7 +47,8 @@ import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.XPathUtils;
 
-import com.sun.org.apache.xpath.internal.XPathAPI;
+//import com.sun.org.apache.xpath.internal.XPathAPI;
+import org.apache.xpath.XPathAPI;
 
 /**
  * Parses an <code>&lt;InfoboxReadResponse&gt;</code>.
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
index b5c57d5cf..1dfc266a9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessValidatorInputServlet.java
@@ -175,7 +175,7 @@ public class ProcessValidatorInputServlet extends AuthServlet {
 		    
       AuthenticationSession session = AuthenticationServer.getSession(sessionID);
       AuthenticationServer.processInput(session, parameters);
-      String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().getCreateXMLSignatureRequestAuthBlockOrRedirect(session, null, null);
+      String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().getCreateXMLSignatureRequestAuthBlockOrRedirect(session, null, null, false);
       if (!createXMLSignatureRequestOrRedirect.startsWith("Redirect")) {
         // Now sign the AUTH Block
         String dataURL = new DataURLBuilder().buildDataURL(
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index 5a9fc2fe9..bea81abf3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
@@ -174,13 +174,13 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
     	else {
     		boolean useMandate = session.getUseMandate();
     		if (useMandate) { // Mandate modus
-    			// read certificate and set dataurl to VerifyCertificateForMandatesServlet
+    			// read certificate and set dataurl to VerifyCertificateServlet
     			
     			Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate.");
     			
      		   String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true);
 
-     		   // build dataurl (to the GetForeignIDSerlvet)
+     		   // build dataurl
      		   String dataurl =
                  new DataURLBuilder().buildDataURL(
                    session.getAuthURL(),
diff --git a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
index e79394a28..19867dd38 100644
--- a/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
+++ b/id/server/idserverlib/src/test/java/test/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilderTest.java
@@ -63,7 +63,7 @@ public class AuthenticationBlockAssertionBuilderTest extends UnitTestCase {
 
 	public void testBuild() throws Exception {
 		AuthenticationBlockAssertionBuilder builder = new AuthenticationBlockAssertionBuilder();
-		String assertionBuilt = builder.buildAuthBlock(ISSUER, ISSUE_INSTANT, AUTH_URL, TARGET, "", "", OA_URL, GEB_DAT, null, null);
+		String assertionBuilt = builder.buildAuthBlock(ISSUER, ISSUE_INSTANT, AUTH_URL, TARGET, "", "", OA_URL, GEB_DAT, null, null, false);
 		assertionBuilt = XML_DECL + assertionBuilt;
 		String assertionShould = XML_DECL + ASSERTION_SHOULD;
 		assertXmlEquals(assertionShould, assertionBuilt);
diff --git a/spss/pom.xml b/spss/pom.xml
index c5ecda04d..ce76a939d 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA</groupId>
     <artifactId>spss</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.0</version>
+    <version>1.5.x</version>
     <name>MOA SP/SS</name>
 
     <properties>
-- 
cgit v1.2.3