From b415df2605833029d7b551fc67163a232fa8f25b Mon Sep 17 00:00:00 2001 From: Dave Date: Sun, 21 Sep 2014 19:13:50 -0400 Subject: [PATCH] Remove old Tomcat startup scripts-- WEB-148 --- src/main/scripts/server_80.xml | 406 ------------------ src/main/scripts/server_8080.xml | 406 ------------------ src/main/scripts/webgoat for SQL Server.bat | 34 -- src/main/scripts/webgoat for SQL Server_1.bat | 34 -- src/main/scripts/webgoat.bat | 25 -- src/main/scripts/webgoat.sh | 60 --- src/main/scripts/webgoat_1.bat | 25 -- src/main/scripts/webgoat_1.sh | 64 --- src/main/scripts/webgoat_8080.bat | 25 -- src/main/scripts/webgoat_8080_1.bat | 25 -- src/main/scripts/webscarab.bat | 7 - src/main/scripts/webscarab_1.bat | 7 - 12 files changed, 1118 deletions(-) delete mode 100644 src/main/scripts/server_80.xml delete mode 100644 src/main/scripts/server_8080.xml delete mode 100644 src/main/scripts/webgoat for SQL Server.bat delete mode 100644 src/main/scripts/webgoat for SQL Server_1.bat delete mode 100644 src/main/scripts/webgoat.bat delete mode 100644 src/main/scripts/webgoat.sh delete mode 100644 src/main/scripts/webgoat_1.bat delete mode 100644 src/main/scripts/webgoat_1.sh delete mode 100644 src/main/scripts/webgoat_8080.bat delete mode 100644 src/main/scripts/webgoat_8080_1.bat delete mode 100644 src/main/scripts/webscarab.bat delete mode 100644 src/main/scripts/webscarab_1.bat diff --git a/src/main/scripts/server_80.xml b/src/main/scripts/server_80.xml deleted file mode 100644 index 71fa1729f..000000000 --- a/src/main/scripts/server_80.xml +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/scripts/server_8080.xml b/src/main/scripts/server_8080.xml deleted file mode 100644 index b8d1f4e86..000000000 --- a/src/main/scripts/server_8080.xml +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/scripts/webgoat for SQL Server.bat b/src/main/scripts/webgoat for SQL Server.bat deleted file mode 100644 index d88d8dd35..000000000 --- a/src/main/scripts/webgoat for SQL Server.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -@REM Configure environment variables to override web.xml -SET DatabaseDriver=net.sourceforge.jtds.jdbc.Driver -SET DatabaseConnectionString=jdbc:jtds:sqlserver://./webgoat;namedPipe=true;INSTANCE=WEBGOAT -SET DatabaseUser=webgoat -SET DtabasePassword=_webgoat - -delete .\tomcat\conf\server.xml -copy .\tomcat\conf\server_80.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 80. -echo - - - diff --git a/src/main/scripts/webgoat for SQL Server_1.bat b/src/main/scripts/webgoat for SQL Server_1.bat deleted file mode 100644 index 16f05b930..000000000 --- a/src/main/scripts/webgoat for SQL Server_1.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -@REM Configure environment variables to override web.xml -SET DatabaseDriver=net.sourceforge.jtds.jdbc.Driver -SET DatabaseConnectionString=jdbc:jtds:sqlserver://./webgoat;namedPipe=true;INSTANCE=WEBGOAT -SET DatabaseUser=webgoat -SET DtabasePassword=_webgoat - -del .\tomcat\conf\server.xml -copy .\tomcat\conf\server_80.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 80. -echo - - - diff --git a/src/main/scripts/webgoat.bat b/src/main/scripts/webgoat.bat deleted file mode 100644 index 885ccd849..000000000 --- a/src/main/scripts/webgoat.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -delete .\tomcat\conf\server.xml -copy .\tomcat\conf\server_80.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 80. -echo diff --git a/src/main/scripts/webgoat.sh b/src/main/scripts/webgoat.sh deleted file mode 100644 index 25f26ea17..000000000 --- a/src/main/scripts/webgoat.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh - -SYSTEM=`uname -s` -CATALINA_HOME=./tomcat -PATH=${PATH}:./tomcat/bin -export CATALINA_HOME PATH - -chmod +x ./$CATALINA_HOME/bin/*.sh -if [ $SYSTEM = "Darwin" ]; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home - export JAVA_HOME - -else - -is_java_1dot5() { - if [ "X$JAVA_HOME" != "X" -a -d $JAVA_HOME ]; then - $JAVA_HOME/bin/java -version 2>&1 | grep 'version \"1.5' >/dev/null - if [ $? -ne 0 ]; then - echo "The JVM in \$JAVA_HOME isn't version 1.5." - exit 1 - fi - else - echo "Please set JAVA_HOME to a Java 1.5 JDK install" - exit 1 - fi -} - -is_java_1dot5 - -fi - -case "$1" in - start80) - cp -f $CATALINA_HOME/conf/server_80.xml $CATALINA_HOME/conf/server.xml - $CATALINA_HOME/bin/startup.sh - printf "\n Open http://127.0.0.1/WebGoat/attack" - printf "\n Username: guest" - printf "\n Password: guest" - printf "\n Or try http://guest:guest@127.0.0.1/WebGoat/attack \n\n\r" - sleep 2 - tail -f $CATALINA_HOME/logs/catalina.out - ;; - start8080) - cp -f $CATALINA_HOME/conf/server_8080.xml $CATALINA_HOME/conf/server.xml - $CATALINA_HOME/bin/startup.sh - printf "\n Open http://127.0.0.1:8080/WebGoat/attack" - printf "\n Username: guest" - printf "\n Password: guest" - printf "\n Or try http://guest:guest@127.0.0.1:8080/WebGoat/attack \n\n\r" - sleep 2 - tail -f $CATALINA_HOME/logs/catalina.out - ;; - stop) - $CATALINA_HOME/bin/shutdown.sh - ;; - *) - echo $"Usage: $prog {start8080|start80|stop}" - exit 1 - ;; -esac diff --git a/src/main/scripts/webgoat_1.bat b/src/main/scripts/webgoat_1.bat deleted file mode 100644 index f1a52d1e6..000000000 --- a/src/main/scripts/webgoat_1.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -del .\tomcat\conf\server.xml -copy .\tomcat\conf\server_80.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 80. -echo diff --git a/src/main/scripts/webgoat_1.sh b/src/main/scripts/webgoat_1.sh deleted file mode 100644 index f4bfdcf16..000000000 --- a/src/main/scripts/webgoat_1.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -SYSTEM=`uname -s` -CATALINA_HOME=./tomcat -PATH=${PATH}:./tomcat/bin -export CATALINA_HOME PATH - -chmod +x ./$CATALINA_HOME/bin/*.sh -if [ $SYSTEM = "Darwin" ]; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home - export JAVA_HOME - -else - -is_java_1dot6() { - if [ -z "$JAVA_HOME" ]; then - export JAVA_HOME=$(dirname $(readlink -f $(which javac)))/../ - fi - - if [ "X$JAVA_HOME" != "X" -a $JAVA_HOME ]; then - $JAVA_HOME/bin/java -version 2>&1 | grep 'version "1.6' >/dev/null - if [ $? -ne 0 ]; then - echo "The JVM in \$JAVA_HOME isn't version 1.6." - exit 1 - fi - else - echo "Please set JAVA_HOME to a Java 1.6 JDK install" - exit 1 - fi -} - -is_java_1dot6 - -fi - -case "$1" in - start80) - cp -f $CATALINA_HOME/conf/server_80.xml $CATALINA_HOME/conf/server.xml - $CATALINA_HOME/bin/startup.sh - printf "\n Open http://127.0.0.1/WebGoat/attack" - printf "\n Username: guest" - printf "\n Password: guest" - printf "\n Or try http://guest:guest@127.0.0.1/WebGoat/attack \n\n\r" - sleep 2 - tail -f $CATALINA_HOME/logs/catalina.out - ;; - start8080) - cp -f $CATALINA_HOME/conf/server_8080.xml $CATALINA_HOME/conf/server.xml - $CATALINA_HOME/bin/startup.sh - printf "\n Open http://127.0.0.1:8080/WebGoat/attack" - printf "\n Username: guest" - printf "\n Password: guest" - printf "\n Or try http://guest:guest@127.0.0.1:8080/WebGoat/attack \n\n\r" - sleep 2 - tail -f $CATALINA_HOME/logs/catalina.out - ;; - stop) - $CATALINA_HOME/bin/shutdown.sh - ;; - *) - echo $"Usage: $prog {start8080|start80|stop}" - exit 1 - ;; -esac diff --git a/src/main/scripts/webgoat_8080.bat b/src/main/scripts/webgoat_8080.bat deleted file mode 100644 index 153fd36e3..000000000 --- a/src/main/scripts/webgoat_8080.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -delete .\tomcat\conf\server.xml -copy .\tomcat\conf\server_8080.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 8080. -echo diff --git a/src/main/scripts/webgoat_8080_1.bat b/src/main/scripts/webgoat_8080_1.bat deleted file mode 100644 index 55e840560..000000000 --- a/src/main/scripts/webgoat_8080_1.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo on - - -@REM Clear the lib env var as it can hose tomcat -SET lib= - -@REM Make sure the webgoat DB is writable -attrib -R .\tomcat\webapps\WebGoat\database\*.* - -@REM Set env vars for tomcat and java, use PWD as some machines don't have -@REM \. on their path -set PWD=%cd% -set CATALINA_HOME=%PWD%\tomcat -set JAVA_HOME=%PWD%\java - -del .\tomcat\conf\server.xml -copy .\tomcat\conf\server_8080.xml .\tomcat\conf\server.xml - -@REM Run tomcat: must have quotes incase var has spaces in it -call "%CATALINA_HOME%\bin\startup.bat" start - -echo -echo If the Tomcat DOS shell quit immediately, it is likely that -echo there is another service listening on port 8080. -echo diff --git a/src/main/scripts/webscarab.bat b/src/main/scripts/webscarab.bat deleted file mode 100644 index 9db235089..000000000 --- a/src/main/scripts/webscarab.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - - -@REM Run webscarab -@REM - Assumes webscarab.properties file is in webscarab directory -cd webscarab -..\java\bin\javaw -Duser.home=.\ -jar webscarab.jar diff --git a/src/main/scripts/webscarab_1.bat b/src/main/scripts/webscarab_1.bat deleted file mode 100644 index 9db235089..000000000 --- a/src/main/scripts/webscarab_1.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - - -@REM Run webscarab -@REM - Assumes webscarab.properties file is in webscarab directory -cd webscarab -..\java\bin\javaw -Duser.home=.\ -jar webscarab.jar