[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jun 10 12:19:30 2016
New Revision: 8267

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8267&view=rev
Log:
IDP-997 NameSpace Handler woes.

https://issues.shibboleth.net/jira/browse/IDP-997

The tests were using the wrong sort of BeanDefinitionReader which ended up with parsers being declared twice.
It also means that the SSOS profile parser didn't work outside tests.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/impl/RelyingPartyNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/RelyingPartySAMLNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML1ArtifactResolutionProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML1AttributeQueryProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2ArtifactResolutionProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2AttributeQueryProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2BrowserSSOProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2ECPProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2LogoutRequestProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/SAML2SSOSProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/ShibbolethSSOProfileParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/impl/RelyingPartyNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/impl/RelyingPartyNamespaceHandler.java?rev=8267&r1=8266&r2=8267&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/impl/RelyingPartyNamespaceHandler.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/impl/RelyingPartyNamespaceHandler.java	Fri Jun 10 12:19:30 2016
@@ -19,41 +19,15 @@
 
 import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML1ArtifactResolutionProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML1AttributeQueryProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2ArtifactResolutionProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2AttributeQueryProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2BrowserSSOProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2ECPProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2LogoutRequestProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.SAML2SSOSProfileParser;
-import net.shibboleth.idp.profile.spring.relyingparty.saml.impl.ShibbolethSSOProfileParser;
 
-// TODO incomplete
-/** Namespace handler for the relying party files. */
+/** Namespace handler for the relying party files. Only the elements need to be handled.
+    All the types belong in the SAML namespace. */
 public class RelyingPartyNamespaceHandler extends BaseSpringNamespaceHandler {
 
     /** {@inheritDoc} */
     @Override public void init() {
         // Relying party Configuration

[... 835 lines stripped ...]