fixed merge issue

This commit is contained in:
Nanne Baars 2015-06-22 13:38:58 +02:00
commit 09cd0fcb3a

View File

@ -84,13 +84,27 @@ Using a command shell/window:
> mvn clean package > mvn clean package
Building the webgoat-classloader is only necessary once, the classloader needs to be present in your local repository. Building the webgoat-classloader is only necessary once, the classloader needs to be present in your local repository.
After opening the project in Netbeans or Eclipse, you can easily run the project using maven: After opening the project in Netbeans or Eclipse, you can easily run the project using:
1. Maven-Tomcat Plugin
Using a command shell/window:
> mvn tomcat:run-war > mvn tomcat:run-war
Maven will run the project in an embedded tomcat. Maven will run the project in an embedded tomcat.
2. Java JAR
the package phase also builds an executable jar file. You can run it using: the package phase also builds an executable jar file. You can run it using:
cd target cd target
java -jar WebGoat-6.0-exec-war.jar java -jar WebGoat-6.0-exec-war.jar
http://localhost:8080/WebGoat http://localhost:8080/WebGoat
3. Tomcat
the package phase also builds a war file. You can deploy it using:
cp target/WebGoat-6.0-exec-war.war <tomcat>/webapps/
Then also clone https://github.com/WebGoat/WebGoat-Lessons run:
cd WebGoat-Lessons
mvn package
cp plugins/* <tomcat>/webapps/WebGoat-6.0-exec-war/plugin_lessons/