merge

2 files changed, 10 insertions, 2 deletions

diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
index c143d050b..85f16e11f 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/Configuration.java
@@ -40,6 +40,7 @@ import java.util.Timer;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.log4j.Logger;
 import org.opensaml.DefaultBootstrap;
 import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
 import org.opensaml.xml.parse.BasicParserPool;
@@ -52,6 +53,8 @@ import at.iaik.commons.util.MiscUtil;
 
 public class Configuration {
 
+	private static final Logger log = Logger.getLogger(Configuration.class);
+	
 	private Properties props;
 	private static final String SYSTEM_PROP_CONFIG = "moa.id.demoOA";
 	
@@ -216,6 +219,8 @@ public class Configuration {
 			//load OpenSAML library
 			DefaultBootstrap.bootstrap();
 			
+			log.info("Demo Application initializaten finished.");
+			
 		} catch ( FileNotFoundException e) {
 			throw new ConfigurationException("DemoOA configuration is not found at " + configFileName);
 			
@@ -259,6 +264,8 @@ public class Configuration {
 
 			pvp2logininitialzied = true;
 			
+			log.info("Load IDP Metadata finished.");
+			
 		} catch (Exception e) {
 			throw new ConfigurationException("PVP2 authentification can not be initialized.", e);
 		}	
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
index 5bf9c4970..00d82296c 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
@@ -129,10 +129,11 @@ public class Authenticate extends HttpServlet {
 			authReq.setSubject(subject);
 			issuer.setFormat(NameIDType.ENTITY);
 			authReq.setIssuer(issuer);
+			
 			NameIDPolicy policy = SAML2Utils
 					.createSAMLObject(NameIDPolicy.class);
-			policy.setAllowCreate(true);
-			policy.setFormat(NameID.PERSISTENT);
+			policy.setAllowCreate(true);			
+			policy.setFormat(NameID.PERSISTENT);			
 			authReq.setNameIDPolicy(policy);
 			
 			String entityname = config.getPVP2IDPMetadataEntityName();