vmassol 2003/12/31 01:35:02 Modified: integration/maven plugin.properties plugin.jelly integration/maven/xdocs changes.xml properties.xml Log: Added support for the new <code>configxml</code> attribute used in the <code><weblogic7x></code> element of the <code><cactus></code> task. Revision Changes Path 1.7 +3 -1 jakarta-cactus/integration/maven/plugin.properties Index: plugin.properties =================================================================== RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plugin.properties 20 Dec 2003 12:06:56 -0000 1.6 +++ plugin.properties 31 Dec 2003 09:35:02 -0000 1.7 @@ -105,4 +105,6 @@ # the parent directory of cactus.home.weblogic7x #cactus.weblogic7x.beahome = - +# (optional). WebLogic 7.x configuration file if you don't want to use the +# cactus-provided one +#cactus.weblogic7x.config = 1.10 +12 -0 jakarta-cactus/integration/maven/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plugin.jelly 20 Dec 2003 12:06:56 -0000 1.9 +++ plugin.jelly 31 Dec 2003 09:35:02 -0000 1.10 @@ -384,6 +384,9 @@ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}"> <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/> </j:if> + <j:if test="${context.getVariable('cactus.weblogic7x.config') != null}"> + <ant:setProperty name="configxml" value="${cactus.weblogic7x.config}"/> + </j:if> </weblogic7x> </containerset> @@ -579,6 +582,9 @@ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}"> <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/> </j:if> + <j:if test="${context.getVariable('cactus.weblogic7x.config') != null}"> + <ant:setProperty name="configxml" value="${cactus.weblogic7x.config}"/> + </j:if> </weblogic7x> </containerset> @@ -713,6 +719,9 @@ <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}"> <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/> </j:if> + <j:if test="${context.getVariable('cactus.weblogic7x.config') != null}"> + <ant:setProperty name="configxml" value="${cactus.weblogic7x.config}"/> + </j:if> </weblogic7x> </containerset> @@ -891,6 +900,9 @@ </j:if> <j:if test="${context.getVariable('cactus.weblogic7x.beahome') != null}"> <ant:setProperty name="beahome" value="${cactus.weblogic7x.beahome}"/> + </j:if> + <j:if test="${context.getVariable('cactus.weblogic7x.config') != null}"> + <ant:setProperty name="configxml" value="${cactus.weblogic7x.config}"/> </j:if> </weblogic7x> 1.12 +8 -3 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- changes.xml 31 Dec 2003 09:21:05 -0000 1.11 +++ changes.xml 31 Dec 2003 09:35:02 -0000 1.12 @@ -8,10 +8,15 @@ <body> <release version="1.6dev" date="in CVS"> + <action dev="vmassol" type="add" due-to="Tony Czupryna" due-to-email="[EMAIL PROTECTED]"> + Added support for the new <code>configxml</code> attribute used in the + <code><weblogic7x></code> element of the + <code><cactus></code> task. + </action> <action dev="vmassol" type="add" issue="24754" due-to="Michael Gaffney" due-to-email="[EMAIL PROTECTED]"> - Added support for EJB testing with Cactus. Calling - <code>cactus:test-ear</code> packages the whole thing in an EAR and - executes the Cactus tests. + Added support for EJB testing with Cactus. Calling + <code>cactus:test-ear</code> packages the whole thing in an EAR and + executes the Cactus tests. </action> <action dev="vmassol" type="add"> The <code>cactus:test</code> goal now automatically discovers JUnit 1.10 +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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- properties.xml 20 Dec 2003 12:06:56 -0000 1.9 +++ properties.xml 31 Dec 2003 09:35:02 -0000 1.10 @@ -350,6 +350,16 @@ </p> </td> </tr> + <tr> + <td>cactus.weblogic7x.config</td> + <td>Yes</td> + <td> + <p> + Location of the WebLogic 7.x configuration file if you don't want + to use the cactus-provided one. + </p> + </td> + </tr> </table> </section>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]