jvanzyl 02/01/23 19:55:26
Modified: . build-test.xml
src/java/org/apache/turbine Pipeline.java Turbine.java
Valve.java
src/java/org/apache/turbine/pipeline
DefaultACLCreationValve.java
DefaultActionValve.java DefaultLoginValve.java
DefaultSessionTimeoutValve.java
DefaultSessionValidationValve.java
DefaultTargetValve.java DetermineActionValve.java
DetermineTargetValve.java JspRendererValve.java
RunModulesValve.java TurbinePipeline.java
src/test/org/apache/turbine/pipeline SimpleValve.java
Added: src/java/org/apache/turbine/pipeline AbstractValve.java
Removed: src/test/org/apache/turbine/pipeline TestPipelineMapper.java
Log:
o Change Pipeline interface method init() to initialize() which match
the lifecycle interfaces in stratum.
o Updated Turbine.java to reflect the above change.
o Added initialize() to the Valve interface. Added specifically because
the TestPipelineMapper was failing because a static referene to
Turbine.getConfiguration() was required. This call was moved into
the initialize() method and now doesn't cause the test to fail. Valves
may need to perform some form of initialization as the RunModulesValve
does.
o Added an AbstractValve that has a template initialize() method.
o Added functionality to the TurbinePipeline to initialize each of
the valves in the pipeline.
o Each of the valves now extends the AbstractValve
o Fixed the the Pipeline test classes to reflect the above changes.
Revision Changes Path
1.11 +2 -1 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-test.xml 22 Jan 2002 16:32:23 -0000 1.10
+++ build-test.xml 24 Jan 2002 03:55:25 -0000 1.11
@@ -26,6 +26,7 @@
<pathelement location="${httpclient.jar}"/>
<pathelement location="${tidy.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${log4j.jar}"/>
<pathelement location="${build.dest}"/>
<!-- AspectJ Runtime Jar -->
@@ -83,7 +84,7 @@
<classpath refid="classpath"/>
<batchtest todir="${test.reportsDirectory}">
<fileset dir="${build.dest}">
- <include name="**/*Test*.class"/>
+ <include name="**/*Test.class"/>
<exclude name="**/*ServletTest.class"/>
</fileset>
</batchtest>
1.5 +1 -1 jakarta-turbine-3/src/java/org/apache/turbine/Pipeline.java
Index: Pipeline.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Pipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Pipeline.java 29 Dec 2001 22:32:48 -0000 1.4
+++ Pipeline.java 24 Jan 2002 03:55:25 -0000 1.5
@@ -85,7 +85,7 @@
/**
* Initializes this instance. Called once by the Turbine servlet.
*/
- public void init()
+ public void initialize()
throws Exception;
/**
1.24 +2 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Turbine.java 18 Jan 2002 22:36:59 -0000 1.23
+++ Turbine.java 24 Jan 2002 03:55:26 -0000 1.24
@@ -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.23 2002/01/18 22:36:59 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.24 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
@@ -691,7 +691,7 @@
pipeline = (Pipeline) pipelineClass.newInstance();
}
- pipeline.init();
+ pipeline.initialize();
// Setup the RunData service for the application
runDataService = (RunDataService) TurbineServices.getInstance()
1.2 +6 -0 jakarta-turbine-3/src/java/org/apache/turbine/Valve.java
Index: Valve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Valve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Valve.java 29 Dec 2001 22:32:48 -0000 1.1
+++ Valve.java 24 Jan 2002 03:55:26 -0000 1.2
@@ -122,4 +122,10 @@
*/
public void invoke(RunData data, ValveContext context)
throws IOException, TurbineException;
+
+ /**
+ * Initialize the valve before using in a pipeline.
+ */
+ public void initialize()
+ throws Exception;
}
1.3 +3 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
Index: DefaultACLCreationValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultACLCreationValve.java 19 Jan 2002 03:23:26 -0000 1.2
+++ DefaultACLCreationValve.java 24 Jan 2002 03:55:26 -0000 1.3
@@ -74,10 +74,11 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultACLCreationValve.java,v 1.2 2002/01/19 03:23:26 jvanzyl Exp
$
+ * @version $Id: DefaultACLCreationValve.java,v 1.3 2002/01/24 03:55:26 jvanzyl Exp
$
*/
public class DefaultACLCreationValve
- implements Valve, TurbineConstants
+ extends AbstractValve
+ implements TurbineConstants
{
private static final Category log =
Category.getInstance(DefaultACLCreationValve.class);
1.7 +3 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java
Index: DefaultActionValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultActionValve.java 19 Jan 2002 03:23:26 -0000 1.6
+++ DefaultActionValve.java 24 Jan 2002 03:55:26 -0000 1.7
@@ -80,10 +80,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DefaultActionValve.java,v 1.6 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DefaultActionValve.java,v 1.7 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class DefaultActionValve
- implements Valve, TurbineConstants
+ extends AbstractValve
+ implements TurbineConstants
{
private static final Category log =
Category.getInstance(DefaultActionValve.class);
1.3 +3 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
Index: DefaultLoginValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoginValve.java 19 Jan 2002 03:23:26 -0000 1.2
+++ DefaultLoginValve.java 24 Jan 2002 03:55:26 -0000 1.3
@@ -76,10 +76,11 @@
* cycle.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultLoginValve.java,v 1.2 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DefaultLoginValve.java,v 1.3 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class DefaultLoginValve
- implements Valve, TurbineConstants
+ extends AbstractValve
+ implements TurbineConstants
{
private static final Category log =
Category.getInstance(DefaultLoginValve.class);
1.3 +3 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
Index: DefaultSessionTimeoutValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSessionTimeoutValve.java 19 Jan 2002 03:23:26 -0000 1.2
+++ DefaultSessionTimeoutValve.java 24 Jan 2002 03:55:26 -0000 1.3
@@ -71,10 +71,11 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultSessionTimeoutValve.java,v 1.2 2002/01/19 03:23:26 jvanzyl
Exp $
+ * @version $Id: DefaultSessionTimeoutValve.java,v 1.3 2002/01/24 03:55:26 jvanzyl
Exp $
*/
public class DefaultSessionTimeoutValve
- implements Valve, TurbineConstants
+ extends AbstractValve
+ implements TurbineConstants
{
private static final Category log =
Category.getInstance(DefaultSessionTimeoutValve.class);
1.3 +3 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
Index: DefaultSessionValidationValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSessionValidationValve.java 19 Jan 2002 03:23:26 -0000 1.2
+++ DefaultSessionValidationValve.java 24 Jan 2002 03:55:26 -0000 1.3
@@ -76,10 +76,11 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultSessionValidationValve.java,v 1.2 2002/01/19 03:23:26
jvanzyl Exp $
+ * @version $Id: DefaultSessionValidationValve.java,v 1.3 2002/01/24 03:55:26
jvanzyl Exp $
*/
public class DefaultSessionValidationValve
- implements Valve, TurbineConstants
+ extends AbstractValve
+ implements TurbineConstants
{
private static final Category log =
Category.getInstance(DefaultSessionValidationValve.class);
1.8 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultTargetValve.java 19 Jan 2002 03:23:26 -0000 1.7
+++ DefaultTargetValve.java 24 Jan 2002 03:55:26 -0000 1.8
@@ -81,10 +81,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- * @version $Id: DefaultTargetValve.java,v 1.7 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DefaultTargetValve.java,v 1.8 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class DefaultTargetValve
- implements Valve
+ extends AbstractValve
{
private static final Category log =
Category.getInstance(DefaultTargetValve.class);
1.2 +1 -1
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
Index: DetermineActionValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineActionValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetermineActionValve.java 18 Jan 2002 03:34:59 -0000 1.1
+++ DetermineActionValve.java 24 Jan 2002 03:55:26 -0000 1.2
@@ -71,7 +71,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
*/
public class DetermineActionValve
- implements Valve
+ extends AbstractValve
{
private static final Category log =
Category.getInstance( DetermineActionValve.class );
1.2 +1 -1
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
Index: DetermineTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetermineTargetValve.java 18 Jan 2002 03:34:59 -0000 1.1
+++ DetermineTargetValve.java 24 Jan 2002 03:55:26 -0000 1.2
@@ -75,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
*/
public class DetermineTargetValve
- implements Valve
+ extends AbstractValve
{
private static final Category log =
Category.getInstance( DetermineTargetValve.class );
1.2 +2 -2
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java
Index: JspRendererValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspRendererValve.java 22 Jan 2002 13:50:46 -0000 1.1
+++ JspRendererValve.java 24 Jan 2002 03:55:26 -0000 1.2
@@ -69,10 +69,10 @@
* based on JSP.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: JspRendererValve.java,v 1.1 2002/01/22 13:50:46 jvanzyl Exp $
+ * @version $Id: JspRendererValve.java,v 1.2 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class JspRendererValve
- implements Valve
+ extends AbstractValve
{
private static final Category log =
Category.getInstance(JspRendererValve.class);
1.4 +20 -7
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java
Index: RunModulesValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RunModulesValve.java 22 Jan 2002 01:16:52 -0000 1.3
+++ RunModulesValve.java 24 Jan 2002 03:55:26 -0000 1.4
@@ -74,20 +74,33 @@
* release 2
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- * @version $Id: RunModulesValve.java,v 1.3 2002/01/22 01:16:52 jon Exp $
+ * @version $Id: RunModulesValve.java,v 1.4 2002/01/24 03:55:26 jvanzyl Exp $
*/
public class RunModulesValve
- implements Valve
+ extends AbstractValve
{
+ /**
+ * Log4j category used for logging.
+ */
private static final Category log =
Category.getInstance( RunModulesValve.class );
- private String targetModuleType = Turbine.getConfiguration()
- .getString( "pipeline.default.targetModuleType" );
+ /**
+ * The default target module used for building up the
+ * context.
+ */
+ private String targetModuleType;
- private String defaultTarget = Turbine.getConfiguration()
- .getString( Turbine.TEMPLATE_HOMEPAGE );
-
+ /**
+ * Initialize this valve for use in the pipeline.
+ */
+ public void initialize()
+ throws Exception
+ {
+ targetModuleType = Turbine.getConfiguration()
+ .getString( "pipeline.default.targetModuleType" );
+ }
+
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
1.8 +7 -1
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbinePipeline.java 17 Jan 2002 16:38:54 -0000 1.7
+++ TurbinePipeline.java 24 Jan 2002 03:55:26 -0000 1.8
@@ -100,11 +100,17 @@
/**
* @see org.apache.turbine.Pipeline#init()
*/
- public void init()
+ public void initialize()
throws Exception
{
// Valve implementations are added to this Pipeline using the
// Mapper.
+
+ // Initialize the valves
+ for (int i = 0; i < valves.length; i++)
+ {
+ valves[i].initialize();
+ }
}
/**
1.1
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/AbstractValve.java
Index: AbstractValve.java
===================================================================
package org.apache.turbine.pipeline;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.io.IOException;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
/**
* Valve that can be used as the basis of Valve implementations.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @version $Id: AbstractValve.java,v 1.1 2002/01/24 03:55:26 jvanzyl Exp $
*/
public abstract class AbstractValve
implements Valve
{
/**
* Initialize this valve for use in a pipeline.
*
* @throws Exception
*/
public void initialize()
throws Exception
{
}
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
public abstract void invoke(RunData data, ValveContext context)
throws IOException, TurbineException;
}
1.2 +4 -3
jakarta-turbine-3/src/test/org/apache/turbine/pipeline/SimpleValve.java
Index: SimpleValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/test/org/apache/turbine/pipeline/SimpleValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleValve.java 3 Jan 2002 04:50:43 -0000 1.1
+++ SimpleValve.java 24 Jan 2002 03:55:26 -0000 1.2
@@ -60,16 +60,17 @@
import org.apache.turbine.Pipeline;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
+import org.apache.turbine.pipeline.AbstractValve;
/**
* <code>Valve</code> implementation use for testing purposes.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: SimpleValve.java,v 1.1 2002/01/03 04:50:43 dlr Exp $
+ * @version $Id: SimpleValve.java,v 1.2 2002/01/24 03:55:26 jvanzyl Exp $
*/
-class SimpleValve implements Valve
+class SimpleValve
+ extends AbstractValve
{
private String value;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
