[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 12:15:34 2014
New Revision: 5544

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5544&view=rev
Log:
IDP-277 SAML2ECPProfileConfiguration and tests

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.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/SAML2BrowserSSOProfileParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecp.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=5544&r1=5543&r2=5544&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 12:15:34 2014
@@ -20,6 +20,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.SAML2ECPProfileParser;
 import net.shibboleth.idp.profile.spring.relyingparty.saml.SAML2LogoutRequestProfileParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
@@ -40,7 +41,9 @@
                 new SAML2AttributeQueryProfileParser());
         registerBeanDefinitionParser(SAML2BrowserSSOProfileParser.ELEMENT_NAME,
                 new SAML2BrowserSSOProfileParser());
+        registerBeanDefinitionParser(SAML2ECPProfileParser.ELEMENT_NAME,
+            new SAML2ECPProfileParser());
         registerBeanDefinitionParser(RelyingPartyParser.ELEMENT_NAME,
-            new RelyingPartyParser());
+                new RelyingPartyParser());
         }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java?rev=5544&r1=5543&r2=5544&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java Sat Mar  8 12:15:34 2014
@@ -48,7 +48,7 @@
     private Logger log = LoggerFactory.getLogger(SAML2BrowserSSOProfileParser.class);
 
     /** {@inheritDoc} */
-    @Override protected Class<BrowserSSOProfileConfiguration> getBeanClass(Element element) {
+    @Override protected Class<? extends BrowserSSOProfileConfiguration> getBeanClass(Element element) {
         return BrowserSSOProfileConfiguration.class;
     }
 

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=5544&r1=5543&r2=5544&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml Sat Mar  8 12:15:34 2014
@@ -31,5 +31,7 @@
     <bean id="shibboleth.SAML2.AttributeQuery.ServiceIndex" class="java.lang.String" c:_0="2143"/>
     <bean id="shibboleth.SAML2.BrowserSSO.ServiceURL" class="java.lang.String" c:_0="https://idp.example.org/SSO"/>
     <bean id="shibboleth.SAML2.BrowserSSO.ServiceIndex" class="java.lang.String" c:_0="1111"/>
+    <bean id="shibboleth.SAML2.ECP.ServiceURL" class="java.lang.String" c:_0="https://idp.example.org/ECP"/>

[... 28 lines stripped ...]