Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address jetty 8 -> 9 differences

This commit is contained in:
Jesse McConnell 2012-09-24 16:04:10 -05:00
parent 1cfa277c6c
commit 9a58e9e671
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-distribution/src/main/resources/bin/jetty-cygwin.sh
View File

@ -5,7 +5,7 @@
# To get the service to restart correctly on reboot, uncomment below (3 lines):
# ========================
# chkconfig: 3 99 99
# description: Jetty 8 webserver
# description: Jetty 9 webserver
# processname: jetty
# ========================
@ -134,8 +134,8 @@ NO_START=0
##################################################
# See if there's a default configuration file
##################################################
if [ -f /etc/default/jetty8 ] ; then
. /etc/default/jetty8
if [ -f /etc/default/jetty9 ] ; then
. /etc/default/jetty9
elif [ -f /etc/default/jetty ] ; then
. /etc/default/jetty
fi
@ -196,13 +196,13 @@ if [ "$JETTY_HOME" = "" ] ; then
/home \
"
JETTY_DIR_NAMES=" \
jetty-8 \
jetty8 \
jetty-8.* \
jetty-9 \
jetty9 \
jetty-9.* \
jetty \
Jetty-8 \
Jetty8 \
Jetty-8.* \
Jetty-9 \
Jetty9 \
Jetty-9.* \
Jetty \
"
@ -511,7 +511,7 @@ case "$ACTION" in
echo -n "Starting Jetty: "
if [ "$NO_START" = "1" ]; then
echo "Not starting jetty - NO_START=1 in /etc/default/jetty8";
echo "Not starting jetty - NO_START=1 in /etc/default/jetty9";
exit 0;
fi

16
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -5,7 +5,7 @@
# To get the service to restart correctly on reboot, uncomment below (3 lines):
# ========================
# chkconfig: 3 99 99
# description: Jetty 8 webserver
# description: Jetty 9 webserver
# processname: jetty
# ========================
@ -136,7 +136,7 @@ shift
##################################################
# Read any configuration files
##################################################
for CONFIG in /etc/default/jetty{,8} $HOME/.jettyrc; do
for CONFIG in /etc/default/jetty{,9} $HOME/.jettyrc; do
if [ -f "$CONFIG" ] ; then
readConfig "$CONFIG"
fi
@ -192,13 +192,13 @@ if [ -z "$JETTY_HOME" ] ; then
"/home"
)
JETTY_DIR_NAMES=(
"jetty-8"
"jetty8"
"jetty-8.*"
"jetty-9"
"jetty9"
"jetty-9.*"
"jetty"
"Jetty-8"
"Jetty8"
"Jetty-8.*"
"Jetty-9"
"Jetty9"
"Jetty-9.*"
"Jetty"
)

4
test-jetty-webapp/src/main/webapp/index.html
View File

@ -11,9 +11,9 @@
</HEAD>
<BODY>
<A HREF="http://jetty.eclipse.org"><IMG SRC="jetty_banner.gif"></A>
<h1>Welcome to Jetty 8</h1>
<h1>Welcome to Jetty 9</h1>
<p>
This is the Test webapp for the Jetty 8 HTTP Server and Servlet Container.
This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container.
For more information about Jetty, please visit our
<a href="http://www.eclipse.org/jetty">website</a>
or <a href="http://wiki.eclipse.org/Jetty">wiki</a> or see the bundled <a href="javadoc/">javadoc</a>.<br/>