jvanzyl 02/03/13 23:18:30
Modified: . build.xml project.properties
src/java/org/apache/maven ProjectProperties.java
src/templates/build build.init.target build.xml
default.properties
Log:
Pushing more of the project properties into the ant build automatically
and slowly killing off the project.properties to reach the end goal
of defining everything in the project.xml file.
Revision Changes Path
1.14 +0 -2 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 14 Mar 2002 04:55:08 -0000 1.13
+++ build.xml 14 Mar 2002 07:18:29 -0000 1.14
@@ -11,8 +11,6 @@
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="project.properties" />
- <!-- Set default values for the build -->
- <property file="${ant.home}/maven/default.properties" />
<!-- ================================================================== -->
<!-- J A V A C C -->
1.3 +0 -7 jakarta-turbine-maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 5 Mar 2002 04:12:57 -0000 1.2
+++ project.properties 14 Mar 2002 07:18:29 -0000 1.3
@@ -2,13 +2,6 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-name = jakarta-turbine-maven
-version = 0.1
-project = maven
-id = maven
-organization = Apache Software Foundation
-inception.year = 2001
-package = org.apache.maven
compile.debug = on
compile.optimize = off
compile.deprecation = off
1.8 +7 -7
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProjectProperties.java 14 Mar 2002 07:06:38 -0000 1.7
+++ ProjectProperties.java 14 Mar 2002 07:18:29 -0000 1.8
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.7 2002/03/14 07:06:38 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.8 2002/03/14 07:18:29 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -116,12 +116,12 @@
// Add some basic attribute values of the project in
// the ant build process.
- getProject().addReference("name", mavenProject.getName());
- getProject().addReference("currentVersion",
mavenProject.getCurrentVersion());
- getProject().addReference("id", mavenProject.getId());
- getProject().addReference("organization", mavenProject.getOrganization());
- getProject().addReference("inceptionYear", mavenProject.getInceptionYear());
- getProject().addReference("package", mavenProject.getPackage());
+ getProject().setProperty("name", mavenProject.getName());
+ getProject().setProperty("currentVersion",
mavenProject.getCurrentVersion());
+ getProject().setProperty("id", mavenProject.getId());
+ getProject().setProperty("organization", mavenProject.getOrganization());
+ getProject().setProperty("inceptionYear", mavenProject.getInceptionYear());
+ getProject().setProperty("package", mavenProject.getPackage());
}
// Create the classpath reference
1.6 +12 -0 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.init.target,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.init.target 5 Mar 2002 16:27:18 -0000 1.5
+++ build.init.target 14 Mar 2002 07:18:30 -0000 1.6
@@ -59,4 +59,16 @@
<project-properties projectDescriptor="project.xml"/>
+ <!-- Set default values for the build -->
+ <property file="${ant.home}/maven/default.properties" />
+
+ <echo>
+ name ------------> ${name}
+ currentVersion --> ${currentVersion}
+ id --------------> ${id}
+ organization ----> ${organization}
+ inceptionYear ---> ${inceptionYear}
+ package ---------> ${package}
+ </echo>
+
</target>
1.22 +30 -15 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 14 Mar 2002 04:55:09 -0000 1.21
+++ build.xml 14 Mar 2002 07:18:30 -0000 1.22
@@ -20,63 +20,78 @@
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
- <target name="maven:site">
+ <target
+ name="maven:site">
<ant antfile="$mavenDirectory/build-docs.xml" target="site"/>
</target>
- <target name="maven:jar">
+ <target
+ name="maven:jar">
<ant antfile="$mavenDirectory/build-maven.xml" target="jar"/>
</target>
- <target name="maven:install-jar">
+ <target
+ name="maven:install-jar">
<ant antfile="$mavenDirectory/build-maven.xml" target="install-jar"/>
</target>
- <target name="maven:env">
+ <target
+ name="maven:env">
<ant antfile="$mavenDirectory/build-maven.xml" target="env"/>
</target>
- <target name="maven:docs">
+ <target
+ name="maven:docs">
<ant antfile="$mavenDirectory/build-docs.xml" target="docs"/>
</target>
- <target name="maven:test">
+ <target
+ name="maven:test">
<ant antfile="$mavenDirectory/build-test.xml" target="test"/>
</target>
- <target name="maven:singletest">
+ <target
+ name="maven:singletest">
<ant antfile="$mavenDirectory/build-test.xml" target="run-singletest"/>
</target>
- <target name="maven:clean">
+ <target
+ name="maven:clean">
<ant antfile="$mavenDirectory/build-maven.xml" target="clean"/>
</target>
- <target name="maven:metrics">
+ <target
+ name="maven:metrics">
<ant antfile="$mavenDirectory/build-metrics.xml" target="metrics"/>
</target>
- <target name="maven:dist">
+ <target
+ name="maven:dist">
<ant antfile="$mavenDirectory/build-maven.xml" target="dist"/>
</target>
- <target name="maven:deploy-site">
+ <target
+ name="maven:deploy-site">
<ant antfile="$mavenDirectory/build-docs.xml" target="deploy-site"/>
</target>
- <target name="maven:gump-descriptor">
+ <target
+ name="maven:gump-descriptor">
<ant antfile="$mavenDirectory/build-maven.xml" target="gump-descriptor"/>
</target>
- <target name="maven:javadocs">
+ <target
+ name="maven:javadocs">
<ant antfile="$mavenDirectory/build-docs.xml" target="javadocs"/>
</target>
- <target name="maven:compile">
+ <target
+ name="maven:compile">
<ant antfile="$mavenDirectory/build-maven.xml" target="compile"/>
</target>
- <target name="maven:update-jars">
+ <target
+ name="maven:update-jars">
<ant antfile="$mavenDirectory/build-maven.xml" target="update-jars"/>
</target>
1.8 +1 -1 jakarta-turbine-maven/src/templates/build/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 5 Mar 2002 04:10:55 -0000 1.7
+++ default.properties 14 Mar 2002 07:18:30 -0000 1.8
@@ -20,7 +20,7 @@
# These names will actually be based on the versioning document
# that morgan checked into jakarta-site2 the other day.
-final.name = ${id}-${version}
+final.name = ${id}-${currentVersion}
final.dir = ${basedir}/${final.name}
javadoc.destdir = ${basedir}/docs/apidocs
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
