From c51948b6d35002bf2942f5b78b82dc616c9efc04 Mon Sep 17 00:00:00 2001
From: Manolo Carrasco <manolo@apache.org>
Date: Wed, 4 Jan 2012 17:18:42 +0000
Subject: [PATCH] Fix mvn compilation warnings,  and Eclipse errors when
 importing

---
 .../resources/archetype-resources/.classpath  |  6 ++---
 .../resources/archetype-resources/pom.xml     | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/archetype/src/main/resources/archetype-resources/.classpath b/archetype/src/main/resources/archetype-resources/.classpath
index daed4300..df9acc34 100644
--- a/archetype/src/main/resources/archetype-resources/.classpath
+++ b/archetype/src/main/resources/archetype-resources/.classpath
@@ -4,10 +4,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
+	<classpathentry kind="src" output="target/${artifactId}-${version}/WEB-INF/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="output" path="target/${artifactId}-${version}/WEB-INF/classes"/>
 </classpath>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 596b0e1f..a079e6ff 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -98,7 +98,7 @@
                     <logLevel>${gwt.loglevel}</logLevel>
                     <style>${gwt.outputstyle}</style>
                     <gwtVersion>${gwtversion}</gwtVersion>
-                    <soyc>false</soyc>
+                    <compileReport>true</compileReport>
                     <runTarget>${projectName}/${projectName}.html</runTarget>
                     <hostedWebApp>${project.build.directory}/${project.build.finalName}</hostedWebApp>
                 </configuration>
@@ -113,6 +113,7 @@
             </plugin>
             <plugin>
                <artifactId>maven-surefire-plugin</artifactId>
+               <version>2.8.1</version>
                <configuration>
                  <additionalClasspathElements>
                    <additionalClasspathElement>\${project.build.sourceDirectory}</additionalClasspathElement>
@@ -123,31 +124,25 @@
                  <systemProperties>
                    <property>
                      <name>gwt.args</name>
-                     <value>-out target/www</value>
+                     <value>-out target/gwt-tests</value>
+                   </property>
+                   <property>
+                     <!-- Setting this to true (default) causes a exception first time test are run Gwt issue_6443 -->
+                     <name>gwt.persistentunitcache</name>
+                     <value>false</value>
                    </property>
                  </systemProperties>
                </configuration>
             </plugin>
-            <plugin>
-              <artifactId>maven-clean-plugin</artifactId>
-              <configuration>
-                <filesets>
-                  <fileset><directory>src/main/webapp/${projectName}</directory></fileset>
-                  <fileset><directory>src/main/webapp/WEB-INF/classes</directory></fileset>
-                  <fileset><directory>tomcat</directory></fileset>
-                  <fileset><directory>www-test</directory></fileset>
-                  <fileset><directory>.gwt-tmp</directory></fileset>
-                </filesets>
-              </configuration>
-            </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-eclipse-plugin</artifactId>
+              <version>2.8</version>
               <configuration>
                  <downloadSources>true</downloadSources>
                  <downloadJavadocs>false</downloadJavadocs>
                  <additionalBuildcommands>
-                   <buildCommand>com.google.gwt.eclipse.core.gwtProjectValidator</buildCommand>
+                   <buildcommand>com.google.gwt.eclipse.core.gwtProjectValidator</buildcommand>
                    <buildcommand>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</buildcommand>
                    <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
                    <buildcommand>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</buildcommand>
-- 
2.39.5