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 14:26:34 UTC
cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container AbstractJavaContainer.java
felipeal 2004/12/10 05:26:34
Modified: documentation/docs/xdocs changes.xml
documentation/docs/xdocs/integration/ant task_cactus.xml
integration/ant/src/java/org/apache/cactus/integration/ant/container
AbstractJavaContainer.java
Log:
Fix for CACTUS-158: new jvmArgs attribute to be passed to the container's JVM
Revision Changes Path
1.203 +4 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- changes.xml 23 Jul 2004 09:56:30 -0000 1.202
+++ changes.xml 10 Dec 2004 13:26:34 -0000 1.203
@@ -87,9 +87,13 @@
<person name="Nicholas Lesiecki" email="ndlesiecki@yahoo.com" id="NDL"/>
<person name="Christopher Lenz" email="cmlenz@gmx.de" id="CML"/>
<person name="Julien Ruaux" email="jruaux@apache.org" id="JRU"/>
+ <person name="Felipe Leme" email="maven@felipeal.net" id="FAL"/>
</devs>
<release version="1.7dev" date="in CVS">
+ <action dev="FAL" type="add" issue="CACTUS-158" due-to="Matheus Bianconi">
+ Add attribute <code>jvmArgs</code> in the container tasks.
+ </action>
<action dev="VMA" type="fix">
The <code><resin3x></code> element of the
<code><cactus></code> task is now correctly using the
1.27 +72 -0 jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactus.xml
Index: task_cactus.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/ant/task_cactus.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- task_cactus.xml 26 Jun 2004 17:46:25 -0000 1.26
+++ task_cactus.xml 10 Dec 2004 13:26:34 -0000 1.27
@@ -477,6 +477,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -572,6 +580,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -667,6 +683,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -769,6 +793,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -871,6 +903,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -973,6 +1013,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -1097,6 +1145,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -1222,6 +1278,14 @@
</td>
<td>No</td>
</tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
+ </td>
+ <td>No</td>
+ </tr>
</table>
</section>
@@ -1348,6 +1412,14 @@
<td>
Tests will only be run in the container if a property of the
given name doesn't exist in the current project
+ </td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>jvmArgs</td>
+ <td>
+ Arguments to be passed to the JVM running the container (for
+ instance, -Xms256m -Xmx800m)
</td>
<td>No</td>
</tr>
1.13 +35 -2 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractJavaContainer.java
Index: AbstractJavaContainer.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/container/AbstractJavaContainer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractJavaContainer.java 31 May 2004 20:05:22 -0000 1.12
+++ AbstractJavaContainer.java 10 Dec 2004 13:26:34 -0000 1.13
@@ -47,6 +47,12 @@
*/
private boolean append;
+
+ /**
+ * The arguments for JVM.
+ */
+ private String jvmArgs;
+
// Public Methods ----------------------------------------------------------
/**
@@ -70,6 +76,17 @@
this.append = isAppend;
}
+
+ /**
+ * Sets the arguments for JVM.
+ *
+ * @param theJVMArgs The arguments
+ */
+ public final void setJVMArgs(String theJVMArgs)
+ {
+ this.jvmArgs = theJVMArgs;
+ }
+
// Protected Methods -------------------------------------------------------
/**
@@ -102,6 +119,14 @@
java.setOutput(this.output);
java.setAppend(this.append);
+ // pass arguments to the JVM
+ if (this.jvmArgs != null)
+ {
+ getLog().trace(
+ "Passing arguments to the container JVM: " + this.jvmArgs);
+ java.setJvmargs(this.jvmArgs);
+ }
+
// Add extra container classpath entries specified by the user.
addExtraClasspath(java);
@@ -223,7 +248,15 @@
}
}
}
-
+
+ /**
+ * @return The arguments for JVM.
+ */
+ protected final String getJVMArgs()
+ {
+ return this.jvmArgs;
+ }
+
// Private Methods -------------------------------------------------------
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org