jvanzyl 01/07/17 16:03:44
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/util Log.java
Log:
- updating Turbine.java service init to allow the app logging info
to be passed into the services. this is not an elegant solution but
what we have isn't elegant so it will do until the services build
separately. than we can fix them.
- don't need to store the Configuration for the app within the
services because the TurbineResourceService doesn't exist anymore.
Revision Changes Path
1.76 +3 -7 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Turbine.java 2001/07/17 11:37:26 1.75
+++ Turbine.java 2001/07/17 23:03:42 1.76
@@ -108,7 +108,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.75 2001/07/17 11:37:26 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.76 2001/07/17 23:03:42 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -549,12 +549,8 @@
// when a category isn't specified. The 'default'
// category must be setup in the TRP.
serviceManager.setCategory(Category.getInstance("default"));
-
- // The TurbineResourceService needs to access the
- // whole configuration file because it really has
- // no configuration of its own.
- serviceManager.setServiceObject("configuration", configuration);
-
+ serviceManager.setCategoryTable(Log.getLoggers());
+
// Initialize the service manager. Services
// that have its 'earlyInit' property set to
// a value of 'true' will be started when
1.17 +5 -0 jakarta-turbine/src/java/org/apache/turbine/util/Log.java
Index: Log.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/Log.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Log.java 2001/07/10 01:04:49 1.16
+++ Log.java 2001/07/17 23:03:43 1.17
@@ -358,4 +358,9 @@
{
error("", e);
}
+
+ public static Hashtable getLoggers()
+ {
+ return loggers;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
