[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: Wed Mar  5 11:45:54 2014
New Revision: 5528

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5528&view=rev
Log:
IDP-277 SAML2LogoutProfileConfiguration plus tests

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2LogoutRequestProfileParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logout.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/logoutValues.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java?rev=5528&r1=5527&r2=5528&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java Wed Mar  5 11:45:54 2014
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.profile.spring.relyingparty;
 
 import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2ArtifactResolutionProfileParser;
+import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2LogoutRequestProfileParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
 // TODO incomplete
@@ -31,6 +32,8 @@
     @Override public void init() {
         registerBeanDefinitionParser(SAML2ArtifactResolutionProfileParser.ELEMENT_NAME,
                 new SAML2ArtifactResolutionProfileParser());
+        registerBeanDefinitionParser(SAML2LogoutRequestProfileParser.ELEMENT_NAME,
+                new SAML2LogoutRequestProfileParser());
 
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java?rev=5528&r1=5527&r2=5528&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/RelyingPartySAMLNamespaceHandler.java Wed Mar  5 11:45:54 2014
@@ -28,7 +28,5 @@
 
     /** {@inheritDoc} */
     @Override public void init() {
-        registerBeanDefinitionParser(SAML2ArtifactResolutionProfileParser.ELEMENT_NAME,
-                new SAML2ArtifactResolutionProfileParser());
     }
 }

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java?rev=5528&r1=5527&r2=5528&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java Wed Mar  5 11:45:54 2014
@@ -64,8 +64,6 @@
         Assert.assertTrue(proxyAudiences.contains("ProxyAudience1"));
         Assert.assertTrue(proxyAudiences.contains("ProxyAudience2"));
 
-        // defaults for AbstractSAMLProfileConfiguration
-
         assertFalsePredicate(profile.getSignRequestsPredicate());
         assertFalsePredicate(profile.getSignAssertionsPredicate());
         assertConditionalPredicate(profile.getSignResponsesPredicate());

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml?rev=5528&r1=5527&r2=5528&view=diff

[... 12 lines stripped ...]