epugh 2004/10/18 11:37:04
Modified: src/java/org/apache/turbine/services/jsp TurbineJsp.java
src/test/org/apache/turbine/modules LayoutLoaderTest.java
ActionLoaderTest.java
src/test/org/apache/turbine TurbineTest.java
src/test/org/apache/turbine/pipeline
DefaultSessionTimeoutValveTest.java
DefaultLoginValveTest.java
DefaultACLCreationValveTest.java
ExecutePageValveTest.java
DetermineTargetValveTest.java
DefaultSessionValidationValveTest.java
DetermineActionValveTest.java
src/java/org/apache/turbine/services/pull
TurbinePullService.java
src/java/org/apache/turbine/modules GenericLoader.java
Assembler.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
src/test/org/apache/turbine/modules/actions
VelocityActionDoesNothing.java
src/java/org/apache/turbine/services/pull/tools
TemplateLink.java ContentTool.java
src/java/org/apache/turbine/util RunData.java
RunDataFactory.java
src/java/org/apache/turbine/services/rundata
TurbineRunDataService.java
DefaultTurbineRunData.java
src/java/org/apache/turbine/pipeline AbstractValve.java
TurbinePipeline.java
src/test/org/apache/turbine/test BaseTestCase.java
src/java/org/apache/turbine/modules/screens
TemplateScreen.java
Removed: src/java/org/apache/turbine/services/rundata
TurbineRunDataFacade.java
Log:
RunData is now an Implementation of PipelineData.
Revision Changes Path
1.5 +12 -11
jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJsp.java
Index: TurbineJsp.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJsp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineJsp.java 2 Aug 2004 08:57:29 -0000 1.4
+++ TurbineJsp.java 18 Oct 2004 18:37:02 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
-
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
@@ -103,9 +101,10 @@
*/
public static void addDefaultObjects(PipelineData pipelineData)
{
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
- addDefaultObjects(data);
+ //Map runDataMap = (Map) pipelineData.get(RunData.class);
+ //RunData data = (RunData)runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
+ addDefaultObjects(runData);
}
/**
@@ -151,9 +150,10 @@
public static void handleRequest(PipelineData pipelineData, String
templateName, boolean isForward)
throws TurbineException
{
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
- handleRequest(data, templateName, isForward);
+ //Map runDataMap = (Map) pipelineData.get(RunData.class);
+ //RunData data = (RunData)runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
+ handleRequest(runData, templateName, isForward);
}
/**
@@ -167,9 +167,10 @@
public static void handleRequest(PipelineData pipelineData, String templateName)
throws TurbineException
{
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
- handleRequest(data, templateName);
+ if(!(pipelineData instanceof RunData)){
+ throw new RuntimeException("Can't cast to rundata from pipeline data.");
+ }
+ handleRequest((RunData)pipelineData, templateName);
}
1.2 +1 -7
jakarta-turbine-2/src/test/org/apache/turbine/modules/LayoutLoaderTest.java
Index: LayoutLoaderTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/modules/LayoutLoaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LayoutLoaderTest.java 2 Aug 2004 08:57:35 -0000 1.1
+++ LayoutLoaderTest.java 18 Oct 2004 18:37:02 -0000 1.2
@@ -53,8 +53,6 @@
*/
package org.apache.turbine.modules;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -64,7 +62,6 @@
import org.apache.turbine.modules.layouts.TestVelocityOnlyLayout;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.test.BaseTestCase;
@@ -140,10 +137,7 @@
try
{
RunData data = getRunData(request,response,config);
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, data);
- pipelineData.put(RunData.class, runDataMap);
+ PipelineData pipelineData = data;
data.setLayout("TestVelocityOnlyLayout");
int numberOfCalls = TestVelocityOnlyLayout.numberOfCalls;
try {
1.5 +1 -5
jakarta-turbine-2/src/test/org/apache/turbine/modules/ActionLoaderTest.java
Index: ActionLoaderTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/modules/ActionLoaderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionLoaderTest.java 2 Aug 2004 08:57:35 -0000 1.4
+++ ActionLoaderTest.java 18 Oct 2004 18:37:02 -0000 1.5
@@ -64,7 +64,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.actions.VelocityActionDoesNothing;
-import org.apache.turbine.modules.actions.VelocityActionThrowsException;
import org.apache.turbine.om.security.User;
import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.pipeline.PipelineData;
@@ -297,10 +296,7 @@
public void testDoPerformWithPipelineData() throws Exception
{
RunData data = getRunData(request,response,config);
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, data);
- pipelineData.put(RunData.class, runDataMap);
+ PipelineData pipelineData = data;
data.setAction("VelocityActionDoesNothing");
int numberOfCalls = VelocityActionDoesNothing.numberOfCalls;
int pipelineDataCalls = VelocityActionDoesNothing.pipelineDataCalls;
1.3 +51 -40 jakarta-turbine-2/src/test/org/apache/turbine/TurbineTest.java
Index: TurbineTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/TurbineTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineTest.java 30 May 2004 15:27:32 -0000 1.2
+++ TurbineTest.java 18 Oct 2004 18:37:02 -0000 1.3
@@ -1,46 +1,57 @@
package org.apache.turbine;
-/*
- * ==================================================================== The
- * Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights reserved.
- *
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2003 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.
+ * 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/>.
+ *
+ * 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 javax.servlet.ServletConfig;
1.4 +5 -6
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
Index: DefaultSessionTimeoutValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSessionTimeoutValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ DefaultSessionTimeoutValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -155,8 +154,8 @@
pipeline.addValve(valve);
pipeline.invoke(pipelineData);
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData runData = (RunData)runDataMap.get(RunData.class);
+
+ RunData runData = (RunData)pipelineData;
assertEquals(0,runData.getSession().getMaxInactiveInterval());
@@ -177,8 +176,8 @@
pipeline.addValve(valve);
pipeline.invoke(pipelineData);
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData runData = (RunData)runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
+
assertEquals(3600,runData.getSession().getMaxInactiveInterval());
1.4 +2 -9
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
Index: DefaultLoginValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLoginValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ DefaultLoginValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -153,12 +151,7 @@
runData.setAction(TurbineConstants.ACTION_LOGIN_DEFAULT);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
DefaultLoginValve valve = new DefaultLoginValve();
pipeline.addValve(valve);
1.4 +2 -9
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java
Index: DefaultACLCreationValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultACLCreationValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultACLCreationValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ DefaultACLCreationValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
@@ -148,12 +146,7 @@
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
DefaultACLCreationValve valve = new DefaultACLCreationValve();
pipeline.addValve(valve);
1.4 +2 -9
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java
Index: ExecutePageValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/ExecutePageValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExecutePageValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ ExecutePageValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -157,13 +155,8 @@
runData.setUser(tu);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
ExecutePageValve valve = new ExecutePageValve();
pipeline.addValve(valve);
1.5 +3 -16
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java
Index: DetermineTargetValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineTargetValveTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DetermineTargetValveTest.java 2 Aug 2004 08:57:33 -0000 1.4
+++ DetermineTargetValveTest.java 18 Oct 2004 18:37:02 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -147,13 +145,7 @@
RunData runData = getRunData(request,response,config);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
-
+ PipelineData pipelineData = runData;
DetermineTargetValve valve = new DetermineTargetValve();
pipeline.addValve(valve);
@@ -175,12 +167,7 @@
RunData runData = getRunData(request,response,config);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
DetermineTargetValve valve = new DetermineTargetValve();
pipeline.addValve(valve);
1.4 +4 -16
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java
Index: DefaultSessionValidationValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DefaultSessionValidationValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSessionValidationValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ DefaultSessionValidationValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -154,13 +152,8 @@
runData.setAction(TurbineConstants.ACTION_LOGIN_DEFAULT);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
-
+ PipelineData pipelineData = runData;
+
DefaultSessionValidationValve valve = new DefaultSessionValidationValve();
pipeline.addValve(valve);
@@ -191,12 +184,7 @@
session.setupGetAttribute(User.SESSION_KEY, tu);
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
DefaultSessionValidationValve valve = new DefaultSessionValidationValve();
pipeline.addValve(valve);
1.4 +2 -10
jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java
Index: DetermineActionValveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/pipeline/DetermineActionValveTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DetermineActionValveTest.java 2 Aug 2004 08:57:33 -0000 1.3
+++ DetermineActionValveTest.java 18 Oct 2004 18:37:02 -0000 1.4
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.Vector;
import javax.servlet.ServletConfig;
@@ -144,14 +142,8 @@
{
RunData runData = getRunData(request,response,config);
- //URIConstants.CGI_ACTION_PARAM
Pipeline pipeline = new TurbinePipeline();
- PipelineData pipelineData = new DefaultPipelineData();
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
+ PipelineData pipelineData = runData;
DetermineActionValve valve = new DetermineActionValve();
pipeline.addValve(valve);
1.30 +14 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TurbinePullService.java 2 Aug 2004 08:57:35 -0000 1.29
+++ TurbinePullService.java 18 Oct 2004 18:37:02 -0000 1.30
@@ -57,7 +57,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.apache.commons.configuration.Configuration;
@@ -455,8 +454,9 @@
*/
public void populateContext(Context context, PipelineData pipelineData)
{
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
+ // Map runDataMap = (Map) pipelineData.get(RunData.class);
+ // RunData data = (RunData)runDataMap.get(RunData.class);
+ RunData data = (RunData)pipelineData;
populateWithRequestTools(context, pipelineData);
// session tools (whether session-only or persistent are
@@ -594,8 +594,9 @@
private void populateWithSessionTools(List tools, Context context,
PipelineData pipelineData, User user)
{
- Map runDataMap = (Map)pipelineData.get(RunData.class);
- RunData data = (RunData) runDataMap.get(RunData.class);
+ //Map runDataMap = (Map)pipelineData.get(RunData.class);
+ //RunData data = (RunData) runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
// Iterate the tools
for (Iterator it = tools.iterator(); it.hasNext();)
{
@@ -604,11 +605,11 @@
{
// ensure that tool is created only once for a user
// by synchronizing against the user object
- synchronized (data.getSession())
+ synchronized (runData.getSession())
{
// first try and fetch the tool from the user's
// hashtable
- Object tool = data.getSession().getAttribute(
+ Object tool = runData.getSession().getAttribute(
SESSION_TOOLS_ATTRIBUTE_PREFIX
+ toolData.toolClassName);
@@ -622,7 +623,7 @@
initTool(tool, user);
// store the newly created tool in the session
- data.getSession().setAttribute(
+ runData.getSession().setAttribute(
SESSION_TOOLS_ATTRIBUTE_PREFIX
+ tool.getClass().getName(), tool);
}
@@ -1085,8 +1086,9 @@
private RunData getRunData(PipelineData pipelineData)
{
- Map runDataMap = (Map)pipelineData.get(RunData.class);
- RunData data = (RunData) runDataMap.get(RunData.class);
- return data;
+ if(!(pipelineData instanceof RunData)){
+ throw new RuntimeException("Can't cast to rundata from pipeline data.");
+ }
+ return (RunData)pipelineData;
}
}
1.12 +5 -6
jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java
Index: GenericLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GenericLoader.java 2 Aug 2004 08:57:32 -0000 1.11
+++ GenericLoader.java 18 Oct 2004 18:37:03 -0000 1.12
@@ -55,7 +55,6 @@
*/
import java.util.Hashtable;
-import java.util.Map;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
@@ -191,10 +190,10 @@
private RunData getRunData(PipelineData pipelineData)
{
- RunData data = null;
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- data = (RunData)runDataMap.get(RunData.class);
- return data;
+ if(!(pipelineData instanceof RunData)){
+ throw new RuntimeException("Can't cast to rundata from pipeline data.");
+ }
+ return (RunData)pipelineData;
}
}
1.8 +5 -5
jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java
Index: Assembler.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Assembler.java 2 Aug 2004 08:57:32 -0000 1.7
+++ Assembler.java 18 Oct 2004 18:37:03 -0000 1.8
@@ -77,10 +77,10 @@
*/
public final RunData getRunData(PipelineData pipelineData)
{
- RunData data = null;
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- data = (RunData)runDataMap.get(RunData.class);
- return data;
+ if(!(pipelineData instanceof RunData)){
+ throw new RuntimeException("Can't cast to rundata from pipeline data.");
+ }
+ return (RunData)pipelineData;
}
1.34 +3 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TurbineVelocityService.java 2 Aug 2004 08:57:31 -0000 1.33
+++ TurbineVelocityService.java 18 Oct 2004 18:37:03 -0000 1.34
@@ -61,7 +61,6 @@
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.servlet.ServletConfig;
@@ -301,8 +300,8 @@
*/
public Context getContext(PipelineData pipelineData)
{
- Map runDataMap = (Map)pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
+ //Map runDataMap = (Map)pipelineData.get(RunData.class);
+ RunData data = (RunData)pipelineData;
// Attempt to get it from the data first. If it doesn't
// exist, create it and then stuff it into the data.
Context context = (Context)
1.3 +1 -4
jakarta-turbine-2/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java
Index: VelocityActionDoesNothing.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityActionDoesNothing.java 2 Aug 2004 08:57:34 -0000 1.2
+++ VelocityActionDoesNothing.java 18 Oct 2004 18:37:03 -0000 1.3
@@ -53,8 +53,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
-
import junit.framework.Assert;
import org.apache.turbine.pipeline.PipelineData;
@@ -99,8 +97,7 @@
{
log.debug("Calling doPerform(PipelineData)");
VelocityActionDoesNothing.numberOfCalls++;
- Map rundataMap = (Map)pipelineData.get(RunData.class);
- RunData rd = (RunData)rundataMap.get(RunData.class);
+ RunData rd = (RunData)pipelineData;
Assert.assertNotNull("RunData object was Null.", rd);
VelocityActionDoesNothing.pipelineDataCalls++;
}
1.10 +2 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
Index: TemplateLink.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TemplateLink.java 2 Aug 2004 08:57:34 -0000 1.9
+++ TemplateLink.java 18 Oct 2004 18:37:03 -0000 1.10
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
-
import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
@@ -151,8 +149,7 @@
if (data instanceof PipelineData)
{
PipelineData pipelineData = (PipelineData) data;
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData runData = (RunData)runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
templateURI = new TemplateURI(runData);
}
else
1.6 +2 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
Index: ContentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/tools/ContentTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContentTool.java 2 Aug 2004 08:57:34 -0000 1.5
+++ ContentTool.java 18 Oct 2004 18:37:03 -0000 1.6
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
import org.apache.commons.configuration.Configuration;
@@ -145,8 +144,7 @@
if (data instanceof PipelineData)
{
PipelineData pipelineData = (PipelineData) data;
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData runData = (RunData)runDataMap.get(RunData.class);
+ RunData runData = (RunData)pipelineData;
dataURI = new DataURI(runData);
}
else
1.10 +3 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/RunData.java
Index: RunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/RunData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RunData.java 19 Jun 2003 18:16:26 -0000 1.9
+++ RunData.java 18 Oct 2004 18:37:03 -0000 1.10
@@ -69,6 +69,7 @@
import org.apache.ecs.StringElement;
import org.apache.turbine.om.security.User;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.security.AccessControlList;
@@ -88,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
* @version $Id$
*/
-public interface RunData
+public interface RunData extends PipelineData
{
/**
* Gets the parameters.
1.7 +15 -4
jakarta-turbine-2/src/java/org/apache/turbine/util/RunDataFactory.java
Index: RunDataFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/RunDataFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RunDataFactory.java 19 Mar 2003 16:10:56 -0000 1.6
+++ RunDataFactory.java 18 Oct 2004 18:37:03 -0000 1.7
@@ -61,10 +61,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.pool.TurbinePool;
import org.apache.turbine.services.rundata.DefaultTurbineRunData;
+import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.services.rundata.TurbineRunData;
-import org.apache.turbine.services.rundata.TurbineRunDataFacade;
import org.apache.turbine.util.parser.DefaultCookieParser;
import org.apache.turbine.util.parser.DefaultParameterParser;
@@ -133,7 +134,8 @@
{
try
{
- return TurbineRunDataFacade.getRunData(req, res, config);
+
+ return getRunDataService().getRunData(req, res, config);
}
catch (Exception x)
{
@@ -201,7 +203,7 @@
{
try
{
- TurbineRunDataFacade.putRunData(data);
+ getRunDataService().putRunData(data);
return;
}
catch (Exception x)
@@ -211,5 +213,14 @@
// Failed, use the Pool Service instead.
TurbinePool.putInstance(data);
+ }
+
+ /**
+ * Static Helper method for looking up the RunDataService
+ * @return A RunDataService
+ */
+ private static RunDataService getRunDataService(){
+ return (RunDataService) TurbineServices
+ .getInstance().getService(RunDataService.SERVICE_NAME);
}
}
1.15 +1 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineRunDataService.java 3 Jun 2003 13:41:28 -0000 1.14
+++ TurbineRunDataService.java 18 Oct 2004 18:37:04 -0000 1.15
@@ -91,17 +91,6 @@
extends TurbineBaseService
implements RunDataService
{
- /** @deprecated Use RunDataService.RUN_DATA_KEY */
- public static final String RUN_DATA =
- RunDataService.RUN_DATA_KEY;
-
- /** @deprecated Use RunDataService.PARAMETER_PARSER_KEY */
- public static final String PARAMETER_PARSER =
- RunDataService.PARAMETER_PARSER_KEY;
-
- /** @deprecated Use RunDataService.COOKIE_PARSER_KEY */
- public static final String COOKIE_PARSER =
- RunDataService.COOKIE_PARSER_KEY;
/** The default implementation of the RunData object*/
private static final String DEFAULT_RUN_DATA =
1.21 +25 -8
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultTurbineRunData.java 16 Feb 2004 07:06:27 -0000 1.20
+++ DefaultTurbineRunData.java 18 Oct 2004 18:37:04 -0000 1.21
@@ -82,6 +82,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.om.security.User;
+import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -91,7 +92,6 @@
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.pool.Recyclable;
-import org.apache.turbine.util.pool.RecyclableSupport;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.template.TemplateInfo;
@@ -119,9 +119,14 @@
* @version $Id$
*/
public class DefaultTurbineRunData
- extends RecyclableSupport
+ extends DefaultPipelineData
implements TurbineRunData, Recyclable
{
+ /**
+ * The disposed flag.
+ */
+ private boolean disposed;
+
/** The default locale. */
private static Locale defaultLocale = null;
@@ -375,14 +380,15 @@
public DefaultTurbineRunData()
{
super();
+ recycle();
}
/**
- * Recycles a run data object.
+ * Recycles the object by removing its disposed flag.
*/
public void recycle()
{
- super.recycle();
+ disposed = false;
}
/**
@@ -424,8 +430,6 @@
stackTrace = null;
stackTraceException = null;
debugVariables.clear();
-
- super.dispose();
}
// ***************************************
@@ -554,8 +558,10 @@
public Document getPage()
{
pageSet = true;
- if (this.page == null)
+ if (this.page == null)
+ {
this.page = new Document();
+ }
return this.page;
}
@@ -1537,4 +1543,15 @@
{
getServerData().setScriptName(scriptName);
}
+
+ /**
+ * Checks whether the object is disposed.
+ *
+ * @return true, if the object is disposed.
+ */
+ public boolean isDisposed()
+ {
+ return disposed;
+ }
+
}
1.4 +5 -6
jakarta-turbine-2/src/java/org/apache/turbine/pipeline/AbstractValve.java
Index: AbstractValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/pipeline/AbstractValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractValve.java 2 Aug 2004 08:57:29 -0000 1.3
+++ AbstractValve.java 18 Oct 2004 18:37:04 -0000 1.4
@@ -55,7 +55,6 @@
*/
import java.io.IOException;
-import java.util.Map;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
@@ -94,10 +93,10 @@
*/
public final RunData getRunData(PipelineData pipelineData)
{
- RunData data = null;
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- data = (RunData)runDataMap.get(RunData.class);
- return data;
+ if(!(pipelineData instanceof RunData)){
+ throw new RuntimeException("Can't cast pipelineData to rundata");
+ }
+ return (RunData)pipelineData;
}
}
1.5 +6 -2
jakarta-turbine-2/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Index: TurbinePipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/pipeline/TurbinePipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbinePipeline.java 2 Aug 2004 08:57:29 -0000 1.4
+++ TurbinePipeline.java 18 Oct 2004 18:37:04 -0000 1.5
@@ -92,7 +92,7 @@
* a subscript equal to <code>values.length</code> if the basic
* Valve is currently being processed.
*/
- protected ThreadLocal state = new ThreadLocal();
+ protected ThreadLocal state= new ThreadLocal();
/**
* @see org.apache.turbine.Pipeline#initialize()
@@ -100,9 +100,13 @@
public void initialize()
throws Exception
{
+ if (state==null){
+ state = new ThreadLocal();
+ }
+
// Valve implementations are added to this Pipeline using the
// Mapper.
-
+
// Initialize the valves
for (int i = 0; i < valves.length; i++)
{
1.8 +2 -11
jakarta-turbine-2/src/test/org/apache/turbine/test/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/test/BaseTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseTestCase.java 2 Aug 2004 08:57:36 -0000 1.7
+++ BaseTestCase.java 18 Oct 2004 18:37:04 -0000 1.8
@@ -57,8 +57,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
import java.util.Vector;
@@ -71,7 +69,6 @@
import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
@@ -123,14 +120,8 @@
return runData;
}
protected PipelineData getPipelineData(HttpServletRequest
request,HttpServletResponse response,ServletConfig config) throws Exception {
- PipelineData pipelineData = new DefaultPipelineData();
RunData runData = getRunData(request,response,config);
- Map runDataMap = new HashMap();
- runDataMap.put(RunData.class, runData);
- // put the data into the pipeline
- pipelineData.put(RunData.class, runDataMap);
- //pipelineData.put(RunData.class,runData);
- return pipelineData;
+ return runData;
}
1.7 +4 -3
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Index: TemplateScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TemplateScreen.java 2 Aug 2004 08:57:33 -0000 1.6
+++ TemplateScreen.java 18 Oct 2004 18:37:04 -0000 1.7
@@ -268,8 +268,9 @@
*/
public static void setTemplate(PipelineData pipelineData, String template)
{
- Map runDataMap = (Map) pipelineData.get(RunData.class);
- RunData data = (RunData)runDataMap.get(RunData.class);
+ //Map runDataMap = (Map) pipelineData.get(RunData.class);
+ //RunData data = (RunData)runDataMap.get(RunData.class);
+ RunData data = (RunData)pipelineData;
setTemplate(data, template);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
