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 vm...@apache.org on 2002/07/22 14:26:06 UTC
cvs commit: jakarta-cactus/sample-servlet/conf/sample/build/share build-share.xml build-tests-orion-14.xml build-tests-orion-15.xml build-tests-orion-16.xml build-tests-resin-20.xml build-tests-tomcat-40.xml build-tests-weblogic-61.xml build-tests-weblogic-70.xml
vmassol 2002/07/22 05:26:06
Modified: . build.properties.sample build.xml gump.xml
documentation/docs/xdocs changes.xml todo.xml
framework build.properties.sample build.xml
framework/src/java/j2ee13/org/apache/cactus/server
FilterTestRedirector.java
framework/src/java/share/org/apache/cactus
AbstractTestCase.java ServletURL.java
WebResponse.java
framework/src/java/share/org/apache/cactus/client
AutoReadHttpURLConnection.java
HttpClientHelper.java
framework/src/java/share/org/apache/cactus/server
AbstractHttpServletRequestWrapper.java
AbstractWebTestCaller.java
AbstractWebTestController.java
JspTestRedirector.java ServletTestRedirector.java
framework/src/java/share/org/apache/cactus/server/runner
ServletTestRunner.java WebappTestRunner.java
framework/src/java/share/org/apache/cactus/util/log
LogAspect.java LogManagerAspect.java
framework/src/test/share/org/apache/cactus
TestAbstractTestCase.java TestServletURL.java
TestServletUtil.java TestWebRequest.java
TestWebTestResult.java
framework/src/test/share/org/apache/cactus/client
TestWebTestResultParser.java
framework/web jspRedirector.jsp
sample-servlet build.properties.sample build.xml
sample-servlet/conf/sample/build/j2ee12
build-tests-enhydra-31.xml build-tests-resin-12.xml
build-tests-tomcat-32.xml build-tests-tomcat-33.xml
build-tests-weblogic-51.xml build.properties.sample
sample-servlet/conf/sample/build/j2ee13
build-tests-resin-13.xml build.properties.sample
sample-servlet/conf/sample/build/share build-share.xml
build-tests-orion-14.xml build-tests-orion-15.xml
build-tests-orion-16.xml build-tests-resin-20.xml
build-tests-tomcat-40.xml
build-tests-weblogic-61.xml
build-tests-weblogic-70.xml
Removed: framework/src/java/share/org/apache/cactus/util/log
BaseLog.java BaseLogDummy.java Log.java
LogService.java
Log:
Now using Commons Logging as the logging framework (or rather Facade). It replaces our previous LogService. This was a move we wanted to do but it was hastened by the fact that Commons HttpClient now requires Commons Logging, so I thought it was time to make the switch. As a benefit, Cactus can now use any of the following logging frameworks with no modification to Cactus itself: Log4J, JDK 1.4 logging, LogKit, No logging, SimpleLog (provided in Commons Logging). The Cactus Sample build file configures Cactus to use Log4J (but you can really use any of the other logging frameworks).
Revision Changes Path
1.22 +5 -2 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.properties.sample 21 Jul 2002 11:06:11 -0000 1.21
+++ build.properties.sample 22 Jul 2002 12:26:03 -0000 1.22
@@ -17,7 +17,7 @@
# -----------------------------------------------------------------------------
# Location of all jars. Note: This is not a mandatory property. It is only
-# used in so that it can be reused when defining the location of all the jars
+# used here so that it can be reused when defining the location of all the jars
# below. You do not have to put all the external jars in a single location.
lib.repo = c:/apps/repo
@@ -30,6 +30,9 @@
# Location of the Servlet API jar (it is needed because we want to copy it
# in the Cactus distribution).
servlet.jar = ${lib.repo}/servletapi-2.3.jar
+
+# The location of the Commons Logging jar
+commons.logging.jar = ${lib.repo}/commons-logging-1.0.jar
# The location of the log4j jar
log4j.jar = ${lib.repo}/log4j-1.2.5.jar
1.16 +3 -0 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 16 Jul 2002 22:18:01 -0000 1.15
+++ build.xml 22 Jul 2002 12:26:03 -0000 1.16
@@ -87,6 +87,7 @@
<echo message="user.home = ${user.home}"/>
<echo message="ant.home = ${ant.home}"/>
<echo message=""/>
+ <echo message="commons.logging.jar = ${commons.logging.jar}"/>
<echo message="commons.httpclient.jar = ${commons.httpclient.jar}"/>
<echo message="httpunit.jar = ${httpunit.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
@@ -115,6 +116,7 @@
<available file="${servlet.jar}"/>
<available file="${j2ee.jar}"/>
<available file="${log4j.jar}"/>
+ <available file="${commons.logging.jar}"/>
<available file="${commons.httpclient.jar}"/>
<available file="${httpunit.jar}"/>
<available file="${junit.jar}"/>
@@ -443,6 +445,7 @@
<!-- Copy external libraries in a tmp directory for them to be included
in the distribution -->
<copy todir="${target.lib.dir}" file="${log4j.jar}"/>
+ <copy todir="${target.lib.dir}" file="${commons.logging.jar}"/>
<copy todir="${target.lib.dir}" file="${commons.httpclient.jar}"/>
<copy todir="${target.lib.dir}" file="${httpunit.jar}"/>
<copy todir="${target.lib.dir}" file="${junit.jar}"/>
1.14 +7 -0 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gump.xml 20 Jul 2002 10:31:04 -0000 1.13
+++ gump.xml 22 Jul 2002 12:26:03 -0000 1.14
@@ -72,6 +72,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -107,6 +108,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -142,6 +144,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -177,6 +180,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -211,6 +215,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="servlet.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -247,6 +252,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="servlet.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
@@ -283,6 +289,7 @@
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="servlet.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
+ <depend property="commons.logging.jar" project="commons-logging"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
1.32 +11 -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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- changes.xml 21 Jul 2002 12:16:32 -0000 1.31
+++ changes.xml 22 Jul 2002 12:26:04 -0000 1.32
@@ -48,6 +48,17 @@
</devs>
<release version="1.4 in CVS">
+ <action dev="VMA" type="add">
+ Cactus now requires the Commons Logging library
+ (<code>commons-logging.jar</code>). It is needed as Commons HttpClient
+ is now using Commons Logging for logging and Cactus depends on
+ HttpClient. As a side-effect, Cactus is also now using Commons
+ HttpClient for all its internal logs. This lets us use any underlying
+ logging implementation : Log4j, LogKit, JDK 1.4 Logging, No Logging
+ or SimpleLog (provided with Commons Logging - logs to the console).
+ Check the <link href="howto_config.html">Config Howto</link> for how
+ to configure logging in Cactus.
+ </action>
<action dev="VMA" type="remove">
Removed deprecated <code>org.apache.cactus.ServletTestRequest</code>
class (was deprecated in Cactus 1.2).
1.13 +6 -4 jakarta-cactus/documentation/docs/xdocs/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/todo.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- todo.xml 20 Jul 2002 14:19:53 -0000 1.12
+++ todo.xml 22 Jul 2002 12:26:04 -0000 1.13
@@ -36,6 +36,12 @@
Modify the configuration page to reflect the fact that all cactus
properties are now java system properties.
</action>
+ <action assigned-to="Vincent Massol">
+ Explain how to configure logging using Commons Logging.
+ </action>
+ <action assigned-to="Vincent Massol">
+ Modify documentation for new jar : Commons Logging
+ </action>
</category>
</version>
@@ -125,10 +131,6 @@
environment (at the current time, you need to call your EJB from a
Servlet/JSP/Filter Redirector, which is fine for certain tests but not
needed for others.
- </action>
- <action>
- Consider using Commons Logging Wrapper as it provides seamless support
- for No Log, Log4J, LogKit and JDK 1.4 logging.
</action>
<action assigned-to="Hudson Wong, Vincent Massol">
Add an EJB sample application to demonstrate how to perform EJB
1.11 +4 -1 jakarta-cactus/framework/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.properties.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties.sample 20 Jul 2002 11:19:58 -0000 1.10
+++ build.properties.sample 22 Jul 2002 12:26:04 -0000 1.11
@@ -27,6 +27,9 @@
# only available for Servlet 2.3 (part of J2EE 1.3).
j2ee.jar = ${lib.repo}/servletapi-2.3.jar
+# The location of the Commons Logging jar
+commons.logging.jar = ${lib.repo}/commons-logging-1.0.jar
+
# The location of the log4j jar
log4j.jar = ${lib.repo}/log4j-1.2.5.jar
1.20 +3 -0 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 21 Jul 2002 17:43:40 -0000 1.19
+++ build.xml 22 Jul 2002 12:26:04 -0000 1.20
@@ -148,6 +148,7 @@
<pathelement location="${j2ee.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${commons.logging.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${httpunit.jar}"/>
@@ -173,6 +174,7 @@
<echo message=""/>
<echo message="j2ee.jar = ${j2ee.jar}"/>
<echo message="log4j.jar = ${log4j.jar}"/>
+ <echo message="commons.logging.jar = ${commons.logging.jar}"/>
<echo message="commons.httpclient.jar = ${commons.httpclient.jar}"/>
<echo message="httpunit.jar = ${httpunit.jar}"/>
<echo message=""/>
@@ -192,6 +194,7 @@
<and>
<available file="${j2ee.jar}"/>
<available file="${log4j.jar}"/>
+ <available file="${commons.logging.jar}"/>
<available file="${commons.httpclient.jar}"/>
<available file="${httpunit.jar}"/>
</and>
1.3 +5 -14 jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestRedirector.java
Index: FilterTestRedirector.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/server/FilterTestRedirector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilterTestRedirector.java 14 Apr 2002 10:35:44 -0000 1.2
+++ FilterTestRedirector.java 22 Jul 2002 12:26:04 -0000 1.3
@@ -56,6 +56,9 @@
*/
package org.apache.cactus.server;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -66,9 +69,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
-
/**
* Generic Filter redirector that calls a test method on the server side.
*
@@ -80,19 +80,10 @@
public class FilterTestRedirector implements Filter
{
/**
- * Initialize the logging subsystem so that it can get it's configuration
- * details from the correct properties file. Initialization is done here
- * as this servlet is the first point of entry to the server code.
- */
- static {
- LogService.getInstance().init("/log_server.properties");
- }
-
- /**
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().getLog(FilterTestRedirector.class.getName());
+ LogFactory.getLog(FilterTestRedirector.class);
/**
* The filter configuration object passed by the container when it calls
1.9 +7 -8 jakarta-cactus/framework/src/java/share/org/apache/cactus/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/AbstractTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTestCase.java 21 Jul 2002 12:09:16 -0000 1.8
+++ AbstractTestCase.java 22 Jul 2002 12:26:04 -0000 1.9
@@ -63,8 +63,8 @@
import junit.framework.TestCase;
import org.apache.cactus.util.JUnitVersionHelper;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Abstract class that is a thin layer on top of JUnit and that knows about
@@ -183,9 +183,9 @@
public void runBare() throws Throwable
{
// We make sure we reinitialize The logger with the name of the
- // current class (that's why the logged instance is not static).
- this.logger =
- LogService.getInstance().getLog(this.getClass().getName());
+ // current extending class so that log statements will contain the
+ // actual class name (that's why the logged instance is not static).
+ this.logger = LogFactory.getLog(this.getClass());
// Mark beginning of test on client side
getLogger().debug("------------- Test: " + this.getCurrentTestMethod());
@@ -227,8 +227,7 @@
// the logging initialisation. This method is only called on the server
// side, so we instanciate the log for server side here.
if (getLogger() == null) {
- this.logger =
- LogService.getInstance().getLog(this.getClass().getName());
+ this.logger = LogFactory.getLog(this.getClass());
}
setUp();
1.5 +4 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/ServletURL.java
Index: ServletURL.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/ServletURL.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletURL.java 21 Jul 2002 18:46:51 -0000 1.4
+++ ServletURL.java 22 Jul 2002 12:26:04 -0000 1.5
@@ -59,8 +59,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.cactus.server.ServletUtil;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Simulate an HTTP URL by breaking it into its different parts :<br>
@@ -177,8 +177,7 @@
/**
* The logger
*/
- private static final Log LOGGER =
- LogService.getInstance().getLog(ServletURL.class.getName());
+ private static final Log LOGGER = LogFactory.getLog(ServletURL.class);
/**
* Default constructor. Need to call the different setters to make this
1.4 +4 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/WebResponse.java
Index: WebResponse.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/WebResponse.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebResponse.java 21 Jul 2002 12:09:16 -0000 1.3
+++ WebResponse.java 22 Jul 2002 12:26:04 -0000 1.4
@@ -65,12 +65,12 @@
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.cactus.client.HttpClientHelper;
import org.apache.cactus.util.ChainedRuntimeException;
import org.apache.cactus.util.IoUtil;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
/**
* Default web response implementation that provides a minimal
@@ -87,8 +87,7 @@
/**
* The logger
*/
- private static final Log LOGGER =
- LogService.getInstance().getLog(WebResponse.class.getName());
+ private static final Log LOGGER = LogFactory.getLog(WebResponse.class);
/**
* The connection object that was used to call the URL
1.4 +5 -6 jakarta-cactus/framework/src/java/share/org/apache/cactus/client/AutoReadHttpURLConnection.java
Index: AutoReadHttpURLConnection.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/client/AutoReadHttpURLConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AutoReadHttpURLConnection.java 21 Jul 2002 12:09:16 -0000 1.3
+++ AutoReadHttpURLConnection.java 22 Jul 2002 12:26:04 -0000 1.4
@@ -56,6 +56,9 @@
*/
package org.apache.cactus.client;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -68,9 +71,6 @@
import java.net.URL;
import java.security.Permission;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
-
/**
* Wrapper class for the real <code>HttpURLConnection</code> to the test servlet
* that reads the complete input stream into an internal buffer on
@@ -94,8 +94,7 @@
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().
- getLog(AutoReadHttpURLConnection.class.getName());
+ LogFactory.getLog(AutoReadHttpURLConnection.class);
/**
* Default size of array for copying data.
1.6 +4 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/client/HttpClientHelper.java
Index: HttpClientHelper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/client/HttpClientHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpClientHelper.java 21 Jul 2002 12:09:16 -0000 1.5
+++ HttpClientHelper.java 22 Jul 2002 12:26:04 -0000 1.6
@@ -69,12 +69,12 @@
import java.util.Vector;
import org.apache.commons.httpclient.Header;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import org.apache.cactus.ServletURL;
import org.apache.cactus.WebRequest;
import org.apache.cactus.client.authentication.AbstractAuthentication;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
import org.apache.cactus.util.ChainedRuntimeException;
/**
@@ -91,8 +91,7 @@
/**
* The logger
*/
- private static final Log LOGGER =
- LogService.getInstance().getLog(HttpClientHelper.class.getName());
+ private static final Log LOGGER = LogFactory.getLog(HttpClientHelper.class);
/**
* The URL that will be used for the HTTP connection.
1.5 +4 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java
Index: AbstractHttpServletRequestWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractHttpServletRequestWrapper.java 21 Jul 2002 12:09:16 -0000 1.4
+++ AbstractHttpServletRequestWrapper.java 22 Jul 2002 12:26:04 -0000 1.5
@@ -69,8 +69,8 @@
import javax.servlet.http.Cookie;
import org.apache.cactus.ServletURL;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* Abstract wrapper around <code>HttpServletRequest</code>. This class provides
@@ -109,8 +109,7 @@
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().
- getLog(AbstractHttpServletRequestWrapper.class.getName());
+ LogFactory.getLog(AbstractHttpServletRequestWrapper.class);
// New methods not in the interface --------------------------------------
1.7 +4 -4 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestCaller.java
Index: AbstractWebTestCaller.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestCaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractWebTestCaller.java 21 Jul 2002 12:09:16 -0000 1.6
+++ AbstractWebTestCaller.java 22 Jul 2002 12:26:04 -0000 1.7
@@ -64,9 +64,9 @@
import org.apache.cactus.AbstractTestCase;
import org.apache.cactus.HttpServiceDefinition;
import org.apache.cactus.WebTestResult;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
import org.apache.cactus.util.ClassLoaderUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Responsible for instanciating the <code>TestCase</code> class on the server
@@ -91,7 +91,7 @@
* The logger.
*/
private static final Log LOGGER =
- LogService.getInstance().getLog(AbstractWebTestCaller.class.getName());
+ LogFactory.getLog(AbstractWebTestCaller.class);
/**
* The implicit objects (which will be used to set the test case fields
1.4 +4 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestController.java
Index: AbstractWebTestController.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/AbstractWebTestController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractWebTestController.java 21 Jul 2002 11:39:03 -0000 1.3
+++ AbstractWebTestController.java 22 Jul 2002 12:26:04 -0000 1.4
@@ -61,8 +61,8 @@
import org.apache.cactus.HttpServiceDefinition;
import org.apache.cactus.ServiceEnumeration;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Controller that extracts the requested service from the HTTP request and
@@ -80,8 +80,7 @@
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().getLog(
- AbstractWebTestController.class.getName());
+ LogFactory.getLog(AbstractWebTestController.class);
/**
* @param theObjects the implicit objects coming from the redirector
1.3 +5 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestRedirector.java
Index: JspTestRedirector.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/JspTestRedirector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspTestRedirector.java 10 Mar 2002 13:58:25 -0000 1.2
+++ JspTestRedirector.java 22 Jul 2002 12:26:04 -0000 1.3
@@ -56,10 +56,10 @@
*/
package org.apache.cactus.server;
-import javax.servlet.ServletException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
+import javax.servlet.ServletException;
/**
* Extension of the <code>jspRedirector.jsp</code> JSP Redirector in the java
@@ -76,7 +76,7 @@
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().getLog(JspTestRedirector.class.getName());
+ LogFactory.getLog(JspTestRedirector.class);
/**
* Handles requests from the <code>jspRedirector.jsp</code> JSP Redirector.
1.3 +5 -14 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestRedirector.java
Index: ServletTestRedirector.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/ServletTestRedirector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletTestRedirector.java 14 Apr 2002 10:46:25 -0000 1.2
+++ ServletTestRedirector.java 22 Jul 2002 12:26:04 -0000 1.3
@@ -56,14 +56,14 @@
*/
package org.apache.cactus.server;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.cactus.util.log.Log;
-import org.apache.cactus.util.log.LogService;
-
/**
* Generic Servlet redirector that calls a test method on the server side.
*
@@ -75,19 +75,10 @@
public class ServletTestRedirector extends HttpServlet
{
/**
- * Initialize the logging subsystem so that it can get it's configuration
- * details from the correct properties file. Initialization is done here
- * as this servlet is the first point of entry to the server code.
- */
- static {
- LogService.getInstance().init("/log_server.properties");
- }
-
- /**
* The logger
*/
private static final Log LOGGER =
- LogService.getInstance().getLog(ServletTestRedirector.class.getName());
+ LogFactory.getLog(ServletTestRedirector.class);
/**
* Handle GET requests.
1.5 +1 -11 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/ServletTestRunner.java
Index: ServletTestRunner.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/ServletTestRunner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletTestRunner.java 21 Jul 2002 12:09:16 -0000 1.4
+++ ServletTestRunner.java 22 Jul 2002 12:26:04 -0000 1.5
@@ -63,7 +63,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
-import org.apache.cactus.util.log.LogService;
import org.apache.cactus.util.Configuration;
import junit.framework.TestResult;
import junit.framework.Test;
@@ -77,15 +76,6 @@
*/
public class ServletTestRunner extends HttpServlet
{
- /**
- * Initialize the logging subsystem so that it can get it's configuration
- * details from the correct properties file. Initialization is done here
- * as this servlet is the first point of entry to the server code.
- */
- static {
- LogService.getInstance().init("/log_server.properties");
- }
-
/**
* HTTP parameter containing name of test suite to execute
*/
1.2 +35 -1 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/WebappTestRunner.java
Index: WebappTestRunner.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/WebappTestRunner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebappTestRunner.java 12 May 2002 20:38:11 -0000 1.1
+++ WebappTestRunner.java 22 Jul 2002 12:26:04 -0000 1.2
@@ -59,6 +59,7 @@
import junit.runner.BaseTestRunner;
import junit.runner.TestSuiteLoader;
import junit.framework.Test;
+import junit.framework.AssertionFailedError;
/**
* JUnit Test Runner that can load test cases that are in the classpath of
@@ -135,6 +136,39 @@
* @param theTestName the test case name
*/
public void testStarted(String theTestName)
+ {
+ // not used
+ }
+
+ /**
+ * @see BaseTestRunner#addError(Test, Throwable)
+ */
+ public void addError(Test theTest, Throwable theThrowable)
+ {
+ // not used
+ }
+
+ /**
+ * @see BaseTestRunner#addFailure(Test, AssertionFailedError)
+ */
+ public void addFailure(Test theTest,
+ AssertionFailedError theAssertionFailedError)
+ {
+ // not used
+ }
+
+ /**
+ * @see BaseTestRunner#endTest(Test)
+ */
+ public void endTest(Test theTest)
+ {
+ // not used
+ }
+
+ /**
+ * @see BaseTestRunner#startTest(Test)
+ */
+ public void startTest(Test theTest)
{
// not used
}
1.3 +54 -40 jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogAspect.java
Index: LogAspect.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogAspect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogAspect.java 12 May 2002 19:41:14 -0000 1.2
+++ LogAspect.java 22 Jul 2002 12:26:04 -0000 1.3
@@ -55,6 +55,8 @@
import org.aspectj.lang.reflect.*;
import org.aspectj.lang.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Log every entry and exit of methods.
@@ -66,54 +68,57 @@
public aspect LogAspect
{
/**
- * All objects in the log package. We don't want to log these as they are the object that
- * perform the logging and thus at execution time we would enter an infinite recursive loop.
+ * All objects in the log package. We don't want to log these as they are
+ * the object that perform the logging and thus at execution time we would
+ * enter an infinite recursive loop.
*/
pointcut logObjectCalls() :
- execution(public * org.apache.cactus.util.log..*(..)) ||
- execution(public * org.apache.cactus.util.ClassLoaderUtils.loadPropertyResourceBundle(..));
+ execution(public * org.apache.cactus.util.log..*(..))
+ || execution(public * org.apache.cactus.util.ClassLoaderUtils.loadPropertyResourceBundle(..));
/**
* All public static methods that have parameters.
*/
pointcut publicStaticMethodsWithParameterCalls() :
- !execution(public static * org.apache.cactus..*()) &&
- execution(public static * org.apache.cactus..*(..));
+ !execution(public static * org.apache.cactus..*())
+ && execution(public static * org.apache.cactus..*(..));
/**
* All public methods that have parameters.
*/
pointcut publicMethodsWithParameterCalls() :
- !execution(public * org.apache.cactus..*()) &&
- execution(public * org.apache.cactus..*(..));
+ !execution(public * org.apache.cactus..*())
+ && execution(public * org.apache.cactus..*(..));
/**
* All public methods that return values
*/
pointcut publicMethodsWithReturnValueCalls() :
- !execution(public void org.apache.cactus..*(..)) &&
- execution(public * org.apache.cactus..*(..));
+ !execution(public void org.apache.cactus..*(..))
+ && execution(public * org.apache.cactus..*(..));
/**
* Log all entries and exits of static methods that have no return values.
*/
Object around() :
- !logObjectCalls() && publicMethodsWithParameterCalls() &&
- publicStaticMethodsWithParameterCalls() && !publicMethodsWithReturnValueCalls()
+ !logObjectCalls()
+ && publicMethodsWithParameterCalls()
+ && publicStaticMethodsWithParameterCalls()
+ && !publicMethodsWithReturnValueCalls()
{
// Get The logger to perform logging
- Log logger = LogService.getInstance().getLog(
- thisJoinPoint.getSignature().getDeclaringType().getName());
+ Log logger =
+ LogFactory.getLog(thisJoinPoint.getSignature().getDeclaringType());
if (logger.isDebugEnabled()) {
// Log the entry
- logger.entry(getFullSignature(thisJoinPoint));
+ logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Log the exit
- logger.exit(thisJoinPoint.getSignature().getName());
+ logger.debug('>' + thisJoinPoint.getSignature().getName());
return result;
}
@@ -121,27 +126,30 @@
}
/**
- * Log all entries and exits of non-static methods that have no return values.
+ * Log all entries and exits of non-static methods that have no return
+ * values.
*/
Object around() :
- !logObjectCalls() && publicMethodsWithParameterCalls() &&
- !publicStaticMethodsWithParameterCalls() && !publicMethodsWithReturnValueCalls()
+ !logObjectCalls()
+ && publicMethodsWithParameterCalls()
+ && !publicStaticMethodsWithParameterCalls()
+ && !publicMethodsWithReturnValueCalls()
{
- // The class name that uses the method that has been called
- final String targetName = thisJoinPoint.getTarget().getClass().getName();
+ // The class that uses the method that has been called
+ final Class target = thisJoinPoint.getTarget().getClass();
// Get The logger to perform logging
- Log logger = LogService.getInstance().getLog(targetName);
+ Log logger = LogFactory.getLog(target);
if (logger.isDebugEnabled()) {
// Log the entry
- logger.entry(getFullSignature(thisJoinPoint));
+ logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Log the exit
- logger.exit(thisJoinPoint.getSignature().getName());
+ logger.debug('>' + thisJoinPoint.getSignature().getName());
return result;
}
@@ -152,22 +160,25 @@
* Log all entries and exits of static methods that have return values.
*/
Object around() :
- !logObjectCalls() && publicMethodsWithParameterCalls() &&
- publicMethodsWithReturnValueCalls() && publicStaticMethodsWithParameterCalls()
+ !logObjectCalls()
+ && publicMethodsWithParameterCalls()
+ && publicMethodsWithReturnValueCalls()
+ && publicStaticMethodsWithParameterCalls()
{
// Get The logger to perform logging
- Log logger = LogService.getInstance().getLog(
- thisJoinPoint.getSignature().getDeclaringType().getName());
+ Log logger =
+ LogFactory.getLog(thisJoinPoint.getSignature().getDeclaringType());
if (logger.isDebugEnabled()) {
// Log the entry
- logger.entry(getFullSignature(thisJoinPoint));
+ logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Compute the exit string to print
- final StringBuffer exitString = new StringBuffer(thisJoinPoint.getSignature().getName());
+ final StringBuffer exitString =
+ new StringBuffer(thisJoinPoint.getSignature().getName());
exitString.append(' ');
exitString.append('=');
@@ -177,7 +188,7 @@
exitString.append(']');
// Log the exit
- logger.exit(exitString.toString());
+ logger.debug('>' + exitString.toString());
return result;
}
@@ -188,24 +199,27 @@
* Log all entries and exits of non-static methods that have return values.
*/
Object around() :
- !logObjectCalls() && publicMethodsWithParameterCalls() &&
- publicMethodsWithReturnValueCalls() && !publicStaticMethodsWithParameterCalls()
+ !logObjectCalls()
+ && publicMethodsWithParameterCalls()
+ && publicMethodsWithReturnValueCalls()
+ && !publicStaticMethodsWithParameterCalls()
{
- // The class name that uses the method that has been called
- final String targetName = thisJoinPoint.getTarget().getClass().getName();
+ // The class that uses the method that has been called
+ final Class target = thisJoinPoint.getTarget().getClass();
// Get The logger to perform logging
- Log logger = LogService.getInstance().getLog(targetName);
+ Log logger = LogFactory.getLog(target);
if (logger.isDebugEnabled()) {
// Log the entry
- logger.entry(getFullSignature(thisJoinPoint));
+ logger.debug('<' + getFullSignature(thisJoinPoint));
// Execute the method
final Object result = proceed();
// Compute the exit string to print
- final StringBuffer exitString = new StringBuffer(thisJoinPoint.getSignature().getName());
+ final StringBuffer exitString =
+ new StringBuffer(thisJoinPoint.getSignature().getName());
exitString.append(' ');
exitString.append('=');
@@ -215,7 +229,7 @@
exitString.append(']');
// Log the exit
- logger.exit(exitString.toString());
+ logger.debug('>' + exitString.toString());
return result;
}
1.2 +1 -17 jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogManagerAspect.java
Index: LogManagerAspect.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogManagerAspect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogManagerAspect.java 1 Mar 2002 00:43:47 -0000 1.1
+++ LogManagerAspect.java 22 Jul 2002 12:26:04 -0000 1.2
@@ -62,20 +62,4 @@
*/
public aspect LogManagerAspect dominates LogAspect
{
- /**
- * Name of properties file to initialize logging subsystem on the client
- * side.
- */
- public final static String LOG_CLIENT_CONFIG = "log_client.properties";
-
- /**
- * Initialise logging subsystem for the client side (client JVM)
- */
- before() :
- initialization(org.apache.cactus.AbstractTestCase.new(..))
- {
- if (!LogService.getInstance().isInitialized()) {
- LogService.getInstance().init("/" + LogManagerAspect.LOG_CLIENT_CONFIG);
- }
- }
}
1.6 +4 -5 jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAbstractTestCase.java
Index: TestAbstractTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAbstractTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestAbstractTestCase.java 21 Jul 2002 13:07:27 -0000 1.5
+++ TestAbstractTestCase.java 22 Jul 2002 12:26:05 -0000 1.6
@@ -58,8 +58,6 @@
import java.net.HttpURLConnection;
-import org.apache.cactus.util.log.LogService;
-
/**
* Unit tests of the <code>AbstractTestCase</code> class.
*
@@ -70,9 +68,10 @@
public class TestAbstractTestCase extends
TestAbstractTestCaseInterceptorTestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.6 +4 -5 jakarta-cactus/framework/src/test/share/org/apache/cactus/TestServletURL.java
Index: TestServletURL.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestServletURL.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestServletURL.java 21 Jul 2002 18:46:51 -0000 1.5
+++ TestServletURL.java 22 Jul 2002 12:26:05 -0000 1.6
@@ -58,8 +58,6 @@
import junit.framework.TestCase;
-import org.apache.cactus.util.log.LogService;
-
/**
* Unit tests of the <code>ServletURL</code> class.
*
@@ -69,9 +67,10 @@
*/
public class TestServletURL extends TestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.5 +4 -4 jakarta-cactus/framework/src/test/share/org/apache/cactus/TestServletUtil.java
Index: TestServletUtil.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestServletUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestServletUtil.java 21 Jul 2002 13:07:27 -0000 1.4
+++ TestServletUtil.java 22 Jul 2002 12:26:05 -0000 1.5
@@ -59,7 +59,6 @@
import junit.framework.TestCase;
import org.apache.cactus.server.ServletUtil;
-import org.apache.cactus.util.log.LogService;
/**
* Unit tests of the <code>ServletUtil</code> class.
@@ -70,9 +69,10 @@
*/
public class TestServletUtil extends TestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.4 +4 -4 jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebRequest.java
Index: TestWebRequest.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWebRequest.java 21 Jul 2002 14:59:03 -0000 1.3
+++ TestWebRequest.java 22 Jul 2002 12:26:05 -0000 1.4
@@ -58,7 +58,6 @@
import junit.framework.TestCase;
-import org.apache.cactus.util.log.LogService;
import org.apache.cactus.util.ChainedRuntimeException;
/**
@@ -70,9 +69,10 @@
*/
public class TestWebRequest extends TestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.4 +4 -5 jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebTestResult.java
Index: TestWebTestResult.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestWebTestResult.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWebTestResult.java 21 Jul 2002 13:07:27 -0000 1.3
+++ TestWebTestResult.java 22 Jul 2002 12:26:05 -0000 1.4
@@ -58,8 +58,6 @@
import junit.framework.TestCase;
-import org.apache.cactus.util.log.LogService;
-
/**
* Unit tests of the <code>WebTestResult</code> class.
*
@@ -69,9 +67,10 @@
*/
public class TestWebTestResult extends TestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.5 +4 -4 jakarta-cactus/framework/src/test/share/org/apache/cactus/client/TestWebTestResultParser.java
Index: TestWebTestResultParser.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/client/TestWebTestResultParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestWebTestResultParser.java 21 Jul 2002 13:07:27 -0000 1.4
+++ TestWebTestResultParser.java 22 Jul 2002 12:26:05 -0000 1.5
@@ -58,7 +58,6 @@
import junit.framework.TestCase;
-import org.apache.cactus.util.log.LogService;
import org.apache.cactus.WebTestResult;
/**
@@ -70,9 +69,10 @@
*/
public class TestWebTestResultParser extends TestCase
{
- // Initialize logging system first
+ // Make sure logging is disabled
static {
- LogService.getInstance().init(null);
+ System.setProperty("org.apache.commons.logging.Log",
+ "org.apache.commons.logging.impl.NoOpLog");
}
/**
1.4 +2 -12 jakarta-cactus/framework/web/jspRedirector.jsp
Index: jspRedirector.jsp
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/web/jspRedirector.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jspRedirector.jsp 23 May 2002 19:06:29 -0000 1.3
+++ jspRedirector.jsp 22 Jul 2002 12:26:05 -0000 1.4
@@ -1,9 +1,7 @@
-<%@page import="org.apache.cactus.server.*,
- org.apache.cactus.util.log.LogService" session="true" %><%
+<%@page import="org.apache.cactus.server.*" session="true" %><%
/**
- *
- * Note:
+ * Note:
* It is very important not to put any character between the end
* of the page tag and the beginning of the java code expression, otherwise,
* the generated servlet containss a 'out.println("\r\n");' and this breaks
@@ -16,14 +14,6 @@
* example we need access to JSP implicit objects (PageContext and
* JspWriter).
*/
-
- /**
- * Initialise logging if not already initialised
- */
- if (!LogService.getInstance().isInitialized())
- {
- LogService.getInstance().init("/log_server.properties");
- }
JspImplicitObjects objects = new JspImplicitObjects();
objects.setHttpServletRequest(request);
1.20 +5 -2 jakarta-cactus/sample-servlet/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.properties.sample,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties.sample 21 Jul 2002 11:06:11 -0000 1.19
+++ build.properties.sample 22 Jul 2002 12:26:05 -0000 1.20
@@ -17,7 +17,7 @@
# -----------------------------------------------------------------------------
# Location of all jars. Note: This is not a mandatory property. It is only
-# used in so that it can be reused when defining the location of all the jars
+# used here so that it can be reused when defining the location of all the jars
# below. You do not have to put all the external jars in a single location.
lib.repo = c:/apps/repo
@@ -29,6 +29,9 @@
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectjrt-1.0.5.jar
+
+# The location of the Commons Logging jar
+commons.logging.jar = ${lib.repo}/commons-logging-1.0.jar
# The location of the log4j jar
log4j.jar = ${lib.repo}/log4j-1.2.5.jar
1.8 +3 -0 jakarta-cactus/sample-servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 20 Jul 2002 12:48:13 -0000 1.7
+++ build.xml 22 Jul 2002 12:26:05 -0000 1.8
@@ -178,6 +178,7 @@
<echo message="ant.home = ${ant.home}"/>
<echo message=""/>
<echo message="j2ee.jar = ${j2ee.jar}"/>
+ <echo message="commons.logging.jar = ${commons.logging.jar}"/>
<echo message="commons.httpclient.jar = ${commons.httpclient.jar}"/>
<echo message="aspectjrt.jar = ${aspectjrt.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
@@ -202,6 +203,7 @@
<and>
<available file="${j2ee.jar}"/>
<available file="${aspectjrt.jar}"/>
+ <available file="${commons.logging.jar}"/>
<available file="${commons.httpclient.jar}"/>
<available file="${junit.jar}"/>
<available file="${httpunit.jar}"/>
@@ -375,6 +377,7 @@
<arg value="-Dcactus.framework.jar=${cactus.framework.elected.jar}"/>
<arg value="-Dcactus.ant.jar=${cactus.ant.jar}"/>
<arg value="-Djunit.jar=${junit.jar}"/>
+ <arg value="-Dcommons.logging.jar=${commons.logging.jar}"/>
<arg value="-Dcommons.httpclient.jar=${commons.httpclient.jar}"/>
<arg value="-Daspectjrt.jar=${aspectjrt.jar}"/>
<arg value="-Dhttpunit.jar=${httpunit.jar}"/>
1.5 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-enhydra-31.xml
Index: build-tests-enhydra-31.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-enhydra-31.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-enhydra-31.xml 20 Jul 2002 12:25:02 -0000 1.4
+++ build-tests-enhydra-31.xml 22 Jul 2002 12:26:05 -0000 1.5
@@ -26,6 +26,10 @@
<target name="start.enhydra.31">
<java classname="org.apache.cactus.ant.EnhydraRun" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="-start"/>
<arg value="${target.enhydra31.dir}/conf/multiserver.conf"/>
<classpath>
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-resin-12.xml
Index: build-tests-resin-12.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-resin-12.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-resin-12.xml 20 Jul 2002 12:25:02 -0000 1.3
+++ build-tests-resin-12.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -32,6 +32,9 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<!-- Needed so that Resin use the resin.home.12 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin12.dir}"/>
1.5 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-32.xml
Index: build-tests-tomcat-32.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-32.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-tomcat-32.xml 20 Jul 2002 12:56:54 -0000 1.4
+++ build-tests-tomcat-32.xml 22 Jul 2002 12:26:05 -0000 1.5
@@ -26,6 +26,10 @@
<target name="start.tomcat.32">
<java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="-config"/>
<arg value="${target.tomcat32.dir}/conf/server.xml"/>
<classpath>
1.4 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-33.xml
Index: build-tests-tomcat-33.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-33.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-tomcat-33.xml 20 Jul 2002 12:25:02 -0000 1.3
+++ build-tests-tomcat-33.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -26,6 +26,10 @@
<target name="start.tomcat.33">
<java classname="org.apache.tomcat.startup.Main" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<jvmarg value="-Dtomcat.home=${target.tomcat33.full.dir}"/>
<jvmarg value="-Dtomcat.install=${tomcat.home.33}"/>
<arg value="start"/>
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-weblogic-51.xml
Index: build-tests-weblogic-51.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-weblogic-51.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-weblogic-51.xml 20 Jul 2002 12:25:02 -0000 1.3
+++ build-tests-weblogic-51.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -32,6 +32,9 @@
<pathelement location="${weblogic.home.51}/classes/boot"/>
</classpath>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
<jvmarg value="-Dweblogic.class.path=${weblogic.home.51}/lib/weblogic510sp8.jar;${weblogic.home.51}/license;${weblogic.home.51}/classes;${weblogic.home.51}/lib/weblogicaux.jar"/>
1.17 +6 -3 jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.properties.sample 21 Jul 2002 10:52:40 -0000 1.16
+++ build.properties.sample 22 Jul 2002 12:26:05 -0000 1.17
@@ -28,6 +28,9 @@
# The location of the AspectJ runtime jar
aspectjrt.jar = ../lib/aspectjrt-1.0.5.jar
+# The location of the Commons Logging jar
+commons.logging.jar = ../lib/commons-logging-1.0.jar
+
# The location of the log4j jar (optional). Only needed if you want Cactus to
# generate logs
log4j.jar = ../lib/log4j-1.2.5.jar
@@ -55,14 +58,14 @@
# comment it's home property. For example, if you don't want to run the
# tests on the Resin 1.2, comment the "resin.home.12" property.
-#resin.home.20 = c:/Apps/resin-2.1.0
+#resin.home.20 = c:/Apps/resin-2.1.2
#resin.home.12 = xxx
#tomcat.home.32 = c:/Apps/jakarta-tomcat-3.2.4
#tomcat.home.33 = c:/Apps/jakarta-tomcat-3.3.1
#orion.home.15 = c:/Apps/orion-1.5.4
#orion.home.16 = c:/Apps/orion-1.6.0
#weblogic.home.51 = xxx
-#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
+#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.4
# Note: weblogic.home.61 is the location of BEA Home and NOT the location of
# wlserver6.1, inside the bea home directory.
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build-tests-resin-13.xml
Index: build-tests-resin-13.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build-tests-resin-13.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-resin-13.xml 20 Jul 2002 12:25:03 -0000 1.3
+++ build-tests-resin-13.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -32,6 +32,9 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<!-- Needed so that Resin use the resin.home.13 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin13.dir}"/>
1.15 +6 -3 jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.properties.sample 21 Jul 2002 10:52:40 -0000 1.14
+++ build.properties.sample 22 Jul 2002 12:26:05 -0000 1.15
@@ -28,6 +28,9 @@
# The location of the AspectJ runtime jar
aspectjrt.jar = ../lib/aspectjrt-1.0.5.jar
+# The location of the Commons Logging jar
+commons.logging.jar = ../lib/commons-logging-1.0.jar
+
# The location of the log4j jar (optional). Only needed if you want Cactus to
# generate logs
log4j.jar = ../lib/log4j-1.2.5.jar
@@ -55,9 +58,9 @@
# comment it's home property. For example, if you don't want to run the
# tests on the Resin 1.2, comment the "resin.home.12" property.
-#resin.home.20 = c:/Apps/resin-2.1.0
+#resin.home.20 = c:/Apps/resin-2.1.2
#resin.home.13 = xxx
-#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
+#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.4
#orion.home.15 = c:/Apps/orion-1.5.4
#orion.home.16 = c:/Apps/orion-1.6.0
1.5 +7 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-share.xml 9 Jun 2002 18:28:07 -0000 1.4
+++ build-share.xml 22 Jul 2002 12:26:05 -0000 1.5
@@ -90,6 +90,7 @@
<pathelement location="${cactus.ant.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${commons.logging.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${junit.jar}"/>
@@ -119,6 +120,7 @@
<echo message="cactus.ant.jar = ${cactus.ant.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message="aspectjrt.jar = ${aspectjrt.jar}"/>
+ <echo message="commons.logging.jar = ${commons.logging.jar}"/>
<echo message="commons.httpclient.jar = ${commons.httpclient.jar}"/>
<echo message="httpunit.jar = ${httpunit.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
@@ -147,6 +149,7 @@
<available file="${cactus.ant.jar}"/>
<available file="${servlet.jar}"/>
<available file="${aspectjrt.jar}"/>
+ <available file="${commons.logging.jar}"/>
<available file="${commons.httpclient.jar}"/>
<available file="${httpunit.jar}"/>
<available file="${junit.jar}"/>
@@ -349,6 +352,9 @@
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes"
fork="yes">
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_client.properties"/>
+
<classpath>
<!-- Cactus.propertie and log_client.properties need to be in
the classpath -->
@@ -398,6 +404,7 @@
<copy todir="${target.lib.dir}" file="${junit.jar}"/>
<copy todir="${target.lib.dir}" file="${cactus.framework.jar}"/>
<copy todir="${target.lib.dir}" file="${aspectjrt.jar}"/>
+ <copy todir="${target.lib.dir}" file="${commons.logging.jar}"/>
<!-- Make sure the directory for the war exist -->
<mkdir dir="${target.test.dir}"/>
1.4 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-14.xml
Index: build-tests-orion-14.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-14.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-orion-14.xml 20 Jul 2002 12:25:03 -0000 1.3
+++ build-tests-orion-14.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -26,6 +26,10 @@
<target name="start.orion.14">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="-config"/>
<arg value="${target.orion14.dir}/conf/server.xml"/>
<classpath>
1.4 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-15.xml
Index: build-tests-orion-15.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-15.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-orion-15.xml 20 Jul 2002 12:25:03 -0000 1.3
+++ build-tests-orion-15.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -26,6 +26,10 @@
<target name="start.orion.15">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="-config"/>
<arg value="${target.orion15.dir}/conf/server.xml"/>
<classpath>
1.2 +4 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-16.xml
Index: build-tests-orion-16.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-16.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-orion-16.xml 20 Jul 2002 12:48:14 -0000 1.1
+++ build-tests-orion-16.xml 22 Jul 2002 12:26:05 -0000 1.2
@@ -26,6 +26,10 @@
<target name="start.orion.16">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="-config"/>
<arg value="${target.orion16.dir}/conf/server.xml"/>
<classpath>
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-resin-20.xml
Index: build-tests-resin-20.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-resin-20.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-resin-20.xml 20 Jul 2002 12:25:03 -0000 1.3
+++ build-tests-resin-20.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -32,6 +32,9 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<!-- Needed so that Resin use the resin.home.20 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin20.dir}"/>
1.2 +5 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests-tomcat-40.xml 21 Apr 2002 12:51:59 -0000 1.1
+++ build-tests-tomcat-40.xml 22 Jul 2002 12:26:05 -0000 1.2
@@ -26,8 +26,13 @@
<target name="start.tomcat.40">
<java classname="org.apache.catalina.startup.Bootstrap" fork="yes">
+
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
+
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<arg value="start"/>
<classpath>
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-61.xml
Index: build-tests-weblogic-61.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-61.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-weblogic-61.xml 20 Jul 2002 14:19:54 -0000 1.3
+++ build-tests-weblogic-61.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -42,6 +42,9 @@
<pathelement location="${junit.jar}"/>
</classpath>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
1.4 +3 -0 jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-70.xml
Index: build-tests-weblogic-70.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-70.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-weblogic-70.xml 21 Jul 2002 10:52:40 -0000 1.3
+++ build-tests-weblogic-70.xml 22 Jul 2002 12:26:05 -0000 1.4
@@ -42,6 +42,9 @@
<pathelement location="${junit.jar}"/>
</classpath>
+ <!-- When using Log4j for logging -->
+ <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
+
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>