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

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  7 21:25:45 2014
New Revision: 5879

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5879&view=rev
Log:
Move webflow-config to system tree

Added:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
      - copied, changed from r5878, trunk/idp-conf/src/main/resources/conf/webflow-config.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Copied: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (from r5878, 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/system/conf/webflow-config.xml?p2=trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml&p1=trunk/idp-conf/src/main/resources/conf/webflow-config.xml&r1=5878&r2=5879&rev=5879&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Wed May  7 21:25:45 2014
@@ -9,8 +9,11 @@
     <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
 
     <!--
-    Define custom flows, or override system flows, by using filesystem directly. Flows will be
-    named based on the directories between the base-path and the flow file ending in -flow.xml
+    Define custom flows by using the filesystem directly. Flows will be named based
+    on the directories between the base-path and the flow file ending in -flow.xml
+    
+    NOTE: you cannot override named flows in the system registry below. If absolutely
+    necessary, you can comment out system flows to override them.
     -->
     <webflow:flow-registry id="userFlowRegistry" base-path="file:${idp.home}/flows" flow-builder-services="flowBuilderServices">
         <webflow:flow-location-pattern value="/**/*-flow.xml" />

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml?rev=5879&r1=5878&r2=5879&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml Wed May  7 21:25:45 2014
@@ -37,14 +37,14 @@
 	<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.ArtifactServiceURL" class="java.lang.String"
 		c:_0="https://idp.example.org/ECP" />
@@ -55,7 +55,7 @@
 
     <!--  SAML2 - Liberty -->
     <bean id="shibboleth.SAML2.SSOS.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2SSOS" />
+        c:_0="security-policy/saml2-ssoS" />
 
     <!--  SAML1 -->
 	<bean id="shibboleth.SAML1.Artifact.ArtifactServiceURL" class="java.lang.String"
@@ -70,14 +70,14 @@
 	<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-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=5879&r1=5878&r2=5879&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)

[... 11 lines stripped ...]