Remove standalone Jetty 6.x support scripts
In the 2.1 series we're strongly encouring everyone to switch
to using our embedded Jetty container (under our daemon command)
rather than installing and running their own external Jetty process.
It vastly simplifies the installation and maintenance of upgrades.
Also, Jetty 6.x is already (or very close to) being end-of-lifed.
The entire Jetty project moved to the Eclipes Foundation and
rewrote their package namespace during the 7.x release cycle.
A stable 7.x has already been released, and we're embedding it in
our daemon command. So users who absolutely want to run their own
external Jetty container should just run Jetty 7 and use our jetty7
support scripts instead.
Change-Id: I4981549e2ece146d49c2b1b6c5d9933e9d7d0419
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh
deleted file mode 100644
index f8e22d9..0000000
--- a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-export JETTY_HOST=127.0.0.1
-export JETTY_PORT=8081
-export JETTY_USER=gerrit2
-export JETTY_PID=/var/run/jetty$JETTY_PORT.pid
-export JETTY_HOME=/home/$JETTY_USER/jetty
-export JAVA_HOME=/usr/lib/jvm/java-6-sun-1.6.0.07/jre
-
-JAVA_OPTIONS=""
-JAVA_OPTIONS="$JAVA_OPTIONS -Djetty.host=$JETTY_HOST"
-export JAVA_OPTIONS
-
-C="jetty-logging jetty"
-[ -f "$JETTY_HOME/etc/jetty_sslproxy.xml" ] && C="$C jetty_sslproxy"
-
-exec $JETTY_HOME/bin/jetty.sh "$@" $C
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml
deleted file mode 100644
index cbc4343..0000000
--- a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<!--
-
- Jetty configuration to place "gerrit.war" into the root context,
- so it answers to simple URLs like "/$changeid" and "/mine".
-
- * Copy this file to $JETTY_HOME/contexts/gerrit.xml
- * Edit user, password, jdbcUrl as necessary below for database.
- * Edit mail.smtp.host, user, password as necessary for outgoing SMTP.
-
- * Copy commons-dbcp-*.jar to $JETTY_HOME/lib/plus/
- * Copy commons-pool-*.jar to $JETTY_HOME/lib/plus/
- * Copy JDBC driver to $JETTY_HOME/lib/plus/
- * Copy www/gerrit-*.war to $JETTY_HOME/webapps/gerrit.war
-
- * Make sure you remove $JETTY_HOME/context/test.xml
-
--->
-<Configure id="wac" class="org.mortbay.jetty.webapp.WebAppContext">
- <Set name="contextPath">/</Set>
- <Set name="war"><SystemProperty name="jetty.home" default="."/>/webapps/gerrit.war</Set>
-
- <Set name="extractWAR">true</Set>
- <Set name="copyWebDir">true</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-
- <Set name="ConfigurationClasses">
- <Array type="java.lang.String">
- <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.Configuration</Item>
- <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
- </Array>
- </Set>
-
- <New id="ReviewDb" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg></Arg>
- <Arg>jdbc/ReviewDb</Arg>
- <Arg>
- <New class="org.apache.commons.dbcp.BasicDataSource">
-<!-- PostgreSQL
- <Set name="driverClassName">org.postgresql.Driver</Set>
- <Set name="url">jdbc:postgresql:reviewdb</Set>
- <Set name="username">gerrit2</Set>
- <Set name="password">secretkey</Set>
--->
-<!-- MySQL
- <Set name="driverClassName">com.mysql.jdbc.Driver</Set>
- <Set name="url">jdbc:mysql://localhost/reviewdb?user=gerrit2&password=secretkey</Set>
--->
-<!-- H2
- <Set name="driverClassName">org.h2.Driver</Set>
- <Set name="url">jdbc:h2:file:ReviewDb</Set>
--->
- <Set name="initialSize">4</Set>
- <Set name="maxActive">8</Set>
- <Set name="minIdle">4</Set>
- <Set name="maxIdle">4</Set>
- <Set name="maxWait">60000</Set>
- </New>
- </Arg>
- </New>
-</Configure>
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml
deleted file mode 100644
index 2bf77b8..0000000
--- a/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<!--
-
- Jetty configuration to correctly handle SSL/HTTPS traffic when
- Apache is handling the SSL and proxying over plain HTTP to us.
-
- Requires Jetty 6.1.12 (or later) or 7.0.0pre3 (or later).
-
- * Copy this file to $JETTY_HOME/etc/jetty_sslproxy.xml
- * Add jetty_sslproxy to your start line:
-
- $JETTY_HOME/bin/jetty.sh start jetty-logging jetty jetty_sslproxy
-
- * Configure Apache to set X-Forwarded-Scheme on requests:
-
- RequestHeader set X-Forwarded-Scheme https
-
--->
-<Configure id="Server" class="org.mortbay.jetty.Server">
- <Get id="oldHandler" name="handler"/>
- <Set name="handler">
- <New class="org.mortbay.jetty.handler.rewrite.RewriteHandler">
- <Set name="handler"><Ref id="oldHandler"/></Set>
- <Set name="rules">
- <Array type="org.mortbay.jetty.handler.rewrite.Rule">
- <Item>
- <New class="org.mortbay.jetty.handler.rewrite.ForwardedSchemeHeaderRule">
- <Set name="header">X-Forwarded-Scheme</Set>
- <Set name="headerValue">https</Set>
- <Set name="scheme">https</Set>
- </New>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-</Configure>
