jvanzyl 02/03/25 20:39:07
Modified: . build-bootstrap.xml project.xml
src/dvsl/gump convert-project.dvsl
src/java/org/apache/maven ProjectProperties.java
src/templates/build build-maven.xml
xdocs musings.xml
Log:
Adding the gump descriptor dvsl to the install and making the
maven:gump-descriptor work for all projects using maven.
Revision Changes Path
1.52 +4 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- build-bootstrap.xml 25 Mar 2002 21:55:07 -0000 1.51
+++ build-bootstrap.xml 26 Mar 2002 04:39:07 -0000 1.52
@@ -117,6 +117,10 @@
<copy todir="${maven.home}/stylesheets">
<fileset dir="src/dvsl/xdocs"/>
</copy>
+
+ <copy todir="${maven.home}/dvsl/gump">
+ <fileset dir="src/dvsl/gump"/>
+ </copy>
<copy todir="${maven.home}/templates/project">
<fileset dir="src/templates/project"/>
1.38 +27 -25 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- project.xml 24 Mar 2002 18:16:37 -0000 1.37
+++ project.xml 26 Mar 2002 04:39:07 -0000 1.38
@@ -134,7 +134,14 @@
<!-- Need to mark these as compile-time/run-time -->
<dependencies>
-
+
+ <!-- Compile time dependencies. These are really the only operational
+ dependencies that we should have to declare. Anything required
+ for runtime operation should be determined by a dependency
+ graph and libs required for documentation should be separated
+ from compile time and runtime dependencies.
+ -->
+
<dependency>
<name>jakarta-turbine-stratum</name>
<type>required</type>
@@ -150,24 +157,26 @@
</dependency>
<dependency>
- <name>jakarta-log4j</name>
+ <name>jakarta-velocity</name>
<type>required</type>
- <version>1.1.3</version>
- <jar>log4j-1.1.3.jar</jar>
+ <version>1.3-dev</version>
+ <jar>velocity-1.3-dev.jar</jar>
</dependency>
<dependency>
- <name>jakarta-velocity</name>
+ <name>jakarta-oro</name>
<type>required</type>
- <version>1.3-dev</version>
- <jar>velocity-1.3-dev.jar</jar>
+ <version>1.3</version>
+ <jar>oro.jar</jar>
</dependency>
+ <!-- Runtime dependencies -->
+
<dependency>
- <name>jakarta-velocity-dvsl</name>
- <type>documentation</type>
- <version>0.43</version>
- <jar>velocity-dvsl-0.43.jar</jar>
+ <name>jakarta-log4j</name>
+ <type>required</type>
+ <version>1.1.3</version>
+ <jar>log4j-1.1.3.jar</jar>
</dependency>
<dependency>
@@ -198,15 +207,6 @@
<jar>commons-util-1.0-rc2-dev.jar</jar>
</dependency>
- <!--
- <dependency>
- <name>commons-graph</name>
- <type>required</type>
- <version>0.1</version>
- <jar>commons-graph.jar</jar>
- </dependency>
- -->
-
<dependency>
<name>commons-beanutils</name>
<type>required</type>
@@ -220,12 +220,14 @@
<version>1.0</version>
<jar>commons-collections.jar</jar>
</dependency>
-
+
+ <!-- Documentation dependencies -->
+
<dependency>
- <name>jakarta-oro</name>
- <type>required</type>
- <version>1.3</version>
- <jar>oro.jar</jar>
+ <name>jakarta-velocity-dvsl</name>
+ <type>documentation</type>
+ <version>0.43</version>
+ <jar>velocity-dvsl-0.43.jar</jar>
</dependency>
<dependency>
1.7 +11 -2 jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl
Index: convert-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- convert-project.dvsl 25 Feb 2002 20:30:28 -0000 1.6
+++ convert-project.dvsl 26 Mar 2002 04:39:07 -0000 1.7
@@ -3,7 +3,12 @@
<description>$context.applyTemplates("shortDescription")</description>
<url href="$context.applyTemplates("url")"/>
+
+ <!--
<cvs repository="$context.applyTemplates("repository")"/>
+ -->
+
+ <cvs repository="jakarta"/>
#set ($projectName = $context.applyTemplates("name"))
@@ -11,19 +16,23 @@
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
- <ant target="dist"/>
+ <ant buildfile="build-maven.xml" target="dist"/>
+ <!--
<depend project="${projectName}-gump-descriptor"/>
+ -->
$context.applyTemplates("//dependencies/dependency")
<work nested="target/classes"/>
<home nested="target"/>
<jar name="$context.applyTemplates("id")-@@DATE@@.jar"/>
<javadoc nested="docs/apidocs"/>
</project>
-
+
+ <!--
<project name="${projectName}-gump-descriptor">
<ant target="gump-descriptor"/>
</project>
+ -->
</module>
#end
1.14 +2 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ProjectProperties.java 24 Mar 2002 17:23:26 -0000 1.13
+++ ProjectProperties.java 26 Mar 2002 04:39:07 -0000 1.14
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.13 2002/03/24 17:23:26 kaz Exp $
+ * @version $Id: ProjectProperties.java,v 1.14 2002/03/26 04:39:07 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -119,6 +119,7 @@
if (mavenProject.getName() != null)
{
getProject().setProperty("name", mavenProject.getName());
+ getProject().setProperty("gump.descriptor", mavenProject.getName());
}
if (mavenProject.getCurrentVersion() != null)
1.12 +2 -2 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-maven.xml 25 Mar 2002 21:28:37 -0000 1.11
+++ build-maven.xml 26 Mar 2002 04:39:07 -0000 1.12
@@ -348,9 +348,9 @@
basedir="."
destdir="./"
extension=".xml"
- style="src/dvsl/gump/convert-project.dvsl"
+ style="${maven.home}/dvsl/gump/convert-project.dvsl"
in="project.xml"
- out="${project}.xml"
+ out="${gump.descriptor}.xml"
/>
</target>
1.21 +4 -0 jakarta-turbine-maven/xdocs/musings.xml
Index: musings.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/musings.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- musings.xml 25 Mar 2002 16:51:32 -0000 1.20
+++ musings.xml 26 Mar 2002 04:39:07 -0000 1.21
@@ -210,6 +210,10 @@
Automate the archiving of the mail to mail-archive.com or
at least provide instructions on what to do.
</li>
+ <li>
+ Create a project descriptor validator for models stored in
+ XML format.
+ </li>
</ul>
</section>
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
