Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/dotuml plugin.jelly plugin.propertiesproject.properties project.xml
|
From: Jeff J. <jj...@ap...> - 2007-03-16 01:22:42
|
lukas_theussl 07/03/15 10:05:18
Modified: dotuml/src/main/net/sourceforge/mavenplugins/dotuml
PathHelper.java
dotuml/xdocs changes.xml
dotuml plugin.jelly plugin.properties project.properties
project.xml
Added: dotuml/lib UmlGraph-2.10.jar
dotuml/src/main/net/sourceforge/mavenplugins/dotuml
package.html
Log:
Make it work with maven-1.1. Add UmlGraph jar in lib/ as it is not on
ibiblio.
Revision Changes Path
1.1 maven-plugins/dotuml/lib/UmlGraph-2.10.jar
<<Binary file>>
1.3 +11 -7
maven-plugins/dotuml/src/main/net/sourceforge/mavenplugins/dotuml/PathHelper
.java
Index: PathHelper.java
===================================================================
RCS file:
/cvsroot/maven-plugins/maven-plugins/dotuml/src/main/net/sourceforge/mavenpl
ugins/dotuml/PathHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PathHelper.java 22 Oct 2004 10:23:47 -0000 1.2
+++ PathHelper.java 15 Mar 2007 17:05:15 -0000 1.3
@@ -19,7 +19,7 @@
* 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/)."
+ * 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.
*
@@ -69,6 +69,7 @@
*/
public class PathHelper {
+ /** The path. */
private String path;
@@ -80,18 +81,19 @@
/**
* set the fully qualified path of a file or directory.
*
- * @param path the new path
+ * @param newPath the new path.
*/
- public void setPath(String path) {
- this.path = path;
+ public final void setPath(final String newPath) {
+ this.path = newPath;
}
/**
* get the path.
*
* @return the canonical path with <code>File.separator</code>
ending.
+ * @throws Exception Exception.
*/
- public String getPath() throws Exception {
+ public final String getPath() throws Exception {
File file = new File(path);
// append the File.separator, because the canonicalization
removes
@@ -104,8 +106,9 @@
* extension is removed.
*
* @return the path string without the file extension.
+ * @throws Exception Exception.
*/
- public String getNameWithoutExtension() throws Exception {
+ public final String getNameWithoutExtension() throws Exception {
return path.substring(0, path.lastIndexOf("."));
}
@@ -113,8 +116,9 @@
* get the parent of the fully qualified path.
*
* @return returns the parent of the fully qualified path.
+ * @throws Exception Exception.
*/
- public String getParent() throws Exception {
+ public final String getParent() throws Exception {
File file = new File(path);
String parent = file.getParent();
1.1
maven-plugins/dotuml/src/main/net/sourceforge/mavenplugins/dotuml/package.ht
ml
Index: package.html
===================================================================
<html>
<body>
<p>
Helper class to handle file paths.
</p>
</body>
</html>
1.3 +9 -0 maven-plugins/dotuml/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dotuml/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 22 Oct 2004 10:23:47 -0000 1.2
+++ changes.xml 15 Mar 2007 17:05:16 -0000 1.3
@@ -10,6 +10,15 @@
</properties>
<body>
+ <release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="lukas_theussl" type="update">
+ Make it work with Maven 1.1.
+ </action>
+ <action dev="lukas_theussl" type="update">
+ Upgrade to UmlGraph-2.10, which is distributed with the plugin
+ as it's not on ibiblio.
+ </action>
+ </release>
<release version="1.0" date="03.10.2004">
<action dev="dahlemd" type="fix">
Fix project structure to suit maven-plugins.sf.net.
1.3 +23 -6 maven-plugins/dotuml/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dotuml/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 22 Oct 2004 10:23:46 -0000 1.2
+++ plugin.jelly 15 Mar 2007 17:05:17 -0000 1.3
@@ -5,6 +5,7 @@
xmlns:define="jelly:define"
xmlns:log="jelly:log"
xmlns:doc="doc"
+ xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:x="jelly:xml">
@@ -58,11 +59,16 @@
-->
<goal
name="dotuml:init"
- prereqs="xdoc:init"
description="initialize the dotuml plugin">
- <j:set var="genDocs"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.do
cs')}/dotuml" />
+ <maven:get var="maven.xdoc.gen" plugin="maven-xdoc-plugin"
property="maven.gen.docs"/>
+ <j:set var="genDocs" value="${maven.xdoc.gen}/dotuml" />
+
+ <j:set var="destdir" value="${maven.dotuml.destdir}" />
+ <j:if test="${destdir.equals('') or destdir == null}">
+ <maven:get var="maven.docs.dest" plugin="maven-xdoc-plugin"
property="maven.docs.dest"/>
+ <j:set var="maven.dotuml.destdir" value="${maven.docs.dest}/dotuml"
/>
+ </j:if>
<ant:mkdir dir="${maven.dotuml.destdir}"/>
<ant:mkdir dir="${genDocs}" />
@@ -386,7 +392,7 @@
private="${maven.dotuml.private}">
<doclet name="${maven.dotuml.doclet}"
- path="${plugin.getDependencyPath('umlgraph:UmlGraph')}">
+ path="${plugin.getDependencyPath('gr.spinellis:UmlGraph')}">
<param name="-output" value="${maven.dotuml.output}" />
@@ -463,6 +469,10 @@
<param name="-apidocmap" value="${apidocmap}" />
</j:if>
<j:set var="apidocroot" value="${maven.dotuml.apidocroot}" />
+ <j:if test="${apidocroot.equals('') or apidocroot == null}">
+ <maven:get var="maven.dotuml.apidocroot"
plugin="maven-javadoc-plugin" property="maven.javadoc.destdir"/>
+ <j:set var="apidocroot" value="${maven.dotuml.apidocroot}" />
+ </j:if>
<j:if test="${!apidocroot.equals('')}">
<param name="-apidocroot" value="${apidocroot}" />
</j:if>
@@ -489,7 +499,7 @@
<!-- stop recording -->
<ant:record name="${maven.dotuml.destdir}/report.txt" action="stop"
/>
- <j:set var="cont"
value="${context.getVariable('maven.dotuml.packagename')}"/>
+ <j:set var="cont" value="${maven.dotuml.packagename}"/>
<j:if test="${cont != null and cont.length() gt 0}">
<j:set var="diagram" value="Packages ${cont}" />
</j:if>
@@ -534,6 +544,13 @@
<j:choose>
<j:when test="${pic2plotDirIsPresent}">
+
+ <j:set var="pic2plotdestdir"
value="${maven.dotuml.pic2plot.dest.dir}" />
+ <j:if test="${pic2plotdestdir.equals('') or pic2plotdestdir ==
null}">
+ <maven:get var="maven.docs.dest" plugin="maven-xdoc-plugin"
property="maven.docs.dest"/>
+ <j:set var="maven.dotuml.pic2plot.dest.dir"
value="${maven.docs.dest}/sequence" />
+ </j:if>
+
<ant:mkdir dir="${maven.dotuml.pic2plot.dest.dir}"/>
<!-- generate the sequence diagrams -->
@@ -570,7 +587,7 @@
<j:otherwise>
<ant:echo>
Can not generate sequence diagrams, because the
${maven.dotuml.sequence.src.dir}
- is not present.
+ is not present. Please set the maven.dotuml.sequence.src.dir
property.
</ant:echo>
</j:otherwise>
</j:choose>
1.3 +3 -3 maven-plugins/dotuml/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dotuml/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 22 Oct 2004 10:23:46 -0000 1.2
+++ plugin.properties 15 Mar 2007 17:05:17 -0000 1.3
@@ -4,8 +4,8 @@
# DotUml plugin.
# -------------------------------------------------------------------
-maven.dotuml.destdir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/
dotuml
-maven.dotuml.pic2plot.dest.dir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/
sequence
+#maven.dotuml.destdir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/
dotuml
+#maven.dotuml.pic2plot.dest.dir =
${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}/
sequence
maven.dotuml.pic2plot.src.dir = ${maven.src.dir}/pic
maven.dotuml.pic2plot.fontsize = 12pt
@@ -144,7 +144,7 @@
maven.dotuml.svg.height = 600
# Root to the api documentation
-maven.dotuml.apidocroot=${pom.getPluginContext('maven-javadoc-plugin').getV
ariable('maven.javadoc.destdir')}
+#maven.dotuml.apidocroot=${pom.getPluginContext('maven-javadoc-plugin').get
Variable('maven.javadoc.destdir')}
# File with a map of regular expressions to URL roots to resolve external
# classes (not part of the target package)
1.3 +3 -2 maven-plugins/dotuml/project.properties
Index: project.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dotuml/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 22 Oct 2004 10:23:46 -0000 1.2
+++ project.properties 15 Mar 2007 17:05:17 -0000 1.3
@@ -3,6 +3,7 @@
# -------------------------------------------------------------------
maven.license.licenseFile=${basedir}/../LICENSE.txt
maven.xdoc.version=${pom.currentVersion}
+maven.announcement.lenient=true
#
------------------------------------------------------------------------
# M A V E N J A R O V E R R I D E
@@ -15,5 +16,5 @@
#
------------------------------------------------------------------------
# Jars set explicity by path.
#
------------------------------------------------------------------------
-maven.jar.j2sdk =
-maven.jar.UmlGraph =
+#maven.jar.j2sdk =
+maven.jar.UmlGraph = ${basedir}/lib/UmlGraph-2.10.jar
1.6 +17 -6 maven-plugins/dotuml/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dotuml/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 15 Aug 2006 12:24:08 -0000 1.5
+++ project.xml 15 Mar 2007 17:05:17 -0000 1.6
@@ -8,7 +8,7 @@
<name>Maven DotUml Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<description/>
@@ -16,7 +16,7 @@
<package>net.sourceforge.mavenplugins.dotuml</package>
<!-- logo is in parent. no gumpRepositoryId -->
- <url>http://maven-plugins.sourceforge.net/${pom.artifactId}</url>
+ <url>http://maven-plugins.sourceforge.net/${pom.artifactId}/</url>
<siteDirectory>
/home/groups/m/ma/maven-plugins/htdocs/maven-dotuml-plugin/
@@ -27,7 +27,7 @@
<repository>
<connection>
-
scm:cvs:pserver:ano...@ma...:/cvsroot/maven-p
lugins:maven-plugins/dotuml
+
scm:cvs:pserver:anonymous:@maven-plugins.cvs.sourceforge.net:/cvsroot/maven-
plugins:maven-plugins/dotuml
</connection>
<developerConnection>
scm:cvs:ext:${maven.username}@maven-plugins.cvs.sourceforge.net:/cvsroot/mav
en-plugins:maven-plugins/dotuml
@@ -86,6 +86,8 @@
</developers>
<dependencies>
+ <!-- doesn't seem to be needed? -->
+ <!--
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
@@ -96,14 +98,23 @@
<artifactId>commons-lang</artifactId>
<version>1.0-b1.1</version>
</dependency>
+ -->
<dependency>
- <groupId>umlgraph</groupId>
+ <groupId>gr.spinellis</groupId>
<artifactId>UmlGraph</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
<url>http://www.spinellis.gr/sw/umlgraph/</url>
</dependency>
</dependencies>
- <!-- build is in the parent -->
+ <!-- rest of build is in the parent -->
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/lib</directory>
+ <targetPath>lib</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
|
