Scarab commit: svn commit: r11253 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline
[email protected] Fri, 4 May 2012 08:21:34 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 08:21:34-0700
New Revision: 11253
Modified:
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve22.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/ResetCacheValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetInfoMessageValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetLocaleValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java
Log:
FIX - AbstractValve.invoke() parameter type org.apache.turbine.util.RunData -> org.apache.turbine.pipeline.PipelineData.
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/AnonymousLoginValve.java 2012-05-04 08:21:34-0700
@@ -6,6 +6,7 @@
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.velocity.context.Context;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
@@ -51,8 +52,10 @@
* If anonymous access is allowed and current user is null the anomynous user is logged in.
* @see org.apache.turbine.pipeline.AbstractValve#invoke(org.apache.turbine.RunData, org.apache.turbine.ValveContext)
*/
- public void invoke(RunData data, ValveContext context) throws IOException, TurbineException
+ public void invoke(PipelineData pipelineData, ValveContext context) throws IOException, TurbineException
{
+
+ RunData data = getRunData(pipelineData);
String target = data.getScreenTemplate();
// Only try this if accessing an authenticated page:
@@ -93,7 +96,7 @@
}
}
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve.java 2012-05-04 08:21:34-0700
@@ -50,6 +50,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.Turbine;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
import org.apache.turbine.pipeline.AbstractValve;
@@ -76,9 +77,11 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+
+ RunData data = getRunData(pipelineData);
// if we are forcing a particular charset, use it. Hopefully
// client has encoded for this default. This is the same
// property that will force the charset in our responses.
@@ -100,6 +103,6 @@
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve22.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve22.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve22.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineCharsetValve22.java 2012-05-04 08:21:34-0700
@@ -50,6 +50,7 @@
import org.apache.turbine.util.RunData;
import org.apache.turbine.Turbine;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
import org.apache.turbine.pipeline.AbstractValve;
@@ -78,9 +79,11 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+
+ RunData data = getRunData(pipelineData);
// if we are forcing a particular charset, use it. Hopefully
// client has encoded for this default. This is the same
// property that will force the charset in our responses.
@@ -102,6 +105,6 @@
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java 2012-05-04 08:21:34-0700
@@ -52,6 +52,7 @@
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.torque.TorqueException;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
@@ -74,9 +75,10 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+ RunData data = getRunData(pipelineData);
ParameterParser parameters = data.getParameters();
if (! data.hasTarget())
{
@@ -153,7 +155,7 @@
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
private Object getEventKey(ParameterParser parameters)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java 2012-05-04 08:21:34-0700
@@ -54,6 +54,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.om.NumberKey;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
import org.apache.turbine.pipeline.AbstractValve;
@@ -107,9 +108,10 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+ RunData data = getRunData(pipelineData);
ScarabUser user = (ScarabUser)data.getUser();
try
@@ -186,7 +188,7 @@
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
private void adjustCurrentModule(ScarabUser user, RunData data)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java 2012-05-04 08:21:34-0700
@@ -14,6 +14,7 @@
import org.apache.log4j.Logger;
import org.apache.torque.TorqueException;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
@@ -54,10 +55,11 @@
*
* @see org.apache.turbine.pipeline.AbstractValve#invoke(org.apache.turbine.RunData, org.apache.turbine.ValveContext)
*/
- public void invoke(RunData data, ValveContext context) throws IOException, TurbineException
+ public void invoke(PipelineData pipelineData, ValveContext context) throws IOException, TurbineException
{
try
{
+ RunData data = getRunData(pipelineData);
if (bNTLMActive &&
(
((null == data.getUserFromSession() || data.getUserFromSession().getName().trim().length()==0) && null == data.getUser())
@@ -76,7 +78,7 @@
{
throw new RuntimeException(e);
}
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
/*
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/ResetCacheValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/ResetCacheValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/ResetCacheValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/ResetCacheValve.java 2012-05-04 08:21:34-0700
@@ -47,7 +47,7 @@
*/
import java.io.IOException;
-import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.AbstractValve;
import org.apache.turbine.pipeline.ValveContext;
@@ -67,13 +67,13 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public final void invoke(RunData data, ValveContext context)
+ public final void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
// clear the short-term cache
ScarabCache.clear();
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetInfoMessageValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetInfoMessageValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetInfoMessageValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetInfoMessageValve.java 2012-05-04 08:21:34-0700
@@ -48,6 +48,7 @@
import java.io.IOException;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.AbstractValve;
import org.apache.turbine.pipeline.ValveContext;
@@ -75,14 +76,15 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+ RunData data = getRunData(pipelineData);
((ScarabRequestTool)Module.getTemplateContext(data)
.get(ScarabConstants.SCARAB_REQUEST_TOOL)).setInfoMessage(message);
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
public static void setMessage(String msg)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetLocaleValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetLocaleValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetLocaleValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/SetLocaleValve.java 2012-05-04 08:21:34-0700
@@ -55,6 +55,7 @@
import org.apache.fulcrum.localization.LocalizationService;
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.AbstractValve;
import org.apache.turbine.pipeline.ValveContext;
@@ -76,9 +77,10 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+ RunData data = getRunData(pipelineData);
ScarabUser user = (ScarabUser) data.getUser();
// Ensure we only deal with exsiting users
@@ -109,7 +111,7 @@
}
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java?view=diff&pathrev=11253&r1=11252&r2=11253
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/TimingInfoValve.java 2012-05-04 08:21:34-0700
@@ -50,6 +50,7 @@
import org.apache.log4j.Logger;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.pipeline.ValveContext;
import org.apache.turbine.modules.Module;
@@ -87,9 +88,10 @@
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
+ RunData data = getRunData(pipelineData);
if (DEBUG)
{
Long start = (Long)data.getRequest().getAttribute(KEY);
@@ -128,6 +130,6 @@
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext(pipelineData);
}
}
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957678