fixed issues after merge

1 files changed, 12 insertions, 14 deletions

diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
index f3821374a..efd22668c 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
@@ -20,7 +20,6 @@ import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.log4j.Logger;
 import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.core.NameIDType;
@@ -50,13 +49,12 @@ import at.gv.egovernment.moa.id.demoOA.Constants;
 import at.gv.egovernment.moa.id.demoOA.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.demoOA.utils.AttributeListBuilder;
 import at.gv.egovernment.moa.id.demoOA.utils.SAML2Utils;
+import at.gv.egovernment.moa.logging.Logger;
 import at.iaik.commons.util.MiscUtil;
 
 public class BuildMetadata extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 	
-	private static final Logger log = Logger.getLogger(BuildMetadata.class);
-
 	/**
 	 * @see HttpServlet#HttpServlet()
 	 */
@@ -88,7 +86,7 @@ public class BuildMetadata extends HttpServlet {
 			
 			String name = config.getPVP2MetadataEntitiesName();
 			if (MiscUtil.isEmpty(name)) {
-				log.info("NO Metadata EntitiesName configurated");
+				Logger.info("NO Metadata EntitiesName configurated");
 				throw new ConfigurationException("NO Metadata EntitiesName configurated");
 			}
 			
@@ -104,7 +102,7 @@ public class BuildMetadata extends HttpServlet {
 			if (!serviceURL.endsWith("/"))
 				serviceURL = serviceURL + "/";
 			
-			log.debug("Set OnlineApplicationURL to " + serviceURL);
+			Logger.debug("Set OnlineApplicationURL to " + serviceURL);
 			spEntityDescriptor.setEntityID(serviceURL);
 
 			SPSSODescriptor spSSODescriptor = SAML2Utils
@@ -126,7 +124,7 @@ public class BuildMetadata extends HttpServlet {
 					config.getPVP2KeystoreMetadataKeyPassword().toCharArray());
 
 			
-			log.debug("Set Metadata key information");
+			Logger.debug("Set Metadata key information");
 			//Set MetaData Signing key
 			KeyDescriptor entitiesSignKeyDescriptor = SAML2Utils
 					.createSAMLObject(KeyDescriptor.class);
@@ -162,7 +160,7 @@ public class BuildMetadata extends HttpServlet {
 				spSSODescriptor.getKeyDescriptors().add(encryKeyDescriptor);
 				
 			} else {
-				log.warn("No Assertion Encryption-Key defined. This setting is not recommended!");
+				Logger.warn("No Assertion Encryption-Key defined. This setting is not recommended!");
 				
 			}
 			
@@ -237,32 +235,32 @@ public class BuildMetadata extends HttpServlet {
 			response.getOutputStream().close();
 			
 		} catch (ConfigurationException e) {
-			log.warn("Configuration can not be loaded.", e);
+			Logger.warn("Configuration can not be loaded.", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 			
 		} catch (NoSuchAlgorithmException e) {
-			log.warn("Requested Algorithm could not found.", e);
+			Logger.warn("Requested Algorithm could not found.", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 							
 		} catch (ParserConfigurationException e) {
-			log.warn("PVP2 Metadata createn error", e);
+			Logger.warn("PVP2 Metadata createn error", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 							
 		} catch (TransformerConfigurationException e) {
-			log.warn("PVP2 Metadata createn error", e);
+			Logger.warn("PVP2 Metadata createn error", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 			
 		} catch (TransformerFactoryConfigurationError e) {
-			log.warn("PVP2 Metadata createn error", e);
+			Logger.warn("PVP2 Metadata createn error", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 			
 		} catch (TransformerException e) {
-			log.warn("PVP2 Metadata createn error", e);
+			Logger.warn("PVP2 Metadata createn error", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 		}
 		
 		catch (Exception e) {
-			log.warn("Unspecific PVP2 Metadata createn error", e);
+			Logger.warn("Unspecific PVP2 Metadata createn error", e);
 			throw new ServletException("MetaData can not be created. Look into LogFiles for more details.");
 		}