[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/conf/ldap.properties test/resources/conf/relyi...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 30 16:43:49 2015
New Revision: 7658

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7658&view=rev
Log:
Revert 80th accidental check in of config files

Modified:
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/test/resources/conf/relying-party.xml

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7658&r1=7657&r2=7658&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Thu Jul 30 16:43:49 2015
@@ -6,7 +6,7 @@
 
 ## Connection properties ##
 idp.authn.LDAP.ldapURL                          = ldap://localhost:10389
-idp.authn.LDAP.useStartTLS                     = false
+#idp.authn.LDAP.useStartTLS                     = true
 #idp.authn.LDAP.useSSL                          = false
 #idp.authn.LDAP.connectTimeout                  = 3000
 

Modified: trunk/idp-conf/src/test/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/conf/relying-party.xml?rev=7658&r1=7657&r2=7658&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/conf/relying-party.xml	(original)
+++ trunk/idp-conf/src/test/resources/conf/relying-party.xml	Thu Jul 30 16:43:49 2015
@@ -62,7 +62,7 @@
                     </bean>
                     <ref bean="SAML1.AttributeQuery" />
                     <ref bean="SAML1.ArtifactResolution" />
-                    <bean parent="SAML2.SSO" p:postAuthenticationFlows="#{{'terms-of-use', 'attribute-release'}}">
+                    <bean parent="SAML2.SSO">
                         <!--
                         <property name="defaultAuthenticationMethods">
                             <util:list>