Fix up some typos/bugs in config files and configuration classes

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

diff --git a/resources/conf/attribute-resolver.xml b/resources/conf/attribute-resolver.xml
index 4167d4d..efe173a 100644 (file)
--- a/resources/conf/attribute-resolver.xml
+++ b/resources/conf/attribute-resolver.xml
@@ -136,11 +136,11 @@
     <!-- ========================================== -->
     <!--      Principal Connectors                  -->
     <!-- ========================================== -->
-    <resolver:PrincipalConnector xsi:type="Direct" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+    <resolver:PrincipalConnector xsi:type="Direct" xmlns="urn:mace:shibboleth:2.0:resolver:pc"
                                  id="saml1UnspecDirect"
                                  nameIDFormat="urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified" />
                                  
-    <resolver:PrincipalConnector xsi:type="Direct" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+    <resolver:PrincipalConnector xsi:type="Direct" xmlns="urn:mace:shibboleth:2.0:resolver:pc"
                                  id="saml2UnspecDirect"
                                  nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />
 

diff --git a/resources/conf/handler.xml b/resources/conf/handler.xml
index f071e80..3d447a2 100644 (file)
--- a/resources/conf/handler.xml
+++ b/resources/conf/handler.xml
@@ -19,7 +19,7 @@
     
     <ProfileHandler xsi:type="SAML1AttributeQuery" 
                     inboundBinding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                    outboundBinding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding">
+                    outboundBindingEnumeration="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding">
         <RequestPath>/saml1/SOAP/AttributeQuery</RequestPath>
     </ProfileHandler>
     

diff --git a/resources/conf/internal.xml b/resources/conf/internal.xml
index 9092524..bd9c8a5 100644 (file)
--- a/resources/conf/internal.xml
+++ b/resources/conf/internal.xml
@@ -12,7 +12,7 @@
             <list>
                 <bean id="shibMetadataExtensions" class="org.opensaml.util.resource.ClasspathResource">
                     <constructor-arg value="/shibboleth-metadata-ext-config.xml" />
-                </bean>   
+                </bean>
             </list>
         </constructor-arg>
     </bean>
@@ -101,7 +101,8 @@
             <key>
                 <value>urn:oasis:names:tc:SAML:1.0:profiles:artifact-01</value>
             </key>
-            <bean id="shibboleth.SAML1HttpArtifactDecoder" class="org.opensaml.saml1.binding.encoding.HTTPArtifactDecoder">
+            <bean id="shibboleth.SAML1HttpArtifactDecoder"
+                class="org.opensaml.saml1.binding.encoding.HTTPArtifactDecoder">
             </bean>
         </entry>
         <entry>
@@ -110,7 +111,7 @@
             </key>
             <bean id="shibboleth.SAML1HttpSoap11Decoder"
                 class="org.opensaml.saml1.binding.decoding.HTTPSOAP11Decoder">
-                <property name="parser" ref="shibboleth.ParserPool" />
+                <constructor-arg ref="shibboleth.ParserPool" />
             </bean>
         </entry>
         <entry>
@@ -118,7 +119,7 @@
                 <value>urn:mace:shibboleth:1.0:profiles:AuthnRequest</value>
             </key>
             <bean id="shibboleth.ShibbolethSSODecoder"
-                class="org.opensaml.saml1.binding.decoding.ShibbolethSSODecoder">
+                class="edu.internet2.middleware.shibboleth.idp.profile.saml1.ShibbolethSSODecoder">
             </bean>
         </entry>
     </util:map>
@@ -167,7 +168,8 @@
             <key>
                 <value>urn:oasis:names:tc:SAML:1.0:profiles:artifact-01</value>
             </key>
-            <bean id="shibboleth.SAML1HttpArtifactEncoder" class="org.opensaml.saml1.binding.encoding.HTTPArtifactEncoder">
+            <bean id="shibboleth.SAML1HttpArtifactEncoder"
+                class="org.opensaml.saml1.binding.encoding.HTTPArtifactEncoder">
             </bean>
         </entry>
         <entry>
@@ -175,7 +177,7 @@
                 <value>urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding</value>
             </key>
             <bean id="shibboleth.SAML1HttpSoap11EncoderBuilder"
-                class="org.opensaml.saml1.binding.encoding.HTTPSOAP11EncoderBuilder" />
+                class="org.opensaml.saml1.binding.encoding.HTTPSOAP11Encoder" />
         </entry>
     </util:map>
 

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java b/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
index 5037c63..8557322 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
@@ -22,6 +22,7 @@ import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHand
 import edu.internet2.middleware.shibboleth.common.config.profile.JSPErrorHandlerBeanDefinitionParser;
 import edu.internet2.middleware.shibboleth.common.config.profile.VelocityErrorHandlerBeanDefinitionParser;
 import edu.internet2.middleware.shibboleth.idp.config.profile.authn.RemoteUserAuthenticationHandlerBeanDefinitionParser;
+import edu.internet2.middleware.shibboleth.idp.config.profile.authn.UsernamePasswordAuthenticationHandlerBeanDefinitionParser;
 import edu.internet2.middleware.shibboleth.idp.config.profile.saml1.SAML1AttributeQueryProfileHandlerBeanDefinitionParser;
 import edu.internet2.middleware.shibboleth.idp.config.profile.saml1.ShibbolethSSOProfileHandlerBeanDefinitionParser;
 import edu.internet2.middleware.shibboleth.idp.config.profile.saml2.SAML2AttributeQueryProfileHandlerBeanDefinitionParser;
@@ -66,5 +67,8 @@ public class ProfileHandlerNamespaceHandler extends BaseSpringNamespaceHandler {
 
         registerBeanDefinitionParser(RemoteUserAuthenticationHandlerBeanDefinitionParser.SCHEMA_TYPE,
                 new RemoteUserAuthenticationHandlerBeanDefinitionParser());
+
+        registerBeanDefinitionParser(UsernamePasswordAuthenticationHandlerBeanDefinitionParser.SCHEMA_TYPE,
+                new UsernamePasswordAuthenticationHandlerBeanDefinitionParser());
     }
 }
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java b/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java
index ff193f4..72ba609 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java
@@ -19,7 +19,6 @@ package edu.internet2.middleware.shibboleth.idp.config.profile.saml1;
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.w3c.dom.Element;
 
@@ -45,9 +44,6 @@ public class ShibbolethSSOProfileHandlerBeanDefinitionParser extends AbstractSAM
 
         builder.addConstructorArg(DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null,
                 "authenticationManagerPath")));
-
-        builder.addConstructorArg(XMLHelper.getAttributeValueAsList(config.getAttributeNodeNS(null,
-                "outboundBindingEnumeration")));
     }
 
 }
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java b/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java
index 9120a2b..97f8100 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java
@@ -45,10 +45,5 @@ public class SAML2SSOProfileHandlerBeanDefinitionParser extends AbstractSAML2Pro
 
         builder.addConstructorArg(DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null,
                 "authenticationManagerPath")));
-
-        builder.addConstructorArg(XMLHelper.getAttributeValueAsList(config.getAttributeNodeNS(null,
-                "outboundBindingEnumeration")));
-
-        builder.addConstructorArg(DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "decodingBinding")));
     }
 }
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
index 645dbf5..0df301e 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
@@ -18,7 +18,6 @@ package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -94,20 +93,13 @@ public class SSOProfileHandler extends AbstractSAML2ProfileHandler {
      * Constructor.
      * 
      * @param authnManagerPath path to the authentication manager servlet
-     * @param outgoingBindings URIs of SAML 2 bindings supported for outgoing message encoding
-     * @param decoder URI of the request decoder to use
      */
     @SuppressWarnings("unchecked")
-    public SSOProfileHandler(String authnManagerPath, List<String> outgoingBindings, String decoder) {
+    public SSOProfileHandler(String authnManagerPath) {
         super();
 
-        if (authnManagerPath == null || decoder == null) {
-            throw new IllegalArgumentException("AuthN manager path or decoding bindings URI may not be null");
-        }
         authenticationManagerPath = authnManagerPath;
 
-        decodingBinding = decoder;
-
         authnStatementBuilder = (SAMLObjectBuilder<AuthnStatement>) getBuilderFactory().getBuilder(
                 AuthnStatement.DEFAULT_ELEMENT_NAME);
         authnContextBuilder = (SAMLObjectBuilder<AuthnContext>) getBuilderFactory().getBuilder(