Fix typo in default config

[java-idp.git] / src / edu / internet2 / middleware / shibboleth / idp / config / profile / ProfileHandlerGroupBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java b/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
index bb683da..605b540 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
@@ -22,44 +22,41 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
 
-/**
- * Spring bean definition parser for profile handler root element.
- */
-public class ProfileHandlerGroupBeanDefinitionParser extends AbstractBeanDefinitionParser {
+/** Spring bean definition parser for profile handler root element. */
+public class ProfileHandlerGroupBeanDefinitionParser implements BeanDefinitionParser {
 
     /** Schema type name. */
     public static final QName SCHEMA_TYPE = new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "ProfileHandlerGroup");
 
-    /** {@inheritDoc} */
-    protected AbstractBeanDefinition parseInternal(Element config, ParserContext context) {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ProfileHandlerGroup.class);
+    /** Class logger. */
+    private static Logger log = LoggerFactory.getLogger(ProfileHandlerGroupBeanDefinitionParser.class);
 
+    /** {@inheritDoc} */
+    public BeanDefinition parse(Element config, ParserContext context) {
         Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(config);
         List<Element> children;
 
         children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "ErrorHandler"));
-        builder.addPropertyValue("errorHandler", SpringConfigurationUtils.parseCustomElement(children.get(0), context));
+        log.debug("{} error handler definitions found", children.size());
+        SpringConfigurationUtils.parseCustomElement(children.get(0), context);
 
         children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "ProfileHandler"));
-        builder.addPropertyValue("profileHandlers", SpringConfigurationUtils.parseCustomElements(children, context));
+        log.debug("{} profile handler definitions found", children.size());
+        SpringConfigurationUtils.parseCustomElements(children, context);
 
-        children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "AuthenticationHandler"));
-        builder.addPropertyValue("authenticationHandlers", SpringConfigurationUtils.parseCustomElements(children,
-                context));
+        children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "LoginHandler"));
+        log.debug("{} login handler definitions found", children.size());
+        SpringConfigurationUtils.parseCustomElements(children, context);
 
-        return builder.getBeanDefinition();
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
+        return null;
     }
 }
\ No newline at end of file