epugh 2004/05/07 14:53:09
Modified: src/java/org/apache/turbine Turbine.java
Log:
Patch from bfolkens:
1) Pulled out the deprecated Log4jFactory setting to the newer Log4JLogger
2) Changed the NoSuchField exception reporting to use the non-cached-in-rundata
printwriter
3) Pulled out the data.getPage().toString() since ECS is not supported anymore
Revision Changes Path
1.48 +2 -12 jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Turbine.java 31 Mar 2004 19:19:58 -0000 1.47
+++ Turbine.java 7 May 2004 21:53:09 -0000 1.48
@@ -77,7 +77,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
import org.apache.commons.xo.Mapper;
@@ -271,11 +270,6 @@
private void configure(ServletConfig config, ServletContext context)
throws Exception
{
- //
- // Set up Commons Logging to use the Log4J Logging
- //
- System.getProperties().setProperty(LogFactory.class.getName(),
- Log4jFactory.class.getName());
// Set the application root. This defaults to the webapp
// context if not otherwise set. This is to allow 2.1 apps
@@ -886,10 +880,6 @@
data.getResponse().setContentType(data.getContentType());
data.getResponse().setStatus(data.getStatusCode());
- if (data.isPageSet())
- {
- data.getOut().print(data.getPage().toString());
- }
}
// Catch this one because it occurs if some code hasn't been
// completely re-compiled after a change..
@@ -906,7 +896,7 @@
try
{
- data.getOut().print("java.lang.NoSuchFieldError: "
+
data.getResponse().getWriter().print("java.lang.NoSuchFieldError: "
+ "Please recompile all of your source code.");
}
catch (IOException ignored)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
