dion 2003/08/07 09:58:49
Modified: src/plugins-build/cactus/xdocs Tag: MAVEN_RC1_STABLE
navigation.xml index.xml changes.xml
src/plugins-build/cactus Tag: MAVEN_RC1_STABLE plugin.jelly
project.xml
src/plugins-build/cactus/src/plugin-resources Tag:
MAVEN_RC1_STABLE cactus.jsl
src/plugins-build/checkstyle/src/plugin-resources Tag:
MAVEN_RC1_STABLE checkstyle.jsl
src/plugins-build/changelog Tag: MAVEN_RC1_STABLE
plugin.jelly
src/plugins-build/checkstyle Tag: MAVEN_RC1_STABLE
plugin.jelly
src/plugins-build/changes/src/plugin-resources Tag:
MAVEN_RC1_STABLE changes.jsl
src/plugins-build/changes/xdocs Tag: MAVEN_RC1_STABLE
changes.xml
src/plugins-build/deploy Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/clover Tag: MAVEN_RC1_STABLE project.xml
Added: src/plugins-build/cactus/announcements Tag: MAVEN_RC1_STABLE
3.0.ann
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.4.4.1 +1 -0 maven/src/plugins-build/cactus/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- navigation.xml 8 Apr 2003 21:40:20 -0000 1.4
+++ navigation.xml 7 Aug 2003 16:58:48 -0000 1.4.4.1
@@ -15,6 +15,7 @@
<item name="Properties" href="/properties.html"/>
</menu>
<menu name="Downloads">
+ <item name="Cactus Plugin 3.0"
href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-3.0.jar"/>
<item name="Cactus Plugin 2.0"
href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-2.0.jar"/>
<item name="Cactus Plugin 1.2"
href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.2.jar"/>
<item name="Cactus Plugin 1.1"
href="http://www.ibiblio.org/maven/maven/jars/maven-cactus-plugin-1.1.jar"/>
1.6.4.1 +7 -0 maven/src/plugins-build/cactus/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/index.xml,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- index.xml 23 May 2003 21:30:25 -0000 1.6
+++ index.xml 7 Aug 2003 16:58:48 -0000 1.6.4.1
@@ -25,6 +25,13 @@
<th>Description</th>
</tr>
<tr>
+ <td>05 Aug 2003</td>
+ <td>
+ Release of version 3.0. Read the
+ <a
href="http://cvs.apache.org/viewcvs.cgi/maven/src/plugins-build/cactus/announcements/3.0.ann?rev=1.1&content-type=text/vnd.viewcvs-markup";>announcement</a>.
+ </td>
+ </tr>
+ <tr>
<td>08 Apr 2003</td>
<td>
Release of version 2.0. Read the
1.16.4.1 +12 -1 maven/src/plugins-build/cactus/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- changes.xml 25 Jul 2003 03:32:22 -0000 1.16
+++ changes.xml 7 Aug 2003 16:58:48 -0000 1.16.4.1
@@ -7,7 +7,18 @@
<body>
- <release version="3.0" date="in CVS">
+ <release version="3.1" date="in CVS">
+ <action dev="vmassol" type="add">
+ Added back support for WebLogic 7.x (it had somehow been dropped
+ when we moved to the new Cactus/Ant integration in version 3.0).
+ Not tested yet (I don't have WL7 on my machine)!
+ </action>
+ <action dev="vmassol" type="update">
+ Update to Cactus 1.5-beta1.
+ </action>
+ </release>
+
+ <release version="3.0" date="2003-08-05">
<action dev="dion" type="update">
Upgrade to commons-logging 1.0.3
</action>
No revision
No revision
1.29.4.1 +27 -1 maven/src/plugins-build/cactus/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
retrieving revision 1.29
retrieving revision 1.29.4.1
diff -u -r1.29 -r1.29.4.1
--- plugin.jelly 10 Jul 2003 15:58:11 -0000 1.29
+++ plugin.jelly 7 Aug 2003 16:58:49 -0000 1.29.4.1
@@ -86,7 +86,9 @@
<j:if test="${context.getVariable('cactus.home.tomcat5x') != null}">
<ant:mkdir dir="${cactus.reports.dir}/tomcat5x"/>
</j:if>
-
+ <j:if test="${context.getVariable('cactus.home.weblogic7x') != null}">
+ <ant:mkdir dir="${cactus.reports.dir}/weblogic7x"/>
+ </j:if>
</goal>
@@ -290,6 +292,12 @@
</j:if>
</tomcat5x>
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"
+ beaHome="${cactus.home.weblogic7x}"/>
+
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
<ant:formatter type="xml"/>
@@ -343,6 +351,12 @@
</ant:fileset>
</j:if>
+ <j:if test="${context.getVariable('cactus.home.weblogic7x') != null}">
+ <ant:fileset dir="${cactus.reports.dir}/weblogic7x">
+ <ant:include name="TEST-*.xml"/>
+ </ant:fileset>
+ </j:if>
+
</ant:junitreport>
<j:if test="${cactus.halt.on.failure}">
@@ -444,6 +458,12 @@
</j:if>
</tomcat5x>
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"
+ beaHome="${cactus.home.weblogic7x}"/>
+
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
<ant:formatter type="xml"/>
@@ -543,6 +563,12 @@
excludes="${cactus.tomcat5x.conf.excludes}"/>
</j:if>
</tomcat5x>
+
+ <weblogic7x if="cactus.home.weblogic7x"
+ dir="${cactus.home.weblogic7x}" port="${cactus.port}"
+ output="${cactus.reports.dir}/weblogic7x.out"
+ todir="${cactus.reports.dir}/weblogic7x"
+ beaHome="${cactus.home.weblogic7x}"/>
</containerset>
<ant:formatter type="plain" usefile="${cactus.junit.usefile}"/>
1.31.4.1 +8 -3 maven/src/plugins-build/cactus/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/project.xml,v
retrieving revision 1.31
retrieving revision 1.31.4.1
diff -u -r1.31 -r1.31.4.1
--- project.xml 25 Jul 2003 03:32:22 -0000 1.31
+++ project.xml 7 Aug 2003 16:58:49 -0000 1.31.4.1
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-cactus-plugin</id>
<name>Maven Cactus Plug-in</name>
- <currentVersion>3.0-SNAPSHOT</currentVersion>
+ <currentVersion>3.1-SNAPSHOT</currentVersion>
<description>Plugin for Cactus (http://jakarta.apache.org/cactus) that allows to
automatically start containers, run Cactus tests and stop the containers.</description>
<shortDescription>Cactus plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/cactus/</url>
@@ -38,6 +38,11 @@
<version>
<id>3.0</id>
<name>3.0</name>
+ <tag>MAVEN_CACTUS_3_0</tag>
+ </version>
+ <version>
+ <id>3.1</id>
+ <name>3.1</name>
<tag>HEAD</tag>
</version>
</versions>
@@ -69,12 +74,12 @@
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus</artifactId>
- <version>13-1.5dev-20030619</version>
+ <version>13-1.5-beta1</version>
</dependency>
<dependency>
<groupId>cactus</groupId>
<artifactId>cactus-ant</artifactId>
- <version>13-1.5dev-20030619</version>
+ <version>13-1.5-beta1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
No revision
No revision
1.3.2.1 +3 -3 maven/src/plugins-build/cactus/src/plugin-resources/cactus.jsl
Index: cactus.jsl
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/src/plugin-resources/cactus.jsl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- cactus.jsl 13 Apr 2003 11:12:38 -0000 1.3
+++ cactus.jsl 7 Aug 2003 16:58:49 -0000 1.3.2.1
@@ -12,12 +12,12 @@
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="numbers" class="java.text.DecimalFormat"/>
<j:useBean var="htmlescape" class="org.apache.velocity.anakia.Escape"/>
- <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/>
+ <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/>
<j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
- <j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+ <j:useBean var="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
<define:taglib uri="junit">
No revision
No revision
1.1.2.1 +0 -0 maven/src/plugins-build/cactus/announcements/3.0.ann
Index: 3.0.ann
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/cactus/announcements/3.0.ann,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.9.2.1 +2 -2
maven/src/plugins-build/checkstyle/src/plugin-resources/checkstyle.jsl
Index: checkstyle.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/checkstyle/src/plugin-resources/checkstyle.jsl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- checkstyle.jsl 25 Jul 2003 07:05:01 -0000 1.9
+++ checkstyle.jsl 7 Aug 2003 16:58:49 -0000 1.9.2.1
@@ -10,10 +10,10 @@
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"/>
<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="pathtool" class="org.apache.maven.util.DVSLPathTool"/>
<jsl:template match="checkstyle">
<document>
No revision
No revision
1.8.4.1 +4 -1 maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -r1.8 -r1.8.4.1
--- plugin.jelly 8 Jul 2003 11:01:07 -0000 1.8
+++ plugin.jelly 7 Aug 2003 16:58:49 -0000 1.8.4.1
@@ -46,6 +46,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 changelog report</ant:echo>
@@ -56,7 +59,7 @@
output="${maven.build.dir}/changelog.xml"
outputEncoding="${maven.docs.outputencoding}"
range="${maven.changelog.range}"
- repositoryConnection="${pom.repository.connection}"
+ repositoryConnection="${_connection}"
dateFormat="${maven.changelog.dateformat}"
/>
No revision
No revision
1.13.4.1 +10 -9 maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- plugin.jelly 21 Jul 2003 05:42:20 -0000 1.13
+++ plugin.jelly 7 Aug 2003 16:58:49 -0000 1.13.4.1
@@ -78,16 +78,17 @@
<j:choose>
<j:when test="${not(header.exists())}">
<ant:echo>
- ======================================================================
- = W A R N I N G =
- ======================================================================
- = Your project doesn't contain a header file specified as: =
+ =================================================================
+ = W A R N I N G =
+ =================================================================
+ = Your project doesn't contain a header file specified as: =
= ${header}
- = Checkstyle needs it to check the existence of the License in your =
- = source files. If it can't find this file, it throws an error. =
- = A temporary solution is to create an empty LICENSE.txt file. =
- = Though, we recommend that you edit this License. =
- ======================================================================
+ = Checkstyle needs it to check the existence of the License in =
+ = your source files. If it can't find this file, it throws an =
+ = error. =
+ = A temporary solution is to create an empty LICENSE.txt file. =
+ = Though, we recommend that you edit this License. =
+ =================================================================
</ant:echo>
</j:when>
<j:otherwise>
No revision
No revision
1.4.4.1 +37 -19 maven/src/plugins-build/changes/src/plugin-resources/changes.jsl
Index: changes.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/changes/src/plugin-resources/changes.jsl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- changes.jsl 30 Mar 2003 22:59:56 -0000 1.4
+++ changes.jsl 7 Aug 2003 16:58:49 -0000 1.4.4.1
@@ -15,26 +15,44 @@
<jsl:template match="body" trim="false">
<body>
- <jsl:applyTemplates trim="false"/>
+ <!-- Index of releases -->
+ <section name="Release History">
+ <table>
+ <tr><th
style='width:50px'>Version</th><th>Date</th><th>Description</th></tr>
+ <x:forEach select="release">
+ <tr>
+ <j:set var="version"><x:expr select="@version"/></j:set>
+ <j:set var="date"><x:expr select="@date"/></j:set>
+ <j:set var="description"><x:expr
select="@description"/></j:set>
+ <td><a href="#${version}">${version}</a></td>
+ <td>${date}</td>
+ <td>${description}</td>
+ </tr>
+ </x:forEach>
+ </table>
+ </section>
+
+ <!-- Release details -->
+ <x:forEach select="release">
+ <j:set var="sectionName">Release <x:expr select="@version"/> -
<x:expr select="@date"/></j:set>
+ <j:set var="version"><x:expr select="@version"/></j:set>
+ <section name="${sectionName}">
+ <a name="${version}"/>
+ <table>
+ <tr><th style='width:50px'>Type</th><th>Changes</th><th
style='width:70px'>By</th></tr>
+ <x:forEach var="action" select="action">
+ <j:set var="type"><x:expr select="@type"/></j:set>
+ <j:set var="dev"><x:expr select="@dev"/></j:set>
+ <tr>
+ <td><img src="images/${type}.gif"
alt="${type}"/></td>
+ <td><x:expr select="string(.)"/></td>
+ <td><a href="team-list.html#${dev}">${dev}</a></td>
+ </tr>
+ </x:forEach>
+ </table>
+ </section>
+ </x:forEach>
</body>
- </jsl:template>
-
- <jsl:template match="body/release" trim="false">
- <j:set var="sectionName">Release <x:expr select="@version"/> - <x:expr
select="@date"/></j:set>
- <section name="${sectionName}">
- <table>
- <tr><th style='width:50px'>Type</th><th>Changes</th><th
style='width:70px'>By</th></tr>
- <x:forEach var="action" select="action">
- <j:set var="type"><x:expr select="@type"/></j:set>
- <j:set var="dev"><x:expr select="@dev"/></j:set>
- <tr>
- <td><img src="images/${type}.gif" alt="${type}"/></td>
- <td><x:expr select="string(.)"/></td>
- <td><a href="team-list.html#${dev}">${dev}</a></td>
- </tr>
- </x:forEach>
- </table>
- </section>
</jsl:template>
<!-- copy any other elements through -->
No revision
No revision
1.2.4.1 +4 -0 maven/src/plugins-build/changes/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changes/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- changes.xml 8 Jul 2003 11:01:07 -0000 1.2
+++ changes.xml 7 Aug 2003 16:58:49 -0000 1.2.4.1
@@ -7,6 +7,10 @@
<body>
<release version="1.2" date="in CVS">
+ <action dev="evenisse" type="add">
+ <a
href="http://jira.codehaus.org/ViewIssue.jspa?key=MAVEN-587";>Maven-587</a>.
+ Add index table of release.
+ </action>
<action dev="evenisse" type="fix">
Add xml declaration to generated report. Fixed for character encoding.
</action>
No revision
No revision
1.6.2.1 +6 -7 maven/src/plugins-build/deploy/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/deploy/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- plugin.jelly 3 Jun 2003 05:20:35 -0000 1.6
+++ plugin.jelly 7 Aug 2003 16:58:49 -0000 1.6.2.1
@@ -7,8 +7,7 @@
xmlns:define="jelly:define"
xmlns:deploy="deploy"
xmlns:util="jelly:util"
- xmlns:log="jelly:log"
- xmlns:m="maven">
+ xmlns:log="jelly:log">
<!--
|
@@ -43,7 +42,7 @@
<j:set var="username" value='${context.getVariable("maven.username")}'/>
- <m:user-check user="${username}"/>
+ <maven:user-check user="${username}"/>
<j:set var="copier" value='${context.getVariable("maven.scp.executable")}'/>
<j:set var="commander"
value='${context.getVariable("maven.ssh.executable")}'/>
@@ -63,14 +62,14 @@
<j:set var="typeX" value="${type}X"/>
<j:choose>
<j:when test="${typeX != 'X'}">
- <ant:property
- name="resolvedDirectory"
+ <j:set
+ var="resolvedDirectory"
value="${siteDirectory}/${pom.artifactDirectory}/${type}"
/>
</j:when>
<j:otherwise>
- <ant:property
- name="resolvedDirectory"
+ <j:set
+ var="resolvedDirectory"
value="${siteDirectory}/${pom.artifactDirectory}"
/>
</j:otherwise>
No revision
No revision
1.13.2.1 +3 -3 maven/src/plugins-build/clover/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/clover/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- project.xml 1 Jul 2003 13:53:41 -0000 1.13
+++ project.xml 7 Aug 2003 16:58:49 -0000 1.13.2.1
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<extend>${basedir}/../project.xml</extend>
@@ -50,10 +50,10 @@
</roles>
</developer>
<developer>
- <name>Stéphane Mor</name>
+ <name>St�phane Mor</name>
<id>smor</id>
<email>[EMAIL PROTECTED]</email>
- <organization>Hasgard Systèmes et Réseaux</organization>
+ <organization>Hasgard Syst�mes et R�seaux</organization>
<roles>
<role>Java Developer</role>
</roles>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
