[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn-comparison.xml conf/authn/ conf/aut...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 12:36:15 2014
New Revision: 5844

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5844&view=rev
Log:
Demote authn-related config to a subdirectory

Added:
    trunk/idp-conf/src/main/resources/conf/authn/
    trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/authn-comparison.xml
    trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/general-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
      - copied, changed from r5832, trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/jaas.config
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/jaas.config
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml
      - copied unchanged from r5832, trunk/idp-conf/src/main/resources/conf/remoteuser-authn-config.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/authn-comparison.xml
    trunk/idp-conf/src/main/resources/conf/general-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/jaas.config
    trunk/idp-conf/src/main/resources/conf/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/remoteuser-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml

Copied: trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml (from r5832, trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml?p2=trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml&p1=trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml&r1=5832&r2=5844&rev=5844&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml Mon May  5 12:36:15 2014
@@ -15,7 +15,7 @@
     <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
     
     <!-- Specify your JAAS config. -->
-    <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/jaas.config" />
+    <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/authn/jaas.config" />
     
     <util:property-path id="shibboleth.authn.JAAS.JAASConfigURI" path="JAASConfig.URI" />
     

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=5844&r1=5843&r2=5844&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon May  5 12:36:15 2014
@@ -13,8 +13,8 @@
 
     <import resource="services-user.xml" />
     <import resource="subject-c14n-user.xml" />
-	<import resource="authn-comparison.xml" />
-	<import resource="general-authn-config.xml" />
+	<import resource="authn/authn-comparison.xml" />
+	<import resource="authn/general-authn-config.xml" />
 
     <!-- List of event/error codes during SSO to trap and handle without returning to SPs. -->
 

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml?rev=5844&r1=5843&r2=5844&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml Mon May  5 12:36:15 2014
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="../../../conf/ipaddress-authn-config.xml" />

[... 50 lines stripped ...]