svn commit: r1190546 - in /maven/archetype/trunk: archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java

[olamy]

Author: olamy
Date: Fri Oct 28 20:22:22 2011
New Revision: 1190546

URL: http://svn.apache.org/viewvc?rev=1190546&view=rev
Log:
[ARCHETYPE-387] IntegrationTestMojo has hardcoded target/test-classes/projects 
for resources

Modified:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
    
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java?rev=1190546&r1=1190545&r2=1190546&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/MavenJDOMWriter.java
 Fri Oct 28 20:22:22 2011
@@ -85,6 +85,7 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
@@ -197,7 +198,7 @@ public class MavenJDOMWriter
                 findAndReplaceSimpleElement( innerCounter, element, key, 
(String) props.get( key ), null );
             }
 
-            ArrayList lst = new ArrayList( props.keySet() );
+            List<String> lst = new ArrayList<String>( props.keySet() );
             it = element.getChildren().iterator();
             while ( it.hasNext() )
             {

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java?rev=1190546&r1=1190545&r2=1190546&view=diff
==============================================================================
--- 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
 (original)
+++ 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
 Fri Oct 28 20:22:22 2011
@@ -97,6 +97,16 @@ public class IntegrationTestMojo
      */
     private boolean skip = false;
 
+
+    /**
+     * Directory of test projects
+     *
+     * @parameter expression="${archetype.test.projectsDirectory}" 
default-value="${project.build.testOutputDirectory}"
+     * @required
+     * @since 2.2
+     */
+    private File testProjectsDirectory;
+
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {