michal 2003/07/22 05:04:20
Modified: src/plugins-build/javadoc project.xml plugin.jelly
src/plugins-build/javadoc/xdocs goals.xml changes.xml
Log:
Added install, install-snapshot, deploy and deploy snapshot goals
Revision Changes Path
1.12 +10 -0 maven/src/plugins-build/javadoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 2 Jul 2003 10:24:05 -0000 1.11
+++ project.xml 22 Jul 2003 12:04:19 -0000 1.12
@@ -53,6 +53,16 @@
<role>Release Manager</role>
</roles>
</developer>
+ <developer>
+ <name>Michal Maczka</name>
+ <id>michal</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Dimatics</organization>
+ <roles>
+ <role>Jelly Developer</role>
+ </roles>
+ </developer>
+
</developers>
<dependencies>
<dependency>
1.17 +76 -1 maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 22 Jul 2003 07:05:36 -0000 1.16
+++ plugin.jelly 22 Jul 2003 12:04:19 -0000 1.17
@@ -5,7 +5,9 @@
xmlns:define="jelly:define"
xmlns:doc="doc"
xmlns:j="jelly:core"
- xmlns:util="jelly:util">
+ xmlns:util="jelly:util"
+ xmlns:artifact="artifact"
+ >
<goal name="maven-javadoc-plugin:register">
<j:if test="${sourcesPresent}">
@@ -168,5 +170,78 @@
</j:if>
</goal>
+
+
+ <!--==================================================================-->
+ <!-- Install the war in the local repository -->
+ <!--==================================================================-->
+ <goal name="javadoc:jar" prereqs="javadoc">
+ <j:set var="maven.javadoc.final.name"
+ value="${maven.war.build.dir}/${maven.final.name}_javadoc.jar" />
+ <ant:jar
+ destfile="${maven.javadoc.final.name}"
+ basedir="${maven.javadoc.destdir}"
+ update="true">
+ </ant:jar>
+ </goal>
+
+ <!--==================================================================-->
+ <!-- Install the war in the local repository -->
+ <!--==================================================================-->
+ <goal name="javadoc:install"
+ prereqs="javadoc:jar"
+ description="Install the jar containing javadoc in the local repository">
+
+ <artifact:install
+ artifact="${maven.javadoc.final.name}"
+ type="javadoc"
+ project="${pom}"/>
+
+ </goal>
+
+ <!--==================================================================-->
+ <!-- Install the snapshot version of the war in the local repository -->
+ <!--==================================================================-->
+ <goal name="javadoc:install-snapshot"
+ prereqs="javadoc:jar"
+ description="Install the snapshot version of the jar containing javadoc in
the local repository">
+
+ <artifact:install-snapshot
+ artifact="${maven.javadoc.final.name}"
+ type="javadoc"
+ project="${pom}"/>
+
+ </goal>
+
+ <!--==================================================================-->
+ <!-- Deploys the javadoc to the remote repository -->
+ <!--==================================================================-->
+ <goal name="javadoc:deploy"
+ prereqs="javadoc:jar"
+ description="Deploys the jar containing javadoc to the remote repository">
+
+ <artifact:deploy
+ artifact="${maven.javadoc.final.name}"
+ type="javadoc"
+ project="${pom}"/>
+
+ </goal>
+
+ <!--==================================================================-->
+ <!-- Deploys the snapshot of the javadoc to the remote repository -->
+ <!--==================================================================-->
+ <goal name="javadoc:deploy-snapshot"
+ prereqs="javadoc:jar"
+ description="Deploys the snapshot version of jar containing javadoc to
remote repository">
+
+ <artifact:deploy-snapshot
+ artifact="${maven.javadoc.final.name}"
+ type="javadoc"
+ project="${pom}"/>
+
+ </goal>
+
+
+
</project>
1.2 +30 -21 maven/src/plugins-build/javadoc/xdocs/goals.xml
Index: goals.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/goals.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goals.xml 24 Jan 2003 03:45:34 -0000 1.1
+++ goals.xml 22 Jul 2003 12:04:20 -0000 1.2
@@ -4,32 +4,41 @@
<properties>
<title>JavaDoc Plugin Goals</title>
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
+ <author email="[EMAIL PROTECTED]">Michal Maczka</author>
</properties>
<body>
- <section name="Goals">
- <table>
- <tr><th>Goal</th><th>Description</th></tr>
-
- <a name="javadoc" />
- <tr>
- <td>javadoc</td>
- <td>
+ <goals>
+ <goal>
+ <name>javadoc</name>
+ <description>
The default goal. This goal simply executes the
<a href="#javadoc:generate">javadoc:generate</a> goal
- </td>
- </tr>
-
- <a name="javadoc:generate" />
- <tr>
- <td>javadoc:generate</td>
- <td>
+ </description>
+ </goal>
+ <goal>
+ <name>javadoc:generate</name>
+ <description>
Generates documentation using Java's built-in
- <a href="http://java.sun.com/j2se/javadoc/";>Javadoc</a> tool
- </td>
- </tr>
-
- </table>
- </section>
+ <a href="http://java.sun.com/j2se/javadoc/";>Javadoc</a> tool
+ </description>
+ </goal>
+ <goal>
+ <name>javadoc:install</name>
+ <description>Installs the jar containing javadoc documentation in the local
repository</description>
+ </goal>
+ <goal>
+ <name>javadoc:install-snapshot</name>
+ <description>Installs the jar containing javadoc documentation of the
snapshot version in the local repository</description>
+ </goal>
+ <goal>
+ <name>javadoc:deploy</name>
+ <description>Deploys the jar containing javadoc documentation the remote
repository(ies)</description>
+ </goal>
+ <goal>
+ <name>javadoc:deploy-snapshot</name>
+ <description>Deploys the jar containing javadoc documentation of the
snapshot version to the remote repository(ies)</description>
+ </goal>
+ </goals>
</body>
</document>
1.5 +3 -0 maven/src/plugins-build/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 22 Jul 2003 07:13:29 -0000 1.4
+++ changes.xml 22 Jul 2003 12:04:20 -0000 1.5
@@ -8,6 +8,9 @@
<body>
<release version="1.3" date="in CVS">
+ <action dev="michal" type="add">
+ Added install, install-snapshot, deploy and deploy-snapshot goals
+ </action>
<action dev="dion" type="fix">
Now respects pom.build.sourceModifications
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
