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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  5 14:40:52 2013
New Revision: 4937

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4937&view=rev
Log:
Sync with testbed.

Added:
    trunk/idp-conf/src/main/resources/conf/global-user.xml   (with props)
    trunk/idp-conf/src/main/resources/system/
    trunk/idp-conf/src/main/resources/system/conf/
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
      - copied, changed from r4936, trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
      - copied, changed from r4936, trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
      - copied, changed from r4936, trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/flows/
      - copied from r4936, trunk/idp-conf/src/main/resources/flows/
Modified:
    trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/flows/
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-basic-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-form-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml

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=4937&r1=4936&r2=4937&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Tue Nov  5 14:40:52 2013
@@ -8,7 +8,12 @@
     
     <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="flowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <webflow:flow-location id="Authentication.Abstract" path="/authn/authn-abstract-flow.xml" />
         <webflow:flow-location id="Authentication.Subflow.Abstract" path="/authn/authn-subflow-abstract-flow.xml" />

Copied: trunk/idp-conf/src/main/resources/system/conf/global-system.xml (from r4936, trunk/idp-conf/src/main/resources/conf/global-beans.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?p2=trunk/idp-conf/src/main/resources/system/conf/global-system.xml&p1=trunk/idp-conf/src/main/resources/conf/global-beans.xml&r1=4936&r2=4937&rev=4937&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Nov  5 14:40:52 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/idp-conf/src/main/resources/system/conf/mvc-beans.xml (from r4936, trunk/idp-conf/src/main/resources/conf/mvc-beans.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?p2=trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml&p1=trunk/idp-conf/src/main/resources/conf/mvc-beans.xml&r1=4936&r2=4937&rev=4937&view=diff
==============================================================================
    (empty)

Copied: trunk/idp-conf/src/main/resources/system/conf/session-manager.xml (from r4936, trunk/idp-conf/src/main/resources/conf/session-manager.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager.xml?p2=trunk/idp-conf/src/main/resources/system/conf/session-manager.xml&p1=trunk/idp-conf/src/main/resources/conf/session-manager.xml&r1=4936&r2=4937&rev=4937&view=diff
==============================================================================
    (empty)

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml

[... 59 lines stripped ...]