jvanzyl 2002/07/03 21:41:33
Modified: src/plugins/activity plugin.jelly
src/plugins/changelog plugin.jelly
src/plugins/core plugin.jelly
src/plugins/docbook plugin.jelly
src/plugins/pdf plugin.jelly
src/plugins/xdoc plugin.jelly
Log:
Doing some more cleanup on the plugins. Starting to change the agreed on
name for goals: <plugin-name>:<goal>.
Revision Changes Path
1.2 +2 -2 jakarta-turbine-maven/src/plugins/activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/activity/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 28 Jun 2002 01:02:17 -0000 1.1
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.2
@@ -7,7 +7,7 @@
<!-- ================================================================== -->
<taskdef
- name="change-log"
+ name="changelog"
classname="org.apache.maven.changelog.ChangeLog">
<classpath refid="maven-classpath"/>
</taskdef>
@@ -22,7 +22,7 @@
<mkdir dir="${maven.build.dir}/generated-xdocs"/>
- <change-log
+ <changelog
projectDescriptor="project.xml"
baseDir="."
output="${maven.build.dir}/activity-log.xml"
1.2 +3 -3 jakarta-turbine-maven/src/plugins/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/changelog/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 28 Jun 2002 01:02:17 -0000 1.1
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.2
@@ -7,16 +7,16 @@
<!-- ================================================================== -->
<taskdef
- name="change-log"
+ name="changelog"
classname="org.apache.maven.changelog.ChangeLog">
<classpath refid="maven-classpath"/>
</taskdef>
- <goal name="change-log">
+ <goal name="changelog:generate">
<mkdir dir="${maven.build.dir}/generated-xdocs"/>
- <change-log
+ <changelog
projectDescriptor="project.xml"
baseDir="."
output="${maven.gen.docs}/changelog.xml"
1.9 +2 -2 jakarta-turbine-maven/src/plugins/core/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/core/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 1 Jul 2002 17:15:44 -0000 1.8
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.9
@@ -158,8 +158,8 @@
<!-- junit-report,site -->
<goal name="site-report"
- prereqs="generate-xdocs,jdependx,checkstyle,
- change-log,activity-log,javadocs,jxr,junit-report,task-list,site-x">
+ prereqs="xdocs:generate,jdependx,checkstyle,
+
changelog:generate,activity-log,javadocs,jxr,junit-report,task-list,xdocs:site">
</goal>
1.3 +6 -191 jakarta-turbine-maven/src/plugins/docbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/docbook/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 28 Jun 2002 06:35:36 -0000 1.2
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.3
@@ -6,201 +6,16 @@
<!-- S I M P L E D O C B O O K D O C U M E N T A T I O N -->
<!-- ================================================================== -->
<goal
- name="docbook-simple"
+ name="docbook:transform"
description="Transform any docbook-simple source into xdocs for later use">
- <j:if test="${flags.docbookSimpleOk}">
-
- <style basedir="${maven.src.docbook-simple}"
+ <style
+ basedir="${maven.src.docbook-simple}"
destdir="${maven.gen.docs}" extension=".xml"
style="${maven.home}/plugins/docbook/docbook2document.xsl"
- includes="**/*.xml, **/*.sgml"/>
+ includes="**/*.xml, **/*.sgml"
+ />
- </j:if>
-
- </goal>
-
- <!-- ================================================================== -->
- <!-- D V S L D O C U M E N T A T I O N -->
- <!-- ================================================================== -->
-
- <goal
- name="docs:site"
- description="o Generate html project documentation xdoc sources">
-
- <!-- Transform the auto-generated xdocs first -->
- <dvsl
- basedir="${maven.gen.docs}"
- destdir="${maven.docs.dest}/"
- extension=".html"
- force="true"
- toolboxfile="${maven.home}/stylesheets/toolbox.props"
- style="${maven.home}/stylesheets/site.dvsl"
- excludes="**/project.xml,**/template.xml"
- includes="**/*.xml"
- outputencoding="${maven.docs.outputencoding}">
- <!-- Need to add the maven jar to load the toolbox -->
- <classpath refid="maven-classpath"/>
- <tool name="toolbox.string.basedir" value="${basedir}"/>
- <tool name="toolbox.string.docDest" value="${maven.docs.dest}"/>
- <tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
- <tool name="toolbox.string.genDoc" value="${maven.gen.docs}"/>
- <tool name="toolbox.string.srcDir" value="${maven.src.dir}"/>
- <tool name="toolbox.string.srcPresent" value="${maven.sourcesPresent}"/>
- <tool name="toolbox.string.testSrcPresent"
value="${maven.unitTestSourcesPresent}"/>
- <tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
- </dvsl>
-
- <!-- Then transform user supplied xdocs next -->
- <dvsl
- basedir="${maven.docs.src}"
- destdir="${maven.docs.dest}/"
- extension=".html"
- force="true"
- toolboxfile="${maven.home}/stylesheets/toolbox.props"
- style="${maven.home}/stylesheets/site.dvsl"
- excludes="**/project.xml,**/template.xml"
- includes="**/*.xml"
- outputencoding="${maven.docs.outputencoding}">
- <!-- Need to add the maven jar to load the toolbox -->
- <classpath refid="maven-classpath"/>
- <tool name="toolbox.string.basedir" value="${basedir}"/>
- <tool name="toolbox.string.docSrc" value="${maven.docs.src}"/>
- <tool name="toolbox.string.srcDir" value="${maven.src.dir}"/>
- <tool name="toolbox.string.genDoc" value="${maven.gen.docs}"/>
- <tool name="toolbox.string.srcPresent" value="${maven.sourcesPresent}"/>
- <tool name="toolbox.string.testSrcPresent"
value="${maven.unitTestSourcesPresent}"/>
- <tool name="toolbox.string.currentYear" value="${maven.current.year}"/>
- </dvsl>
-
- <!-- Copy site images -->
- <copy todir="${maven.docs.dest}/images" filtering="no">
- <fileset dir="${maven.home}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
-
- <!-- Copy user supplied images -->
- <copy todir="${maven.docs.dest}/images" filtering="no">
- <fileset dir="${maven.docs.src}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
-
- <!-- Copy maven supplied stylesheets. -->
- <copy todir="${maven.docs.dest}/style" overwrite="yes" filtering="yes">
- <fileset dir="${maven.home}/stylesheets">
- <include name="**/*.css"/>
- </fileset>
- <filterset>
- <filter token="UI_BODY_BACKGROUND" value="${maven.ui.body.background}"/>
- <filter token="UI_BODY_FOREGROUND" value="${maven.ui.body.foreground}"/>
- <filter token="UI_SECTION_BACKGROUND"
value="${maven.ui.section.background}"/>
- <filter token="UI_SECTION_FOREGROUND"
value="${maven.ui.section.foreground}"/>
- <filter token="UI_SUBSECTION_BACKGROUND"
value="${maven.ui.subsection.background}"/>
- <filter token="UI_SUBSECTION_FOREGROUND"
value="${maven.ui.subsection.foreground}"/>
-
- <filter token="UI_TABLE_HEADER_BACKGROUND"
value="${maven.ui.table.header.background}"/>
- <filter token="UI_TABLE_HEADER_FOREGROUND"
value="${maven.ui.table.header.foreground}"/>
- <filter token="UI_TABLE_ROW_ODD_BACKGROUND"
value="${maven.ui.table.row.odd.background}"/>
- <filter token="UI_TABLE_ROW_ODD_FOREGROUND"
value="${maven.ui.table.row.odd.foreground}"/>
- <filter token="UI_TABLE_ROW_EVEN_BACKGROUND"
value="${maven.ui.table.row.even.background}"/>
- <filter token="UI_TABLE_ROW_EVEN_FOREGROUND"
value="${maven.ui.table.row.even.foreground}"/>
-
- <filter token="UI_BANNER_BACKGROUND" value="${maven.ui.banner.background}"/>
- <filter token="UI_BANNER_FOREGROUND" value="${maven.ui.banner.foreground}"/>
- <filter token="UI_BANNER_BORDER_TOP" value="${maven.ui.banner.border.top}"/>
- <filter token="UI_BANNER_BORDER_BOTTOM"
value="${maven.ui.banner.border.bottom}"/>
-
- <filter token="UI_SOURCE_BACKGROUND" value="${maven.ui.source.background}"/>
- <filter token="UI_SOURCE_FOREGROUND" value="${maven.ui.source.foreground}"/>
- <filter token="UI_SOURCE_BORDER_TOP" value="${maven.ui.source.border.top}"/>
- <filter token="UI_SOURCE_BORDER_BOTTOM"
value="${maven.ui.source.border.bottom}"/>
- <filter token="UI_SOURCE_BORDER_RIGHT"
value="${maven.ui.source.border.right}"/>
- <filter token="UI_SOURCE_BORDER_LEFT"
value="${maven.ui.source.border.left}"/>
-
- <filter token="UI_NAVCOL_BACKGROUND" value="${maven.ui.navcol.background}"/>
- <filter token="UI_NAVCOL_FOREGROUND" value="${maven.ui.navcol.foreground}"/>
- <filter token="UI_NAVCOL_BACKGROUND_NS4"
value="${maven.ui.navcol.background.ns4}"/>
- <filter token="UI_NAVCOL_FOREGROUND_NS4"
value="${maven.ui.navcol.foreground.ns4}"/>
- <filter token="UI_NAVCOL_BORDER_TOP" value="${maven.ui.navcol.border.top}"/>
- <filter token="UI_NAVCOL_BORDER_RIGHT"
value="${maven.ui.navcol.border.right}"/>
- <filter token="UI_NAVCOL_BORDER_BOTTOM"
value="${maven.ui.navcol.border.bottom}"/>
-
- <filter token="UI_BREADCRUMBS_BACKGROUND"
value="${maven.ui.breadcrumbs.background}"/>
- <filter token="UI_BREADCRUMBS_FOREGROUND"
value="${maven.ui.breadcrumbs.foreground}"/>
- <filter token="UI_BREADCRUMBS_BORDER_TOP"
value="${maven.ui.breadcrumbs.border.top}"/>
- <filter token="UI_BREADCRUMBS_BORDER_BOTTOM"
value="${maven.ui.breadcrumbs.border.bottom}"/>
-
- <filter token="UI_HREF_LINK" value="${maven.ui.href.link}"/>
- <filter token="UI_HREF_LINK_ACTIVE" value="${maven.ui.href.link.active}"/>
- <filter token="UI_HREF_LINK_SELFREF" value="${maven.ui.href.link.selfref}"/>
- </filterset>
- </copy>
-
- <!-- Copy user supplied stylesheets, can override maven -->
- <copy todir="${maven.docs.dest}/style" filtering="no">
- <fileset dir="${maven.docs.src}/stylesheets">
- <include name="**/*.css"/>
- </fileset>
- </copy>
- </goal>
-
- <goal
- name="fo"
- prereqs="do-fo"
- description="o Generate XSL:FO project documentation"/>
-
- <goal name="do-fo">
-
- <mkdir dir="${maven.docs.dest}"/>
-
- <java classname="org.apache.xalan.xslt.Process" fork="yes">
- <classpath>
- <pathelement location="${lib.repo}/xercesImpl-2.0.0.jar"/>
- <pathelement location="${lib.repo}/xmlParserAPIs-2.0.0.jar"/>
- <pathelement location="${lib.repo}/xalan-2.1.0.jar"/>
- </classpath>
- <arg value="-in"/>
- <!-- FIXME: Using ${maven.docs.src} here causes the build to fail because
- xalan constructs the path relative to the current directory
- even if it is an absolute path. -->
- <arg value="xdocs/navigation.xml"/>
- <arg value="-out"/>
- <arg value="${maven.docs.dest}/project.fo"/>
- <arg value="-xsl"/>
- <arg value="${maven.home}/stylesheets/project2fo.xslt"/>
- <arg value="-param"/>
- <arg value="basePath"/>
- <arg value="${maven.docs.src}"/>
- </java>
-
</goal>
-
- <goal
- name="pdf"
- prereqs="fo, do-pdf"
- description="o Generate PDF project documentation"/>
-
- <goal name="do-pdf">
-
- <java classname="org.apache.fop.apps.Fop" fork="yes">
- <classpath>
- <pathelement location="${lib.repo}/fop-0.20.3.jar"/>
- <pathelement location="${lib.repo}/batik.jar"/>
- <pathelement location="${lib.repo}/logkit-1.0.jar"/>
- <pathelement location="${lib.repo}/avalon-framework-4.0.jar"/>
- <pathelement location="${lib.repo}/xercesImpl-2.0.0.jar"/>
- </classpath>
- <arg line="-fo ${maven.docs.dest}/project.fo -pdf
${maven.docs.dest}/project.pdf"/>
- </java>
-
- </goal>
-
+
</project>
1.2 +2 -2 jakarta-turbine-maven/src/plugins/pdf/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/pdf/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 28 Jun 2002 01:02:19 -0000 1.1
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.2
@@ -5,7 +5,7 @@
<goal
name="fo"
prereqs="do-fo"
- description="o Generate XSL:FO project documentation"/>
+ description="Generate XSL:FO project documentation"/>
<goal name="do-fo">
@@ -36,7 +36,7 @@
<goal
name="pdf"
prereqs="fo, do-pdf"
- description="o Generate PDF project documentation"/>
+ description="Generate PDF project documentation"/>
<goal name="do-pdf">
1.6 +2 -2 jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 28 Jun 2002 02:36:27 -0000 1.5
+++ plugin.jelly 4 Jul 2002 04:41:32 -0000 1.6
@@ -13,7 +13,7 @@
</taskdef>
<goal
- name="generate-xdocs"
+ name="xdocs:generate"
description="Generates xdocs for site based on project descriptor">
<create-xdocs
@@ -37,7 +37,7 @@
</taskdef>
<goal
- name="site-x"
+ name="xdocs:site"
description="Generate html project documentation xdoc sources">
<tstamp>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
