From 07d02928203325f868c7af0716889868bd1eaf8d Mon Sep 17 00:00:00 2001 From: Nanne Baars Date: Fri, 9 Sep 2016 08:26:59 +0200 Subject: [PATCH] Changing README.md to integrate the new standalone possibility --- README.MD | 17 +++++++---------- .../src/main/java/org/owasp/webgoat/Main.java | 3 +-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README.MD b/README.MD index 0363c91fb6..fffea8fc16 100644 --- a/README.MD +++ b/README.MD @@ -59,23 +59,20 @@ wish to simply try/test/run the current development version of WebGoat #### 1. Download the easy run executable jar file which contains all the lessons and a embedded Tomcat server: -https://s3.amazonaws.com/webgoat-war/webgoat-container-7.0.1-war-exec.jar +https://s3.amazonaws.com/webgoat-war/webgoat-standalone-7.0.1-exec.jar #### 2. Run it using java: Open a command shell/window, browse to where you downloaded the easy run jar and type: ```Shell -java -jar webgoat-container-7.0.1-war-exec.jar +java -jar webgoat-standalone-7.0.1-exec.jar [-p | --p ] [-a | --address
] ``` -#### 3. Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking ! +Using the `--help` option will show the allowed command line arguments. -#### (Optional) If you would like to change the port or other options, use the help command for guidance: +#### 3. Browse to the url shown in the console and happy hacking ! -```Shell -java -jar webgoat-container-7.0.1-war-exec.jar --help -``` # For Developers @@ -150,11 +147,11 @@ The __maven package__ goal generates an executable .jar file: ```Shell cd WebGoat mvn package -cd webgoat-container/target -java -jar webgoat-container-7.1-SNAPSHOT-war-exec.jar http://localhost:8080/WebGoat +cd webgoat-standalone/target +java -jar webgoat-standalone-7.1-SNAPSHOT-exec.jar [-p | --p ] [-a | --address
] ``` -Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking ! +Browse to url shown in the console and happy hacking ! #### Option #3: Deploy the WebGoat WAR file in your local Tomcat or other Application Server: The __maven package__ goal generates a .war file that can deployed into an Application Server, such as Tomcat diff --git a/webgoat-standalone/src/main/java/org/owasp/webgoat/Main.java b/webgoat-standalone/src/main/java/org/owasp/webgoat/Main.java index 76e4aa37ee..d74e4e406a 100644 --- a/webgoat-standalone/src/main/java/org/owasp/webgoat/Main.java +++ b/webgoat-standalone/src/main/java/org/owasp/webgoat/Main.java @@ -43,7 +43,7 @@ * @version $Id: $Id * @since July 24, 2016 */ -@Command(name = "webgoat", descriptions = "Start the WebGoat") +@Command(name = "webgoat", descriptions = "Starting WebGoat") public class Main { private final Logger logger = LoggerFactory.getLogger(Main.class); @@ -73,7 +73,6 @@ void run() throws Exception { tomcat.getServer().await(); } - public static void main(String[] args) throws Exception { OptionParser parser = new OptionParser(Main.class); parser.parse(args);