felipeal 2005/03/29 13:48:22
Modified: integration/maven plugin.jelly plugin.properties
integration/maven/xdocs changes.xml properties.xml
Added: integration/maven/src/plugin-test/testCactusWarEarProperties
maven.xml project.properties project.xml
integration/maven/src/plugin-test/testCactusWarEarProperties/src/web/WEB-INF
web.xml
Log:
CACTUS-202: cactus.ear is now defined at plugin.properties
Revision Changes Path
1.44 +0 -3 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- plugin.jelly 11 Mar 2005 10:46:24 -0000 1.43
+++ plugin.jelly 29 Mar 2005 21:48:21 -0000 1.44
@@ -124,9 +124,6 @@
<ant:dirname property="cactus.ejb.dir" file="${cactus.src.ejb}"/>
<ant:basename property="cactus.ejb.name" file="${cactus.src.ejb}"/>
- <j:set var="cactus.ear"
- value="${maven.build.dir}/${pom.artifactId}-cactus.ear"/>
-
</goal>
<!--
1.23 +3 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plugin.properties 10 Dec 2004 14:11:04 -0000 1.22
+++ plugin.properties 29 Mar 2005 21:48:21 -0000 1.23
@@ -84,6 +84,9 @@
# in an EAR, etc).
cactus.war = ${maven.build.dir}/${pom.artifactId}-cactus.war
+# Location where to generate the cactified EAR.
+cactus.ear = ${maven.build.dir}/${pom.artifactId}-cactus.ear
+
# (optional) Location of client and server logging properties file to debug
# Cactus tests.
# cactus.logging.config.client = ${basedir}/logging_client.properties
1.1
jakarta-cactus/integration/maven/src/plugin-test/testCactusWarEarProperties/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 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 default="testPlugin"
xmlns:j="jelly:core"
xmlns:assert="assert"
>
<goal name="testPlugin" prereqs="testPropertiesDefined,
testCustomProperties">
<attainGoal name="clean"/>
</goal>
<goal name="testPropertiesDefined">
<j:if
test="${pom.getPluginContext('cactus-maven').getVariable('cactus.war') ==
null}">
<fail>Property cactus.war is null</fail>
</j:if>
<j:if
test="${pom.getPluginContext('cactus-maven').getVariable('cactus.ear') ==
null}">
<fail>Property cactus.ear is null</fail>
</j:if>
</goal>
<goal name="testCustomProperties">
<j:set var="newWar" value="${maven.build.dir}/myCactus.war"/>
<j:set var="newEar" value="${maven.build.dir}/myCactus.ear"/>
<j:set var="cactus.war" value="${newWar}"/>
<j:set var="cactus.ear" value="${newEar}"/>
<attainGoal name="cactus:cactifywar"/>
<assert:assertFileExists file="${newWar}"/>
<attainGoal name="cactus:cactifyear"/>
<assert:assertFileExists file="${newEar}"/>
</goal>
</project>
1.1
jakarta-cactus/integration/maven/src/plugin-test/testCactusWarEarProperties/project.properties
Index: project.properties
===================================================================
maven.war.src=${basedir}/src/web
1.1
jakarta-cactus/integration/maven/src/plugin-test/testCactusWarEarProperties/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2005 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>
<pomVersion>3</pomVersion>
<extend>../project.xml</extend>
<artifactId>TestCactusWarEarProperties</artifactId>
<name>TestCactusWarEarProperties</name>
<shortDescription>Test cactus.war and cactus.ear
properties</shortDescription>
<description>Test if the cactus.war and cactus.ear are being properly
defined and used properties</description>
</project>
1.1
jakarta-cactus/integration/maven/src/plugin-test/testCactusWarEarProperties/src/web/WEB-INF/web.xml
Index: web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
</web-app>
1.63 +4 -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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- changes.xml 23 Mar 2005 14:08:48 -0000 1.62
+++ changes.xml 29 Mar 2005 21:48:21 -0000 1.63
@@ -8,6 +8,10 @@
<body>
<release version="1.8dev" date="in CVS">
+ <action dev="felipeal" type="fix" issue="CACTUS-202">
+ Property <code>cactus.ear</code> is now defined at
+ the <code>plugin.properties</code> file.
+ </action>
<action dev="felipeal" type="fix" issue="CACTUS-197">
Added support for <code>ear.bundle.name</code> and
<code>ear.bundle.dir</code> properties.
1.26 +10 -0 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- properties.xml 10 Dec 2004 14:11:04 -0000 1.25
+++ properties.xml 29 Mar 2005 21:48:21 -0000 1.26
@@ -203,6 +203,16 @@
</td>
</tr>
<tr>
+ <td>cactus.ear</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Location where to generate the cactified EAR. Defaults to
+ <code>${maven.build.dir}/${pom.artifactId}-cactus.ear</code>.
+ </p>
+ </td>
+ </tr>
+ <tr>
<td>cactus.build.goal.war</td>
<td>Yes</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
