jvanzyl 02/03/15 06:55:12
Modified: . build-bootstrap.xml
src/java/org/apache/maven ProjectProperties.java
src/templates/build build-docs.xml build-metrics.xml
build-test.xml
Log:
The stylesheets for dvsl xformations are now installed in the ${maven.home}
directory as part of the bootstrap process. We are starting to build up
the ${maven.home} directory in the process of trying to determine what
the best installation procedure should be.
Revision Changes Path
1.36 +9 -3 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build-bootstrap.xml 15 Mar 2002 04:00:38 -0000 1.35
+++ build-bootstrap.xml 15 Mar 2002 14:55:11 -0000 1.36
@@ -87,12 +87,18 @@
/>
<delete dir="${basedir}/bootstrap"/>
-
+
+ <delete dir="${maven.home}"/>
+ <mkdir dir="${maven.home}"/>
+
<copy todir="${maven.home}">
<fileset dir="maven"/>
</copy>
-
- <delete dir="maven"/>
+
+ <copy todir="${maven.home}/stylesheets">
+ <fileset dir="src/dvsl/xdocs"/>
+ </copy>
+
</target>
1.9 +4 -2
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProjectProperties.java 14 Mar 2002 07:18:29 -0000 1.8
+++ ProjectProperties.java 15 Mar 2002 14:55:12 -0000 1.9
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.8 2002/03/14 07:18:29 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.9 2002/03/15 14:55:12 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -156,7 +156,9 @@
p.setPath(sourceDirectory);
srcSet.append(p);
}
-
+
+ log("Adding Reference " + reference + " with a value of " + srcSet);
+
getProject().addReference(reference, srcSet);
}
1.28 +6 -6 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build-docs.xml 14 Mar 2002 14:37:59 -0000 1.27
+++ build-docs.xml 15 Mar 2002 14:55:12 -0000 1.28
@@ -89,7 +89,7 @@
<dvsl
basedir="."
- style="${docs.src}/stylesheets/index.dvsl"
+ style="${maven.home}/stylesheets/index.dvsl"
in="project.xml"
out="${gen.docs}/index.xml"
/>
@@ -110,7 +110,7 @@
<dvsl
basedir="."
- style="${docs.src}/stylesheets/mail-lists.dvsl"
+ style="${maven.home}/stylesheets/mail-lists.dvsl"
in="project.xml"
out="${gen.docs}/mail-lists.xml"
/>
@@ -131,7 +131,7 @@
<dvsl
basedir="."
- style="${docs.src}/stylesheets/developer-list.dvsl"
+ style="${maven.home}/stylesheets/developer-list.dvsl"
in="project.xml"
out="${gen.docs}/developer-list.xml"
/>
@@ -152,7 +152,7 @@
<dvsl
basedir="."
- style="${docs.src}/stylesheets/dependencies.dvsl"
+ style="${maven.home}/stylesheets/dependencies.dvsl"
in="project.xml"
out="${gen.docs}/dependencies.xml"
/>
@@ -183,7 +183,7 @@
extension=".html"
force="true"
toolboxfile="${docs.src}/toolbox.props"
- style="${docs.src}/stylesheets/site.dvsl"
+ style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
@@ -200,7 +200,7 @@
extension=".html"
force="true"
toolboxfile="${docs.src}/toolbox.props"
- style="${docs.src}/stylesheets/site.dvsl"
+ style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
includes="**/*.xml">
<!-- Need to add the maven jar to load the toolbox -->
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-metrics.xml 14 Mar 2002 04:55:09 -0000 1.9
+++ build-metrics.xml 15 Mar 2002 14:55:12 -0000 1.10
@@ -81,7 +81,7 @@
<dvsl
basedir="."
- style="${docs.src}/stylesheets/jdepend.dvsl"
+ style="${maven.home}/stylesheets/jdepend.dvsl"
toolboxfile="${docs.src}/toolbox.props"
in="${build.dir}/jdepend-raw-report.xml"
out="${gen.docs}/jdepend-report.xml">
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-test.xml 14 Mar 2002 04:42:03 -0000 1.11
+++ build-test.xml 15 Mar 2002 14:55:12 -0000 1.12
@@ -103,7 +103,7 @@
<!-- Convert single report into an xdoc -->
<dvsl
basedir="${basedir}"
- style="${docs.src}/stylesheets/junit.dvsl"
+ style="${maven.home}/stylesheets/junit.dvsl"
toolboxfile="${docs.src}/toolbox.props"
in="${test.reportsDirectory}/TESTS-TestSuites.xml"
out="${gen.docs}/junit-report.xml">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
