From 3a7d946c8f87f9e239837de3cf6f51de4b47bb95 Mon Sep 17 00:00:00 2001
From: "mayhew64@gmail.com"
 <mayhew64@gmail.com@4033779f-a91e-0410-96ef-6bf7bf53c507>
Date: Tue, 20 Nov 2012 15:24:04 +0000
Subject: [PATCH] Fixed most of the maven build except the path to using
 tomcatconf.  Moving the tree from src/main has caused changing all the
 default path locations that maven uses to be specified.

git-svn-id: http://webgoat.googlecode.com/svn/branches/webgoat-6.0@486 4033779f-a91e-0410-96ef-6bf7bf53c507
---
 pom.xml | 140 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d7d9daa0..761e9715c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>WebGoat</artifactId>
 	<packaging>war</packaging>
 	<version>6.0-SNAPSHOT</version>
-	
+
 	<repositories>
 		<repository>
 			<id>maven2-repository.dev.java.net</id>
@@ -13,21 +13,22 @@
 			<url>http://download.java.net/maven/2</url>
 		</repository>
 	</repositories>
-    	
-  	<!-- Shared version number properties -->
+
+	<!-- Shared version number properties -->
 	<properties>
-    	<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
-    	<spring.security.version>3.1.2.RELEASE</spring.security.version>
-    	<tiles.version>2.2.2</tiles.version>
-	</properties>	
+		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+		<spring.security.version>3.1.2.RELEASE</spring.security.version>
+		<tiles.version>2.2.2</tiles.version>
+	</properties>
 
 	<build>
-		<resources>
+			<sourceDirectory>${basedir}/java</sourceDirectory>
+					<resources>
 			<resource>
-				<directory>java</directory>
+				<directory>${basedir}/java</directory>
 			</resource>
 			<resource>
-				<directory>${basedir}resources</directory>
+				<directory>${basedir}/resources</directory>
 			</resource>
 		</resources>
 		<plugins>
@@ -41,11 +42,18 @@
 				</configuration>
 			</plugin>
 			<plugin>
-        			<artifactId>maven-eclipse-plugin</artifactId>
-        			<configuration>
-          				<wtpversion>1.5</wtpversion>
-        			</configuration>
-      			</plugin>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<wtpversion>1.5</wtpversion>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<warSourceDirectory>${basedir}/webapp</warSourceDirectory>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -95,11 +103,11 @@
 			<artifactId>commons-digester</artifactId>
 			<version>1.4.1</version>
 			<exclusions>
-         			<exclusion>
-           				<groupId>xml-apis</groupId>
-           				<artifactId>xml-apis</artifactId>
-         			</exclusion>
-       			</exclusions>
+				<exclusion>
+					<groupId>xml-apis</groupId>
+					<artifactId>xml-apis</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
@@ -155,8 +163,8 @@
 			<groupId>net.sourceforge.jtds</groupId>
 			<artifactId>jtds</artifactId>
 			<version>1.2.2</version>
-		</dependency>	
- 		<dependency>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
 			<version>7.0.27</version>
@@ -173,54 +181,54 @@
 			<version>6.0</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
 
-	    <!-- Spring MVC framework --> 
-	    <dependency>
+		<!-- Spring MVC framework -->
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 			<version>${org.springframework.version}</version>
-			<type>jar</type>			
-	    </dependency>
-	    
+			<type>jar</type>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
 			<version>${spring.security.version}</version>
 		</dependency>
-		
-		<dependency>
-        	<groupId>org.springframework.security</groupId>
-        	<artifactId>spring-security-config</artifactId>
-        	<version>${spring.security.version}</version>
-    	</dependency>
-    	
-		<dependency>
-        	<groupId>org.springframework.security</groupId>
-        	<artifactId>spring-security-web</artifactId>
-        	<version>${spring.security.version}</version>
-    	</dependency>    	
 
-		<!-- Apache Commons Upload --> 
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>${spring.security.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${spring.security.version}</version>
+		</dependency>
+
+		<!-- Apache Commons Upload -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 			<version>1.2.2</version>
 		</dependency>
 
-		<!-- Apache Commons Upload --> 
+		<!-- Apache Commons Upload -->
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>1.3.2</version>
 		</dependency>
 
-		<!-- JSTL --> 
+		<!-- JSTL -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
@@ -232,24 +240,24 @@
 			<artifactId>standard</artifactId>
 			<version>1.1.2</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.15</version>
 			<exclusions>
-			    <exclusion>
+				<exclusion>
 					<groupId>javax.jms</groupId>
 					<artifactId>jms</artifactId>
-		    	</exclusion>
-		    	<exclusion>
+				</exclusion>
+				<exclusion>
 					<groupId>com.sun.jdmk</groupId>
 					<artifactId>jmxtools</artifactId>
-		    	</exclusion>
-		    	<exclusion>
+				</exclusion>
+				<exclusion>
 					<groupId>com.sun.jmx</groupId>
 					<artifactId>jmxri</artifactId>
-		    	</exclusion>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -258,44 +266,44 @@
 			<version>4.8.1</version>
 			<type>jar</type>
 		</dependency>
-	    <dependency>
+		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-core</artifactId>
 			<version>${tiles.version}</version>
-			<type>jar</type>			
-	    </dependency>
-	    <dependency>
+			<type>jar</type>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-template</artifactId>
 			<version>${tiles.version}</version>
-			<type>jar</type>			
-	    </dependency>
-	    <dependency>
+			<type>jar</type>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-servlet</artifactId>
 			<version>${tiles.version}</version>
 			<type>jar</type>
-	    </dependency>
-	    <dependency>
+		</dependency>
+		<dependency>
 			<groupId>org.apache.tiles</groupId>
 			<artifactId>tiles-jsp</artifactId>
 			<version>${tiles.version}</version>
 			<type>jar</type>
-	    </dependency>    
-	    <dependency>
+		</dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>1.5.8</version>
 			<type>jar</type>
-	    </dependency>        
-	    <dependency>
+		</dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.5.8</version>
 			<type>jar</type>
-	    </dependency>		
-		
+		</dependency>
+
 		<!-- ************* END spring MVC and related dependencies ************** -->
-		
+
 	</dependencies>
 </project>