jvanzyl 2002/06/27 08:32:39
Modified: src/templates/build/plugins/changelog plugin.jelly
src/templates/build/plugins/core default.properties
src/templates/build/plugins/docs plugin.jelly
src/templates/build/plugins/jdepend plugin.jelly
Log:
Hacking the jdepend plugin just to get the maven script to work. I
inadvertently had some bad attributes in there keeping the process from
working.
Revision Changes Path
1.2 +1 -1
jakarta-turbine-maven/src/templates/build/plugins/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/changelog/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 26 Jun 2002 21:18:13 -0000 1.1
+++ plugin.jelly 27 Jun 2002 15:32:38 -0000 1.2
@@ -3,7 +3,7 @@
<project xmlns:j="jelly:core">
<!-- ================================================================== -->
- <!-- C H A N G E L O G R E P O R T -->
+ <!-- C H A N G E L O G R E P O R T -->
<!-- ================================================================== -->
<goal name="change-log">
1.13 +1 -0
jakarta-turbine-maven/src/templates/build/plugins/core/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/default.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- default.properties 26 Jun 2002 20:51:44 -0000 1.12
+++ default.properties 27 Jun 2002 15:32:38 -0000 1.13
@@ -78,6 +78,7 @@
# Checkstyle settings ... default maven settings, these can be
# overridden in a project specific properties file.
#
+maven.build.dir = ${basedir}/target
maven.checkstyle.includes = **/*.java
maven.checkstyle.excludes =
maven.checkstyle.properties =
${maven.home}/plugins/core/sun-code-conventions-checkstyle.properties
1.3 +2 -2
jakarta-turbine-maven/src/templates/build/plugins/docs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 26 Jun 2002 21:13:01 -0000 1.2
+++ plugin.jelly 27 Jun 2002 15:32:38 -0000 1.3
@@ -5,7 +5,7 @@
<goal
name="docs"
prereqs="generate-xdocs, docs:site"
- description="o Generate html project documentation xdoc sources">
+ description="Generate html project documentation xdoc sources">
</goal>
<!-- ================================================================== -->
@@ -31,7 +31,7 @@
<goal
name="docs:site"
- description="o Generate html project documentation xdoc sources">
+ description="Generate html project documentation xdoc sources">
<!-- Transform the auto-generated xdocs first -->
<dvsl
1.2 +29 -13
jakarta-turbine-maven/src/templates/build/plugins/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/jdepend/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 26 Jun 2002 21:20:20 -0000 1.1
+++ plugin.jelly 27 Jun 2002 15:32:38 -0000 1.2
@@ -5,11 +5,16 @@
<!-- ================================================================== -->
<!-- M E T R I C S -->
<!-- ================================================================== -->
-
+
<goal
- name="metrics"
- if="maven.sourcesPresent"
- depends="jdepend-report,jdepend-gui">
+ name="metrics">
+
+ <j:if test="${flags.sourcesPresent}">
+
+ <attainGoal name="jdepend-report"/>
+ <attainGoal name="jdepend-gui"/>
+
+ </j:if>
</goal>
@@ -17,10 +22,15 @@
<!-- J D E P E N D R E P O R T T A R G E T -->
<!-- ================================================================== -->
+ <!-- this depends on the sources being compiled -->
+
<goal
- name="jdepend-report"
- depends="local-init,compile"
- unless="use.jdepend.gui">
+ name="jdepend-report">
+
+ <!--
+ unless="use.jdepend.gui"
+ -->
+
<java
classname="jdepend.textui.JDepend"
fork="yes"
@@ -38,9 +48,10 @@
<!-- ================================================================== -->
<goal
- name="jdepend-gui"
- depends="local-init,compile"
- if="use.jdepend.gui">
+ name="jdepend-gui">
+
+ <j:if test="${flags.useJDependGui}">
+
<java
classname="jdepend.swingui.JDepend"
fork="yes"
@@ -51,6 +62,9 @@
<path refid="maven.dependency.classpath"/>
</classpath>
</java>
+
+ </j:if>
+
</goal>
<!-- ================================================================== -->
@@ -58,9 +72,9 @@
<!-- ================================================================== -->
<goal
- name="jdepend-xml"
- if="maven.sourcesPresent"
- depends="local-init,compile">
+ name="jdepend-xml">
+
+ <j:if test="${flags.sourcesPresent}">
<java
classname="jdepend.xmlui.JDepend"
@@ -88,6 +102,8 @@
of MavenTool -->
<tool name="toolbox.string.basedir" value="${basedir}"/>
</dvsl>
+
+ </j:if>
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
