[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/profile-defaults.xml conf/webflow-config....

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  7 20:47:57 2014
New Revision: 5878

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5878&view=rev
Log:
Renaming flows to make user-override cleaner 

Modified:
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-security-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-security-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5878&r1=5877&r2=5878&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Wed May  7 20:47:57 2014
@@ -19,7 +19,7 @@
 
     <!--  SAML2 -->
     <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2ArtifactResolution" /><!-- TODO -->
+        c:_0="security-policy/soap" /><!-- TODO -->
         
     <bean id="shibboleth.SAML2.Logout.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/Logout" />
@@ -33,39 +33,39 @@
     <bean id="shibboleth.SAML2.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
         c:_0="2143" />
     <bean id="shibboleth.SAML2.AttributeQuery.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2AttributeQuery" />
+        c:_0="security-policy/soap" />
 
     <bean id="shibboleth.SAML2.BrowserSSO.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/SSO" />
     <bean id="shibboleth.SAML2.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
         c:_0="1111" />
     <bean id="shibboleth.SAML2.BrowserSSO.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2SSO" />
+        c:_0="security-policy/saml2-sso" />
         
     <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
         c:_0="SecurityPolicy.SAML2ECP" /><!-- TODO -->
 
     <!--  SAML2 - Liberty -->
     <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2SSOS" /><!-- TODO -->
+        c:_0="security-policy/saml2-ssoS" /><!-- TODO -->
 
     <!--  SAML1 -->
     <bean id="shibboleth.SAML1.Artifact.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML1ArtifactResolution" />
+        c:_0="security-policy/soap" />
         
     <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/AttributeQuery/SAML1" />
     <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceIndex" class="java.lang.String"
         c:_0="432100" />
     <bean id="shibboleth.SAML1.AttributeQuery.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML1AttributeQuery" />
+        c:_0="security-policy/soap" />
         
     <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/SSO/SAML1" />
     <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
         c:_0="1111" />
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.ShibbolethSSO" />
+        c:_0="security-policy/shibboleth-sso" />
         
 	<!-- And the default security Policy -->
 

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5878&r1=5877&r2=5878&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Wed May  7 20:47:57 2014
@@ -36,13 +36,10 @@
         <webflow:flow-location id="profile/SAML2/SOAP/ArtifactResolution" path="/saml/saml2/artifact-resolution-flow.xml"  />
     
         <!-- Inbound security processing of SAML messages. -->
-        <webflow:flow-location id="SecurityPolicy.Abstract" path="/saml/security-abstract-flow.xml" />
-        <webflow:flow-location id="SecurityPolicy.ShibbolethSSO" path="/saml/saml1/sso-security-flow.xml" />
-        <webflow:flow-location id="SecurityPolicy.SAML1AttributeQuery" path="/saml/soap-security-flow.xml" />
-        <webflow:flow-location id="SecurityPolicy.SAML1ArtifactResolution" path="/saml/soap-security-flow.xml" />
-        <webflow:flow-location id="SecurityPolicy.SAML2SSO" path="/saml/saml2/sso-security-flow.xml" />
-        <webflow:flow-location id="SecurityPolicy.SAML2AttributeQuery" path="/saml/soap-security-flow.xml" />

[... 54 lines stripped ...]