dlr 02/01/11 15:43:09
Modified: src/java/org/apache/turbine/pipeline TurbinePipeline.java
turbine-classic-pipeline.xml
Removed: src/java/org/apache/turbine/pipeline ValveDefinition.java
default-action-valve.xml default-target-valve.xml
direct-classic-pipeline.xml
Log:
Removed additional layer of indirection introduced by the
ValveDefinition class in favor of using the Valve interface directly. This
simlifies both framework and test code, and XML definitions.
Revision Changes Path
1.6 +3 -57
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Index: TurbinePipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- TurbinePipeline.java 11 Jan 2002 01:12:44 -0000 1.5
+++ TurbinePipeline.java 11 Jan 2002 23:43:09 -0000 1.6
@@ -55,9 +55,6 @@
*/
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
import org.apache.turbine.Pipeline;
import org.apache.turbine.RunData;
@@ -78,7 +75,7 @@
/**
* The "Turbine Classic" pipeline.
*/
- protected static String CLASSIC_PIPELINE =
+ public static String CLASSIC_PIPELINE =
"org/apache/turbine/pipeline/turbine-classic-pipeline.xml";
/**
@@ -92,13 +89,6 @@
protected Valve[] valves = new Valve[0];
/**
- * The set of valve definitions associated with this Pipeline.
- * From actual valve instances will be initialized from the
- * valve definitions.
- */
- protected List valveDefinitions = new ArrayList();
-
- /**
* The per-thread execution state for processing through this
* pipeline. The actual value is a java.lang.Integer object
* containing the subscript into the <code>values</code> array, or
@@ -108,28 +98,13 @@
protected ThreadLocal state = new ThreadLocal();
/**
- * Instantiates {@link org.apache.turbine.Valve} implementations
- * from {@link org.apache.turbine.pipeline.ValveDefinition} list.
- *
* @see org.apache.turbine.Pipeline#init()
*/
public void init()
throws Exception
{
- // Transform ValveDefinitions into Valves
- for (Iterator i = valveDefinitions.iterator(); i.hasNext(); )
- {
- Valve valve;
- try
- {
- valve = ((ValveDefinition) i.next()).toValve();
- }
- catch (TurbineException e)
- {
- throw new TurbineException("Misconfigured Pipeline", e);
- }
- addValve(valve);
- }
+ // Valve implementations are added to this Pipeline using the
+ // Mapper.
}
/**
@@ -150,35 +125,6 @@
public String getName()
{
return name;
- }
-
- /**
- * Add a ValveDefinition to this pipeline.
- */
- public void addValveDefinition(ValveDefinition valveDefinition)
- {
- valveDefinitions.add(valveDefinition);
- }
-
- /**
- * Return the configured valve definitions.
- *
- * @return An ArrayList containing the Valve definitions for this
- * pipeline.
- */
- public List getValveDefinitions()
- {
- return valveDefinitions;
- }
-
- /**
- * Return the ValveDefinition specified by the index i.
- *
- * @return ValveDefintion
- */
- public ValveDefinition getValveDefinition(int i)
- {
- return (ValveDefinition) valveDefinitions.get(i);
}
/**
1.2 +8 -4
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/turbine-classic-pipeline.xml
Index: turbine-classic-pipeline.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/turbine-classic-pipeline.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- turbine-classic-pipeline.xml 3 Jan 2002 04:58:48 -0000 1.1
+++ turbine-classic-pipeline.xml 11 Jan 2002 23:43:09 -0000 1.2
@@ -1,7 +1,11 @@
<pipeline>
<name>TurbineClassicPipeline</name>
- <valveDefinitions>
- <valveDefinition id="default-action-valve"/>
- <valveDefinition id="default-target-valve"/>
- </valveDefinitions>
+ <valves>
+ <valve>
+ <className>org.apache.turbine.pipeline.DefaultActionValve</className>
+ </valve>
+ <valve>
+ <className>org.apache.turbine.pipeline.DefaultTargetValve</className>
+ </valve>
+ </valves>
</pipeline>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
