From c3908e8700277b4b6e99f8d336f3af3b6e90139e Mon Sep 17 00:00:00 2001
From: "mayhew64@gmail.com"
 <mayhew64@gmail.com@4033779f-a91e-0410-96ef-6bf7bf53c507>
Date: Wed, 11 Nov 2009 04:04:25 +0000
Subject: [PATCH] More readme tweaks, fixed the delete command in the SQL
 Server startup

git-svn-id: http://webgoat.googlecode.com/svn/trunk/webgoat@413 4033779f-a91e-0410-96ef-6bf7bf53c507
---
 README.txt                                  | 18 ++++++++++++++++++
 src/main/scripts/webgoat for SQL Server.bat |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index 0bc7409c1..8d7556bd5 100644
--- a/README.txt
+++ b/README.txt
@@ -35,17 +35,28 @@ You can find more information about WebGoat at:
 http://code.google.com/p/webgoat
 
 
+--------------
 Prerequisites (Skip to Option 3 for unzip and click to run configruation): 
 --------------
 
+These tools must be installed independent of the webgoat download.
 - Java 1.6
+    Java can ne downloaded at http://java.sun.com/javase/downloads/index.jsp
+	You only need to download and install the "Java SE Development Kit (JDK)"
 - Maven > 2.0.9
 	Maven can be downloaded at: http://maven.apache.org/
 	At Ubuntu it can be installed with:
 	> apt-get install maven2
+- WebGoat source code
+    WebGoat source code can be downloaded at: http://webgoat.googlecode.com/files/WebGoat-OWASP_Standard-5.3.zip
+	This is the directory structure for the commands below.  You can also work with the latest 
+	WebGoat by checking out the WebGoat source at: http://code.google.com/p/webgoat/source/checkout
 
+	
+--------------------
 Building the project
 --------------------
+
 > cd webgoat
 > mvn compile
 
@@ -56,8 +67,10 @@ delete artifacts from previous build:
 > mvn clean
 
 
+----------------------------------
 Building the Eclipse project files
 ----------------------------------
+
 > mvn eclipse:eclipse
 
 Afterward the project can be imported within Eclipse:
@@ -67,8 +80,10 @@ Don't forget to declare a classpath variable named M2_REPO, pointing to ~/.m2/re
 You can declare new variables in Eclipse in Windows -> Preferences... and selecting Java -> Build Path -> Classpath Variables
 
 
+---------------------------------------------------
 Option 1: Run the project on Tomcat within Eclipse
 ---------------------------------------------------
+
 1. Install a local Tomcat server
 2. Open Eclipse -> File -> New -> Other -> Server -> Apache -> Tomcat -> Next 
 -> Insert your Tomcat Installation directory
@@ -91,12 +106,15 @@ Option 1: Run the project on Tomcat within Eclipse
 5. http://localhost:8080/webgoat/attack
 
 
+----------------------------------------------
 Option 2: Run the project on Tomcat with Maven
 ----------------------------------------------
+
 1. mvn tomcat:run-war
 2. http://localhost:8080/webgoat/attack
 
 
+--------------------------------------------------------
 Option 3: Run from the WebGoat 5.3 Standard distribution
 --------------------------------------------------------
 1. Download the WebGoat-OWASP_Standard-X.X.zip file from http://code.google.com/p/webgoat/downloads/list
diff --git a/src/main/scripts/webgoat for SQL Server.bat b/src/main/scripts/webgoat for SQL Server.bat
index d88d8dd35..16f05b930 100644
--- a/src/main/scripts/webgoat for SQL Server.bat	
+++ b/src/main/scripts/webgoat for SQL Server.bat	
@@ -19,7 +19,7 @@ SET DatabaseConnectionString=jdbc:jtds:sqlserver://./webgoat;namedPipe=true;INST
 SET DatabaseUser=webgoat
 SET DtabasePassword=_webgoat
 
-delete .\tomcat\conf\server.xml
+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