[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-resolver-full.xml conf/attribut...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 12:14:41 2014
New Revision: 6637

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6637&view=rev
Log:
Start factoring properties, starting with ldap and service config. Rename some audit properties.

Added:
    trunk/idp-conf/src/main/resources/conf/ldap.properties   (with props)
    trunk/idp-conf/src/main/resources/conf/services.properties   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=6637&r1=6636&r2=6637&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Mon Oct  6 12:14:41 2014
@@ -308,10 +308,10 @@
     <!-- Example LDAP Connector -->
     <!--
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
-        ldapURL="%{idp.attribute.resolver.myLDAP.ldapURL}"
-        baseDN="%{idp.attribute.resolver.myLDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.myLDAP.principal}"
-        principalCredential="%{idp.attribute.resolver.myLDAP.principalCredential}">
+        ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
+        baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
+        principal="%{idp.attribute.resolver.LDAP.principal}"
+        principalCredential="%{idp.attribute.resolver.LDAP.principalCredential}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml?rev=6637&r1=6636&r2=6637&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Mon Oct  6 12:14:41 2014
@@ -75,10 +75,10 @@
     <!-- Example LDAP Connector -->
     <!--
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
-        ldapURL="%{idp.attribute.resolver.myLDAP.ldapURL}"
-        baseDN="%{idp.attribute.resolver.myLDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.myLDAP.principal}"
-        principalCredential="%{idp.attribute.resolver.myLDAP.principalCredential}">
+        ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
+        baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
+        principal="%{idp.attribute.resolver.LDAP.principal}"
+        principalCredential="%{idp.attribute.resolver.LDAP.principalCredential}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6637&r1=6636&r2=6637&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Oct  6 12:14:41 2014
@@ -1,3 +1,6 @@
+# Load any additional property resources in a comma-delimited list
+idp.additionalProperties = conf/ldap.properties, conf/services.properties
+
 # Set the entityID of the IdP
 idp.entityID = https://idp.example.org
 
@@ -140,45 +143,10 @@
 # for use by user interface logic; adds overhead so off by default.
 #idp.logout.elaboration = false
 
-# Reload "failfast" (stop the IdP if a configuration is bad)
-# and reload check interval (0 == never reload).
-#idp.service.logging.failFast=true
-#idp.service.logging.checkInterval=PT5M
 #Set true to generate audit log entries for errors trapped locally
-#idp.service.logging.auditLocalErrors=false
+#idp.logging.auditLocalErrors=false
 # Format of audit log entries, defaults to V2-compatible
-#idp.service.logging.audit=%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i
-
-# Relying Party resolver
-#idp.service.relyingparty.failFast=false
-idp.service.relyingparty.checkInterval=PT5M
-
-# Metadata resolver
-#idp.service.metadata.failFast=false

[... 226 lines stripped ...]