jvanzyl 2002/07/16 15:00:38
Modified: src/plugins-build/activity project.xml
src/plugins-build/changelog project.xml
src/plugins-build/checkstyle plugin.jelly project.xml
src/plugins-build/dependency plugin.jelly project.xml
src/plugins-build/graph plugin.jelly project.xml
src/plugins-build/gump plugin.jelly project.xml
src/plugins-build/jdepend plugin.jelly project.xml
src/plugins-build/junit-report plugin.jelly project.xml
src/plugins-build/pdf project.xml
src/plugins-build/pom plugin.jelly
src/plugins-build/tasklist plugin.jelly plugin.properties
project.xml
src/plugins-build/webserver project.xml
src/plugins-build/xdoc plugin.jelly project.xml
Added: src/plugins-build/xdoc/src/java/org/apache/maven
BaseProjectTask.java
Log:
o Various changes to the plugins to try and decouple them from the
maven core.
Revision Changes Path
1.4 +21 -1 jakarta-turbine-maven/src/plugins-build/activity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 16 Jul 2002 16:20:26 -0000 1.3
+++ project.xml 16 Jul 2002 22:00:36 -0000 1.4
@@ -42,7 +42,27 @@
<mailingLists/>
<developers/>
- <dependencies/>
+
+ <dependencies>
+
+ <dependency>
+ <id>commons-collections</id>
+ <version>2.0</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ </dependencies>
+
<build/>
</project>
1.5 +16 -0 jakarta-turbine-maven/src/plugins-build/changelog/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 16 Jul 2002 16:20:27 -0000 1.4
+++ project.xml 16 Jul 2002 22:00:36 -0000 1.5
@@ -51,6 +51,22 @@
</dependency>
<dependency>
+ <id>commons-collections</id>
+ <version>2.0</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
<id>junit</id>
<version>3.7</version>
</dependency>
1.3 +0 -2 jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 15 Jul 2002 14:25:55 -0000 1.2
+++ plugin.jelly 16 Jul 2002 22:00:36 -0000 1.3
@@ -19,13 +19,11 @@
<taskdef
name="dvsl"
classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
</taskdef>
<taskdef
name="checkstyle"
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- <classpath refid="maven-classpath"/>
</taskdef>
<echo>${maven.checkstyle.properties}</echo>
1.6 +44 -4 jakarta-turbine-maven/src/plugins-build/checkstyle/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/checkstyle/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 16 Jul 2002 16:20:27 -0000 1.5
+++ project.xml 16 Jul 2002 22:00:36 -0000 1.6
@@ -46,6 +46,15 @@
<dependencies>
<dependency>
+ <id>antlr</id>
+ <version>2.7.1</version>
+ <jar>antlrall-2.7.1.jar</jar>
+ <metaEntries>
+ <metaEntry>classloader:root.maven</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
<id>checkstyle</id>
<version>2.2</version>
<metaEntries>
@@ -54,17 +63,48 @@
</dependency>
<dependency>
- <id>antlr</id>
- <version>2.7.1</version>
- <jar>antlrall-2.7.1.jar</jar>
+ <id>commons-collections</id>
+ <version>2.0</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>jdepend</id>
+ <version>2.2</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
<dependency>
<id>regexp</id>
<version>1.2</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity-dvsl</id>
+ <version>SNAPSHOT</version>
<metaEntries>
<metaEntry>classloader:root</metaEntry>
</metaEntries>
1.2 +0 -1 jakarta-turbine-maven/src/plugins-build/dependency/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/dependency/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:06 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:36 -0000 1.2
@@ -147,7 +147,6 @@
<taskdef
name="dvsl"
classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
</taskdef>
<j:forEach var="file" items="${scanner.iterator()}">
1.6 +10 -6 jakarta-turbine-maven/src/plugins-build/dependency/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/dependency/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 16 Jul 2002 16:20:27 -0000 1.5
+++ project.xml 16 Jul 2002 22:00:36 -0000 1.6
@@ -45,6 +45,11 @@
<dependencies>
<dependency>
+ <id>ant</id>
+ <version>1.4.1</version>
+ </dependency>
+
+ <dependency>
<id>commons-betwixt</id>
<version>1.0-dev</version>
</dependency>
@@ -57,31 +62,30 @@
<dependency>
<id>commons-lang</id>
<version>1.0-dev</version>
- <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>commons-collections</id>
<version>2.0</version>
- <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
<id>commons-beanutils</id>
<version>1.4-dev</version>
- <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <id>ant</id>
- <version>1.4.1</version>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0</version>
</dependency>
-
<dependency>
<id>commons-graph</id>
1.2 +10 -7 jakarta-turbine-maven/src/plugins-build/graph/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/graph/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:08 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:37 -0000 1.2
@@ -1,12 +1,5 @@
<project default="graph" xmlns:maven="jelly:maven">
- <taskdef
- name="dvsl"
- classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
-
<!-- ===================================================================== -->
<!-- G R A P H P R O J E C T D E P E N D E N C I E S -->
<!-- ===================================================================== -->
@@ -48,6 +41,11 @@
description="Get a .gif graph of current goals and their dependencies"
prereqs="graph:goals-to-xml">
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
+
<dvsl
basedir="${maven.build.dir}/graph"
destdir="${maven.build.dir}/graph"
@@ -81,6 +79,11 @@
<goal name="graph:goals-to-xdoc"
description="Create an xdoc document from the project goals"
prereqs="graph:goals-to-xml">
+
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
<dvsl
basedir="${maven.build.dir}/graph"
1.3 +22 -6 jakarta-turbine-maven/src/plugins-build/graph/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/graph/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Jul 2002 16:20:27 -0000 1.2
+++ project.xml 16 Jul 2002 22:00:37 -0000 1.3
@@ -46,18 +46,34 @@
<dependencies>
<dependency>
- <id>ant</id>
- <version>1.4.1</version>
+ <id>commons-collections</id>
+ <version>2.0</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity-dvsl</id>
+ <version>SNAPSHOT</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.2 +5 -7 jakarta-turbine-maven/src/plugins-build/gump/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/gump/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:08 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:37 -0000 1.2
@@ -12,16 +12,14 @@
<!-- for Gump will be correct. Distribution of responsibility. -->
<!-- ================================================================== -->
- <taskdef
- name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
-
<goal
name="gump:generate-descriptor"
description="Generate Gump descriptor from Maven descriptor">
+
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
<dvsl
basedir="."
1.3 +22 -6 jakarta-turbine-maven/src/plugins-build/gump/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/gump/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Jul 2002 16:20:28 -0000 1.2
+++ project.xml 16 Jul 2002 22:00:37 -0000 1.3
@@ -46,18 +46,34 @@
<dependencies>
<dependency>
- <id>ant</id>
- <version>1.4.1</version>
+ <id>commons-collections</id>
+ <version>2.0</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity-dvsl</id>
+ <version>SNAPSHOT</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.2 +5 -6 jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:20 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:37 -0000 1.2
@@ -6,12 +6,6 @@
<!-- J D E P E N D X M L T A R G E T -->
<!-- ================================================================== -->
- <taskdef
- name="dvsl"
- classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<goal name="jdepend"
description="Generate a dependency report with JDepend"
prereqs="jdepend:generate-report"/>
@@ -22,6 +16,11 @@
description="Generate a dependency report with JDepend">
<j:if test="${sourcesPresent == 'true'}">
+
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
<attainGoal name="java:compile"/>
1.4 +18 -2 jakarta-turbine-maven/src/plugins-build/jdepend/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 16 Jul 2002 16:20:28 -0000 1.3
+++ project.xml 16 Jul 2002 22:00:37 -0000 1.4
@@ -46,6 +46,22 @@
<dependencies>
<dependency>
+ <id>commons-collections</id>
+ <version>2.0</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
<id>jdepend</id>
<version>2.2</version>
<metaEntries>
@@ -57,7 +73,7 @@
<id>velocity</id>
<version>1.3</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
@@ -65,7 +81,7 @@
<id>velocity-dvsl</id>
<version>SNAPSHOT</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.2 +5 -6
jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:20 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:37 -0000 1.2
@@ -6,12 +6,6 @@
<!-- C R E A T E J U N I T X M L R E P O R T -->
<!-- ================================================================== -->
- <taskdef
- name="dvsl"
- classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<goal
name="junit-report"
description="Generate a report from the test results">
@@ -22,6 +16,11 @@
name="junit-report:generate">
<j:if test="${unitTestSourcesPresent == 'true'}">
+
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
<mkdir dir="${maven.test.reportsDirectory}"/>
1.3 +22 -6 jakarta-turbine-maven/src/plugins-build/junit-report/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Jul 2002 16:20:28 -0000 1.2
+++ project.xml 16 Jul 2002 22:00:37 -0000 1.3
@@ -46,18 +46,34 @@
<dependencies>
<dependency>
- <id>ant</id>
- <version>1.4.1</version>
+ <id>commons-collections</id>
+ <version>2.0</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity-dvsl</id>
+ <version>SNAPSHOT</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.4 +1 -1 jakarta-turbine-maven/src/plugins-build/pdf/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/pdf/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 16 Jul 2002 16:20:28 -0000 1.3
+++ project.xml 16 Jul 2002 22:00:37 -0000 1.4
@@ -87,7 +87,7 @@
<dependency>
<id>xalan</id>
- <version>2.0.0</version>
+ <version>2.3.1</version>
<metaEntries>
<metaEntry>classloader:root.maven</metaEntry>
</metaEntries>
1.2 +3 -1 jakarta-turbine-maven/src/plugins-build/pom/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/pom/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:29 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:37 -0000 1.2
@@ -11,8 +11,10 @@
<goal
name="pom:validate"
description="Validate the Maven XML project descriptor">
-
+
+ <!--
<v:verifier uri="${maven.home}/project.xsd" var="pomVerifier"/>
+ -->
</goal>
1.5 +1 -0 jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 16 Jul 2002 00:11:27 -0000 1.4
+++ plugin.jelly 16 Jul 2002 22:00:38 -0000 1.5
@@ -36,6 +36,7 @@
outputFile="${maven.gen.docs}/task-list.xml"
outputEncoding="${maven.docs.outputencoding}"
project="${maven.ant.project}"
+ mavenProject="${pom}"
/>
</j:if>
1.2 +1 -0
jakarta-turbine-maven/src/plugins-build/tasklist/plugin.properties
Index: plugin.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 14 Jul 2002 19:09:31 -0000 1.1
+++ plugin.properties 16 Jul 2002 22:00:38 -0000 1.2
@@ -7,3 +7,4 @@
maven.src.dir = ${basedir}/src
maven.build.dir = ${basedir}/target
maven.gen.docs = ${maven.build.dir}/generated-xdocs
+maven.docs.outputencoding = ISO-8859-1
1.5 +1 -1 jakarta-turbine-maven/src/plugins-build/tasklist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 16 Jul 2002 16:20:29 -0000 1.4
+++ project.xml 16 Jul 2002 22:00:38 -0000 1.5
@@ -44,7 +44,7 @@
<developers/>
<dependencies>
-
+
<dependency>
<id>ant</id>
<version>1.4.1</version>
1.2 +2 -2 jakarta-turbine-maven/src/plugins-build/webserver/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/webserver/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 14 Jul 2002 19:09:32 -0000 1.1
+++ project.xml 16 Jul 2002 22:00:38 -0000 1.2
@@ -2,8 +2,8 @@
<project>
<pomVersion>3</pomVersion>
- <id>webserver</id>
- <name>Webserver Plugin</name>
+ <id>webserver-maven-plugin</id>
+ <name>Webserver Maven Plugin</name>
<currentVersion>1.0</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.2 +10 -12 jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Jul 2002 19:09:33 -0000 1.1
+++ plugin.jelly 16 Jul 2002 22:00:38 -0000 1.2
@@ -10,16 +10,15 @@
prereqs="xdoc:generate-from-pom, xdoc:transform"
description="Generate html project documentation xdoc sources"/>
- <taskdef
- name="create-xdocs"
- classname="org.apache.maven.BaseProjectTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<goal
name="xdoc:generate-from-pom"
description="Generates xdocs for site based on project descriptor">
+ <taskdef
+ name="create-xdocs"
+ classname="org.apache.maven.BaseProjectTask">
+ </taskdef>
+
<create-xdocs
controlTemplate="Control.vm"
outputDirectory="${maven.gen.docs}"
@@ -34,15 +33,14 @@
<!-- D V S L D O C U M E N T A T I O N -->
<!-- ================================================================== -->
- <taskdef
- name="dvsl"
- classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<goal
name="xdoc:transform"
description="Generate html project documentation xdoc sources">
+
+ <taskdef
+ name="dvsl"
+ classname="org.apache.tools.dvsl.DVSLTask">
+ </taskdef>
<tstamp>
<format property="maven.current.year" pattern="yyyy" />
1.3 +37 -4 jakarta-turbine-maven/src/plugins-build/xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Jul 2002 16:20:29 -0000 1.2
+++ project.xml 16 Jul 2002 22:00:38 -0000 1.3
@@ -49,15 +49,48 @@
<id>ant</id>
<version>1.4.1</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
<dependency>
- <id>commons-lang</id>
- <version>1.0-dev</version>
+ <id>commons-collections</id>
+ <version>2.0</version>
<metaEntries>
- <metaEntry>classloader:root.maven</metaEntry>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>dom4j</id>
+ <version>1.4-dev-3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>velocity-dvsl</id>
+ <version>SNAPSHOT</version>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
+ </metaEntries>
+ </dependency>
+
+ <dependency>
+ <id>maven</id>
+ <version>b5</version>
+ <jar>maven.jar</jar>
+ <metaEntries>
+ <metaEntry>classloader:root</metaEntry>
</metaEntries>
</dependency>
1.1
jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
package org.apache.maven;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Maven" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Maven", 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
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
import java.io.File;
import org.apache.maven.project.Project;
import org.apache.tools.ant.BuildException;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.anakia.Escape;
import org.apache.velocity.context.Context;
import org.apache.velocity.texen.ant.TexenTask;
/**
* Used for generating xdoc formatted documenation from
* the POM.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: BaseProjectTask.java,v 1.1 2002/07/16 22:00:38 jvanzyl Exp $
*/
public class BaseProjectTask
extends TexenTask
{
/**
* Project descriptor.
*/
private File projectDescriptor;
/**
* Velocity context use in rendering the build system.
*/
private Context context;
/**
* Project
*/
private Project mavenProject;
/**
* Set the project descriptor file. This file must exist.
* @param projectDescriptor the project descriptor file
*/
public void setProjectDescriptor(File projectDescriptor)
{
this.projectDescriptor = projectDescriptor;
}
/**
* Execute the task.
*
* @return the velocity context for use in DVSL/Velocity
* @throws BuildException when any error occurs
*/
public Context initControlContext()
throws BuildException
{
context = new VelocityContext();
try
{
mavenProject = MavenUtils.getProject(projectDescriptor);
context.put("project", mavenProject);
context.put("escape", new Escape());
return context;
}
catch (Exception e)
{
// Propagate the error up the stack so that
// the stacktrace will appear in the standard
// ant output.
throw new BuildException(e);
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
