Author: sgoeschl
Date: Tue Nov 1 04:43:05 2005
New Revision: 330048
URL: http://svn.apache.org/viewcvs?rev=330048&view=rev
Log:
Deleting hard-coded enforcement of early initialization of the
AvalonComponentService. This might break existing code but it is an early hack
since Turbine should have no knowledge of an AvalonComponentService
Modified:
jakarta/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
Modified: jakarta/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=330048&r1=330047&r2=330048&view=diff
==============================================================================
--- jakarta/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
(original)
+++ jakarta/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Tue Nov
1 04:43:05 2005
@@ -48,7 +48,7 @@
import org.apache.turbine.pipeline.TurbinePipeline;
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
+// import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -379,14 +379,6 @@
log.debug("Initializing pipeline");
pipeline.initialize();
-
-
- //
- // Be sure, that our essential services get run early
- //
- configuration.setProperty(TurbineServices.SERVICE_PREFIX +
- AvalonComponentService.SERVICE_NAME +
".earlyInit",
- Boolean.TRUE);
getServiceManager().setConfiguration(configuration);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
