[jetty8] 07/09: Removed the JSP_COMPILER variable from /etc/default/jetty8

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jetty8.

commit 72f831de8b2c87026dc0f13c6307093bcddcf15d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 2 12:11:30 2015 +0100

    Removed the JSP_COMPILER variable from /etc/default/jetty8
---
 debian/changelog      | 2 +-
 debian/jetty8.default | 4 ----
 debian/jetty8.init    | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b059df..49c36ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ jetty8 (8.1.18-3) UNRELEASED; urgency=medium
   * Removed the unused commons-daemon.jar and tools.jar from the start classpath
   * Invoke Jetty with 'java -jar start.jar' instead of
     'java -cp start.jar org.eclipse.jetty.start.Main'
-  * Removed the JDK_DIRS variable from /etc/default/jetty8
+  * Removed the JDK_DIRS and JSP_COMPILER variables from /etc/default/jetty8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Dec 2015 10:05:19 +0100
 
diff --git a/debian/jetty8.default b/debian/jetty8.default
index 1c322d8..53bd3fd 100644
--- a/debian/jetty8.default
+++ b/debian/jetty8.default
@@ -33,10 +33,6 @@ VERBOSE=yes
 # the Oracle JDK are tried.
 #JAVA_HOME=
 
-# Java compiler to use for translating JavaServer Pages (JSPs). You can use all
-# compilers that are accepted by Ant's build.compiler property.
-#JSP_COMPILER=jikes
-
 # Jetty uses a directory to store temporary files like unpacked webapps
 #JETTY_TMP=/var/cache/jetty8
 
diff --git a/debian/jetty8.init b/debian/jetty8.init
index 0fdb804..331c507 100644
--- a/debian/jetty8.init
+++ b/debian/jetty8.init
@@ -197,11 +197,6 @@ JAVA_OPTIONS="$JAVA_OPTIONS \
 	-Djetty.host=$JETTY_HOST \
 	-Djetty.port=$JETTY_PORT"
 
-# Set the JSP compiler if set in the jetty.default file
-if [ -n "$JSP_COMPILER" ]; then
-	JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
 export JAVA_OPTIONS
 
 # Define other required variables

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty8.git