Author: tv
Date: Sat Jan 23 17:54:22 2016
New Revision: 1726422
URL: http://svn.apache.org/viewvc?rev=1726422&view=rev
Log:
Remove methods in RunData referring to Jakarta ECS
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java?rev=1726422&r1=1726421&r2=1726422&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
Sat Jan 23 17:54:22 2016
@@ -23,6 +23,7 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.util.RunData;
@@ -40,6 +41,7 @@ public class DetermineRedirectRequestedV
extends AbstractValve
{
private static final Log log =
LogFactory.getLog(DetermineRedirectRequestedValve.class);
+
/**
* Creates a new instance.
*/
@@ -51,6 +53,7 @@ public class DetermineRedirectRequestedV
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData,
ValveContext)
*/
+ @Override
public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
@@ -77,56 +80,17 @@ public class DetermineRedirectRequestedV
{
RunData data = getRunData(pipelineData);
// handle a redirect request
- boolean requestRedirected = ((data.getRedirectURI() != null)
- && (data.getRedirectURI().length() > 0));
+ boolean requestRedirected =
StringUtils.isNotEmpty(data.getRedirectURI());
if (requestRedirected)
{
if (data.getResponse().isCommitted())
{
- requestRedirected = false;
- log.warn("redirect requested, response already committed: " +
- data.getRedirectURI());
+ log.warn("redirect requested, response already committed: " +
data.getRedirectURI());
}
else
{
data.getResponse().sendRedirect(data.getRedirectURI());
}
}
-
- if (!requestRedirected)
- {
- try
- {
- if (data.isPageSet() == false && data.isOutSet() == false)
- {
- throw new Exception("Nothing to output");
- }
-
- // We are all done! if isPageSet() output that way
- // otherwise, data.getOut() has already been written
- // to the data.getOut().close() happens below in the
- // finally.
- if (data.isPageSet() && data.isOutSet() == false)
- {
- // Modules can override these.
- data.getResponse().setLocale(data.getLocale());
- data.getResponse().setContentType(
- data.getContentType());
-
- // Set the status code.
- data.getResponse().setStatus(data.getStatusCode());
- // Output the Page.
- data.getPage().output(data.getResponse().getWriter());
- }
- }
- catch (Exception e)
- {
- // The output stream was probably closed by the client
- // end of things ie: the client clicked the Stop
- // button on the browser, so ignore any errors that
- // result.
- log.debug("Output stream closed? ", e);
- }
- }
}
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1726422&r1=1726421&r2=1726422&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Sat Jan 23 17:54:22 2016
@@ -37,9 +37,6 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.Document;
-import org.apache.ecs.Element;
-import org.apache.ecs.StringElement;
import org.apache.fulcrum.mimetype.MimeTypeService;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.ParameterParser;
@@ -95,12 +92,6 @@ public class DefaultTurbineRunData
/** The default charset. */
private static String defaultCharSet = null;
- /** Determines if there is information in the document or not. */
- private boolean pageSet;
-
- /** This creates an ECS Document. */
- private Document page;
-
/** Cached action name to execute for this request. */
private String action;
@@ -323,8 +314,6 @@ public class DefaultTurbineRunData
// empty pipelinedata map
get(Turbine.class).clear();
- pageSet = false;
- page = null;
action = null;
layout = null;
screen = null;
@@ -472,37 +461,6 @@ public class DefaultTurbineRunData
}
/**
- * Checks to see if the page is set.
- *
- * @return true if the page is set.
- * @deprecated no replacement planned, ECS is no longer a requirement
- */
- @Override
- @Deprecated
- public boolean isPageSet()
- {
- return pageSet;
- }
-
- /**
- * Gets the page.
- *
- * @return a document.
- * @deprecated no replacement planned, ECS is no longer a requirement
- */
- @Override
- @Deprecated
- public Document getPage()
- {
- pageSet = true;
- if (this.page == null)
- {
- this.page = new Document();
- }
- return this.page;
- }
-
- /**
* Whether or not an action has been defined.
*
* @return true if an action has been defined.
@@ -530,7 +488,7 @@ public class DefaultTurbineRunData
/**
* Sets the action for the request.
*
- * @param action a atring.
+ * @param action a string.
*/
@Override
public void setAction(String action)
@@ -719,9 +677,8 @@ public class DefaultTurbineRunData
@Override
public boolean hasMessage()
{
- StringElement message = get(Turbine.class, StringElement.class);
- return (message != null)
- && StringUtils.isNotEmpty(message.toString());
+ StringBuilder message = get(Turbine.class, StringBuilder.class);
+ return message != null && message.length() > 0;
}
/**
@@ -733,8 +690,8 @@ public class DefaultTurbineRunData
@Override
public String getMessage()
{
- StringElement message = get(Turbine.class, StringElement.class);
- return (message == null ? null : message.toString());
+ StringBuilder message = get(Turbine.class, StringBuilder.class);
+ return message == null ? null : message.toString();
}
/**
@@ -745,7 +702,7 @@ public class DefaultTurbineRunData
@Override
public void setMessage(String msg)
{
- get(Turbine.class).put(StringElement.class, new StringElement(msg));
+ get(Turbine.class).put(StringBuilder.class, new StringBuilder(msg));
}
/**
@@ -757,54 +714,28 @@ public class DefaultTurbineRunData
@Override
public void addMessage(String msg)
{
- addMessage(new StringElement(msg));
+ StringBuilder message = get(Turbine.class, StringBuilder.class);
+ if (message == null)
+ {
+ setMessage(msg);
+ }
+ else
+ {
+ message.append(msg);
+ }
}
/**
* Gets the results of an action or another message
- * to be displayed as an ECS string element.
+ * to be displayed as a string (never null).
*
* @return a string element.
*/
@Override
- public StringElement getMessageAsHTML()
- {
- return get(Turbine.class, StringElement.class);
- }
-
- /**
- * Sets the message for the request as an ECS element.
- *
- * @param msg an element.
- */
- @Override
- public void setMessage(Element msg)
+ public String getMessageAsHTML()
{
- get(Turbine.class).put(StringElement.class, new StringElement(msg));
- }
-
- /**
- * Adds the ECS element to message. If message has prior messages from
- * other actions or screens, this method can be used to chain them.
- *
- * @param msg an element.
- */
- @Override
- public void addMessage(Element msg)
- {
- if (msg != null)
- {
- StringElement message = get(Turbine.class, StringElement.class);
-
- if (message != null)
- {
- message.addElement(msg);
- }
- else
- {
- setMessage(msg);
- }
- }
+ String message = getMessage();
+ return message == null ? "" : message;
}
/**
@@ -813,7 +744,7 @@ public class DefaultTurbineRunData
@Override
public void unsetMessage()
{
- get(Turbine.class).remove(StringElement.class);
+ get(Turbine.class).remove(StringBuilder.class);
}
/**
@@ -961,7 +892,6 @@ public class DefaultTurbineRunData
{
setOut(getResponse().getWriter());
}
- pageSet = false;
outSet = true;
return this.out;
}
@@ -976,7 +906,6 @@ public class DefaultTurbineRunData
public void declareDirectResponse()
{
outSet = true;
- pageSet = false;
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java?rev=1726422&r1=1726421&r2=1726422&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java Sat Jan 23
17:54:22 2016
@@ -33,9 +33,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.ecs.Document;
-import org.apache.ecs.Element;
-import org.apache.ecs.StringElement;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.security.acl.AccessControlList;
@@ -123,24 +120,6 @@ public interface RunData extends Pipelin
void setACL(AccessControlList acl);
/**
- * Checks to see if the page is set.
- *
- * @return true if the page is set.
- * @deprecated no replacement planned, ECS is no longer a requirement
- */
- @Deprecated
- boolean isPageSet();
-
- /**
- * Gets the page.
- *
- * @return a document.
- * @deprecated no replacement planned, ECS is no longer a requirement
- */
- @Deprecated
- Document getPage();
-
- /**
* Whether or not an action has been defined.
*
* @return true if an action has been defined.
@@ -295,26 +274,11 @@ public interface RunData extends Pipelin
/**
* Gets the results of an action or another message
- * to be displayed as an ECS string element.
- *
- * @return a string element.
- */
- StringElement getMessageAsHTML();
-
- /**
- * Sets the message for the request as an ECS element.
- *
- * @param msg an element.
- */
- void setMessage(Element msg);
-
- /**
- * Adds the ECS element to message. If message has prior messages from
- * other actions or screens, this method can be used to chain them.
+ * to be displayed as a string.
*
- * @param msg an element.
+ * @return a string.
*/
- void addMessage(Element msg);
+ String getMessageAsHTML();
/**
* Unsets the message for the request.
