From 27ed0480b91ebf910a19f79911975f86dd2da9ec Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 10 Jun 2016 11:52:32 +1000 Subject: [PATCH] Issue #632 Remove unneeded scripts --- tests/test-jmx/jmx-webapp-it/pom.xml | 33 ------------------- .../src/test/scripts/setup-jetty.sh | 19 ----------- .../src/test/scripts/start-jetty.sh | 17 ---------- .../src/test/scripts/stop-jetty.sh | 11 ------- 4 files changed, 80 deletions(-) delete mode 100755 tests/test-jmx/jmx-webapp-it/src/test/scripts/setup-jetty.sh delete mode 100755 tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh delete mode 100755 tests/test-jmx/jmx-webapp-it/src/test/scripts/stop-jetty.sh diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 6664661e205..8f4c6d20b75 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -31,9 +31,7 @@ UTF-8 UTF-8 ${project.groupId}.jmx.webapp.it - ${project.basedir}/src/test/scripts ${project.build.directory}/test-base - ${project.build.directory}/test-home @@ -98,35 +96,4 @@ - - - it-windows - - - Windows - - - - cmd - /c - start-jetty.bat - stop-jetty.bat - - - - it-unix - - - unix - - - - sh - -- - setup-jetty.sh - start-jetty.sh - stop-jetty.sh - - - diff --git a/tests/test-jmx/jmx-webapp-it/src/test/scripts/setup-jetty.sh b/tests/test-jmx/jmx-webapp-it/src/test/scripts/setup-jetty.sh deleted file mode 100755 index 22beac14dbe..00000000000 --- a/tests/test-jmx/jmx-webapp-it/src/test/scripts/setup-jetty.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -JAVA_HOME=$1 -JETTY_HOME=$2 -JETTY_BASE=$3 - -echo \${java.home} : $JAVA_HOME -echo \${jetty.home} : $JETTY_HOME -echo \${jetty.base} : $JETTY_BASE - -cd "$JETTY_BASE" - -"$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - --approve-all-licenses \ - --add-to-start=deploy,http,annotations,jmx,jmx-remote,logging - -"$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - --version - diff --git a/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh b/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh deleted file mode 100755 index ea7843bf256..00000000000 --- a/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -JAVA_HOME=$1 -JETTY_HOME=$2 -JETTY_BASE=$3 - -echo \${java.home} : $JAVA_HOME -echo \${jetty.home} : $JETTY_HOME -echo \${jetty.base} : $JETTY_BASE - -cd "$JETTY_BASE" - -"$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - jetty.http.port=58080 \ - STOP.PORT=58181 STOP.KEY=it - - diff --git a/tests/test-jmx/jmx-webapp-it/src/test/scripts/stop-jetty.sh b/tests/test-jmx/jmx-webapp-it/src/test/scripts/stop-jetty.sh deleted file mode 100755 index 32e40774908..00000000000 --- a/tests/test-jmx/jmx-webapp-it/src/test/scripts/stop-jetty.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -JAVA_HOME=$1 -JETTY_HOME=$2 -JETTY_BASE=$3 - -cd "$JETTY_BASE" -"$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - --stop STOP.PORT=58181 STOP.KEY=it - -