felipeal 2004/10/13 19:29:59
Modified: . default-project.xml
documentation/docs/xdocs/participating howto_build.xml
integration/maven project.properties project.xml
integration/maven/xdocs changes.xml
Added: integration/maven maven.xml
Log:
fix for CACTUS-137: Building maven plugin should be easier
Revision Changes Path
1.18 +6 -0 jakarta-cactus/default-project.xml
Index: default-project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/default-project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- default-project.xml 9 Aug 2004 18:56:58 -0000 1.17
+++ default-project.xml 14 Oct 2004 02:29:59 -0000 1.18
@@ -122,6 +122,12 @@
<email>[EMAIL PROTECTED]</email>
<organization></organization>
</developer>
+ <developer>
+ <name>Felipe Leme</name>
+ <id>felipeal</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Falcon Informatica</organization>
+ </developer>
</developers>
<contributors>
<contributor>
1.18 +2 -9
jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml
Index: howto_build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/xdocs/participating/howto_build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- howto_build.xml 25 Aug 2004 07:44:42 -0000 1.17
+++ howto_build.xml 14 Oct 2004 02:29:59 -0000 1.18
@@ -95,7 +95,7 @@
To build Cactus from source, you'll need to have
<link href="ext:ant">Ant</link> 1.6.1 (or later) installed. For
building the Maven plugin you'll need to have
- <link href="ext:maven">Maven</link> 1.0 rc3 (or later) installed.
+ <link href="ext:maven">Maven</link> 1.0 (or later) installed.
</p>
<p>
@@ -548,15 +548,8 @@
<section title="Generating the Maven plugin">
<p>
- Right now the Maven plugin must be build in a separate process, as
described below:
+ To generate the maven plugin, you must first perform the Ant build (see
above). Than you just need to go to the <code>integration/maven</code> sub-directory
and run <code>maven plugin:install</code>.
</p>
- <ol>
- <li>Build the Cactus framework using Ant, as described in the previous
section</li>
- <li>Copy the generated jar (in <code>dist-13/lib</code>) to your local
maven repository, adding <code>-13</code> in the name (between <code>cactus</code> and
the version number). Example: <code>cp framework/dist-13/lib/cactus-1.7dev.jar
~/.maven/repository/cactus/jars/cactus-13-1.7dev.jar</code></li>
- <li>Build the Cactus Ant integration using Ant, as described in the
previous section</li>
- <li>Copy the generated jar (in <code>dist-13/lib</code>) to your local
maven repository, adding <code>-13</code> in the name (between <code>cactus</code> and
the version number). Example: <code>cp
integration/ant/dist-13/lib/cactus-ant-1.7dev.jar
~/.maven/repository/cactus/jars/cactus-ant-13-1.7dev.jar</code></li>
- <li>Go to the <code>integration/maven</code> directory and type <code>maven
plugin:install</code></li>
- </ol>
</section>
1.8 +12 -1 jakarta-cactus/integration/maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 8 May 2004 18:48:52 -0000 1.7
+++ project.properties 14 Oct 2004 02:29:59 -0000 1.8
@@ -59,3 +59,14 @@
# For the changes plugin to link issue with Bugzilla
maven.changes.issue.template = %URL%/../browse/%ISSUE%
+
+##
+## properties necessary to build plugin after framework and ant integration were
generated
+## using ant
+##
+maven.jar.override=on
+maven.jar.cactus=../../framework/dist-13/lib/cactus-${pom.currentVersion}.jar
+# NOTE: maven properties can't have dashes, so we need these 2 properties
+# ( see http://jira.codehaus.org/browse/MAVEN-581 )
+maven.jar.cactus-ant=../ant/dist-13/lib/cactus-ant-${pom.currentVersion}.jar
+maven.jar.cactus.ant=../ant/dist-13/lib/cactus-ant-${pom.currentVersion}.jar
1.17 +0 -1 jakarta-cactus/integration/maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 14 May 2004 12:08:07 -0000 1.16
+++ project.xml 14 Oct 2004 02:29:59 -0000 1.17
@@ -123,7 +123,6 @@
<includes>
<include>plugin.jelly</include>
<include>plugin.properties</include>
- <include>project.properties</include>
<include>project.xml</include>
</includes>
</resource>
1.1 jakarta-cactus/integration/maven/maven.xml
Index: maven.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<project
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
>
<postGoal name="plugin:install">
<j:set var="jarsDir" value="${maven.repo.local}/${pom.groupId}/jars"/>
<ant:echo>Copying Cactus jars to ${jarsDir}</ant:echo>
<ant:mkdir dir="${jarsDir}"/>
<ant:copy tofile="${jarsDir}/cactus-13-${pom.currentVersion}.jar"
file="${maven.jar.cactus}"/>
<ant:copy tofile="${jarsDir}/cactus-ant-13-${pom.currentVersion}.jar"
file="${maven.jar.cactus.ant}"/>
</postGoal>
</project>
1.45 +3 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- changes.xml 1 Oct 2004 08:23:59 -0000 1.44
+++ changes.xml 14 Oct 2004 02:29:59 -0000 1.45
@@ -8,6 +8,9 @@
<body>
<release version="1.7dev" date="in CVS">
+ <action dev="felipeal" type="update" issue="CACTUS-137">
+ Plugin is now buildable withouth any manual intervention.
+ </action>
<action dev="vmassol" type="update" issue="CACTUS-135" due-to="Felipe Leme">
The Cactus HTML report now displays the stack trace in case of failure.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
