[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: Tue Mar 11 12:23:27 2014
New Revision: 5556

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

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSO.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.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/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=5556&r1=5555&r2=5556&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 Tue Mar 11 12:23:27 2014
@@ -24,6 +24,7 @@
 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.profile.spring.relyingparty.saml.ShibbolethSSOProfileParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
 // TODO incomplete
@@ -35,7 +36,8 @@
 
     /** {@inheritDoc} */
     @Override public void init() {
-        registerBeanDefinitionParser(SAML2ArtifactResolutionProfileParser.ELEMENT_NAME,
+        // Profile Configuration
+        registerBeanDefinitionParser(SAML2ArtifactResolutionProfileParser.ELEMENT_NAME, 
                 new SAML2ArtifactResolutionProfileParser());
         registerBeanDefinitionParser(SAML2LogoutRequestProfileParser.ELEMENT_NAME,
                 new SAML2LogoutRequestProfileParser());
@@ -50,6 +52,10 @@
                 new SAML1ArtifactResolutionProfileParser());
         registerBeanDefinitionParser(SAML1AttributeQueryProfileParser.ELEMENT_NAME,
                 new SAML1AttributeQueryProfileParser());
+        registerBeanDefinitionParser(SAML1AttributeQueryProfileParser.ELEMENT_NAME,
+                new SAML1AttributeQueryProfileParser());
+        registerBeanDefinitionParser(ShibbolethSSOProfileParser.ELEMENT_NAME,
+                new ShibbolethSSOProfileParser());
         
         registerBeanDefinitionParser(RelyingPartyParser.ELEMENT_NAME,
                 new RelyingPartyParser());

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=5556&r1=5555&r2=5556&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 Tue Mar 11 12:23:27 2014
@@ -38,6 +38,9 @@
     <bean id="shibboleth.SAML1.Artifact.ServiceIndex" class="java.lang.String" c:_0="43210"/>
     <bean id="shibboleth.SAML1.AttributeQuery.ServiceURL" class="java.lang.String" c:_0="https://idp.example.org/AttributeQuery/SAML1"/>
     <bean id="shibboleth.SAML1.AttributeQuery.ServiceIndex" class="java.lang.String" c:_0="432100"/>
+    <bean id="shibboleth.SAML1.BrowserSSO.ServiceURL" class="java.lang.String" c:_0="https://idp.example.org/SSO/SAML1"/>
+    <bean id="shibboleth.SAML1.BrowserSSO.ServiceIndex" class="java.lang.String" c:_0="1111"/>
+
     
 </beans>