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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun  1 11:29:40 2016
New Revision: 8264

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8264&view=rev
Log:
IDP-983 Merge Jetty 9.3 changes forward fron 
https://issues.shibboleth.net/jira/browse/IDP-983

Notably:
 - Collect the correct jetty-base
 - Populate an empty jetty-base/tmp
 - Setup java.io.tmpdir to point to same
 - Cute little red words sayign that you need to have java 1.8 in a couple of dialogs

Added:
    trunk/idp-distribution/src/main/resources/embedded/jetty-base-9.3/tmp/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base-9.3/tmp/.gitkeep
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
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs

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=8264&r1=8263&r2=8264&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	Wed Jun  1 11:29:40 2016
@@ -15,7 +15,7 @@
 
     <!-- Release some attributes to an SP. -->
     <AttributeFilterPolicy id="example1">
-        <PolicyRequirementRule xsi:type="Requester" value="https://sp.example.org" />
+        <PolicyRequirementRule xsi:type="EntityAttributeExactMatch" attributeName="http://macedir.org/entity-category" attributeValue="http://refeds.org/category/research-and-scholarship"/>
 
         <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=8264&r1=8263&r2=8264&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Wed Jun  1 11:29:40 2016
@@ -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/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=8264&r1=8263&r2=8264&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml	Wed Jun  1 11:29:40 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{short}</Pattern>
+            <Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n%ex{29}</Pattern>
         </encoder>
     </appender>
     

Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=8264&r1=8263&r2=8264&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat	(original)
+++ trunk/idp-installer/src/main/wix/IdP.bat	Wed Jun  1 11:29:40 2016
@@ -121,16 +121,16 @@
 
 rem The file names gets too big....
 rename %idpex% IdPEx
-set idpex=IdPExe
+set idpex=IdPEx
 
-rem we Want to call embedded/jetty-base jetty-base
-move %idpex%\embedded\jetty-base %idpex%\jetty-base
+rem we Want to call embedded/jetty-base-9.3 jetty-base
+move %idpex%\embedded\jetty-base-9.3 %idpex%\jetty-base
 if ERRORLEVEL 1 (
   cd ..
-  echo embedded/jetty-base directory not found?
+  echo embedded/jetty-base-9.3 directory not found?
   goto done;
 )
-rd embedded
+rd /s /q %idpex%\embedded
 
 rem We want to call jetty-base/start.d jetty-base/start.d.dist
 

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs

[... 72 lines stripped ...]