vmassol 2004/06/27 03:46:37
Modified: framework/src/java/share-12-13-14/org/apache/cactus/server/runner
ServletTestRunner.java
framework/src/java/share-12-13-14/org/apache/cactus/internal/configuration
ConfigurationInitializer.java
documentation/docs/xdocs changes.xml
Log:
The Cactus Servlet Test Runner now re-initializes the Cactus configuration when it
is called the first time (in its <code>init()</code> method). This allows testing
several webapps in the same JVM (i.e without restarting the container).
Revision Changes Path
1.3 +6 -1
jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/runner/ServletTestRunner.java
Index: ServletTestRunner.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/runner/ServletTestRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletTestRunner.java 31 May 2004 20:05:25 -0000 1.2
+++ ServletTestRunner.java 27 Jun 2004 10:46:37 -0000 1.3
@@ -107,6 +107,11 @@
*/
public void init() throws ServletException
{
+ // Reset the Cactus initialization so that multiple web application can
+ // work with different Cactus configurations. Otherwise, as the Cactus
+ // initialization is JVM-wide, the config is not read again.
+ ConfigurationInitializer.setIsInitialized(false);
+
// Initialize Cactus configuration
ConfigurationInitializer.initialize();
1.2 +12 -2
jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/internal/configuration/ConfigurationInitializer.java
Index: ConfigurationInitializer.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/internal/configuration/ConfigurationInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationInitializer.java 22 May 2004 11:34:46 -0000 1.1
+++ ConfigurationInitializer.java 27 Jun 2004 10:46:37 -0000 1.2
@@ -64,6 +64,16 @@
private static boolean isInitialized;
/**
+ * @param isInitializedFlag if false consider the system as uninitialized
+ * so that next time the [EMAIL PROTECTED] #initialize()} method is
called the
+ * Cactus configurations will be read again
+ */
+ public static void setIsInitialized(boolean isInitializedFlag)
+ {
+ isInitialized = isInitializedFlag;
+ }
+
+ /**
* Read Cactus configuration files.
*/
public static synchronized void initialize()
@@ -72,7 +82,7 @@
{
initializeConfig();
initializeLoggingConfig();
- isInitialized = true;
+ setIsInitialized(true);
}
}
1.201 +6 -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.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- changes.xml 20 Jun 2004 14:04:12 -0000 1.200
+++ changes.xml 27 Jun 2004 10:46:37 -0000 1.201
@@ -90,6 +90,12 @@
</devs>
<release version="1.7dev" date="in CVS">
+ <action dev="VMA" type="fix">
+ The Cactus Servlet Test Runner now re-initializes the Cactus
+ configuration when it is called the first time (in its
+ <code>init()</code> method). This allows testing several webapps
+ in the same JVM (i.e without restarting the container).
+ </action>
<action dev="VMA" type="add" issue="CACTUS-119">
The <code><jboss3x></code> container element now supports
running JBoss in a temporary directory, specified by the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
