[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/idp.properties

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Aug  2 15:42:38 2016
New Revision: 8311

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8311&view=rev
Log:
Revert 8308 which spreads a property across multiple lines

Some integration tests fail as a result due to use of PropertiesWithComments to modify idp.properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties

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=8311&r1=8310&r2=8311&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties	Tue Aug  2 15:42:38 2016
@@ -1,9 +1,5 @@
 # Load any additional property resources from a comma-delimited list
-idp.additionalProperties = \
-/conf/ldap.properties, \
-/conf/saml-nameid.properties, \
-/conf/services.properties, \
-/conf/authn/duo.properties
+idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties, /conf/authn/duo.properties
 
 # Set the entityID of the IdP
 idp.entityID = https://idp.example.org