You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/03/29 03:37:01 UTC
cvs commit: jakarta-turbine-maven/src/templates/build build-metrics.xml
jvanzyl 02/03/28 18:37:01
Modified: src/java/org/apache/maven ProjectProperties.java
src/templates/build build-metrics.xml
Log:
Making the doc process more robust when there is a very minimal
project descriptor.
Revision Changes Path
1.17 +39 -34 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ProjectProperties.java 29 Mar 2002 02:05:08 -0000 1.16
+++ ProjectProperties.java 29 Mar 2002 02:37:00 -0000 1.17
@@ -81,7 +81,7 @@
* the project.
*
* @author <a href="jason@zenplex.com">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.16 2002/03/29 02:05:08 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.17 2002/03/29 02:37:00 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -94,39 +94,6 @@
public void doExecute()
throws Exception
{
- System.out.println("mavenProject: " + mavenProject);
-
- log("Creating classpath reference ...");
- createClasspathReference();
-
- log("Creating dependency.set ...");
- createDependencySet();
-
- // If a project does not have any sources then there isn't
- // much point in running source related tasks.
- if (mavenProject.getBuild().getSourceDirectories().size() > 0)
- {
- getProject().setProperty("sourcesPresent", "true");
- }
-
- log("Creating source set reference ...");
- createPathReference("src.set",
- mavenProject.getBuild().getSourceDirectories());
-
- log("Creating test source set reference ...");
- createPathReference("test.src.set",
- mavenProject.getBuild().getTestSourceDirectories());
-
- log("Creating unit test class entries reference ...");
- createPatternSetReference("unit.test.set",
- mavenProject.getBuild().getUnitTestClassEntries());
-
- log("Creating integration unit test class entries reference ...");
- createPatternSetReference("integration.unit.test.set",
- mavenProject.getBuild().getIntegrationUnitTestClassEntries());
-
- createJarResourcesProperty();
-
// Add some basic attribute values of the project in
// the ant build process.
if (mavenProject.getName() != null)
@@ -174,6 +141,44 @@
{
getProject().setProperty("siteDirectory", mavenProject.getSiteDirectory());
}
+
+ // If there are no build parameters in the POM then we can
+ // can just leave now.
+ if (mavenProject.getBuild() == null)
+ {
+ return;
+ }
+
+ log("Creating classpath reference ...");
+ createClasspathReference();
+
+ log("Creating dependency.set ...");
+ createDependencySet();
+
+ // If a project does not have any sources then there isn't
+ // much point in running source related tasks.
+ if (mavenProject.getBuild().getSourceDirectories().size() > 0)
+ {
+ getProject().setProperty("sourcesPresent", "true");
+ }
+
+ log("Creating source set reference ...");
+ createPathReference("src.set",
+ mavenProject.getBuild().getSourceDirectories());
+
+ log("Creating test source set reference ...");
+ createPathReference("test.src.set",
+ mavenProject.getBuild().getTestSourceDirectories());
+
+ log("Creating unit test class entries reference ...");
+ createPatternSetReference("unit.test.set",
+ mavenProject.getBuild().getUnitTestClassEntries());
+
+ log("Creating integration unit test class entries reference ...");
+ createPatternSetReference("integration.unit.test.set",
+ mavenProject.getBuild().getIntegrationUnitTestClassEntries());
+
+ createJarResourcesProperty();
}
// Create the classpath reference
1.15 +2 -1 jakarta-turbine-maven/src/templates/build/build-metrics.xml
Index: build-metrics.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-metrics.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build-metrics.xml 29 Mar 2002 02:05:09 -0000 1.14
+++ build-metrics.xml 29 Mar 2002 02:37:01 -0000 1.15
@@ -81,7 +81,8 @@
<!-- ======================================================================== -->
<target
- name="jdepend-xml"
+ name="jdepend-xml"
+ if="sourcesPresent"
depends="local-init">
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>