brekke 02/03/15 21:12:25
Modified: . build-bootstrap.xml
src/templates/build build-docs.xml build-metrics.xml
build-test.xml build.init.target
Added: src/dvsl/xdocs toolbox.props
Removed: xdocs toolbox.props
Log:
Maven handles its dependencies and places them on its own classpath so projects
do not have to define them in their descriptors. There were some missing
dependencies that were added ( velocity, dvsl, jdepend ). The classpaths to
load tasks that are not needed to build project code, only need to use the maven
classpath so I cleaned those up.
The documentation generation using the dvsl stylesheets needed the toolbox
properties file to be distributed also.
Revision Changes Path
1.40 +20 -1 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build-bootstrap.xml 16 Mar 2002 00:07:03 -0000 1.39
+++ build-bootstrap.xml 16 Mar 2002 05:12:24 -0000 1.40
@@ -106,7 +106,15 @@
<copy todir="${maven.home}/templates/reactor">
<fileset dir="src/templates/reactor"/>
</copy>
-
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- C R E A T E J A R D I S T R I B U T I O N S -->
+ <!-- ================================================================== -->
+
+ <target
+ name="dist">
+
<mkdir dir="${maven.home}/install"/>
<copy todir="${maven.home}/install" file="project.xml"/>
@@ -125,6 +133,8 @@
<include name="log4j-1.1.3.jar"/>
<include name="stratum-0.1-dev.jar"/>
<include name="velocity-1.3-dev.jar"/>
+ <include name="velocity-dvsl-0.40.jar"/>
+ <include name="jdepend.jar"/>
</fileset>
</copy>
@@ -197,6 +207,15 @@
verbose="false"
usetimestamp="true"/>
+ <get src="${get.jars.baseUrl}/velocity-dvsl-0.40.jar"
+ dest="${lib.repo}/velocity-dvsl-0.40.jar"
+ verbose="false"
+ usetimestamp="true"/>
+
+ <get src="${get.jars.baseUrl}/jdepend.jar"
+ dest="${lib.repo}/jdepend.jar"
+ verbose="false"
+ usetimestamp="true"/>
</target>
</project>
1.1 jakarta-turbine-maven/src/dvsl/xdocs/toolbox.props
Index: toolbox.props
===================================================================
toolbox.contextname = toolbox
toolbox.tool.htmlescape = org.apache.velocity.anakia.Escape
toolbox.tool.numbers = org.apache.commons.lang.Numbers
toolbox.tool.strings = org.apache.commons.lang.Strings
toolbox.tool.formatter = org.apache.maven.DVSLFormatter
1.29 +7 -9 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build-docs.xml 15 Mar 2002 14:55:12 -0000 1.28
+++ build-docs.xml 16 Mar 2002 05:12:25 -0000 1.29
@@ -80,7 +80,7 @@
classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -101,7 +101,7 @@
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -122,7 +122,7 @@
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -143,7 +143,7 @@
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -169,7 +169,7 @@
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -182,13 +182,12 @@
destdir="${docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${docs.src}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
<classpath>
- <path refid="classpath"/>
<path refid="maven-classpath"/>
</classpath>
</dvsl>
@@ -199,13 +198,12 @@
destdir="${docs.dest}/"
extension=".html"
force="true"
- toolboxfile="${docs.src}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
<classpath>
- <path refid="classpath"/>
<path refid="maven-classpath"/>
</classpath>
</dvsl>
1.11 +14 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-metrics.xml 15 Mar 2002 14:55:12 -0000 1.10
+++ build-metrics.xml 16 Mar 2002 05:12:25 -0000 1.11
@@ -36,7 +36,10 @@
fork="yes"
failonerror="yes">
<arg line="-file ${build.dir}/jdepend-report.txt ${build.dest}"/>
- <classpath refid="classpath"/>
+ <classpath>
+ <path refid="classpath"/>
+ <path refid="maven-classpath"/>
+ </classpath>
</java>
</target>
@@ -53,7 +56,10 @@
fork="yes"
failonerror="yes">
<arg line="${build.dest}"/>
- <classpath refid="classpath"/>
+ <classpath>
+ <path refid="classpath"/>
+ <path refid="maven-classpath"/>
+ </classpath>
</java>
</target>
@@ -67,7 +73,7 @@
<taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -76,18 +82,20 @@
fork="yes"
failonerror="yes">
<arg line="-file ${build.dir}/jdepend-raw-report.xml ${build.dest}"/>
- <classpath refid="classpath"/>
+ <classpath>
+ <path refid="classpath"/>
+ <path refid="maven-classpath"/>
+ </classpath>
</java>
<dvsl
basedir="."
style="${maven.home}/stylesheets/jdepend.dvsl"
- toolboxfile="${docs.src}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
in="${build.dir}/jdepend-raw-report.xml"
out="${gen.docs}/jdepend-report.xml">
<!-- Need to add the maven jar to load the toolbox -->
<classpath>
- <path refid="classpath"/>
<path refid="maven-classpath"/>
</classpath>
</dvsl>
1.13 +2 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build-test.xml 15 Mar 2002 14:55:12 -0000 1.12
+++ build-test.xml 16 Mar 2002 05:12:25 -0000 1.13
@@ -89,7 +89,7 @@
classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <path refid="classpath"/>
+ <path refid="maven-classpath"/>
</classpath>
</taskdef>
@@ -104,11 +104,10 @@
<dvsl
basedir="${basedir}"
style="${maven.home}/stylesheets/junit.dvsl"
- toolboxfile="${docs.src}/toolbox.props"
+ toolboxfile="${maven.home}/stylesheets/toolbox.props"
in="${test.reportsDirectory}/TESTS-TestSuites.xml"
out="${gen.docs}/junit-report.xml">
<classpath>
- <path refid="classpath"/>
<path refid="maven-classpath"/>
</classpath>
</dvsl>
1.9 +4 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.init.target 14 Mar 2002 22:23:35 -0000 1.8
+++ build.init.target 16 Mar 2002 05:12:25 -0000 1.9
@@ -18,6 +18,10 @@
<pathelement location="${lib.repo}/commons-util-1.0-rc2-dev.jar"/>
<pathelement location="${lib.repo}/commons-io.jar"/>
<pathelement location="${lib.repo}/commons-lang-0.1-dev.jar"/>
+ <pathelement location="${lib.repo}/velocity-dvsl-0.40.jar"/>
+ <pathelement location="${lib.repo}/velocity-1.3-dev.jar"/>
+ <pathelement location="${lib.repo}/log4j-1.1.3.jar"/>
+ <pathelement location="${lib.repo}/jdepend.jar"/>
</path>
<!-- ================================================================== -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
