[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: Sat Mar  8 11:48:03 2014
New Revision: 5542

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

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSO.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOvalues.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyNamespaceHandler.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.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=5542&r1=5541&r2=5542&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 Sat Mar  8 11:48:03 2014
@@ -19,6 +19,7 @@
 
 import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2ArtifactResolutionProfileParser;
 import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2AttributeQueryProfileParser;
+import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2BrowserSSOProfileParser;
 import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2LogoutRequestProfileParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
@@ -37,5 +38,9 @@
                 new SAML2LogoutRequestProfileParser());
         registerBeanDefinitionParser(SAML2AttributeQueryProfileParser.ELEMENT_NAME,
                 new SAML2AttributeQueryProfileParser());
-    }
+        registerBeanDefinitionParser(SAML2BrowserSSOProfileParser.ELEMENT_NAME,
+                new SAML2BrowserSSOProfileParser());
+        registerBeanDefinitionParser(RelyingPartyParser.ELEMENT_NAME,
+            new RelyingPartyParser());
+        }
 }

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java?rev=5542&r1=5541&r2=5542&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java Sat Mar  8 11:48:03 2014
@@ -62,15 +62,15 @@
         return context.getBean(claz);
     }
     
-    protected void assertTruePredicate(Predicate<ProfileRequestContext> predicate) {
+    protected static void assertTruePredicate(Predicate<ProfileRequestContext> predicate) {
         Assert.assertTrue(predicate.apply(null));
     }
     
-    protected void assertFalsePredicate(Predicate<ProfileRequestContext> predicate) {
+    protected static void assertFalsePredicate(Predicate<ProfileRequestContext> predicate) {
         Assert.assertFalse(predicate.apply(null));
     }
     
-    protected void assertConditionalPredicate(Predicate<ProfileRequestContext> predicate) {
+    protected static void assertConditionalPredicate(Predicate<ProfileRequestContext> predicate) {
         // a conditional predicate will look at the parameter and fail immediately
         try {
             predicate.apply(null);

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=5542&r1=5541&r2=5542&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml (original)

[... 10 lines stripped ...]