You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by fe...@apache.org on 2004/12/10 15:11:04 UTC
cvs commit: jakarta-cactus/integration/maven/xdocs changes.xml properties.xml
felipeal 2004/12/10 06:11:04
Modified: integration/maven plugin.jelly plugin.properties
integration/maven/xdocs changes.xml properties.xml
Log:
Fix for CACTUS-158: added jvmArgs to all container tasks
Revision Changes Path
1.40 +16 -8 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- plugin.jelly 8 Dec 2004 18:32:19 -0000 1.39
+++ plugin.jelly 10 Dec 2004 14:11:04 -0000 1.40
@@ -460,7 +460,8 @@
output="${cactus.reports.dir}/jboss3x.out"
todir="${cactus.reports.dir}/jboss3x"
config="${cactus.jboss3x.config.name}"
- tmpdir="${cactus.jboss3x.tmp.dir}">
+ tmpdir="${cactus.jboss3x.tmp.dir}"
+ jvmArgs="${cactus.jboss3x.jvmArgs}">
<j:if test="${context.getVariable('cactus.jboss3x.config.dir') != null}">
<ant:setProperty name="configdir" value="${cactus.jboss3x.config.dir}"/>
</j:if>
@@ -472,7 +473,8 @@
<orion1x if="cactus.home.orion1x" port="${cactus.port}"
dir="${cactus.home.orion1x}"
output="${cactus.reports.dir}/orion1x.out"
- todir="${cactus.reports.dir}/orion1x">
+ todir="${cactus.reports.dir}/orion1x"
+ jvmArgs="${cactus.orion1x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -481,7 +483,8 @@
<orion2x if="cactus.home.orion2x" port="${cactus.port}"
dir="${cactus.home.orion2x}"
output="${cactus.reports.dir}/orion2x.out"
- todir="${cactus.reports.dir}/orion2x">
+ todir="${cactus.reports.dir}/orion2x"
+ jvmArgs="${cactus.orion2x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -490,7 +493,8 @@
<resin2x if="cactus.home.resin2x" port="${cactus.port}"
dir="${cactus.home.resin2x}"
output="${cactus.reports.dir}/resin2x.out"
- todir="${cactus.reports.dir}/resin2x">
+ todir="${cactus.reports.dir}/resin2x"
+ jvmArgs="${cactus.resin2x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -502,7 +506,8 @@
<resin3x if="cactus.home.resin3x" port="${cactus.port}"
dir="${cactus.home.resin3x}"
output="${cactus.reports.dir}/resin3x.out"
- todir="${cactus.reports.dir}/resin3x">
+ todir="${cactus.reports.dir}/resin3x"
+ jvmArgs="${cactus.resin3x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -514,7 +519,8 @@
<tomcat4x if="cactus.home.tomcat4x" port="${cactus.port}"
dir="${cactus.home.tomcat4x}"
output="${cactus.reports.dir}/tomcat4x.out"
- todir="${cactus.reports.dir}/tomcat4x">
+ todir="${cactus.reports.dir}/tomcat4x"
+ jvmArgs="${cactus.tomcat4x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -534,7 +540,8 @@
<tomcat5x if="cactus.home.tomcat5x" port="${cactus.port}"
dir="${cactus.home.tomcat5x}"
output="${cactus.reports.dir}/tomcat5x.out"
- todir="${cactus.reports.dir}/tomcat5x">
+ todir="${cactus.reports.dir}/tomcat5x"
+ jvmArgs="${cactus.tomcat5x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
@@ -554,7 +561,8 @@
<weblogic7x if="cactus.home.weblogic7x" port="${cactus.port}"
dir="${cactus.home.weblogic7x}"
output="${cactus.reports.dir}/weblogic7x.out"
- todir="${cactus.reports.dir}/weblogic7x">
+ todir="${cactus.reports.dir}/weblogic7x"
+ jvmArgs="${cactus.weblogic7x.jvmArgs}">
<j:if test="${context.getVariable('cactus.tmp.dir') != null}">
<ant:setProperty name="tmpdir" value="${cactus.tmp.dir}"/>
</j:if>
1.22 +32 -0 jakarta-cactus/integration/maven/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plugin.properties 4 Nov 2004 14:48:40 -0000 1.21
+++ plugin.properties 10 Dec 2004 14:11:04 -0000 1.22
@@ -122,6 +122,14 @@
# Container-related properties
# -------------------------------------------------------------------
+## Generic properties - each container will have an equivalent property, which
+## by default points to the generic value
+
+# Arguments to be passed to the container's JVM
+#cactus.genericContainer.jvmArgs
+
+## Container-specific properties
+
# Name of the JBoss server configuration to use.
cactus.jboss3x.config.name = default
@@ -137,14 +145,29 @@
# to shutdown JBoss.
cactus.jboss3x.jndiport = 1099
+# Arguments to be passed to the container's JVM
+cactus.jboss3x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
# (optional). Resin 2.x configuration file if you don't want to use the
# cactus-provided one
#cactus.resin2x.config =
+# Arguments to be passed to the container's JVM
+cactus.resin2x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
# (optional). Resin 3.x configuration file if you don't want to use the
# cactus-provided one
#cactus.resin3x.config =
+# Arguments to be passed to the container's JVM
+cactus.resin3x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
+# Arguments to be passed to the container's JVM
+cactus.orion1x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
+# Arguments to be passed to the container's JVM
+cactus.orion2x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
# (optional). Tomcat 4.x configuration file if you don't want to use the
# cactus-provided one
#cactus.tomcat4x.config =
@@ -160,6 +183,9 @@
# for the tests. By default the system temporary directory is used
#cactus.tomcat4x.tmpdir =
+# Arguments to be passed to the container's JVM
+cactus.tomcat4x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
# (optional). Tomcat 5.x configuration file if you don't want to use the
# cactus-provided one
#cactus.tomcat5x.config =
@@ -175,6 +201,9 @@
# for the tests. By default the system temporary directory is used
#cactus.tomcat5x.tmpdir =
+# Arguments to be passed to the container's JVM
+cactus.tomcat5x.jvmArgs=${cactus.genericContainer.jvmArgs}
+
# (optional). Location of BEA HOME. If not specified it defaults to
# the parent directory of cactus.home.weblogic7x
#cactus.weblogic7x.beahome =
@@ -182,3 +211,6 @@
# (optional). WebLogic 7.x configuration file if you don't want to use the
# cactus-provided one
#cactus.weblogic7x.config =
+
+# Arguments to be passed to the container's JVM
+cactus.weblogic7x.jvmArgs=${cactus.genericContainer.jvmArgs}
1.55 +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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- changes.xml 14 Nov 2004 10:28:01 -0000 1.54
+++ changes.xml 10 Dec 2004 14:11:04 -0000 1.55
@@ -8,6 +8,9 @@
<body>
<release version="1.7dev" date="in CVS">
+ <action dev="felipeal" type="add" issue="CACTUS-158">
+ Added <code>jvmArg</code> property to the containers tasks.
+ </action>
<action dev="vmassol" type="update" due-to="Henner Kollmann" issue="CACTUS-156">
Added optional <code>source</code> attribute from the java plugin for
compiling cactus tests.
1.25 +122 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- properties.xml 3 Nov 2004 04:20:58 -0000 1.24
+++ properties.xml 10 Dec 2004 14:11:04 -0000 1.25
@@ -275,6 +275,28 @@
</table>
</section>
+ <section name="Cactus/Generic Container Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.genericContainer.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to a container's JVM (for instance,
+ <code>-Xms256m -Xmx800m</code>). Each container has an
+ equivalent property, which by default points to this one.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
+
<section name="Cactus/JBoss 3.x Settings">
<table>
<tr>
@@ -324,6 +346,16 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.jboss3x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
@@ -344,6 +376,16 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.resin2x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
@@ -364,9 +406,59 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.resin3x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
+ <section name="Cactus/Orion 1.x Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.orion1x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
+ <section name="Cactus/Orion 2.x Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>cactus.orion2x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
<section name="Cactus/Tomcat 4.x Settings">
<table>
<tr>
@@ -426,6 +518,16 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.tomcat4x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
@@ -488,6 +590,16 @@
</p>
</td>
</tr>
+ <tr>
+ <td>cactus.tomcat5x.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
+ </td>
+ </tr>
</table>
</section>
@@ -551,6 +663,16 @@
<td>
Comma-separated list of which files in the directory defined by cactus.resources.[label].dir should be included in the Cactus war.
Default value is none, which means no files are excluded.
+ </td>
+ </tr>
+ <tr>
+ <td>cactus.weblogic.jvmArgs</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Arguments to be passed to the container's JVM. Defaults to
+ <code>${cactus.genericContainer.jvmArgs}</code>.
+ </p>
</td>
</tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org