Unit test for basic configuration loading

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

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 09d7334..504b123 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
@@ -61,11 +61,11 @@ public class ProfileHandlerGroupBeanDefinitionParser extends AbstractBeanDefinit
         }
         builder.addPropertyValue("profileHandlers", SpringConfigurationUtils.parseCustomElements(children, context));
 
-        children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "AuthenticationHandler"));
+        children = configChildren.get(new QName(ProfileHandlerNamespaceHandler.NAMESPACE, "LoginHandler"));
         if(log.isDebugEnabled()){
-            log.debug(children.size() + " authentication handler definitions found");
+            log.debug(children.size() + " login handler definitions found");
         }
-        builder.addPropertyValue("authenticationHandlers", SpringConfigurationUtils.parseCustomElements(children,
+        builder.addPropertyValue("loginHandlers", SpringConfigurationUtils.parseCustomElements(children,
                 context));
 
         return builder.getBeanDefinition();

diff --git a/test/data/conf1/handler.xml b/test/data/conf1/handler.xml
index 6796a74..5345e50 100644 (file)
--- a/test/data/conf1/handler.xml
+++ b/test/data/conf1/handler.xml
@@ -43,13 +43,13 @@
         <RequestPath>/saml2/SOAP/AttributeQuery</RequestPath>
     </ProfileHandler>
     
-    <AuthenticationHandler xsi:type="RemoteUser">
+    <LoginHandler xsi:type="RemoteUser">
         <AuthenticationMethod>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</AuthenticationMethod>
-    </AuthenticationHandler>
+    </LoginHandler>
     
-    <AuthenticationHandler xsi:type="UsernamePassword" 
+    <LoginHandler xsi:type="UsernamePassword" 
                            jaasConfigurationLocation="file://$IDP_HOME$/conf/login.config">
         <AuthenticationMethod>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</AuthenticationMethod>
-    </AuthenticationHandler>
+    </LoginHandler>
 
 </ProfileHandlerGroup>
\ No newline at end of file