Author: tv
Date: Sun Mar 22 16:40:18 2009
New Revision: 757210
URL: http://svn.apache.org/viewvc?rev=757210&view=rev
Log:
Moved the initialization of the pipeline so that all services are initialized
first and can be used in the pipeline.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=757210&r1=757209&r2=757210&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Sun Mar 22
16:40:18 2009
@@ -362,7 +362,15 @@
configuration.setProperty(TurbineConstants.APPLICATION_ROOT_KEY,
applicationRoot);
configuration.setProperty(TurbineConstants.WEBAPP_ROOT_KEY,
webappRoot);
- // Retrieve the pipeline class and then initialize it. The
pipeline
+ getServiceManager().setConfiguration(configuration);
+
+ // Initialize the service manager. Services
+ // that have its 'earlyInit' property set to
+ // a value of 'true' will be started when
+ // the service manager is initialized.
+ getServiceManager().init();
+
+ // Retrieve the pipeline class and then initialize it. The pipeline
// handles the processing of a webrequest/response cycle.
String descriptorPath =
@@ -380,14 +388,6 @@
log.debug("Initializing pipeline");
pipeline.initialize();
-
- getServiceManager().setConfiguration(configuration);
-
- // Initialize the service manager. Services
- // that have its 'earlyInit' property set to
- // a value of 'true' will be started when
- // the service manager is initialized.
- getServiceManager().init();
}
/**
