[Tynstep-svn] r152 - trunk/step-web-app

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2010-07-14 10:13:59 -0700 (Wed, 14 Jul 2010)
New Revision: 152

Modified:
   trunk/step-web-app/pom.xml
Log:
pom.xml to form correct war file

Modified: trunk/step-web-app/pom.xml
===================================================================
--- trunk/step-web-app/pom.xml	2010-07-14 16:08:51 UTC (rev 151)
+++ trunk/step-web-app/pom.xml	2010-07-14 17:13:59 UTC (rev 152)
@@ -18,7 +18,7 @@
 			this is because the maven gwt plugin apparently has a hard-coded path
 			to /war
 		-->
-		<war.directory>${basedir}/war</war.directory>
+<!-- 		<war.directory>${basedir}/war</war.directory>  -->
 		<!-- <output.directory>${basedir}/war/WEB-INF/classes</output.directory>  -->
 	</properties>
 
@@ -100,6 +100,8 @@
 	
 
 	<build>
+	 
+	
 		<resources>
 			<resource>
 				<directory>src/main/java</directory>
@@ -107,28 +109,43 @@
 			<resource>
 				<directory>src/main/resources</directory>
 			</resource>
+			<resource>
+				<directory>src/main/webapp</directory>
+			</resource>
 		</resources>
-
+ 
 		<!--  <outputDirectory>${output.directory}</outputDirectory>  -->
 		<plugins>
+	
+	 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.1.1</version>
 				<configuration>
+					<executable>java</executable>
 					<classpathScope>compile</classpathScope>
-					<mainClass>com.google.gwt.dev.Compiler</mainClass>
-					<commandlineArgs>-war ${project.build.directory}/war com.tyndalehouse.step.web.step</commandlineArgs>
+					<arguments>
+						<argument>-Xms256m</argument>
+						<argument>-Xmx256m</argument>
+						<argument>-classpath</argument>
+						<classpath />
+						<argument>com.google.gwt.dev.Compiler</argument>
+						<argument>com.tyndalehouse.step.web.step</argument>
+						<argument>-war</argument>
+						<argument>target/${project.build.finalName}</argument>
+					</arguments>
 				</configuration>
 				<executions>
 					<execution>
 						<goals>
-							<goal>java</goal>
+							<goal>exec</goal>
 						</goals>
-						<phase>compile</phase>
+						<phase>process-classes</phase>
 					</execution>
 				</executions>
 			</plugin>
+			 
 		<!-- 
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -157,7 +174,6 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
@@ -167,6 +183,8 @@
 					<webXml>${war.directory}/WEB-INF/web.xml</webXml>
 				</configuration>
 			</plugin>
+			 -->
+	
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
@@ -284,7 +302,7 @@
 			            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
 			            <classpathContainer>com.google.gwt.eclipse.core.GWT_CONTAINER</classpathContainer>
 			          </classpathContainers>
-			          <buildOutputDirectory>war/WEB-INF/classes</buildOutputDirectory>
+	<!-- 		          <buildOutputDirectory>war/WEB-INF/classes</buildOutputDirectory>  -->
 			        </configuration>
 			      </plugin>
 			</plugins>