jvanzyl 02/01/18 14:36:59
Modified: src/java/org/apache/turbine Turbine.java
Log:
- using iterator usage pattern recommended by Josh Bloch in EJ. Localize
the instance to the loop and by pass object creation.
Revision Changes Path
1.23 +6 -11 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Turbine.java 17 Jan 2002 16:38:54 -0000 1.22
+++ Turbine.java 18 Jan 2002 22:36:59 -0000 1.23
@@ -121,7 +121,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: Turbine.java,v 1.22 2002/01/17 16:38:54 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.23 2002/01/18 22:36:59 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -641,9 +641,7 @@
moduleLoader.setConfiguration(configuration);
moduleLoader.init();
- //
// set up the resolver, should be done before the pipeline
- //
String resolverClass;
resolverClass = configuration.getString(RESOLVER,
"org.apache.turbine.pipeline.DefaultResolver");
@@ -657,14 +655,11 @@
if (systemProperties != null)
{
- Iterator k = systemProperties.getKeys();
-
- while (k.hasNext())
+ for (Iterator k = systemProperties.getKeys(); k.hasNext();)
{
String name = (String) k.next();
String value = systemProperties.getString(name);
- Log.debug("[Turbine] System Property: " + name + " => " +
- value);
+ Log.debug("[Turbine] System Property: " + name + " => " + value);
System.getProperties().setProperty(name, value);
}
}
@@ -674,7 +669,9 @@
// but we'll set a standard one up here for now.
Class pipelineClass = Class.forName
(configuration.getString("pipeline.default", STANDARD_PIPELINE));
+
Log.debug("[Turbine] Using Pipeline: " + pipelineClass.getName());
+
if (TurbinePipeline.class.isAssignableFrom(pipelineClass))
{
// Turbine's standard Pipeline implementation uses
@@ -684,9 +681,7 @@
Log.debug("[Turbine] Using descriptor path: " + descriptorPath);
Mapper m = new Mapper();
- m.setInclusionRule("valveDefinition", "");
- pipeline = (Pipeline) m.map(descriptorPath,
- pipelineClass.getName());
+ pipeline = (Pipeline) m.map(descriptorPath,pipelineClass.getName());
}
else
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
