jvanzyl 01/07/14 16:04:51
Modified: src/java/org/apache/turbine Turbine.java
Log:
- placing the logging system initialization first
Revision Changes Path
1.70 +18 -18 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Turbine.java 2001/07/14 18:20:46 1.69
+++ Turbine.java 2001/07/14 23:04:50 1.70
@@ -112,7 +112,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Turbine.java,v 1.69 2001/07/14 18:20:46 ilkka Exp $
+ * @version $Id: Turbine.java,v 1.70 2001/07/14 23:04:50 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -177,23 +177,6 @@
try
{
- // We want to save the ServletConfig and
- // ServletContext so that we can share these objects
- // with parts of Turbine that may need access and
- // have no direct contact with RunData. Right now
- // the ServletService is providing this information,
- // but that service could disappear and client code
- // could use the methods now provided in the Turbine
- // class.
- setTurbineServletConfig(getServletConfig());
- setTurbineServletContext(getServletContext());
-
- // Set the applicationRoot for this webapp.
- setApplicationRoot(getServletContext().getRealPath("/"));
-
- // Get the instance of the service manager
- ServiceManager serviceManager = TurbineServices.getManager();
-
// This is for our log4j setup. We are embedding
// the log4j configuration in the TRP but log4j
// must be initialized with a Properties object.
@@ -213,6 +196,23 @@
// should move toward using log4j correctly.
Log.setProperties(p);
Log.init();
+
+ // We want to save the ServletConfig and
+ // ServletContext so that we can share these objects
+ // with parts of Turbine that may need access and
+ // have no direct contact with RunData. Right now
+ // the ServletService is providing this information,
+ // but that service could disappear and client code
+ // could use the methods now provided in the Turbine
+ // class.
+ setTurbineServletConfig(getServletConfig());
+ setTurbineServletContext(getServletContext());
+
+ // Set the applicationRoot for this webapp.
+ setApplicationRoot(getServletContext().getRealPath("/"));
+
+ // Get the instance of the service manager
+ ServiceManager serviceManager = TurbineServices.getManager();
// Set the service managers application root. In our
// case it is the webapp context.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
