dion 2003/08/07 09:59:41
Modified: src/plugins-build/j2ee Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/jellydoc Tag: MAVEN_RC1_STABLE project.xml
src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc
Tag: MAVEN_RC1_STABLE TestHtml2Xdoc.java
src/plugins-build/ejb Tag: MAVEN_RC1_STABLE
plugin.properties plugin.jelly
src/plugins-build/file-activity Tag: MAVEN_RC1_STABLE
plugin.jelly project.xml
src/plugins-build/hibernate Tag: MAVEN_RC1_STABLE
project.xml
src/plugins-build/jbuilder Tag: MAVEN_RC1_STABLE
plugin.jelly plugin.properties
src/plugins-build/jdee Tag: MAVEN_RC1_STABLE project.xml
src/plugins-build/jar/xdocs Tag: MAVEN_RC1_STABLE
properties.xml changes.xml
src/plugins-build/html2xdoc/src/main/org/apache/maven/html2xdoc
Tag: MAVEN_RC1_STABLE Html2XdocBean.java
src/plugins-build/jdepend/src/plugin-resources Tag:
MAVEN_RC1_STABLE jdepend.jsl
src/plugins-build/java Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/html2xdoc Tag: MAVEN_RC1_STABLE
project.xml
src/plugins-build/jar Tag: MAVEN_RC1_STABLE plugin.jelly
plugin.properties
src/plugins-build/eclipse Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/dist Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/ejb/xdocs Tag: MAVEN_RC1_STABLE
properties.xml
src/plugins-build/ear Tag: MAVEN_RC1_STABLE project.xml
src/plugins-build/file-activity/src/plugin-resources Tag:
MAVEN_RC1_STABLE maven-file-activity-plugin.jsl
src/plugins-build/developer-activity Tag: MAVEN_RC1_STABLE
project.xml plugin.jelly
src/plugins-build/faq Tag: MAVEN_RC1_STABLE project.xml
Added: src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc
Tag: MAVEN_RC1_STABLE link.xml h1h2.xml
comment.html h3h4.html h1h2.html comment.xml
link.html
src/plugins-build/eclipse/src/plugin-resources/templates
Tag: MAVEN_RC1_STABLE project.jelly classpath.jelly
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.9.4.1 +2 -1 maven/src/plugins-build/j2ee/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/j2ee/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- plugin.jelly 1 Apr 2003 06:28:54 -0000 1.9
+++ plugin.jelly 7 Aug 2003 16:59:39 -0000 1.9.4.1
@@ -17,7 +17,7 @@
<!-- ================================================================ -->
<!-- V A L I D A T E A W A R -->
<!-- ================================================================ -->
- <goal name="j2ee:validate-war"
+ <goal name="j2ee:validate-war" prereqs="war:init"
description="Check that a war file is valid">
<ant:taskdef name="warvalidator" classname="org.apache.maven.j2ee.WarValidator">
@@ -27,6 +27,7 @@
<ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
<ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
<ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
</ant:classpath>
</ant:taskdef>
No revision
No revision
1.13.2.1 +2 -2 maven/src/plugins-build/jellydoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jellydoc/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- project.xml 25 Jul 2003 06:21:16 -0000 1.13
+++ project.xml 7 Aug 2003 16:59:39 -0000 1.13.2.1
@@ -10,7 +10,7 @@
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Creates a JavaDoc like report for any Jelly Tags used in a
project.</description>
- <shortDescription/>
+ <shortDescription>Javadoc stuff for Jelly tags</shortDescription>
<url>http://maven.apache.org/reference/plugins/jellydoc/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/jellydoc/</siteDirectory>
<repository>
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<id>nekohtml</id>
- <version>0.7.1</version>
+ <version>0.7.7</version>
<properties>
<classloader>root.maven</classloader>
</properties>
No revision
No revision
1.1.4.1 +4 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java
Index: TestHtml2Xdoc.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- TestHtml2Xdoc.java 6 Mar 2003 19:15:10 -0000 1.1
+++ TestHtml2Xdoc.java 7 Aug 2003 16:59:39 -0000 1.1.4.1
@@ -108,6 +108,10 @@
//-------------------------------------------------------------------------
public void testOne() throws Exception {
assertConversion("input1.html", "output1.xml");
+ assertConversion("h1h2.html", "h1h2.xml");
+ assertConversion("h3h4.html", "h1h2.xml");
+ assertConversion("link.html", "link.xml");
+ assertConversion("comment.html", "comment.xml");
}
// Implementation methods
No revision
No revision
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml
Index: link.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/link.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml
Index: h1h2.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.html
Index: comment.html
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h3h4.html
Index: h3h4.html
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h3h4.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.html
Index: h1h2.html
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/h1h2.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml
Index: comment.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/comment.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/link.html
Index: link.html
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/test/org/apache/maven/html2xdoc/link.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.3.4.1 +32 -32
maven/src/plugins-build/eclipse/src/plugin-resources/templates/project.jelly
Index: project.jelly
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/eclipse/src/plugin-resources/templates/project.jelly,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- project.jelly 29 Jul 2003 00:19:02 -0000 1.3
+++ project.jelly 7 Aug 2003 16:59:39 -0000 1.3.4.1
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<j:whitespace
- xmlns:j="jelly:core"
- xmlns:util="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns="dummy"
- trim="true">
-
-<projectDescription>
- <name>${pom.artifactId}</name>
- <comment>${pom.description}</comment>
- <projects>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="eclipseDependency"
- value="${lib.dependency.getProperty('eclipse.dependency')}"/>
- <j:if test="${eclipseDependency == 'true'}">
- <project>${lib.dependency.artifactId}</project>
- </j:if>
- </j:forEach>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<j:whitespace
+ xmlns:j="jelly:core"
+ xmlns:util="jelly:util"
+ xmlns:ant="jelly:ant"
+ xmlns="dummy"
+ trim="true">
+
+<projectDescription>
+ <name>${pom.artifactId}</name>
+ <comment>${pom.description}</comment>
+ <projects>
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="eclipseDependency"
+ value="${lib.dependency.getProperty('eclipse.dependency')}"/>
+ <j:if test="${eclipseDependency == 'true'}">
+ <project>${lib.dependency.artifactId}</project>
+ </j:if>
+ </j:forEach>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
+
</j:whitespace>
1.2.4.1 +131 -131
maven/src/plugins-build/eclipse/src/plugin-resources/templates/classpath.jelly
Index: classpath.jelly
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/eclipse/src/plugin-resources/templates/classpath.jelly,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- classpath.jelly 28 Jul 2003 09:33:00 -0000 1.2
+++ classpath.jelly 7 Aug 2003 16:59:39 -0000 1.2.4.1
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<j:whitespace
- xmlns:j="jelly:core"
- xmlns:util="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns="dummy"
- trim="true">
-
-<classpath>
- <j:if test="${sourcesPresent}">
- <j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
- <j:if test="${ srcDir.startsWith( basedir ) }">
- <!--ant:echo>Cutting off basedir from sourceDirectory</ant:echo-->
- <j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
- <!--
- cut off also slash or backslash from basedir.
- Is there a way to make it in one step in Jelly?
- -->
- <j:set var="srcDir" value="${srcDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="src" path="${srcDir}"/>
- </j:if>
-
- <j:if test="${unitTestSourcesPresent}">
- <ant:echo>Contains JUnit tests</ant:echo>
- <j:set var="testSrcDir" value="${pom.build.unitTestSourceDirectory}"/>
- <j:if test="${ testSrcDir.startsWith( basedir ) }">
- <!--ant:echo>Cutting off basedir from testSourceDirectory</ant:echo-->
- <j:set var="testSrcDir" value="${testSrcDir.substring(basedir.length())}"/>
- <!-- Cut off slash or backslash from basedir -->
- <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
- </j:if>
-
- <!-- Eclipse supports an output directory per input directory -->
- <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
- <j:if test="${empty testOutputDir}">
- <j:set var="testOutputDir"
-
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>
- </j:if>
- <j:if test="${ testOutputDir.startsWith( basedir ) }">
- <!--ant:echo>Cutting off basedir from testOutputDir</ant:echo-->
- <j:set var="testOutputDir"
value="${testOutputDir.substring(basedir.length())}"/>
- <!-- Cut off slash or backslash from basedir -->
- <j:set var="testOutputDir" value="${testOutputDir.substring(1)}"/>
- </j:if>
-
- <ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
- <classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
-
-
- <!-- Here are the rules:
- If the project has maven.eclipse.junit property, add that ver of junit
- If the project has maven.eclipse.junit property and it is empty, don't add
junit
- If the project has junit dep, use that.
- Use the test plugin version
- -->
- <j:set var="verX" value="${maven.eclipse.junit}X"/>
-
- <j:set
var="depVersion">${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getDependency('junit').getVersion()}</j:set>
-
- <j:if test="${pom.getDependency('junit') != null}">
- <j:set var="depVersion" value="${pom.getDependency('junit').getVersion()}"/>
- </j:if>
-
- <j:if test="${verX != 'X'}">
- <j:set var="depVersion">${maven.eclipse.junit}</j:set>
- </j:if>
-
- <j:if test="${verX == 'noneX'}">
- <j:set var="depVersion" value="none"/>
- </j:if>
-
- <j:if test="${depVersion != 'none'}">
- <classpathentry kind="var"
path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
- </j:if>
- </j:if>
-
- <j:set var="cactusSrcDir"
-
value="${pom.getPluginContext('maven-cactus-plugin').getVariable('cactus.src.dir')}"/>
- <util:available file="${cactusSrcDir}">
- <j:set var="cactusSourcePresent" value="true"/>
- </util:available>
-
- <j:if test="${cactusSourcePresent == 'true'}">
- <ant:echo>Contains Cactus Tests!</ant:echo>
- <j:set var="testSrcDir" value="${cactusSrcDir}"/>
- <j:if test="${ testSrcDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from Cactus source directory</ant:echo>
- <j:set var="testSrcDir"
value="${testSrcDir.substring(basedir.length())}"/>
- <!-- cut off also slash or backslash -->
- <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="src" path="${testSrcDir}"/>
-
- <j:set
var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
- <classpathentry kind="var"
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
- </j:if>
-
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT"
sourcepath="JRE_SRC"/>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="eclipseDependency"
- value="${lib.dependency.getProperty('eclipse.dependency')}"/>
- <j:choose>
- <j:when test="${eclipseDependency == 'true'}">
- <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
- </j:when>
- <j:when test="${lib.dependency.groupId == 'junit'}">
- <!-- ignoring junit dependency as we've already created it -->
- </j:when>
- <j:otherwise>
- <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
- </j:otherwise>
- </j:choose>
- </j:forEach>
-
- <!-- add the unit test build directory so that any files generated via Maven
are available -->
-
- <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
- <j:if test="${empty outputDir}">
- <j:set var="outputDir" value="${maven.build.dest}"/>
- </j:if>
- <j:if test="${ outputDir.startsWith( basedir ) }">
- <!-- Cutting off basedir from outputDir -->
- <j:set var="outputDir" value="${outputDir.substring(basedir.length())}"/>
- <!-- Cut off slash or backslash from basedir -->
- <j:set var="outputDir" value="${outputDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="output" path="${outputDir}"/>
- <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
- </classpath>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<j:whitespace
+ xmlns:j="jelly:core"
+ xmlns:util="jelly:util"
+ xmlns:ant="jelly:ant"
+ xmlns="dummy"
+ trim="true">
+
+<classpath>
+ <j:if test="${sourcesPresent}">
+ <j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
+ <j:if test="${ srcDir.startsWith( basedir ) }">
+ <!--ant:echo>Cutting off basedir from sourceDirectory</ant:echo-->
+ <j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
+ <!--
+ cut off also slash or backslash from basedir.
+ Is there a way to make it in one step in Jelly?
+ -->
+ <j:set var="srcDir" value="${srcDir.substring(1)}"/>
+ </j:if>
+ <classpathentry kind="src" path="${srcDir}"/>
+ </j:if>
+
+ <j:if test="${unitTestSourcesPresent}">
+ <ant:echo>Contains JUnit tests</ant:echo>
+ <j:set var="testSrcDir" value="${pom.build.unitTestSourceDirectory}"/>
+ <j:if test="${ testSrcDir.startsWith( basedir ) }">
+ <!--ant:echo>Cutting off basedir from testSourceDirectory</ant:echo-->
+ <j:set var="testSrcDir" value="${testSrcDir.substring(basedir.length())}"/>
+ <!-- Cut off slash or backslash from basedir -->
+ <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
+ </j:if>
+
+ <!-- Eclipse supports an output directory per input directory -->
+ <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
+ <j:if test="${empty testOutputDir}">
+ <j:set var="testOutputDir"
+
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>
+ </j:if>
+ <j:if test="${ testOutputDir.startsWith( basedir ) }">
+ <!--ant:echo>Cutting off basedir from testOutputDir</ant:echo-->
+ <j:set var="testOutputDir"
value="${testOutputDir.substring(basedir.length())}"/>
+ <!-- Cut off slash or backslash from basedir -->
+ <j:set var="testOutputDir" value="${testOutputDir.substring(1)}"/>
+ </j:if>
+
+ <ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
+ <classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
+
+
+ <!-- Here are the rules:
+ If the project has maven.eclipse.junit property, add that ver of junit
+ If the project has maven.eclipse.junit property and it is empty, don't add
junit
+ If the project has junit dep, use that.
+ Use the test plugin version
+ -->
+ <j:set var="verX" value="${maven.eclipse.junit}X"/>
+
+ <j:set
var="depVersion">${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getDependency('junit').getVersion()}</j:set>
+
+ <j:if test="${pom.getDependency('junit') != null}">
+ <j:set var="depVersion" value="${pom.getDependency('junit').getVersion()}"/>
+ </j:if>
+
+ <j:if test="${verX != 'X'}">
+ <j:set var="depVersion">${maven.eclipse.junit}</j:set>
+ </j:if>
+
+ <j:if test="${verX == 'noneX'}">
+ <j:set var="depVersion" value="none"/>
+ </j:if>
+
+ <j:if test="${depVersion != 'none'}">
+ <classpathentry kind="var"
path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
+ </j:if>
+ </j:if>
+
+ <j:set var="cactusSrcDir"
+
value="${pom.getPluginContext('maven-cactus-plugin').getVariable('cactus.src.dir')}"/>
+ <util:available file="${cactusSrcDir}">
+ <j:set var="cactusSourcePresent" value="true"/>
+ </util:available>
+
+ <j:if test="${cactusSourcePresent == 'true'}">
+ <ant:echo>Contains Cactus Tests!</ant:echo>
+ <j:set var="testSrcDir" value="${cactusSrcDir}"/>
+ <j:if test="${ testSrcDir.startsWith( basedir ) }">
+ <ant:echo>Cutting off basedir from Cactus source directory</ant:echo>
+ <j:set var="testSrcDir"
value="${testSrcDir.substring(basedir.length())}"/>
+ <!-- cut off also slash or backslash -->
+ <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
+ </j:if>
+ <classpathentry kind="src" path="${testSrcDir}"/>
+
+ <j:set
var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
+ <classpathentry kind="var"
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
+ </j:if>
+
+ <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT"
sourcepath="JRE_SRC"/>
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="eclipseDependency"
+ value="${lib.dependency.getProperty('eclipse.dependency')}"/>
+ <j:choose>
+ <j:when test="${eclipseDependency == 'true'}">
+ <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
+ </j:when>
+ <j:when test="${lib.dependency.groupId == 'junit'}">
+ <!-- ignoring junit dependency as we've already created it -->
+ </j:when>
+ <j:otherwise>
+ <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
+ </j:otherwise>
+ </j:choose>
+ </j:forEach>
+
+ <!-- add the unit test build directory so that any files generated via Maven
are available -->
+
+ <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
+ <j:if test="${empty outputDir}">
+ <j:set var="outputDir" value="${maven.build.dest}"/>
+ </j:if>
+ <j:if test="${ outputDir.startsWith( basedir ) }">
+ <!-- Cutting off basedir from outputDir -->
+ <j:set var="outputDir" value="${outputDir.substring(basedir.length())}"/>
+ <!-- Cut off slash or backslash from basedir -->
+ <j:set var="outputDir" value="${outputDir.substring(1)}"/>
+ </j:if>
+ <classpathentry kind="output" path="${outputDir}"/>
+ <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
+ </classpath>
+
</j:whitespace>
No revision
No revision
1.1.1.1.2.1 +1 -1 maven/src/plugins-build/ejb/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/plugin.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- plugin.properties 24 Jan 2003 03:45:10 -0000 1.1.1.1
+++ plugin.properties 7 Aug 2003 16:59:39 -0000 1.1.1.1.2.1
@@ -1 +1 @@
-# -------------------------------------------------------------------
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
# ejb plugin.
# -------------------------------------------------------------------
# Location of where ejb sources (non-java) are located.
maven.ejb.src=${maven.src.dir}/ejb
# Location of ejb xml configs - not used atm due to using jar task not ejbjar
maven.ejb.descriptordir=${maven.ejb.src}/META-INF
maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF
\ No newline at end of file
+# -------------------------------------------------------------------
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
# ejb plugin.
# -------------------------------------------------------------------
# Location of where ejb sources (non-java) are located.
maven.ejb.src=${maven.src.dir}/ejb
# Location of ejb xml configs - not used atm due to using jar task not ejbjar
maven.ejb.descriptordir=${maven.ejb.src}/META-INF
maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF
# Exclude from the client jar those things that should only exist on the EJB server.
# This list is probably incomplete...
# Users' projects can add to the list by setting maven.ejb.client.excludes.
maven.ejb.client.base.excludes=**/*Bean.class,**/*CMP.class,**/*Session.class
\ No newline at end of file
1.8.2.1 +11 -0 maven/src/plugins-build/ejb/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- plugin.jelly 7 Jul 2003 09:52:34 -0000 1.8
+++ plugin.jelly 7 Aug 2003 16:59:39 -0000 1.8.2.1
@@ -107,6 +107,17 @@
</goal>
<!--==================================================================-->
+ <!-- Builds an ejb client jar file -->
+ <!--==================================================================-->
+ <goal name="ejb:ejb-client" prereqs="ejb:ejb" description="Build a client ejb
file">
+ <ant:jar jarfile="${maven.build.dir}/${maven.final.name}-client.jar"
+ basedir="${maven.build.dest}"
+
excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
+ >
+ </ant:jar>
+ </goal>
+
+ <!--==================================================================-->
<!-- Install the ejb in the local repository -->
<!--==================================================================-->
<goal name="ejb:install"
No revision
No revision
1.10.4.1 +4 -1 maven/src/plugins-build/file-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/file-activity/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- plugin.jelly 8 Jul 2003 11:01:07 -0000 1.10
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.10.4.1
@@ -50,6 +50,9 @@
<j:choose>
<j:when test="${maven.mode.online}">
<j:set var="_connection">${pom.repository.connection}</j:set>
+ <j:if test="${empty(_connection)}">
+ <j:set var="_connection">${pom.repository.developerConnection}</j:set>
+ </j:if>
<j:if test="${!empty(_connection)}">
<echo>Generating the file activity report</echo>
@@ -72,7 +75,7 @@
output="${maven.build.dir}/changelog.xml"
outputEncoding="${maven.docs.outputencoding}"
range="${maven.activitylog.range}"
- repositoryConnection="${pom.repository.connection}"
+ repositoryConnection="${_connection}"
dateFormat="${maven.changelog.dateformat}"
/>
</j:if>
1.14.2.1 +1 -1 maven/src/plugins-build/file-activity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/file-activity/project.xml,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- project.xml 2 Jul 2003 09:04:16 -0000 1.14
+++ project.xml 7 Aug 2003 16:59:40 -0000 1.14.2.1
@@ -10,7 +10,7 @@
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>This document provides a report of activity in terms of CVS commits
and breaks it out by file.</description>
- <shortDescription/>
+ <shortDescription>File activity Report</shortDescription>
<url>http://maven.apache.org/reference/plugins/file-activity/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/file-activity/</siteDirectory>
<repository>
No revision
No revision
1.9.2.1 +3 -2 maven/src/plugins-build/hibernate/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/hibernate/project.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- project.xml 25 Jul 2003 06:21:15 -0000 1.9
+++ project.xml 7 Aug 2003 16:59:40 -0000 1.9.2.1
@@ -44,10 +44,11 @@
</dependency>
<dependency>
- <id>commons-jelly</id>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
<version>20030724.033229</version>
+ <url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
-
<dependency>
<groupId>commons-lang</groupId>
No revision
No revision
1.10.2.1 +2 -2 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.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- plugin.jelly 1 Jul 2003 05:13:58 -0000 1.10
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.10.2.1
@@ -34,8 +34,8 @@
<j:set var="home" value="${maven.jbuilder.userHome}/${dir}" />
<j:set var="defaultProject" value="${home}/Default.jpr" />
<u:available file="${defaultProject}">
- <j:expr value="${context.setVariable(userHome,home)}" />
- <j:expr value="${context.setVariable(project,defaultProject)}" />
+ <j:set var="${userHome}" value="${home}" scope="parent"/>
+ <j:set var="${project}" value="${defaultProject}" scope="parent"/>
<j:break/>
</u:available>
</j:forEach>
1.2.2.1 +1 -0 maven/src/plugins-build/jbuilder/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jbuilder/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- plugin.properties 1 Jul 2003 05:13:58 -0000 1.2
+++ plugin.properties 7 Aug 2003 16:59:40 -0000 1.2.2.1
@@ -5,6 +5,7 @@
maven.jbuilder.outpath = ${maven.build.dest}
maven.jbuilder.application.runner = com.borland.jbuilder.runtime.ApplicationRunner
maven.jbuilder.applet.runner = com.borland.jbuilder.runtime.AppletRunner
+maven.jbuilder.verbose=false
# List of additional files that should be added to the JBuilder project if
# they exist. The default is the standard Maven project files.
No revision
No revision
1.2.2.1 +2 -0 maven/src/plugins-build/jdee/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jdee/project.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- project.xml 9 Apr 2003 01:06:46 -0000 1.2
+++ project.xml 7 Aug 2003 16:59:40 -0000 1.2.2.1
@@ -7,7 +7,9 @@
<name>Maven JDEE Plug-in</name>
<currentVersion>1.0-beta-1</currentVersion>
<description>A plugin to create a project file to be used within the
+ <!--
<a href="http://jdee.sunsite.dk/";>Java Developement Enviroment for Emacw</a>
+ -->
</description>
<shortDescription>JDEE Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/jdee/</url>
No revision
No revision
1.4.4.1 +8 -0 maven/src/plugins-build/jar/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/xdocs/properties.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- properties.xml 22 Apr 2003 12:20:49 -0000 1.4
+++ properties.xml 7 Aug 2003 16:59:40 -0000 1.4.4.1
@@ -37,6 +37,14 @@
</td>
</tr>
<tr>
+ <td>maven.jar.index</td>
+ <td>Yes</td>
+ <td>
+ Whether to create an index list to speed up classloading.
+ This is a JDK 1.3+ specific feature. Defaults to false.
+ </td>
+ </tr>
+ <tr>
<td>maven.jar.manifest</td>
<td>Yes</td>
<td>
1.2.4.1 +4 -0 maven/src/plugins-build/jar/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- changes.xml 25 Jul 2003 06:35:27 -0000 1.2
+++ changes.xml 7 Aug 2003 16:59:40 -0000 1.2.4.1
@@ -3,11 +3,15 @@
<properties>
<title>Changes</title>
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
+ <author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
<release version="1.1" date="in CVS">
+ <action dev="dion" type="update">
+ Added maven.jar.index property
+ </action>
<action dev="dion" type="update">
Upgrade to velocity 1.4-dev
</action>
No revision
No revision
1.1.4.1 +264 -110
maven/src/plugins-build/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java
Index: Html2XdocBean.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- Html2XdocBean.java 6 Mar 2003 19:15:11 -0000 1.1
+++ Html2XdocBean.java 7 Aug 2003 16:59:40 -0000 1.1.4.1
@@ -62,7 +62,6 @@
package org.apache.maven.html2xdoc;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -70,140 +69,289 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.dom4j.CharacterData;
+import org.dom4j.Comment;
import org.dom4j.Document;
import org.dom4j.DocumentFactory;
import org.dom4j.Element;
import org.dom4j.Node;
/**
- * A simple bean for converting a HTML document into an XDoc compliant XML document.
+ * A simple bean for converting a HTML document into an XDoc compliant XML
+ * document.
* This could be done via XSLT but is a little more complex than it might first
* appear so its done via Java code instead.
*
* @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a>
*/
public class Html2XdocBean {
-
+
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(Html2XdocBean.class);
-
- private DocumentFactory factory = new DocumentFactory();
- /**
- * Converts the given HTML document into the corresponding XDoc format
- * of XML
- *
- * @param html
- * @return Document
- */
- public Document convert(Document html) {
- Document doc = factory.createDocument();
- Element root = doc.addElement("document");
- Element properties = root.addElement("properties");
- Element title = properties.addElement("title");
- title.setText(html.valueOf("/html/head/title"));
-
- Element body = root.addElement("body");
-
- Element htmlContent = (Element) html.selectSingleNode("/html/body");
+ /**
+ * Used to create the output document
+ */
+ private DocumentFactory factory = new DocumentFactory();
+
+ /**
+ * The current node to attach the sub-nodes.
+ */
+ private Element currentNode = null;
+
+ /**
+ * The current 'root' section node. This is used to keep
+ * track of the root section so that when a subsection is
+ * found it can be associated correctly.
+ */
+ private Element currentSectionNode = null;
+
+ /**
+ * The current section heading level. If a subsequent level
+ * lower or equal, then create a new section.
+ */
+ private int currentSectionHeadingLevel = Integer.MIN_VALUE;
+
+ /**
+ * The current paragraph node. This is used to associate text
+ * and formatting nodes to the current paragraph node.
+ */
+ private Element currentParaNode = null;
+
+ /**
+ * Converts the given HTML document into the corresponding XDoc format
+ * of XML
+ *
+ * @param html the input html document
+ * @return Document
+ */
+ public Document convert(Document html) {
+ Document doc = factory.createDocument();
+ Element root = doc.addElement("document");
+ Element properties = root.addElement("properties");
+ Element title = properties.addElement("title");
+ title.setText(html.valueOf("/html/head/title"));
+
+ Element body = root.addElement("body");
+
+ Element htmlContent = (Element) html.selectSingleNode("/html/body");
if (htmlContent == null) {
- log.info("No body element found for HTML document: " + html.asXML());
- }
- else {
+ log.info("No body element found for HTML document: "
+ + html.asXML());
+ } else {
addSections(body, htmlContent);
}
- return doc;
- }
-
- /**
- * Iterates thorugh the given body looking for h1, h2, h3 nodes and
- * creating the associated section elements. Any text nodes
- * contained inside the body are wrapped in a <p> element
- *
- * @param output the output destination
- * @param body the block of HTML markup to convert
- */
- protected void addSections(Element output, Element body) {
- List content = getBodyContent(body.content());
- Element section = null;
- Element p = null;
-
- for (Iterator iter = content.iterator(); iter.hasNext(); ) {
- Node node = (Node) iter.next();
+ return doc;
+ }
- String name = node.getName();
- if (name != null && name.startsWith("h")) {
- /** @todo we should handle child headings as a nested section */
- section = output.addElement("section");
- section.addAttribute("name", node.getText());
- p = null;
- }
- else {
- if (section == null ) {
- // we have a section with no name
- // should we default it to be the same as the document
title?
- section = output.addElement("section");
- }
-
- if (node instanceof CharacterData) {
- // lets add a <p>
- if (p == null) {
- p = section.addElement("p");
- }
- p.addText( node.getText() );
- }
- else {
- section.add(cloneNode(node));
- p = null;
- }
+ /**
+ * Iterates thorugh the given body looking for h1, h2, h3 nodes and
+ * creating the associated section elements. Any text nodes
+ * contained inside the body are wrapped in a <p> element
+ *
+ * @param output the output destination
+ * @param body the block of HTML markup to convert
+ */
+ protected void addSections(Element output, Element body) {
+ List content = getBodyContent(body.content());
+
+ for (Iterator iter = content.iterator(); iter.hasNext();) {
+ Node node = (Node) iter.next();
+ if (isHeading(node)) {
+ makeSection(output, node);
+ } else {
+ guaranteeHasSection(output);
+ processNode(node);
}
- }
- }
-
- /**
- * @param node
- * @return true if the given node is a heading element (h1, h2, h3 etc)
- */
- protected boolean isHeading(Node node) {
- String name = node.getName();
- return name != null && name.startsWith("h");
- }
-
- /**
- * Returns a copy of the body content, removing any whitespace from the
beginning and end
- * @param body
- * @return List
- */
+ }
+
+ }
+
+ /**
+ * main algorithm which represents the iteration contract.
+ * Use the protected methods to change the behavior.
+ *
+ * @param node the node to process
+ */
+ private void processNode(Node node) {
+ if (isCharacterData(node)) {
+ addTextNode(node);
+ } else if (isTextFormatting(node)) {
+ addFormattingNode(node);
+ } else {
+ addNode(node);
+ }
+ }
+
+ /**
+ * Specifies whether the node is a text modifying construct that should be
+ * passed as is to the resultant html. Such as an anchor '<a>'.
+ *
+ * @param node the node to check
+ * @return true if the node is used to modify the formatting of the
+ * text; otherwise, false
+ */
+ protected boolean isTextFormatting(Node node) {
+ // Ultimately this needs bold, italic, and so on
+ return node.getName() != null && node.getName().equals("a");
+ }
+
+ /**
+ * Specifies whether the node is character data and should be passed as
+ * straight text to the resultant html.
+ *
+ * @param node the node to check
+ * @return true if the node is a text node; otherwise, false.
+ */
+ protected boolean isCharacterData(Node node) {
+ return node instanceof CharacterData
+ && (node instanceof Comment) == false;
+ }
+
+ /**
+ * Specifies whether the node is a heading node.
+ *
+ * @param node the node to check
+ * @return true if the given node is a heading element
+ * (h1, h2, h3 etc); otherwise, false
+ */
+ protected boolean isHeading(Node node) {
+ String name = node.getName();
+ return name != null && name.startsWith("h");
+ }
+
+ /**
+ * Determines the heading level of the node.
+ *
+ * @param node the node to check
+ * @return the integer level of the heading
+ */
+ protected int determineHeadingLevel(Node node) {
+ try {
+ String name = node.getName().substring(1);
+ return Integer.parseInt(name);
+ } catch (NumberFormatException nfe) {
+ return 1;
+ }
+ }
+
+ /**
+ * Creates a section or subsection as necessary based on the node
+ * for the output document.
+ *
+ * @param output the output document to attach the section
+ * @param node the node to base making a section on
+ */
+ protected void makeSection(Element output, Node node) {
+ int level = determineHeadingLevel(node);
+ if (needsNewSection(node)) {
+ currentNode = output.addElement("section");
+ currentSectionHeadingLevel = level;
+ currentSectionNode = currentNode;
+ } else {
+ currentNode = currentSectionNode.addElement("subsection");
+ }
+ currentNode.addAttribute("name", node.getText());
+ currentParaNode = null;
+ }
+
+ /**
+ * Determines if a new section is needed which is based on whether
+ * the node's a heading level and equal to or less than the current
+ * section's heading level.
+ *
+ * @param node the node to check
+ * @return true if the current node's information means for a new
+ * section; otherwise, false
+ */
+ protected boolean needsNewSection(Node node) {
+ int level = determineHeadingLevel(node);
+ return level <= currentSectionHeadingLevel
+ || currentSectionNode == null;
+ }
+
+ /**
+ * Determines if a paragraph node is needed.
+ */
+ private void guaranteeHasParaNode() {
+ if (currentParaNode == null) {
+ currentParaNode = currentNode.addElement("p");
+ }
+ }
+
+ /**
+ * Makes sure the current node is section, if necessary.
+ * @param output the output element to add the section to
+ */
+ private void guaranteeHasSection(Element output) {
+ if (currentNode == null) {
+ // we have a section with no name
+ // should we default it to be the same as the document title?
+ currentNode = output.addElement("section");
+ }
+ }
+
+ /**
+ * Add the node to the current node.
+ * @param node the node to add
+ */
+ private void addNode(Node node) {
+ currentNode.add(cloneNode(node));
+ currentParaNode = null;
+ }
+
+ /**
+ * Adds the text of the node to the current paragraph.
+ * @param node the node to add
+ */
+ private void addTextNode(Node node) {
+ guaranteeHasParaNode();
+ currentParaNode.addText(node.getText());
+ }
+
+ /**
+ * Adds the node to the current paragraph.
+ * @param node the node to add
+ */
+ private void addFormattingNode(Node node) {
+ guaranteeHasParaNode();
+ currentParaNode.add(cloneNode(node));
+ }
+
+ /**
+ * Returns a copy of the body content, removing any whitespace from
+ * the beginning and end.
+ *
+ * @param content the content node list to obtain body content from
+ * @return List
+ */
protected List getBodyContent(List content) {
// lets turn <pre> into <source> and concatenate consective entries
Element lastPre = null;
- LinkedList list = new LinkedList();
+ LinkedList list = new LinkedList();
boolean lastWasElement = true;
- for (Iterator iter = content.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = content.iterator(); iter.hasNext();) {
Node node = (Node) iter.next();
-
+
if (isPre(node)) {
if (lastPre == null) {
lastPre = factory.createElement("source");
list.add(lastPre);
}
lastPre.addText(node.getText());
- }
- else {
+ } else {
if (isWhitespace(node) && lastWasElement) {
if (lastPre != null) {
lastPre.addText(node.getText());
}
- }
- else {
+ } else {
lastWasElement = node instanceof Element;
if (lastWasElement) {
- lastPre = null;
- }
- list.add(node);
+ lastPre = null;
+ }
+ list.add(node);
}
}
- }
+ }
// now lets remove any whitespace text nodes at the beginning and end
while (true) {
@@ -224,7 +372,11 @@
}
return list;
}
-
+
+ /**
+ * @param node the node to check
+ * @return true if the node is a pre tag; otherwise false.
+ */
protected boolean isPre(Node node) {
if (node instanceof Element) {
Element element = (Element) node;
@@ -234,6 +386,7 @@
}
/**
+ * @param node the node to check
* @return true if the given node is a whitespace text node
*/
protected boolean isWhitespace(Node node) {
@@ -242,30 +395,31 @@
return text.trim().length() <= 0;
}
if (node instanceof Element) {
- String name = node.getName();
- if (name.equals("p")) {
+ String name = node.getName();
+ if (name.equals("p")) {
String text = node.getText();
return text.trim().length() <= 0;
- }
- if (name.equals("br")) {
- return true;
- }
+ }
+ if (name.equals("br")) {
+ return true;
+ }
}
return false;
}
- /**
- * Normalizes the whitespace of any Elements
- * @param node
- * @return Node
- */
+ /**
+ * Normalizes the whitespace of any Elements
+ *
+ * @param node the node to clone
+ * @return Node the cloned node
+ */
protected Node cloneNode(Node node) {
- Node answer = (Node) node.clone();
+ Node answer = (Node) node.clone();
if (answer instanceof Element) {
Element element = (Element) answer;
element.normalize();
}
return answer;
}
-
+
}
No revision
No revision
1.4.2.1 +3 -3 maven/src/plugins-build/jdepend/src/plugin-resources/jdepend.jsl
Index: jdepend.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/jdepend/src/plugin-resources/jdepend.jsl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- jdepend.jsl 19 Feb 2003 06:01:38 -0000 1.4
+++ jdepend.jsl 7 Aug 2003 16:59:40 -0000 1.4.2.1
@@ -12,11 +12,11 @@
trim="false">
<!-- This needs to be instantiated here to be available in the template matches
-->
- <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+ <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
<j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
<j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
- <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
- <j:useBean var="stringTool" class="org.apache.maven.StringTool"/>
+ <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
+ <j:useBean var="stringTool" class="org.apache.maven.util.StringTool"/>
<define:taglib uri="jdepend">
<define:tag name="nav">
No revision
No revision
1.18.2.1 +7 -9 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.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- plugin.jelly 23 Jul 2003 06:32:49 -0000 1.18
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.18.2.1
@@ -4,7 +4,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
- xmlns:resources="resources">
+ xmlns:maven="jelly:maven">
<j:choose>
<j:when test="${!pom.build.resources.includes.isEmpty()}">
@@ -102,6 +102,7 @@
<j:if test="${context.getVariable('maven.compile.verbose') != null}">
<ant:setProperty name="verbose" value="${maven.compile.verbose}" />
</j:if>
+
</ant:javac>
</j:when>
<j:otherwise>
@@ -122,14 +123,11 @@
<goal name="java:jar-resources"
description="Copy any resources that must be present in the deployed JAR
file">
- <j:set var="build" value="${pom.build}"/>
- <j:if test="${!empty(build)}">
- <j:if test="${!pom.build.resources.isEmpty()}">
- <resources:copy
- resources="${pom.build.resources}"
- todir="${maven.build.dest}"
- />
- </j:if>
+
+ <j:if test="${!pom.build.resources.isEmpty()}">
+ <maven:copy-resources
+ resources="${pom.build.resources}"
+ todir="${maven.build.dest}"/>
</j:if>
</goal>
No revision
No revision
1.10.2.1 +1 -1 maven/src/plugins-build/html2xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/html2xdoc/project.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.xml 25 Jul 2003 06:21:15 -0000 1.10
+++ project.xml 7 Aug 2003 16:59:40 -0000 1.10.2.1
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<id>nekohtml</id>
- <version>0.7.1</version>
+ <version>0.7.7</version>
<properties>
<classloader>root.maven</classloader>
</properties>
No revision
No revision
1.11.2.1 +4 -6 maven/src/plugins-build/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.jelly,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- plugin.jelly 16 Jun 2003 20:41:35 -0000 1.11
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.11.2.1
@@ -6,10 +6,8 @@
xmlns:license="license"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
- xmlns:resources="resources"
xmlns:util="jelly:util"
- xmlns:doc="doc"
- xmlns:m="maven">
+ xmlns:doc="doc">
<!-- ================================================================== -->
<!-- J A R -->
@@ -29,7 +27,7 @@
<ant:jar
jarfile="${maven.build.dir}/${maven.final.name}.jar"
basedir="${maven.build.dest}"
- index="true"
+ index="${maven.jar.index}"
excludes="${maven.jar.excludes}">
<j:if test="${maven.jar.manifest.available}">
@@ -108,7 +106,7 @@
name="jar:deploy-snapshot"
description="Deploy a snapshot jar to the remote repository">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<attainGoal name="jar:snapshot"/>
<ant:property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
<ant:property name="dir"
@@ -138,7 +136,7 @@
name="jar:deploy"
description="Deploy a jar to the remote repository">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<attainGoal name="jar:jar"/>
<ant:property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
1.3.2.1 +2 -0 maven/src/plugins-build/jar/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- plugin.properties 10 Apr 2003 09:06:34 -0000 1.3
+++ plugin.properties 7 Aug 2003 16:59:40 -0000 1.3.2.1
@@ -2,4 +2,6 @@
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
maven.jar.manifest.extensions.add=false
+maven.jar.excludes = **/package.html
+maven.jar.index=false
maven.remote.group=maven
No revision
No revision
1.21.2.1 +5 -154 maven/src/plugins-build/eclipse/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/eclipse/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- plugin.jelly 8 Jul 2003 08:18:41 -0000 1.21
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.21.2.1
@@ -23,32 +23,10 @@
description="Generate Eclipse .project file">
<ant:echo>Creating ${basedir}/.project ...</ant:echo>
-
<j:file name="${basedir}/.project" prettyPrint="true" xmlns="dummy">
-<projectDescription>
- <name>${pom.artifactId}</name>
- <comment>${pom.description}</comment>
- <projects>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="eclipseDependency"
- value="${lib.dependency.getProperty('eclipse.dependency')}"/>
- <j:if test="${eclipseDependency == 'true'}">
- <project>${lib.dependency.artifactId}</project>
- </j:if>
- </j:forEach>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <j:import file="${plugin.resources}/templates/project.jelly" inherit="true"/>
</j:file>
+
</goal>
@@ -59,137 +37,10 @@
description="Generate Eclipse .classpath file">
<ant:echo>Creating ${basedir}/.classpath ...</ant:echo>
+ <j:file name="${basedir}/.classpath" prettyPrint="true" outputMode="xml"
xmlns="dummy">
+ <j:import file="${plugin.resources}/templates/classpath.jelly"
inherit="true"/>
+ </j:file>
- <j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
- <classpath>
- <j:if test="${sourcesPresent}">
- <j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
- <j:if test="${ srcDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from sourceDirectory</ant:echo>
- <j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
- <!--
- cut off also slash or backslash from basedir.
- Is there a way to make it in one step in Jelly?
- -->
- <j:set var="srcDir" value="${srcDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="src" path="${srcDir}"/>
- </j:if>
-
- <j:if test="${unitTestSourcesPresent}">
- <ant:echo>Contains JUnit Tests!</ant:echo>
- <j:set var="testSrcDir" value="${pom.build.unitTestSourceDirectory}"/>
- <j:if test="${ testSrcDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from testSourceDirectory</ant:echo>
- <j:set var="testSrcDir"
value="${testSrcDir.substring(basedir.length())}"/>
- <!-- cut off also slash or backslash -->
- <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="src" path="${testSrcDir}"/>
- <!-- Here are the rules:
- If the project has maven.eclipse.junit property, add that ver of junit
- If the project has maven.eclipse.junit property and it is empty,
don't add junit
- If the project has junit dep, use that.
- Use the test plugin version
- -->
- <j:set var="verX" value="${maven.eclipse.junit}X"/>
-
- <j:set
var="depVersion">${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getDependency('junit').getVersion()}</j:set>
-
- <j:if test="${pom.getDependency('junit') != null}">
- <j:set var="depVersion"
value="${pom.getDependency('junit').getVersion()}"/>
- </j:if>
-
- <j:if test="${verX != 'X'}">
- <j:set var="depVersion">${maven.eclipse.junit}</j:set>
- </j:if>
-
- <j:if test="${verX == 'noneX'}">
- <j:set var="depVersion" value="none"/>
- </j:if>
-
- <j:if test="${depVersion != 'none'}">
- <classpathentry kind="var"
path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
- </j:if>
- </j:if>
-
- <j:set var="cactusSrcDir"
-
value="${pom.getPluginContext('maven-cactus-plugin').getVariable('cactus.src.dir')}"/>
- <util:available file="${cactusSrcDir}">
- <j:set var="cactusSourcePresent" value="true"/>
- </util:available>
-
- <j:if test="${cactusSourcePresent == 'true'}">
- <ant:echo>Contains Cactus Tests!</ant:echo>
- <j:set var="testSrcDir" value="${cactusSrcDir}"/>
- <j:if test="${ testSrcDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from Cactus source directory</ant:echo>
- <j:set var="testSrcDir"
value="${testSrcDir.substring(basedir.length())}"/>
- <!-- cut off also slash or backslash -->
- <j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="src" path="${testSrcDir}"/>
-
- <j:set
var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
- <classpathentry kind="var"
path="MAVEN_REPO/cactus/jars/cactus-${depVersion}.jar"/>
- </j:if>
-
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT"
sourcepath="JRE_SRC"/>
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="eclipseDependency"
- value="${lib.dependency.getProperty('eclipse.dependency')}"/>
- <j:choose>
- <j:when test="${eclipseDependency == 'true'}">
- <classpathentry kind="src" path="/${lib.dependency.artifactId}"/>
- </j:when>
- <j:when test="${lib.dependency.groupId == 'junit'}">
- <!-- ignoring junit dependency as we've already created it -->
- </j:when>
- <j:otherwise>
- <classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
- </j:otherwise>
- </j:choose>
- </j:forEach>
-
- <!-- add the unit test build directory so that any files generated via Maven
are available -->
-
-
- <j:if test="${unitTestSourcesPresent}">
- <j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
- <j:if test="${empty testOutputDir}">
- <j:set var="testOutputDir"
-
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>
- </j:if>
- <j:if test="${ testOutputDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from testOutputDir</ant:echo>
- <j:set var="testOutputDir"
value="${testOutputDir.substring(basedir.length())}"/>
- <!--
- cut off also slash or backslash from basedir.
- Is there a way to make it in one step in Jelly?
- -->
- <j:set var="testOutputDir" value="${testOutputDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="lib" path="${testOutputDir}"/>
- </j:if>
-
- <j:set var="outputDir" value="${maven.eclipse.output.dir}"/>
- <j:if test="${empty outputDir}">
- <j:set var="outputDir" value="${maven.build.dest}"/>
- </j:if>
- <j:if test="${ outputDir.startsWith( basedir ) }">
- <ant:echo>Cutting off basedir from outputDir</ant:echo>
- <j:set var="outputDir"
value="${outputDir.substring(basedir.length())}"/>
- <!--
- cut off also slash or backslash from basedir.
- Is there a way to make it in one step in Jelly?
- -->
- <j:set var="outputDir" value="${outputDir.substring(1)}"/>
- </j:if>
- <classpathentry kind="output" path="${outputDir}"/>
- </classpath>
- </j:file>
-
-
</goal>
No revision
No revision
1.6.2.1 +5 -6 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.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- plugin.jelly 22 Apr 2003 11:48:49 -0000 1.6
+++ plugin.jelly 7 Aug 2003 16:59:40 -0000 1.6.2.1
@@ -4,8 +4,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
- xmlns:deploy="deploy"
- xmlns:m="maven">
+ xmlns:deploy="deploy">
<!-- ================================================================== -->
<!-- D I S T R I B U T I O N S -->
@@ -186,7 +185,7 @@
<goal name="dist:deploy" description="Deploy a distribution">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<!--
@@ -214,7 +213,7 @@
<goal name="dist:deploy-bin" description="Deploy a binary distribution">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<attainGoal name="dist:build-bin"/>
@@ -229,7 +228,7 @@
<goal name="dist:deploy-src" description="Deploy a source distribution">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<attainGoal name="dist:build-src"/>
@@ -250,7 +249,7 @@
<goal name="dist:deploy-snapshot" description="Deploy a snapshot distribution">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<j:set var="maven.final.name" value="${snapshotSignature}"/>
<ant:echo>Building snapshot distribution: ${maven.final.name}</ant:echo>
No revision
No revision
1.2.2.1 +20 -0 maven/src/plugins-build/ejb/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/xdocs/properties.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- properties.xml 4 Jul 2003 08:05:40 -0000 1.2
+++ properties.xml 7 Aug 2003 16:59:40 -0000 1.2.2.1
@@ -21,6 +21,26 @@
</td>
</tr>
<tr>
+ <td>maven.ejb.client.base.excludes</td>
+ <td>Yes</td>
+ <td>
+ Classes excluded by default from a client ejb jar
+ </td>
+ <td>
+ **/*Bean.class,**/*CMP.class,**/*Session.class
+ </td>
+ </tr>
+ <tr>
+ <td>maven.ejb.client.excludes</td>
+ <td>Yes</td>
+ <td>
+ Classes excluded from a client ejb jar
+ </td>
+ <td>
+ None
+ </td>
+ </tr>
+ <tr>
<td>maven.ejb.manifest</td>
<td>Yes</td>
<td>
No revision
No revision
1.11.2.1 +17 -1 maven/src/plugins-build/ear/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/project.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- project.xml 17 Jun 2003 18:23:22 -0000 1.11
+++ project.xml 7 Aug 2003 16:59:40 -0000 1.11.2.1
@@ -61,8 +61,24 @@
</roles>
</developer>
</developers>
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-xml</artifactId>
+ <version>20030211.142705</version>
+ <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-util</artifactId>
+ <version>20030211.141939</version>
+ <url>http://jakarta.apache.org/commons/jelly/tags/util/</url>
+ </dependency>
+
+ </dependencies>
+
<reports>
<report>maven-changes-plugin</report>
<report>maven-changelog-plugin</report>
No revision
No revision
1.1.1.1.2.1 +1 -1
maven/src/plugins-build/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
Index: maven-file-activity-plugin.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- maven-file-activity-plugin.jsl 24 Jan 2003 03:46:27 -0000 1.1.1.1
+++ maven-file-activity-plugin.jsl 7 Aug 2003 16:59:41 -0000 1.1.1.1.2.1
@@ -7,7 +7,7 @@
xmlns:x="jelly:xml"
xmlns="dummy" trim="false">
<!-- This needs to be instantiated here to be available in the template matches
-->
- <j:useBean var="mavenTool" class="org.apache.maven.MavenTool"/>
+ <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
<jsl:template match="changelog">
<document>
<jsl:applyTemplates/>
No revision
No revision
1.13.2.1 +1 -1 maven/src/plugins-build/developer-activity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/developer-activity/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- project.xml 2 Jul 2003 09:04:16 -0000 1.13
+++ project.xml 7 Aug 2003 16:59:41 -0000 1.13.2.1
@@ -7,7 +7,7 @@
<name>Maven Developer Activity Plug-in</name>
<currentVersion>1.3-SNAPSHOT</currentVersion>
<description>This document provides a report of activity in terms of CVS commits
and breaks it out by developer.</description>
- <shortDescription/>
+ <shortDescription>Developer Activity report</shortDescription>
<url>http://maven.apache.org/reference/plugins/developer-activity/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/developer-activity/</siteDirectory>
<repository>
1.10.4.1 +4 -1 maven/src/plugins-build/developer-activity/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/developer-activity/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- plugin.jelly 8 Jul 2003 11:01:07 -0000 1.10
+++ plugin.jelly 7 Aug 2003 16:59:41 -0000 1.10.4.1
@@ -41,6 +41,9 @@
<j:choose>
<j:when test="${maven.mode.online}">
<j:set var="_connection">${pom.repository.connection}</j:set>
+ <j:if test="${empty(_connection)}">
+ <j:set var="_connection">${pom.repository.developerConnection}</j:set>
+ </j:if>
<j:if test="${!empty(_connection)}">
<ant:echo>Generating the developer activity report</ant:echo>
@@ -63,7 +66,7 @@
output="${maven.build.dir}/changelog.xml"
outputEncoding="${maven.docs.outputencoding}"
range="${maven.activitylog.range}"
- repositoryConnection="${pom.repository.connection}"
+ repositoryConnection="${_connection}"
dateFormat="${maven.changelog.dateformat}"
/>
</j:if>
No revision
No revision
1.10.2.1 +1 -1 maven/src/plugins-build/faq/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/faq/project.xml,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- project.xml 25 Jul 2003 06:21:16 -0000 1.10
+++ project.xml 7 Aug 2003 16:59:41 -0000 1.10.2.1
@@ -10,7 +10,7 @@
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Creates XDoc documentation from an FAQ XML document.</description>
- <shortDescription/>
+ <shortDescription>FAQ Plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/faq/</url>
<siteDirectory>/www/maven.apache.org/reference/plugins/faq/</siteDirectory>
<repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
