Eric,
The following patch includes the deprecation fixes:
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
4) The only other deprecation warning in this file now is for the
ComponentService - I'll let you decide if we should pull that out now or not
(since last I heard ComponentService was getting removed soon in favor of
Avalon)
Hope this helps.
Bradford A. Folkens
[EMAIL PROTECTED]
Index: Turbine.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.47
diff -u -r1.47 Turbine.java
--- Turbine.java 31 Mar 2004 19:19:58 -0000 1.47
+++ Turbine.java 7 May 2004 16:30:25 -0000
@@ -77,7 +77,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
+import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.commons.xo.Mapper;
@@ -274,8 +274,8 @@
//
// Set up Commons Logging to use the Log4J Logging
//
- System.getProperties().setProperty(LogFactory.class.getName(),
- Log4jFactory.class.getName());
+ System.getProperties().setProperty(Log.class.getName(),
+ Log4JLogger.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 +886,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 +902,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)
