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/02/21 22:03:45 UTC
cvs commit: jakarta-turbine-maven/src/templates/build Control.vm LICENSE build-docs.xml build-test.xml build.xml default.properties
jvanzyl 02/02/21 13:03:45
Modified: src/templates/build Control.vm LICENSE build-docs.xml
build-test.xml build.xml default.properties
Log:
- updating the templates for the build, almost have the bootstrapping
working
Revision Changes Path
1.2 +5 -0 jakarta-turbine-maven/src/templates/build/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 21 Feb 2002 15:08:08 -0000 1.1
+++ Control.vm 21 Feb 2002 21:03:45 -0000 1.2
@@ -1,5 +1,10 @@
#set ($buildElements = ["build-docs.xml","build-test.xml","build.xml","default.properties","LICENSE","README.txt"])
+$project
+$project.name
+$project.id
+$project.currentVersion
+
#foreach ($buildElement in $buildElements)
$generator.parse($buildElement,$buildElement,"project",$project)
#end
1.2 +1 -1 jakarta-turbine-maven/src/templates/build/LICENSE
Index: LICENSE
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE 19 Feb 2002 18:10:13 -0000 1.1
+++ LICENSE 21 Feb 2002 21:03:45 -0000 1.2
@@ -29,7 +29,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache ${name}", nor may "Apache" appear in their name, without
+ * "Apache $project.name", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.2 +1 -1 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-docs.xml 20 Feb 2002 21:37:40 -0000 1.1
+++ build-docs.xml 21 Feb 2002 21:03:45 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Maven" default="docs" basedir=".">
+<project name="$project.id" default="docs" basedir=".">
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
1.2 +1 -1 jakarta-turbine-maven/src/templates/build/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-test.xml 20 Feb 2002 21:37:40 -0000 1.1
+++ build-test.xml 21 Feb 2002 21:03:45 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="${name}" default="test" basedir=".">
+<project name="$project.id" default="test" basedir=".">
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 20 Feb 2002 21:37:40 -0000 1.3
+++ build.xml 21 Feb 2002 21:03:45 -0000 1.4
@@ -2,7 +2,7 @@
<!-- Build file for ${name} -->
-<project name="${name}" default="jar" basedir=".">
+<project name="$project.id" default="jar" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
1.3 +6 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 20 Feb 2002 21:37:40 -0000 1.2
+++ default.properties 21 Feb 2002 21:03:45 -0000 1.3
@@ -2,12 +2,12 @@
# D E F A U L T P R O P E R T I E S
# -------------------------------------------------------------------
-name = ${name}
-version = ${version}
-project = ${project}
-organization = ${organization}
-inception.year = ${inception.year}
-package = ${package}
+name = $project.name
+version = $project.currentVersion
+project = $project.id
+organization = $project.organization
+inception.year = $project.inceptionYear
+package = $project.package
compile.debug = on
compile.optimize = off
compile.deprecation = off
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>