dion 2003/03/30 08:17:20
Modified: src/plugins-build/statcvs plugin.jelly
src/plugins-build/pom plugin.jelly
src/plugins-build/war plugin.jelly
src/plugins-build/test plugin.jelly
src/plugins-build/jxr plugin.jelly
src/plugins-build/xdoc plugin.jelly
src/plugins-build/struts plugin.jelly
src/plugins-build/dist plugin.jelly
src/plugins-build/repository plugin.jelly
src/plugins-build/changes plugin.jelly
src/plugins-build/native plugin.jelly
src/plugins-build/ear plugin.jelly
src/plugins-build/jdiff plugin.jelly
src/plugins-build/ashkelon plugin.jelly
src/plugins-build/console plugin.jelly
src/plugins-build/site plugin.jelly
src/plugins-build/aspectj plugin.jelly
src/plugins-build/jbuilder plugin.jelly
src/plugins-build/shell plugin.jelly
src/plugins-build/clover plugin.jelly
src/plugins-build/java plugin.jelly
src/plugins-build/license plugin.jelly
Log:
detab
Revision Changes Path
1.4 +2 -2 maven/src/plugins-build/statcvs/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/statcvs/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 23 Feb 2003 15:57:05 -0000 1.3
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.4
@@ -30,7 +30,7 @@
</goal>
<goal name="maven-statcvs-plugin:report">
- <attainGoal name="statcvs"/>
+ <attainGoal name="statcvs"/>
</goal>
<goal name="statcvs" prereqs="statcvs:generate"
@@ -48,7 +48,7 @@
<cvs command="-q log" output="${statcvs.logfile}"/>
- <property name="maven.docs.dest"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
+ <property name="maven.docs.dest"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
<java jar="${plugin.getDependencyPath('statcvs')}" fork="true">
<arg value="${pom.name}"/>
1.5 +5 -5 maven/src/plugins-build/pom/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/pom/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 26 Mar 2003 15:50:05 -0000 1.4
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.5
@@ -50,13 +50,13 @@
<goal
name="pom:contentvalidate"
description="Validate the content of the Maven POM">
- <j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
- <j:setProperties object="${contentvalidator}" project="${pom}"/>
+ <j:new className="org.apache.maven.ContentValidator" var="contentvalidator"/>
+ <j:setProperties object="${contentvalidator}" project="${pom}"/>
<j:set var="notices" value="${contentvalidator.execute()}"/>
-
- <j:forEach var="notice" items="${notices}">
- <echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
+
+ <j:forEach var="notice" items="${notices}">
+ <echo>${notice.Level} : ${notice.Section} : ${notice.Message}</echo>
</j:forEach>
</goal>
1.11 +6 -6 maven/src/plugins-build/war/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 27 Mar 2003 14:12:46 -0000 1.10
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.11
@@ -36,8 +36,8 @@
</goal>
<goal name="war:build">
-
-
+
+
</goal>
<goal name="war:package">
@@ -50,9 +50,9 @@
<j:if test="${webSourcesPresent == 'true'}">
<fileset dir="${maven.war.src}">
- <exclude name="WEB-INF/web.xml"/>
- <exclude name="WEB-INF/classes/**/*.class"/>
- <exclude name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/web.xml"/>
+ <exclude name="WEB-INF/classes/**/*.class"/>
+ <exclude name="WEB-INF/lib/*.jar"/>
</fileset>
</j:if>
@@ -147,7 +147,7 @@
description="Install the war in the local repository">
<property name="maven.war.install.dir"
- value="${maven.repo.local}/${pom.artifactDirectory}/wars"/>
+ value="${maven.repo.local}/${pom.artifactDirectory}/wars"/>
<mkdir dir="${maven.war.install.dir}"/>
<copy file="${maven.war.build.dir}/${maven.war.final.name}"
tofile="${maven.war.install.dir}/${maven.war.final.name}"/>
1.8 +13 -13 maven/src/plugins-build/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/test/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 26 Mar 2003 12:47:03 -0000 1.7
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.8
@@ -7,9 +7,9 @@
<define:taglib uri="test">
<define:tag name="eclipse">
- <!-- The eclipse plugin requires access to the test plugin.
- Using this tag forces the test plugin to be loaded into the
- eclipse plugin -->
+ <!-- The eclipse plugin requires access to the test plugin.
+ Using this tag forces the test plugin to be loaded into the
+ eclipse plugin -->
</define:tag>
</define:taglib>
@@ -37,8 +37,8 @@
deprecation="${maven.compile.deprecation}"
optimize="${maven.compile.optimize}">
<j:if test="${context.getVariable('maven.test.source') != null}">
- <setProperty name="source" value="${maven.test.source}" />
- </j:if>
+ <setProperty name="source" value="${maven.test.source}" />
+ </j:if>
<classpath>
<pathelement path="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
@@ -274,23 +274,23 @@
<goal name="test:single-test"
description="[deprecated] please use the test:single goal instead">
- <echo>[deprecated] please use the test:single goal instead</echo>
-
- <attainGoal name="test:single"/>
+ <echo>[deprecated] please use the test:single goal instead</echo>
+
+ <attainGoal name="test:single"/>
</goal>
<goal name="test:match-test"
description="[deprecated] please use the test:match goal instead">
- <echo>[deprecated] please use the test:match goal instead</echo>
-
- <attainGoal name="test:match"/>
+ <echo>[deprecated] please use the test:match goal instead</echo>
+
+ <attainGoal name="test:match"/>
</goal>
<goal name="test:eclipse">
- <echo>Used by eclipse to drag in test plugin context</echo>
+ <echo>Used by eclipse to drag in test plugin context</echo>
</goal>
-
+
<!-- ================================================================== -->
<!-- T E S T R E S O U R C E S -->
<!-- ================================================================== -->
1.13 +3 -3 maven/src/plugins-build/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 24 Feb 2003 14:04:25 -0000 1.12
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.13
@@ -15,7 +15,7 @@
link="xref/index"
description="A set of browsable cross-referenced sources."/>
<j:if test="${unitTestSourcesPresent}">
- <doc:registerReport
+ <doc:registerReport
name="Test Xref"
pluginName="maven-jxr-plugin"
link="xref-test/index"
@@ -76,7 +76,7 @@
<util:file var="sourceDirFile" name="${sourceDir}"/>
<j:if test="${!sourceDirFile.isAbsolute()}">
- <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
+ <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
</j:if>
<jxr:jxr
@@ -95,7 +95,7 @@
<util:file var="testSourceDirFile" name="${testSourceDir}"/>
<j:if test="${!testSourceDirFile.isAbsolute()}">
- <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
+ <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
</j:if>
<jxr:jxr
1.22 +59 -59 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plugin.jelly 15 Mar 2003 01:17:31 -0000 1.21
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.22
@@ -15,39 +15,39 @@
<define:taglib uri="doc">
<define:tag name="deregisterReport">
- <!-- @name : Report to deregister, must be same as name used to register -->
-
+ <!-- @name : Report to deregister, must be same as name used to register -->
+
<j:set
var="reports"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
<j:set var="removeRpt" value="null"/>
<j:forEach var="rpt" items="${reports}">
- <j:if test="${rpt.get('name').equals(name)}">
- <j:set var="removeRpt" value="${rpt}"/>
- </j:if>
+ <j:if test="${rpt.get('name').equals(name)}">
+ <j:set var="removeRpt" value="${rpt}"/>
+ </j:if>
</j:forEach>
<j:if test="${removeRpt != null}">
- <j:set var="dummy" value="${reports.remove(removeRpt)}"/>
+ <j:set var="dummy" value="${reports.remove(removeRpt)}"/>
</j:if>
</define:tag>
<define:tag name="registerReport">
<!--
- @name the name of this report. Used for navigation items
- @plugin-name the name of the plugin. @plugin:report goal must exist
- @description text description of report
- @link the nav-bar link for this report
- -->
+ @name the name of this report. Used for navigation items
+ @plugin-name the name of the plugin. @plugin:report goal must exist
+ @description text description of report
+ @link the nav-bar link for this report
+ -->
<j:set
var="reports"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
<j:set var="add" value="true"/>
<j:forEach var="rpt" items="${reports}">
- <j:if test="${rpt.get('name').equals(name)}">
- <j:set var="add" value="false"/>
- </j:if>
+ <j:if test="${rpt.get('name').equals(name)}">
+ <j:set var="add" value="false"/>
+ </j:if>
</j:forEach>
<j:if test="${add.equals('true')}">
@@ -76,9 +76,9 @@
</define:tag>
<define:tag name="jslFile">
- <!--
- | Basic tag for performing arbitrary jsl transformations
- | on arbitrary jsl inputs.
+ <!--
+ | Basic tag for performing arbitrary jsl transformations
+ | on arbitrary jsl inputs.
| @input
| @output
| @stylesheet
@@ -159,54 +159,54 @@
</define:tag>
<define:tag name="itemLink">
- <!--
- @link
- @relativePath
- @name
- @img
- -->
- <a href="${pathTool.calculateLink(link,relativePath)}">
- <j:if test="${empty(img)}">${name}</j:if>
- <j:if test="${!empty(img)}"><img style="border: 1px" src="${img}"
title="${name}" alt="${name}"/></j:if>
- </a>
+ <!--
+ @link
+ @relativePath
+ @name
+ @img
+ -->
+ <a href="${pathTool.calculateLink(link,relativePath)}">
+ <j:if test="${empty(img)}">${name}</j:if>
+ <j:if test="${!empty(img)}"><img style="border: 1px" src="${img}"
title="${name}" alt="${name}"/></j:if>
+ </a>
</define:tag>
<define:tag name="text-xdoc">
- <!--
- @output - The output file
- @title - Title for page
- @section - Section heading
- @encoding - The XML encoding
- @preamble - Placed in paragraph block prior to text
- @inputText - Will be wrapped in a CDATA, will not escape CDATA tags
(as yet)
- @inputFile - Will be read in and wrapped in CDATA. Overrides inputText
if set
- -->
- <j:set var="inputFile">${inputFile}</j:set>
- <j:if test="${inputFile != ''}">
- <util:file name="${inputFile}" var="inputFileObject"/>
- <util:loadText var="inputText" file="${inputFileObject}"/>
- </j:if>
-
- <!-- Set default encoding if not set. -->
+ <!--
+ @output - The output file
+ @title - Title for page
+ @section - Section heading
+ @encoding - The XML encoding
+ @preamble - Placed in paragraph block prior to text
+ @inputText - Will be wrapped in a CDATA, will not escape CDATA tags (as yet)
+ @inputFile - Will be read in and wrapped in CDATA. Overrides inputText if
set
+ -->
+ <j:set var="inputFile">${inputFile}</j:set>
+ <j:if test="${inputFile != ''}">
+ <util:file name="${inputFile}" var="inputFileObject"/>
+ <util:loadText var="inputText" file="${inputFileObject}"/>
+ </j:if>
+
+ <!-- Set default encoding if not set. -->
<j:if test="${encoding == null}">
<j:set var="encoding"
value="${plugin.getVariable('maven.docs.outputencoding')}"/>
</j:if>
-
-
- <j:file name="${output}" prettyPrint="false" encoding="ISO-8859-1">
+
+
+ <j:file name="${output}" prettyPrint="false" encoding="ISO-8859-1">
<document>
<properties><title>${title}</title></properties>
<body>
<section name="${section}">
- <p>${preamble}</p>
+ <p>${preamble}</p>
<source>
- <![CDATA[${inputText}]]>
+ <![CDATA[${inputText}]]>
</source>
</section>
</body>
</document>
- </j:file>
+ </j:file>
</define:tag>
<!-- Alternator for row style in a table -->
@@ -271,7 +271,7 @@
<j:forEach var="file" items="${docFiles.iterator()}">
- <util:replace var="inDirForward" oldChar="\" newChar="/"
value="${file.parent}"/>
+ <util:replace var="inDirForward" oldChar="\" newChar="/"
value="${file.parent}"/>
<j:set var="outDir" value="${dirMapper.mapFileName(inDirForward).0}"/>
<mkdir dir="${outDir}"/>
@@ -533,14 +533,14 @@
|-->
<j:if test="${!pom.reports.isEmpty()}">
- <j:forEach var="report" items="${pom.reports}">
+ <j:forEach var="report" items="${pom.reports}">
<attainGoal name="${report}:register"/>
</j:forEach>
</j:if>
<!-- If the descriptor is empty, use these as defaults -->
<j:if test="${pom.reports.isEmpty()}">
- <attainGoal name="maven-jdepend-plugin:register"/>
+ <attainGoal name="maven-jdepend-plugin:register"/>
<attainGoal name="maven-checkstyle-plugin:register"/>
<attainGoal name="maven-changes-plugin:register"/>
<attainGoal name="maven-changelog-plugin:register"/>
@@ -552,7 +552,7 @@
<attainGoal name="maven-junit-report-plugin:register"/>
<attainGoal name="maven-linkcheck-plugin:register"/>
<attainGoal name="maven-tasklist-plugin:register"/>
- </j:if>
+ </j:if>
</goal>
<goal name="xdoc:jelly-transform"
@@ -605,21 +605,21 @@
<!-- This is required as the linkchecker runs as a final pass over the generated
document tree -->
<goal name="xdoc:performJSL"
- description="Allows the LinkCheck plugin to xdoc a single directory">
- <j:set var="maven.xdoc.src"
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}"/>
+ description="Allows the LinkCheck plugin to xdoc a single directory">
+ <j:set var="maven.xdoc.src"
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.xdoc.src')}"/>
<doc:performJSL
- srcdir="${maven.xdoc.src}"
- destdir="${maven.docs.dest}"/>
+ srcdir="${maven.xdoc.src}"
+ destdir="${maven.docs.dest}"/>
</goal>
<goal name="xdoc:dump-report-settings">
- <echo>Dumping report settings</echo>
+ <echo>Dumping report settings</echo>
<j:set
var="reports"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
<j:forEach var="report" items="${reports}">
- <echo>Report: ${report}</echo>
+ <echo>Report: ${report}</echo>
</j:forEach>
</goal>
1.3 +1 -1 maven/src/plugins-build/struts/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/struts/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 28 Jan 2003 06:41:48 -0000 1.2
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.3
@@ -9,7 +9,7 @@
<goal name="struts:validate-war"
description="Ensure a war file containing a Struts application is valid">
-
+
<taskdef name="struts10warvalidator"
classname="org.apache.maven.struts.Struts10WarValidator">
<classpath>
1.5 +1 -1 maven/src/plugins-build/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/dist/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 27 Mar 2003 13:13:03 -0000 1.4
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.5
@@ -160,7 +160,7 @@
name="dist:build-src"
prereqs="dist:build-setup,dist:prepare-src-filesystem"
description="Build the source distribution.">
-
+
<!-- Create a tar.gz file -->
<ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
<ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
1.19 +6 -6 maven/src/plugins-build/repository/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/repository/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 18 Mar 2003 20:17:52 -0000 1.18
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.19
@@ -64,7 +64,7 @@
<delete file="${localFileName}"/>
<get src="${url}" dest="${localFileName}"/>
-
+
<!-- copy the license -->
<j:set var="directory"
value="${maven.repo.central.directory}/${groupId}/licenses/" />
<repository:copy from="${localFileName}" toFileOrDir="${directory}" />
@@ -105,11 +105,11 @@
<j:set var="${var}" value="${snapAndJar[0]}.${snapAndJar[1]}" scope="parent"/>
</define:tag>
- <!--
- ! @name the name of the value being checked
- ! @value the value that musn't be empty
- ! @message the message to be displayed when value is empty
- !-->
+ <!--
+ ! @name the name of the value being checked
+ ! @value the value that musn't be empty
+ ! @message the message to be displayed when value is empty
+ !-->
<define:tag name="required">
<j:if test="${empty(message)}">
<j:set var="message">'${name}' must be specified</j:set>
1.5 +12 -12 maven/src/plugins-build/changes/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changes/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 26 Mar 2003 23:27:44 -0000 1.4
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.5
@@ -10,14 +10,14 @@
<goal name="maven-changes-plugin:register">
<ant:property name="maven.docs.src"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
- <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
- <j:if test="${changes.exists()}">
- <doc:registerReport
- name="Changes"
- pluginName="maven-changes-plugin"
- link="changes-report"
- description="Report on the project changes."/>
- </j:if>
+ <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
+ <j:if test="${changes.exists()}">
+ <doc:registerReport
+ name="Changes"
+ pluginName="maven-changes-plugin"
+ link="changes-report"
+ description="Report on the project changes."/>
+ </j:if>
</goal>
<goal name="maven-changes-plugin:deregister">
@@ -31,10 +31,10 @@
<goal
name="maven-changes-plugin:report"
description="Generate a changes report">
- <ant:property name="maven.docs.src"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-
- <doc:jsl
+ <ant:property name="maven.docs.src"
+
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+
+ <doc:jsl
input="${maven.docs.src}/changes.xml"
output="changes-report.xml"
stylesheet="${plugin.resources}/changes.jsl"
1.4 +77 -77 maven/src/plugins-build/native/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/native/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 28 Mar 2003 09:08:22 -0000 1.3
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.4
@@ -1,91 +1,91 @@
<?xml version="1.0"?>
<project xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
- <!--==================================================================-->
- <!-- Compile all source code -->
- <!--==================================================================-->
- <goal name="native" description="Native compiler" prereqs="native:compile"/>
- <goal name="native:compile" description="Compile the native compiler"
prereqs="native:jniheader">
- <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
- <typedef name="linker"
classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
- <typedef name="compiler"
classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
- <ant:echo> Real Java Home = '${java.home}/..'
- artifactId = '${pom.artifactId}' </ant:echo>
- <mkdir dir="${maven.build.dir}/native"/>
- <!-- for some reason '.' aren't allow as parameter for outfile-->
- <cc outfile="${maven.build.dir}/native/_" link="shared" debug="true">
- <compiler name="gcc"/>
-
- <fileset dir="src/unix"/>
- <includepath location="${java.home}/../include"/>
- <includepath location="${java.home}/../include/linux"/>
- <includepath location="${java.home}/../include/linux"/>
- <includepath location="${maven.build.dir}/native/jni"/>
- </cc>
- <!-- just copy the file don't move because we don't want the compiler
to compile if for no reason -->
- <ant:copy file="${maven.build.dir}/native/lib_.so"
-
tofile="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
overwrite="true"/>
-
-
- </goal>
- <!-- ================================================================== -->
- <!-- I N S T A L L J A R -->
- <!-- ================================================================== -->
- <goal name="native:install" prereqs="native:compile" description="Install the
lib in the local repository">
- <ant:echo>
+ <!--==================================================================-->
+ <!-- Compile all source code -->
+ <!--==================================================================-->
+ <goal name="native" description="Native compiler" prereqs="native:compile"/>
+ <goal name="native:compile" description="Compile the native compiler"
prereqs="native:jniheader">
+ <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
+ <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
+ <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
+ <ant:echo> Real Java Home = '${java.home}/..'
+ artifactId = '${pom.artifactId}' </ant:echo>
+ <mkdir dir="${maven.build.dir}/native"/>
+ <!-- for some reason '.' aren't allow as parameter for outfile-->
+ <cc outfile="${maven.build.dir}/native/_" link="shared" debug="true">
+ <compiler name="gcc"/>
+
+ <fileset dir="src/unix"/>
+ <includepath location="${java.home}/../include"/>
+ <includepath location="${java.home}/../include/linux"/>
+ <includepath location="${java.home}/../include/linux"/>
+ <includepath location="${maven.build.dir}/native/jni"/>
+ </cc>
+ <!-- just copy the file don't move because we don't want the compiler to
compile if for no reason -->
+ <ant:copy file="${maven.build.dir}/native/lib_.so"
+
tofile="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
overwrite="true"/>
+
+
+ </goal>
+ <!-- ================================================================== -->
+ <!-- I N S T A L L J A R -->
+ <!-- ================================================================== -->
+ <goal name="native:install" prereqs="native:compile" description="Install the lib
in the local repository">
+ <ant:echo>
id = '${pom.artifactId}'
groupId = '${pom.groupId}'
artifactDirectory = '${pom.artifactDirectory}'
</ant:echo>
- <ant:property name="libdir__"
value="${maven.repo.local}/${pom.artifactDirectory}/so"/>
- <ant:mkdir dir="${libdir__}"/>
- <ant:copy
file="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
tofile="${libdir__}/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
- </goal>
- <goal name="native:test" description="Install the lib in the local repository">
- <ant:echo>
+ <ant:property name="libdir__"
value="${maven.repo.local}/${pom.artifactDirectory}/so"/>
+ <ant:mkdir dir="${libdir__}"/>
+ <ant:copy
file="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
tofile="${libdir__}/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
+ </goal>
+ <goal name="native:test" description="Install the lib in the local repository">
+ <ant:echo>
id = '${pom.artifactId}'
groupId = '${pom.groupId}'
artifactDirectory = '${pom.artifactDirectory}'
</ant:echo>
- </goal>
- <goal name="native:jniheader" description="make jniheaders for classes"
prereqs="java:compile">
- <fileScanner var="classFiles">
- <fileset dir="${maven.build.dest}">
- <patternset>
- <include name="**/*.class"/>
- </patternset>
- </fileset>
- </fileScanner>
+ </goal>
+ <goal name="native:jniheader" description="make jniheaders for classes"
prereqs="java:compile">
+ <fileScanner var="classFiles">
+ <fileset dir="${maven.build.dest}">
+ <patternset>
+ <include name="**/*.class"/>
+ </patternset>
+ </fileset>
+ </fileScanner>
- <j:set var="compileJNI" value="false"/>
- <j:forEach var="file" items="${classFiles.iterator()}">
- <j:set var="clazz"
value="${javaSourceTool.getBcelClass(file.toString())}"/>
- <j:forEach var="method" items="${clazz.getMethods()}">
- <j:if test="${method.isNative() == 'true'}">
- <j:set var="compileJNI" value="true"/>
- </j:if>
- </j:forEach>
- </j:forEach>
+ <j:set var="compileJNI" value="false"/>
+ <j:forEach var="file" items="${classFiles.iterator()}">
+ <j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
+ <j:forEach var="method" items="${clazz.getMethods()}">
+ <j:if test="${method.isNative() == 'true'}">
+ <j:set var="compileJNI" value="true"/>
+ </j:if>
+ </j:forEach>
+ </j:forEach>
- <j:if test="${compileJNI == 'true'}">
- <mkdir dir="${maven.build.dir}/native/jni"/>
- <javah destdir="${maven.build.dir}/native/jni">
- <classpath>
- <pathelement location="${maven.build.dest}"/>
- </classpath>
- <j:useBean var="javaSourceTool"
class="org.apache.maven.natives.util.JavaSourceTool"/>
- <j:forEach var="file" items="${classFiles.iterator()}">
- <j:set var="isNative" value="false"/>
- <j:set var="clazz"
value="${javaSourceTool.getBcelClass(file.toString())}"/>
- <j:forEach var="method" items="${clazz.getMethods()}">
- <j:if test="${method.isNative() == 'true'}">
- <j:set var="isNative" value="true"/>
- </j:if>
- </j:forEach>
- <j:if test="${isNative == 'true'}">
- <class name="${clazz.className}"/>
- </j:if>
- </j:forEach>
- </javah>
+ <j:if test="${compileJNI == 'true'}">
+ <mkdir dir="${maven.build.dir}/native/jni"/>
+ <javah destdir="${maven.build.dir}/native/jni">
+ <classpath>
+ <pathelement location="${maven.build.dest}"/>
+ </classpath>
+ <j:useBean var="javaSourceTool"
class="org.apache.maven.natives.util.JavaSourceTool"/>
+ <j:forEach var="file" items="${classFiles.iterator()}">
+ <j:set var="isNative" value="false"/>
+ <j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
+ <j:forEach var="method" items="${clazz.getMethods()}">
+ <j:if test="${method.isNative() == 'true'}">
+ <j:set var="isNative" value="true"/>
+ </j:if>
+ </j:forEach>
+ <j:if test="${isNative == 'true'}">
+ <class name="${clazz.className}"/>
+ </j:if>
+ </j:forEach>
+ </javah>
</j:if>
- </goal>
+ </goal>
</project>
1.6 +4 -4 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 27 Mar 2003 13:15:03 -0000 1.5
+++ plugin.jelly 30 Mar 2003 16:17:19 -0000 1.6
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<project
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:license="license"
- xmlns:util="jelly:util">
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:license="license"
+ xmlns:util="jelly:util">
<!--==================================================================-->
<!-- Default goal : Builds a ear file -->
1.4 +5 -3 maven/src/plugins-build/jdiff/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdiff/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 28 Jan 2003 05:49:52 -0000 1.3
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.4
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core">
+<project
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant">
<!-- ================================================================== -->
<!-- P R O J E C T D O C U M E N T A T I O N -->
@@ -89,7 +91,7 @@
<param name="-apiname" value="${maven.jdiff.old.tag}"/>
<param name="-baseURI" value="${baseuri}"/>
</doclet>
- </javadoc>
+ </javadoc>
<javadoc
packagenames="${pom.package}.*"
@@ -100,7 +102,7 @@
<param name="-apiname" value="${maven.jdiff.new.tag}"/>
<param name="-baseURI" value="${baseuri}"/>
</doclet>
- </javadoc>
+ </javadoc>
<javadoc
private="yes"
1.4 +8 -8 maven/src/plugins-build/ashkelon/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ashkelon/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 26 Mar 2003 12:32:49 -0000 1.3
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.4
@@ -18,7 +18,7 @@
pluginName="maven-ashkelon-plugin"
link="ashkelon"
description="Report on the validity of all links in the documentation."/>
- <!--doc:registerReport
+ <!--doc:registerReport
name="Ashkelon Deploy Report"
pluginName="maven-ashkelon-plugin"
link="ashkelon-output"
@@ -36,15 +36,15 @@
<!-- ================================================================== -->
<goal name="maven-ashkelon-plugin:report">
-
+
</goal>
<goal name="ashkelon:generate-xml">
- <j:new var="packageTool" className="org.apache.maven.ashkelon.PackageTool"/>
- <u:file var="src" name="${pom.build.sourceDirectory}"/>
+ <j:new var="packageTool" className="org.apache.maven.ashkelon.PackageTool"/>
+ <u:file var="src" name="${pom.build.sourceDirectory}"/>
<j:set var="packages" value="${packageTool.findPackages(src)}"/>
${packages}
- <echo>${basedir}/${pom.artifactId}-ashkelon.xml</echo>
+ <echo>${basedir}/${pom.artifactId}-ashkelon.xml</echo>
<j:file name="${basedir}/${pom.artifactId}-ashkelon.xml" prettyPrint="true"
xmlns="dummy">
<api>
<name>${pom.name}</name>
@@ -55,12 +55,12 @@
<release_date>2000-01-01T00:00:00.000</release_date>
<version>${pom.currentVersion}</version>
<j:forEach var="package" items="${packages}">
- <package>${package}</package>
+ <package>${package}</package>
</j:forEach>
</api>
- </j:file>
+ </j:file>
</goal>
-
+
</project>
1.4 +1 -1 maven/src/plugins-build/console/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/console/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 19 Feb 2003 08:25:24 -0000 1.3
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.4
@@ -36,7 +36,7 @@
<j:set var="lastGoal" value="${goal}"/>
</j:catch>
<j:if test="${ex != null}">
- ${pom.getContext().removeVariable("maven.test.failure")}
+ ${pom.getContext().removeVariable("maven.test.failure")}
<log:info>${ex}</log:info>
</j:if>
</j:otherwise>
1.12 +4 -4 maven/src/plugins-build/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/site/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 9 Mar 2003 01:37:54 -0000 1.11
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.12
@@ -27,10 +27,10 @@
</goal>
<goal name="site:run-reports" prereqs="xdoc:register-reports">
- <j:set var="reports"
-
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
-
- <j:forEach var="report" items="${reports}">
+ <j:set var="reports"
+
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+
+ <j:forEach var="report" items="${reports}">
<echo>Generating the ${report.get('name')}...</echo>
<attainGoal name="${report.get('pluginName')}:report"/>
</j:forEach>
1.3 +2 -2 maven/src/plugins-build/aspectj/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/aspectj/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 26 Mar 2003 12:32:49 -0000 1.2
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.3
@@ -64,8 +64,8 @@
</j:if>
- </j:if>
-
+ </j:if>
+
</goal>
<goal name="aspectj:ajdoc" description="Javadoc source using ajdoc">
1.7 +29 -29 maven/src/plugins-build/jbuilder/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 30 Mar 2003 15:25:56 -0000 1.6
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.7
@@ -16,9 +16,9 @@
description="Generate JBuilder [id_project].library file">
<ant:echo>Creating ${basedir}/${pom.artifactId}.library ...</ant:echo>
- <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true"
xmlns="dummy">
-
- <library>
+ <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true"
xmlns="dummy">
+
+ <library>
<x:comment>JBuilder Library Definition File</x:comment>
<fullname>${pom.artifactId}</fullname>
<class>
@@ -40,38 +40,38 @@
</class>
<required>${pom.artifactId}</required>
</library>
- </j:file>
-
+ </j:file>
+
</goal>
<goal name="jbuilder:generate-project"
description="Generate JBuilder [id_project].jpx file">
<ant:echo>Creating ${basedir}/${pom.artifactId}.jpx ...</ant:echo>
- <j:file name="${basedir}/${pom.artifactId}.jpx" prettyPrint="true"
xmlns="dummy">
- <x:comment>Project XML JBuilder</x:comment>
- <project>
- <property category="sys" name="AuthorLabel" value="@author"/>
- <property category="sys" name="BackupPath" value="bak"/>
- <property category="sys" name="Company" value=""/>
- <property category="sys" name="CompanyLabel" value="Company :"/>
- <property category="sys" name="Copyright" value="Copyright (c)
${pom.inceptionYear} - ${pom.organization.name}"/>
- <property category="sys" name="CopyrightLabel" value="Copyright :"/>
- <property category="sys" name="DefaultPath"
value="${pom.build.sourceDirectory}"/>
- <property category="sys" name="Description" value=""/>
- <property category="sys" name="DescriptionLabel" value="Description :"/>
- <property category="sys" name="DocPath" value="doc"/>
- <property category="sys" name="IncludeTestPath" value="1"/>
- <property category="sys" name="OutPath" value="target/classes"/>
- <property category="sys" name="SourcePath"
value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
- <property category="sys" name="TestPath"
value="${pom.build.unitTestSourceDirectory}"/>
- <property category="sys" name="Title" value=""/>
- <property category="sys" name="TitleLabel" value="Title :"/>
- <property category="sys" name="Version" value="${pom.currentVersion}"/>
- <property category="sys" name="VersionLabel" value="@version"/>
- <property category="sys" name="WorkingDirectory" value="."/>
- </project>
- </j:file>
+ <j:file name="${basedir}/${pom.artifactId}.jpx" prettyPrint="true"
xmlns="dummy">
+ <x:comment>Project XML JBuilder</x:comment>
+ <project>
+ <property category="sys" name="AuthorLabel" value="@author"/>
+ <property category="sys" name="BackupPath" value="bak"/>
+ <property category="sys" name="Company" value=""/>
+ <property category="sys" name="CompanyLabel" value="Company :"/>
+ <property category="sys" name="Copyright" value="Copyright (c)
${pom.inceptionYear} - ${pom.organization.name}"/>
+ <property category="sys" name="CopyrightLabel" value="Copyright :"/>
+ <property category="sys" name="DefaultPath"
value="${pom.build.sourceDirectory}"/>
+ <property category="sys" name="Description" value=""/>
+ <property category="sys" name="DescriptionLabel" value="Description :"/>
+ <property category="sys" name="DocPath" value="doc"/>
+ <property category="sys" name="IncludeTestPath" value="1"/>
+ <property category="sys" name="OutPath" value="target/classes"/>
+ <property category="sys" name="SourcePath"
value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
+ <property category="sys" name="TestPath"
value="${pom.build.unitTestSourceDirectory}"/>
+ <property category="sys" name="Title" value=""/>
+ <property category="sys" name="TitleLabel" value="Title :"/>
+ <property category="sys" name="Version" value="${pom.currentVersion}"/>
+ <property category="sys" name="VersionLabel" value="@version"/>
+ <property category="sys" name="WorkingDirectory" value="."/>
+ </project>
+ </j:file>
</goal>
1.2 +15 -15 maven/src/plugins-build/shell/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/shell/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 10 Mar 2003 21:30:36 -0000 1.1
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project xmlns:j="jelly:core"
- xmlns:test="test">
+ xmlns:test="test">
<!--==================================================================-->
<!-- Generate Eclipse .project and .classpath files -->
@@ -13,13 +13,13 @@
<goal name="shell:zsh"
description="Generate Zsh files">
- <j:set var="outputDir" value="${maven.shell.zsh.dir}"/>
- <j:if test="${empty outputDir}">
- <j:set var="outputDir" value="${maven.build.dir}"/>
- </j:if>
+ <j:set var="outputDir" value="${maven.shell.zsh.dir}"/>
+ <j:if test="${empty outputDir}">
+ <j:set var="outputDir" value="${maven.build.dir}"/>
+ </j:if>
- <j:file name="${maven.build.dir}/_mavenzsh.tmp" omitXmlDeclaration="true"
xmlns="dummy">
- <![CDATA[
+ <j:file name="${maven.build.dir}/_mavenzsh.tmp" omitXmlDeclaration="true"
xmlns="dummy">
+ <![CDATA[
#compdef maven
case "$service" in
@@ -50,11 +50,11 @@
tmp=(
]]>
-
- <j:set var="mavenSession" value="${context.getMavenSession()}"/>
- <j:set var="allGoals" value="${mavenSession.getAllGoalNames()}"/>
- <j:new var="modList" className="java.util.ArrayList"/>
- <j:set var="dummy" value="${modList.addAll(allGoals)}"/>
+
+ <j:set var="mavenSession" value="${context.getMavenSession()}"/>
+ <j:set var="allGoals" value="${mavenSession.getAllGoalNames()}"/>
+ <j:new var="modList" className="java.util.ArrayList"/>
+ <j:set var="dummy" value="${modList.addAll(allGoals)}"/>
<j:invokeStatic method="sort" className="java.util.Collections" var="dummy">
<j:arg type="java.util.List" value="${modList}" />
</j:invokeStatic>
@@ -87,8 +87,8 @@
]]>
</j:file>
- <echo>Now start a new zsh shell</echo>
-
+ <echo>Now start a new zsh shell</echo>
+
<filter token="AMBERSAND" value="&"/>
<filter token="LESSER_THAN" value="<"/>
<filter token="GREATER_THAN" value=">"/>
@@ -96,7 +96,7 @@
<delete file="${maven.build.dir}/_mavenzsh.tmp"/>
-
+
</goal>
</project>
1.5 +2 -2 maven/src/plugins-build/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 27 Mar 2003 13:06:14 -0000 1.4
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.5
@@ -109,8 +109,8 @@
|
-->
<ant:mkdir dir="${cloverReportDirectory}"/>
-
- <ant:java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
+
+ <ant:java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
fork="true">
<ant:arg line="-o ${cloverReportDirectory}"/>
<ant:arg line="-i ${clover.initstring}"/>
1.13 +1 -1 maven/src/plugins-build/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/java/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 26 Mar 2003 12:32:50 -0000 1.12
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.13
@@ -183,7 +183,7 @@
<ant:attribute name="Implementation-Vendor"
value="${pom.organization.name}"/>
<ant:attribute name="Implementation-Vendor-Id"
value="${pom.organization.identifier}"/>
<j:set var="mainclass"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
- <j:if test="${!empty(mainclass)}">
+ <j:if test="${!empty(mainclass)}">
<ant:attribute name="Main-Class" value="${mainclass}"/>
</j:if>
</ant:manifest>
1.12 +6 -6 maven/src/plugins-build/license/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/license/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 23 Feb 2003 15:56:33 -0000 1.11
+++ plugin.jelly 30 Mar 2003 16:17:20 -0000 1.12
@@ -10,7 +10,7 @@
<define:taglib uri="license">
<define:tag name="fileName">
- <j:set var="licenseX" value='${maven.license.licenseFile}X'/>
+ <j:set var="licenseX" value='${maven.license.licenseFile}X'/>
<j:choose>
<j:when test="${licenseX != 'X'}">
@@ -80,8 +80,8 @@
</util:available>
<j:if test="${licensePresent != 'true'}">
- <echo>
- ======================================================================
+ <echo>
+ ======================================================================
= W A R N I N G =
======================================================================
= Your project doesn't contain a header file specified as: =
@@ -95,9 +95,9 @@
<j:set var="licenseFile" value='${plugin.resources}/LICENSE.txt'/>
</j:if>
- <doc:text-xdoc
- title="Project License"
- section="Project License"
+ <doc:text-xdoc
+ title="Project License"
+ section="Project License"
output="${genDocs}/license.xml"
inputFile="${licenseFile}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
