[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-filter.xml ldap.properties logb...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jun  2 09:10:02 2016
New Revision: 8265

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8265&view=rev
Log:
For the gazillion-and-tenth time back out test configuration changes.

Thanks to Tom for spotting that

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties
    trunk/idp-conf/src/main/resources/conf/logback.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=8265&r1=8264&r2=8265&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	Thu Jun  2 09:10:02 2016
@@ -15,7 +15,7 @@
 
     <!-- Release some attributes to an SP. -->
     <AttributeFilterPolicy id="example1">
-        <PolicyRequirementRule xsi:type="EntityAttributeExactMatch" attributeName="http://macedir.org/entity-category" attributeValue="http://refeds.org/category/research-and-scholarship"/>
+        <PolicyRequirementRule xsi:type="Requester" value="https://sp.example.org" />
 
         <AttributeRule attributeID="eduPersonPrincipalName">
             <PermitValueRule xsi:type="ANY" />

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=8265&r1=8264&r2=8265&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Thu Jun  2 09:10:02 2016
@@ -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/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=8265&r1=8264&r2=8265&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml	Thu Jun  2 09:10:02 2016
@@ -41,7 +41,7 @@
 
     <!-- Logs IdP, but not OpenSAML, messages -->
     <logger name="net.shibboleth.idp" level="${idp.loglevel.idp:-INFO}"/>
-    
+
     <!-- Logs OpenSAML, but not IdP, messages -->
     <logger name="org.opensaml.saml" level="${idp.loglevel.opensaml:-INFO}"/>
     
@@ -104,7 +104,7 @@
         
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <charset>UTF-8</charset>
-            <Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n%ex{29}</Pattern>
+            <Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n%ex{short}</Pattern>
         </encoder>
     </appender>