[java-idp-testbed COMMIT] in /trunk/src/main: resources/conf/global-beans.xml resources/conf/global-user.xml resource...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  5 13:22:03 2013
New Revision: 37

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=37&view=rev
Log:
Reorganize and rename files to separate user-editable and system config.

Added:
    trunk/src/main/resources/conf/global-user.xml   (with props)
    trunk/src/main/resources/system/
    trunk/src/main/resources/system/conf/
    trunk/src/main/resources/system/conf/global-system.xml
      - copied, changed from r36, trunk/src/main/resources/conf/global-beans.xml
    trunk/src/main/resources/system/conf/mvc-beans.xml
      - copied, changed from r36, trunk/src/main/resources/conf/mvc-beans.xml
    trunk/src/main/resources/system/conf/session-manager.xml
      - copied, changed from r36, trunk/src/main/resources/conf/session-manager.xml
    trunk/src/main/resources/system/conf/testbed-beans.xml
      - copied, changed from r36, trunk/src/main/resources/conf/globalAppContext.xml
    trunk/src/main/resources/system/flows/
    trunk/src/main/resources/system/flows/authn/
      - copied from r36, trunk/src/main/resources/flows/authn/
    trunk/src/main/resources/system/flows/saml2/
      - copied from r36, trunk/src/main/resources/flows/saml2/
Modified:
    trunk/src/main/resources/conf/global-beans.xml
    trunk/src/main/resources/conf/globalAppContext.xml
    trunk/src/main/resources/conf/mvc-beans.xml
    trunk/src/main/resources/conf/session-manager.xml
    trunk/src/main/resources/conf/webflow-config.xml
    trunk/src/main/resources/flows/authn/
    trunk/src/main/resources/flows/saml2/
    trunk/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/src/main/resources/system/flows/authn/jaas-basic-authn-beans.xml
    trunk/src/main/resources/system/flows/authn/jaas-form-authn-beans.xml
    trunk/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/webflow-config.xml?rev=37&r1=36&r2=37&view=diff
==============================================================================
--- trunk/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/src/main/resources/conf/webflow-config.xml Tue Nov  5 13:22:03 2013
@@ -7,8 +7,13 @@
                            http://www.springframework.org/schema/webflow-config classpath:/org/springframework/webflow/config/spring-webflow-config-2.3.xsd">
     
     <context:property-placeholder location="classpath:conf/idp.properties" />
-    
-    <webflow:flow-registry id="flowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">
+
+    <!-- Define custom flows, or override system flows, inside here. -->
+    <webflow:flow-registry id="flowRegistry" parent="systemFlowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">
+    </webflow:flow-registry>
+
+    <!-- System-supplied flows, do not modify. -->
+    <webflow:flow-registry id="systemFlowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <!-- Use dot-separated convention for abstract flows. -->
         <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml2/sso-abstract-flow.xml"  />

Copied: trunk/src/main/resources/system/conf/global-system.xml (from r36, trunk/src/main/resources/conf/global-beans.xml)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/global-system.xml?p2=trunk/src/main/resources/system/conf/global-system.xml&p1=trunk/src/main/resources/conf/global-beans.xml&r1=36&r2=37&rev=37&view=diff
==============================================================================
--- trunk/src/main/resources/conf/global-beans.xml (original)
+++ trunk/src/main/resources/system/conf/global-system.xml Tue Nov  5 13:22:03 2013
@@ -24,8 +24,6 @@
         </property>
     </bean>
 
-    <import resource="authn-comparison.xml" />
-    <import resource="authn-flow-descriptors.xml" />
     <import resource="session-manager.xml" />
     
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">

Copied: trunk/src/main/resources/system/conf/mvc-beans.xml (from r36, trunk/src/main/resources/conf/mvc-beans.xml)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/mvc-beans.xml?p2=trunk/src/main/resources/system/conf/mvc-beans.xml&p1=trunk/src/main/resources/conf/mvc-beans.xml&r1=36&r2=37&rev=37&view=diff
==============================================================================
    (empty)

Copied: trunk/src/main/resources/system/conf/session-manager.xml (from r36, trunk/src/main/resources/conf/session-manager.xml)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/session-manager.xml?p2=trunk/src/main/resources/system/conf/session-manager.xml&p1=trunk/src/main/resources/conf/session-manager.xml&r1=36&r2=37&rev=37&view=diff

[... 92 lines stripped ...]