[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/jetty-base: etc/jetty.xml start.d/jsp.i...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun 11 15:05:22 2014
New Revision: 6077

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6077&view=rev
Log:
Bump Jetty version to latest 9.2.x in parent-v3 POM and override Servlet API 3.0.1 with Servlet API 3.1.0 in the testbed POM.

Added:
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jstl.ini   (with props)
Modified:
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini

Modified: trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml?rev=6077&r1=6076&r2=6077&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml Wed Jun 11 15:05:22 2014
@@ -208,7 +208,6 @@
           <Set name="port"><Property name="jetty.https.port" default="8443" /></Set>
           <Set name="idleTimeout"><Property name="https.timeout" default="30000"/></Set>
           <Set name="soLingerTime"><Property name="https.soLingerTime" default="-1"/></Set>
-          <Set name="idleTimeout">30000</Set>
         </New>
       </Arg>
     </Call>

Modified: trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini?rev=6077&r1=6076&r2=6077&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini Wed Jun 11 15:05:22 2014
@@ -3,5 +3,13 @@
 #
 --module=jsp
 # JSP Configuration
-# To use an non-jdk compiler for JSP compilation uncomment next line
+
+# Select JSP implementation, choices are
+#   glassfish : The reference implementation
+#               default in jetty <= 9.1
+#   apache    : The apache version
+#               default jetty >= 9.2
+jsp-impl=apache
+
+# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line
 # -Dorg.apache.jasper.compiler.disablejsr199=true