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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 30 16:42:35 2015
New Revision: 7657

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7657&view=rev
Log:
Fix dangling idp-consent ref. in idp-war POM

Modified:
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/test/resources/conf/relying-party.xml
    trunk/idp-war/pom.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=7657&r1=7656&r2=7657&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:42:35 2015
@@ -6,7 +6,7 @@
 
 ## Connection properties ##
 idp.authn.LDAP.ldapURL                          = ldap://localhost:10389
-#idp.authn.LDAP.useStartTLS                     = true
+idp.authn.LDAP.useStartTLS                     = false
 #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=7657&r1=7656&r2=7657&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:42:35 2015
@@ -62,7 +62,7 @@
                     </bean>
                     <ref bean="SAML1.AttributeQuery" />
                     <ref bean="SAML1.ArtifactResolution" />
-                    <bean parent="SAML2.SSO">
+                    <bean parent="SAML2.SSO" p:postAuthenticationFlows="#{{'terms-of-use', 'attribute-release'}}">
                         <!--
                         <property name="defaultAuthenticationMethods">
                             <util:list>

Modified: trunk/idp-war/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/pom.xml?rev=7657&r1=7656&r2=7657&view=diff
==============================================================================
--- trunk/idp-war/pom.xml	(original)
+++ trunk/idp-war/pom.xml	Thu Jul 30 16:42:35 2015
@@ -65,7 +65,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>idp-consent</artifactId>
+            <artifactId>idp-consent-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-consent-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>