[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/global-user.xml idp-conf/src/main/resourc...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb 18 14:06:51 2014
New Revision: 5393

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5393&view=rev
Log:
Integrate endpoint resolver action into SAML 1 flow, remove redundant code.

Added:
    trunk/idp-conf/src/main/resources/conf/saml-binding-config.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/PopulateBindingAndEndpointContexts.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/InitializeOutboundMessageContext.java

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5393&r1=5392&r2=5393&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Tue Feb 18 14:06:51 2014
@@ -14,6 +14,7 @@
 	<import resource="authn-comparison.xml" />
 	<import resource="authn-flow-descriptors.xml" />
     <import resource="subject-config.xml" />
+    <import resource="saml-binding-config.xml" />
 	<import resource="attribute-params-config.xml" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=5393&r1=5392&r2=5393&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Tue Feb 18 14:06:51 2014
@@ -1,5 +1,8 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false">
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/sp/SAML2/POST/ACS" index="0"/>
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="false">
+        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/sp/SAML2/POST/ACS" index="1"/>
+        
+        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.example.org/SAML1/POST/ACS" index="10"/>
+        
     </SPSSODescriptor>
 </EntityDescriptor>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5393&r1=5392&r2=5393&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Feb 18 14:06:51 2014
@@ -107,6 +107,8 @@
     <bean id="shibboleth.MarshallerFactory" factory-method="getMarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
     <bean id="shibboleth.UnmarshallerFactory" factory-method="getUnmarshallerFactory" class="org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport" depends-on="shibboleth.OpenSAMLConfig" />
 
+    <bean id="shibboleth.EndpointResolver" class="org.opensaml.saml.common.binding.DefaultEndpointResolver" />
+
     <bean id="shibboleth.CookieManager" class="net.shibboleth.utilities.java.support.net.CookieManager"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:secure="false" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5393&r1=5392&r2=5393&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Tue Feb 18 14:06:51 2014
@@ -25,14 +25,42 @@
         c:messageHandler-ref="inboundMessageHandlerChain"
         c:executionDirection="INBOUND" />
 
+    <!-- TODO: remove once we get real metadata config in place -->

[... 209 lines stripped ...]