Bit more work on startup log messages

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2613 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java b/src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java
index 97bd9de..02175c2 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java
@@ -18,8 +18,6 @@ package edu.internet2.middleware.shibboleth.idp.config.profile;
 
 import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.w3c.dom.Element;
 
@@ -31,12 +29,8 @@ import edu.internet2.middleware.shibboleth.common.config.profile.AbstractShibbol
 public abstract class AbstractSAMLProfileHandlerBeanDefinitionParser extends
         AbstractShibbolethProfileHandlerBeanDefinitionParser {
 
-    /** Class loggger. */
-    private static Logger log = LoggerFactory.getLogger(AbstractSAMLProfileHandlerBeanDefinitionParser.class);
-
     /** {@inheritDoc} */
     protected void doParse(Element config, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} SAML profile handler.", XMLHelper.getXSIType(config).getLocalPart());
         super.doParse(config, builder);
 
         builder.addPropertyReference("idGenerator", config.getAttributeNS(null, "idGeneratorId"));

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/service/IdPConfigBeanDefinitionParser.java b/src/edu/internet2/middleware/shibboleth/idp/config/service/IdPConfigBeanDefinitionParser.java
index 871cd03..0039134 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/service/IdPConfigBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/service/IdPConfigBeanDefinitionParser.java
@@ -22,6 +22,8 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.util.XMLHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -40,6 +42,9 @@ public class IdPConfigBeanDefinitionParser extends AbstractSimpleBeanDefinitionP
 
     /** Schema type. */
     public static final QName SCHEMA_TYPE = new QName(IdPServicesNamespaceHandler.NAMESPACE, "IdPConfigType");
+    
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(IdPConfigBeanDefinitionParser.class);
 
     /** {@inheritDoc} */
     protected Class getBeanClass(Element arg0) {
@@ -48,9 +53,11 @@ public class IdPConfigBeanDefinitionParser extends AbstractSimpleBeanDefinitionP
 
     /** {@inheritDoc} */
     protected void doParse(Element config, ParserContext context, BeanDefinitionBuilder builder) {
+        log.info("Beginning to load IdP configuration");
         Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(config);
         List<Element> children = configChildren.get(new QName(ServiceNamespaceHandler.NAMESPACE, "Service"));
         builder.addConstructorArg(SpringConfigurationUtils.parseCustomElements(children, context));
+        log.info("Finished loading IdP configuration");
     }
     
     /** {@inheritDoc} */