You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ka...@apache.org on 2002/03/02 16:36:42 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven ProjectProperties.java
kaz 02/03/02 07:36:42
Modified: src/java/org/apache/maven ProjectProperties.java
Log:
Modified to also create the Ant 'runtime.test.set' reference from the
appropriate elements in the project descriptor. Also did a little
refactoring of code.
Revision Changes Path
1.3 +21 -31 jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectProperties.java 28 Feb 2002 23:26:48 -0000 1.2
+++ ProjectProperties.java 2 Mar 2002 15:36:42 -0000 1.3
@@ -57,6 +57,7 @@
import java.io.File;
import java.util.Iterator;
+import java.util.List;
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.types.Path;
@@ -79,7 +80,7 @@
* the project.
*
* @author <a href="jason@zenplex.com">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.2 2002/02/28 23:26:48 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.3 2002/03/02 15:36:42 kaz Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -94,12 +95,22 @@
{
log("Creating classpath reference ...");
createClasspathReference();
+
log("Creating source set reference ...");
- createSourceSetReference();
+ createSetReference("src.set",
+ mavenProject.getBuild().getSourceDirectories());
+
log("Creating test source set reference ...");
- createTestSourceSetReference();
+ createSetReference("test.src.set",
+ mavenProject.getBuild().getTestSourceDirectories());
+
log("Creating unit test class entries reference ...");
- createUnitTestClassEntriesReference();
+ createClassEntriesReference("unit.test.set",
+ mavenProject.getBuild().getUnitTestClassEntries());
+
+ log("Creating run-time test class entries reference ...");
+ createClassEntriesReference("runtime.test.set",
+ mavenProject.getBuild().getRuntimeTestClassEntries());
}
// Create the classpath reference
@@ -121,32 +132,12 @@
}
// Create the source directories reference
- private void createSourceSetReference()
- {
- Path srcSet = new Path(getProject());
- String libRepo = getProject().getProperty("lib.repo");
-
- for (Iterator i =
- mavenProject.getBuild().getSourceDirectories().iterator(); i.hasNext();)
- {
- String sourceDirectory = (String) i.next();
- log(sourceDirectory);
- Path p = new Path(getProject());
- p.setPath(new File(sourceDirectory).getAbsolutePath());
- srcSet.append(p);
- }
-
- getProject().addReference("src.set", srcSet);
- }
-
- // Create the source directories reference
- private void createTestSourceSetReference()
+ private void createSetReference(String reference, List directories)
{
Path srcSet = new Path(getProject());
String libRepo = getProject().getProperty("lib.repo");
- for (Iterator i =
- mavenProject.getBuild().getTestSourceDirectories().iterator(); i.hasNext();)
+ for (Iterator i = directories.iterator(); i.hasNext();)
{
String sourceDirectory = (String) i.next();
log(sourceDirectory);
@@ -155,19 +146,18 @@
srcSet.append(p);
}
- getProject().addReference("test.src.set", srcSet);
+ getProject().addReference(reference, srcSet);
}
// Create the source directories reference
- private void createUnitTestClassEntriesReference()
+ private void createClassEntriesReference(String reference, List patterns)
{
String libRepo = getProject().getProperty("lib.repo");
StringBuffer includesSb = new StringBuffer();
StringBuffer excludesSb = new StringBuffer();
PatternSet patternSet = new PatternSet();
- for (Iterator i =
- mavenProject.getBuild().getUnitTestClassEntries().iterator(); i.hasNext();)
+ for (Iterator i = patterns.iterator(); i.hasNext();)
{
String line = (String) i.next();
line = line.trim();
@@ -210,6 +200,6 @@
log("excludes: " + excludes);
}
- getProject().addReference("unit.test.set", patternSet);
+ getProject().addReference(reference, patternSet);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>