Merge branch 'merge' into dokumentservice

3 files changed, 5 insertions, 16 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java
index 56f6d8827..390b8c476 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java
@@ -23,7 +23,6 @@
 package at.gv.egovernment.moa.id.configuration.auth.pvp2.servlets;
 
 import java.io.IOException;
-import java.security.KeyStore;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -36,15 +35,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
 import org.joda.time.DateTime;
 import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.binding.BasicSAMLMessageContext;
 import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.binding.encoding.HTTPPostEncoder;
 import org.opensaml.saml2.core.AuthnContextClassRef;
 import org.opensaml.saml2.core.AuthnContextComparisonTypeEnumeration;
 import org.opensaml.saml2.core.AuthnRequest;
@@ -56,17 +50,12 @@ import org.opensaml.saml2.core.RequestedAuthnContext;
 import org.opensaml.saml2.core.Subject;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.SingleSignOnService;
-import org.opensaml.saml2.metadata.impl.SingleSignOnServiceBuilder;
 import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
-import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter;
 import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.AbstractSignableXMLObject;
-import org.opensaml.xml.signature.Signature;
-import org.opensaml.xml.signature.SignatureConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/BuildMetadata.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/BuildMetadata.java
index f121babc6..5265aed86 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/BuildMetadata.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/BuildMetadata.java
@@ -242,10 +242,10 @@ public class BuildMetadata extends HttpServlet {
 			redirectBindingService.setLocation(serviceURL + Constants.SERVLET_SLO_FRONT);
 			spSSODescriptor.getSingleLogoutServices().add(redirectBindingService);
 			
-//			SingleLogoutService soapBindingService = SAML2Utils.createSAMLObject(SingleLogoutService.class);
-//			soapBindingService.setBinding(SAMLConstants.SAML2_SOAP11_BINDING_URI);
-//			soapBindingService.setLocation(serviceURL + Constants.SERVLET_SLO_BACK);
-//			spSSODescriptor.getSingleLogoutServices().add(soapBindingService);
+			SingleLogoutService soapBindingService = SAML2Utils.createSAMLObject(SingleLogoutService.class);
+			soapBindingService.setBinding(SAMLConstants.SAML2_SOAP11_BINDING_URI);
+			soapBindingService.setLocation(serviceURL + Constants.SERVLET_SLO_BACK);
+			spSSODescriptor.getSingleLogoutServices().add(soapBindingService);
 			
 			spSSODescriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
 			
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index 980bb1e59..4762f1518 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -224,7 +224,7 @@ public class IndexAction extends BasicAction {
 			
 			//store user as authenticated user
 			AuthenticationManager authManager = AuthenticationManager.getInstance();
-			authManager.setActiveUser(authUser);
+			authManager.setActiveUser(authuser);
 
 			Date date = DateTimeHelper.parseDateTime(dbuser.getLastLogin());
 			if (date != null)