You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2015/10/20 19:08:11 UTC
svn commit: r1709648 - in /turbine/core/trunk/src: java/org/apache/turbine/
java/org/apache/turbine/modules/ java/org/apache/turbine/modules/layouts/
java/org/apache/turbine/modules/navigations/
java/org/apache/turbine/modules/pages/ java/org/apache/tu...
Author: tv
Date: Tue Oct 20 17:08:10 2015
New Revision: 1709648
URL: http://svn.apache.org/viewvc?rev=1709648&view=rev
Log:
Reduce ECS dependencies
Removed:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/Error.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/JspPage.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplate.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java
turbine/core/trunk/src/java/org/apache/turbine/util/GenerateUniqueId.java
turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java
turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateScreen.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Tue Oct 20 17:08:10 2015
@@ -935,7 +935,7 @@ public class Turbine
// Attempt to do *something* at this point...
catch (Throwable reallyScrewedNow)
{
- StringBuffer msg = new StringBuffer();
+ StringBuilder msg = new StringBuilder();
msg.append("Horrible Exception: ");
if (data != null)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/TurbineConstants.java Tue Oct 20 17:08:10 2015
@@ -197,13 +197,6 @@ public interface TurbineConstants
/** Default document type. */
String DEFAULT_DOCUMENT_TYPE_KEY = "default.doctype";
- /** Html 4.0 Transitional */
- String DOCUMENT_TYPE_HTML40TRANSITIONAL = "Html40Transitional";
- /** Html 4.0 Strict */
- String DOCUMENT_TYPE_HTML40STRICT = "Html40Strict";
- /** Html 4.0 Frameset */
- String DOCUMENT_TYPE_HTML40FRAMESET = "Html40Frameset";
-
/** Default doctype root element. */
String DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_KEY
= "default.html.doctype.root.element";
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java Tue Oct 20 17:08:10 2015
@@ -19,7 +19,6 @@ package org.apache.turbine.modules;
* under the License.
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.pipeline.PipelineData;
/**
@@ -61,9 +60,10 @@ public abstract class Navigation
* referenced in RunData.
*
* @param pipelineData Turbine information.
+ * @return the content of the navigation module
* @exception Exception a generic exception.
*/
- protected abstract ConcreteElement doBuild(PipelineData pipelineData) throws Exception;
+ protected abstract String doBuild(PipelineData pipelineData) throws Exception;
/**
* Subclasses can override this method to add additional
@@ -71,9 +71,10 @@ public abstract class Navigation
* use NavigationLoader to build a Navigation.
*
* @param pipelineData Turbine information.
+ * @return the content of the navigation module
* @exception Exception a generic exception.
*/
- protected ConcreteElement build(PipelineData pipelineData)
+ protected String build(PipelineData pipelineData)
throws Exception
{
return doBuild(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java Tue Oct 20 17:08:10 2015
@@ -19,7 +19,6 @@ package org.apache.turbine.modules;
* under the License.
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.Turbine;
import org.apache.turbine.pipeline.PipelineData;
@@ -60,7 +59,7 @@ public class NavigationLoader
* @return the navigation module output
* @exception Exception a generic exception.
*/
- public ConcreteElement eval(PipelineData pipelineData, String name)
+ public String eval(PipelineData pipelineData, String name)
throws Exception
{
// Execute Navigation
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules;
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -63,9 +62,10 @@ public abstract class Screen
* or to write the screen to the output stream referenced in
* RunData.
* @param pipelineData Turbine information.
+ * @return the content of the screen
* @exception Exception a generic exception.
*/
- protected abstract ConcreteElement doBuild(PipelineData pipelineData) throws Exception;
+ protected abstract String doBuild(PipelineData pipelineData) throws Exception;
/**
* Subclasses can override this method to add additional
@@ -73,9 +73,10 @@ public abstract class Screen
* use ScreenLoader to build a Screen.
*
* @param pipelineData Turbine information.
+ * @return the content of the screen
* @exception Exception a generic exception.
*/
- protected ConcreteElement build(PipelineData pipelineData)
+ protected String build(PipelineData pipelineData)
throws Exception
{
return doBuild(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules;
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.Turbine;
import org.apache.turbine.pipeline.PipelineData;
@@ -53,7 +52,7 @@ public class ScreenLoader
/**
* Attempts to load and execute the external Screen. This is used
* when you want to execute a Screen which returns its output via
- * a MultiPartElement instead of out the data.getPage() value.
+ * a String instead of out the data.getResponse() value.
* This allows you to easily chain the execution of Screen modules
* together.
*
@@ -62,7 +61,7 @@ public class ScreenLoader
* @return the output of the screen module
* @exception Exception a generic exception.
*/
- public ConcreteElement eval(PipelineData pipelineData, String name)
+ public String eval(PipelineData pipelineData, String name)
throws Exception
{
// Execute screen
@@ -72,7 +71,7 @@ public class ScreenLoader
/**
* Attempts to load and execute the Screen. This is used when you
* want to execute a Screen which returns its output via the
- * data.getPage() object.
+ * data.getResponse() object.
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the screen.
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java Tue Oct 20 17:08:10 2015
@@ -21,9 +21,9 @@ package org.apache.turbine.modules.layou
*/
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineLoader;
import org.apache.turbine.annotation.TurbineService;
@@ -107,10 +107,8 @@ public class VelocityOnlyLayout
// First, generate the screen and put it in the context so
// we can grab it the layout template.
- ConcreteElement results =
- screenLoader.eval(pipelineData, screenName);
-
- String returnValue = (results == null) ? "" : results.toString();
+ String results = screenLoader.eval(pipelineData, screenName);
+ String returnValue = StringUtils.defaultIfEmpty(results, StringUtils.EMPTY);
// variable for the screen in the layout template
context.put(TurbineConstants.SCREEN_PLACEHOLDER, returnValue);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java Tue Oct 20 17:08:10 2015
@@ -23,9 +23,9 @@ package org.apache.turbine.modules.layou
import java.io.StringReader;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.ConcreteElement;
import org.apache.fulcrum.xslt.XSLTService;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineLoader;
@@ -101,10 +101,8 @@ public class VelocityXslLayout extends L
// First, generate the screen and put it in the context so
// we can grab it the layout template.
- ConcreteElement results =
- screenLoader.eval(pipelineData, screenName);
-
- String returnValue = (results == null) ? "" : results.toString();
+ String results = screenLoader.eval(pipelineData, screenName);
+ String returnValue = StringUtils.defaultIfEmpty(results, StringUtils.EMPTY);
// variable for the screen in the layout template
context.put(TurbineConstants.SCREEN_PLACEHOLDER, returnValue);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.navig
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.pipeline.PipelineData;
@@ -68,7 +67,7 @@ public class BaseJspNavigation
* @throws Exception a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.navig
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.pipeline.PipelineData;
@@ -36,7 +35,7 @@ public abstract class TemplateNavigation
extends Navigation
{
/**
- * WebMacro Navigations extending this class should overide this
+ * WebMacro Navigations extending this class should override this
* method to perform any particular business logic and add
* information to the context.
*
@@ -48,20 +47,20 @@ public abstract class TemplateNavigation
/**
* This Builds the WebMacro/FreeMarker/etc template.
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the navigation module
* @throws Exception a generic exception.
*/
- public abstract ConcreteElement buildTemplate(PipelineData pipelineData) throws Exception;
+ public abstract String buildTemplate(PipelineData pipelineData) throws Exception;
/**
* Calls doBuildTemplate() and then buildTemplate().
*
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the navigation module
* @throws Exception a generic exception.
*/
@Override
- protected ConcreteElement doBuild(PipelineData pipelineData)
+ protected String doBuild(PipelineData pipelineData)
throws Exception
{
doBuildTemplate(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java Tue Oct 20 17:08:10 2015
@@ -21,8 +21,6 @@ package org.apache.turbine.modules.navig
*/
-import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.StringElement;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.pipeline.PipelineData;
@@ -93,11 +91,11 @@ public class VelocityNavigation
* This builds the Velocity template.
*
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the navigation module
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
@@ -107,10 +105,6 @@ public class VelocityNavigation
String templateName
= templateService.getNavigationTemplateName(navigationTemplate);
- StringElement output = new StringElement();
- output.setFilterState(false);
- output.addElement(
- velocity.handleRequest(context, prefix + templateName));
- return output;
+ return velocity.handleRequest(context, prefix + templateName);
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java Tue Oct 20 17:08:10 2015
@@ -21,14 +21,9 @@ package org.apache.turbine.modules.pages
*/
-import java.util.List;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.Doctype;
-import org.apache.turbine.Turbine;
-import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineLoader;
import org.apache.turbine.modules.Action;
import org.apache.turbine.modules.ActionLoader;
@@ -39,7 +34,6 @@ import org.apache.turbine.modules.Screen
import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.TurbineException;
/**
* When building sites using templates, Screens need only be defined
@@ -141,10 +135,6 @@ public class DefaultPage
return;
}
- // Set the default doctype from the value given in
- // TurbineResources.properties.
- setDefaultDoctype(data);
-
// Template pages can use this to set up default templates and
// associated class modules. It does nothing here.
doBuildAfterAction(pipelineData);
@@ -215,68 +205,4 @@ public class DefaultPage
{
// do nothing by default
}
-
- /**
- * Set the default Doctype. If Doctype is set to null, it will
- * not be added. The default Doctype can be set in
- * TurbineResources by using the single strings: Html40Strict,
- * Html40Transitional, or Html40Frameset. Additionally the
- * default can be supplied as two strings giving the dtd and uri.
- *
- * @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
- */
- private void setDefaultDoctype(RunData data)
- throws Exception
- {
- String errMsg =
- "default.doctype property not set properly in TurbineResources.properties!";
- List<Object> doctypeProperty =
- Turbine.getConfiguration().getList(TurbineConstants.DEFAULT_DOCUMENT_TYPE_KEY);
-
- if (doctypeProperty != null)
- {
- switch(doctypeProperty.size())
- {
- case 0:
- {
- // Don't add a doctype.
- break;
- }
- case 1:
- {
- String doc = (String) doctypeProperty.get(0);
- if (doc.equalsIgnoreCase(TurbineConstants.DOCUMENT_TYPE_HTML40TRANSITIONAL))
- {
- data.getPage().setDoctype(new Doctype.Html40Transitional());
- }
- else if (doc.equalsIgnoreCase(TurbineConstants.DOCUMENT_TYPE_HTML40STRICT))
- {
- data.getPage().setDoctype(new Doctype.Html40Strict());
- }
- else if (doc.equalsIgnoreCase(TurbineConstants.DOCUMENT_TYPE_HTML40FRAMESET))
- {
- data.getPage().setDoctype(new Doctype.Html40Frameset());
- }
- else
- {
- throw new TurbineException(errMsg);
- }
- break;
- }
- case 2:
- {
- data.getPage()
- .setDoctype(new Doctype()
- .setIdentifier((String) doctypeProperty.get(0))
- .setUri((String) doctypeProperty.get(1)));
- break;
- }
- default:
- {
- throw new TurbineException(errMsg);
- }
- }
- }
- }
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/pages/JspPage.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/JspPage.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/pages/JspPage.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/pages/JspPage.java Tue Oct 20 17:08:10 2015
@@ -21,10 +21,12 @@ package org.apache.turbine.modules.pages
*/
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.jsp.JspService;
-import org.apache.turbine.util.RunData;
/**
* Extends TemplatePage to add some convenience objects to the request.
@@ -53,9 +55,9 @@ public class JspPage
try
{
- RunData data = getRunData(pipelineData);
+ HttpServletResponse response = pipelineData.get(Turbine.class, HttpServletResponse.class);
//We try to set the buffer size from defaults
- data.getResponse().setBufferSize(jspService.getDefaultBufferSize());
+ response.setBufferSize(jspService.getDefaultBufferSize());
}
catch (IllegalStateException ise)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java Tue Oct 20 17:08:10 2015
@@ -20,7 +20,6 @@ package org.apache.turbine.modules.scree
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.jsp.JspService;
@@ -59,7 +58,7 @@ public class BaseJspScreen
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java Tue Oct 20 17:08:10 2015
@@ -22,7 +22,6 @@ package org.apache.turbine.modules.scree
// Turbine stuff.
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.Screen;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -54,7 +53,7 @@ public abstract class RawScreen extends
* @exception Exception, a generic exception.
*/
@Override
- protected final ConcreteElement doBuild(PipelineData pipelineData)
+ protected final String doBuild(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.scree
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.annotation.TurbineLoader;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.modules.Screen;
@@ -76,10 +75,10 @@ public abstract class TemplateScreen
* should contain the specific template service code to generate
* the template.
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the screen
* @exception Exception A generic exception.
*/
- public abstract ConcreteElement buildTemplate(PipelineData pipelineData)
+ public abstract String buildTemplate(PipelineData pipelineData)
throws Exception;
/**
@@ -97,14 +96,14 @@ public abstract class TemplateScreen
* Screen.
*
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the screen
* @exception Exception A generic exception.
*/
@Override
- protected ConcreteElement doBuild(PipelineData pipelineData)
+ protected String doBuild(PipelineData pipelineData)
throws Exception
{
- ConcreteElement out = null;
+ String out = null;
try
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.scree
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -51,7 +50,7 @@ public class VelocityCachedScreen
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.scree
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
@@ -48,11 +47,11 @@ public class VelocityDirectScreen
* This builds the Velocity template.
*
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the screen
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java Tue Oct 20 17:08:10 2015
@@ -22,8 +22,6 @@ package org.apache.turbine.modules.scree
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.StringElement;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineService;
@@ -101,11 +99,11 @@ public class VelocityScreen
* This builds the Velocity template.
*
* @param pipelineData Turbine information.
- * @return A ConcreteElement.
+ * @return the content of the screen
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement buildTemplate(PipelineData pipelineData)
+ public String buildTemplate(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
@@ -154,14 +152,6 @@ public class VelocityScreen
screenData = velocity.handleRequest(context, prefix + templateName);
}
- // package the response in an ECS element
- StringElement output = new StringElement();
- output.setFilterState(false);
-
- if (screenData != null)
- {
- output.addElement(screenData);
- }
- return output;
+ return screenData;
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java Tue Oct 20 17:08:10 2015
@@ -21,7 +21,6 @@ package org.apache.turbine.modules.scree
*/
-import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.A;
import org.apache.fulcrum.parser.ParameterParser;
@@ -56,14 +55,14 @@ public class InvalidState
* @exception Exception, a generic exception.
*/
@Override
- public ConcreteElement doBuild(PipelineData pipelineData)
+ public String doBuild(PipelineData pipelineData)
throws Exception
{
RunData data = getRunData(pipelineData);
ElementContainer body = new ElementContainer();
ElementContainer message = new ElementContainer();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("<b>There has been an error.</b>")
.append("<p>")
.append("- If you used the browser \"Back\" or \"Reload\"")
@@ -84,6 +83,6 @@ public class InvalidState
message.addElement(" to return the the screen you were working on.");
body.addElement(message);
- return body;
+ return body.toString();
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java Tue Oct 20 17:08:10 2015
@@ -31,7 +31,6 @@ import org.apache.turbine.annotation.Tur
import org.apache.turbine.modules.Page;
import org.apache.turbine.modules.PageLoader;
import org.apache.turbine.services.template.TemplateService;
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
/**
@@ -60,6 +59,7 @@ public class ExecutePageValve
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
*/
+ @Override
public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
@@ -84,8 +84,6 @@ public class ExecutePageValve
protected void executePage(PipelineData pipelineData)
throws Exception
{
- RunData data = getRunData(pipelineData);
-
// Start the execution phase. DefaultPage will execute the
// appropriate action as well as get the Layout from the
// Screen and then execute that. The Layout is then
@@ -99,7 +97,7 @@ public class ExecutePageValve
// DefaultPage to do what you want.
String defaultPage = (templateService == null)
- ? null : templateService.getDefaultPageName(data);
+ ? null : templateService.getDefaultPageName(pipelineData);
if (defaultPage == null)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java Tue Oct 20 17:08:10 2015
@@ -21,8 +21,8 @@ package org.apache.turbine.services.temp
*/
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.RunData;
/**
* This service provides a method for mapping templates to their
@@ -191,20 +191,20 @@ public interface TemplateService
/**
* Find the default page module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default page for.
* @return The default page module name.
*/
- String getDefaultPageName(RunData data);
+ String getDefaultPageName(PipelineData pipelineData);
/**
* Find the default layout module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default layout for.
* @return The default layout module name.
*/
- String getDefaultLayoutName(RunData data);
+ String getDefaultLayoutName(PipelineData pipelineData);
/**
* Locate and return the name of the screen module to be used
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplate.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplate.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplate.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplate.java Tue Oct 20 17:08:10 2015
@@ -21,8 +21,8 @@ package org.apache.turbine.services.temp
*/
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.RunData;
/**
* This is a simple static accessor to common TemplateService tasks such as
@@ -211,25 +211,25 @@ public abstract class TurbineTemplate
/**
* Find the default page module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default page for.
* @return The default page module name.
*/
- public static final String getDefaultPageName(RunData data)
+ public static final String getDefaultPageName(PipelineData pipelineData)
{
- return getService().getDefaultPageName(data);
+ return getService().getDefaultPageName(pipelineData);
}
/**
* Find the default layout module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default layout for.
* @return The default layout module name.
*/
- public static final String getDefaultLayoutName(RunData data)
+ public static final String getDefaultLayoutName(PipelineData pipelineData)
{
- return getService().getDefaultLayoutName(data);
+ return getService().getDefaultLayoutName(pipelineData);
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Tue Oct 20 17:08:10 2015
@@ -32,6 +32,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.factory.FactoryException;
import org.apache.fulcrum.factory.FactoryService;
+import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.Assembler;
@@ -40,6 +41,7 @@ import org.apache.turbine.modules.Loader
import org.apache.turbine.modules.Navigation;
import org.apache.turbine.modules.Page;
import org.apache.turbine.modules.Screen;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
@@ -52,7 +54,6 @@ import org.apache.turbine.services.templ
import org.apache.turbine.services.template.mapper.LayoutTemplateMapper;
import org.apache.turbine.services.template.mapper.Mapper;
import org.apache.turbine.services.template.mapper.ScreenTemplateMapper;
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.uri.URIConstants;
/**
@@ -343,7 +344,7 @@ public class TurbineTemplateService
@Override
public String getDefaultTemplate()
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(defaultTemplate);
if (StringUtils.isNotEmpty(defaultExtension))
{
@@ -486,14 +487,15 @@ public class TurbineTemplateService
/**
* Find the default page module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default page for.
* @return The default page module name.
*/
@Override
- public String getDefaultPageName(RunData data)
+ public String getDefaultPageName(PipelineData pipelineData)
{
- String template = data.getParameters().get(URIConstants.CGI_TEMPLATE_PARAM);
+ ParameterParser pp = pipelineData.get(Turbine.class, ParameterParser.class);
+ String template = pp.get(URIConstants.CGI_TEMPLATE_PARAM);
return (template != null) ?
getDefaultPageName(template) : getDefaultPage();
}
@@ -501,14 +503,15 @@ public class TurbineTemplateService
/**
* Find the default layout module name for the given request.
*
- * @param data The encapsulation of the request to retrieve the
+ * @param pipelineData The encapsulation of the request to retrieve the
* default layout for.
* @return The default layout module name.
*/
@Override
- public String getDefaultLayoutName(RunData data)
+ public String getDefaultLayoutName(PipelineData pipelineData)
{
- String template = data.getParameters().get(URIConstants.CGI_TEMPLATE_PARAM);
+ ParameterParser pp = pipelineData.get(Turbine.class, ParameterParser.class);
+ String template = pp.get(URIConstants.CGI_TEMPLATE_PARAM);
return (template != null) ?
getDefaultLayoutName(template) : getDefaultLayout();
}
@@ -769,7 +772,7 @@ public class TurbineTemplateService
for (int i = 0; i < TEMPLATE_TYPES; i++)
{
- StringBuffer mapperProperty = new StringBuffer();
+ StringBuilder mapperProperty = new StringBuilder();
mapperProperty.append("mapper.");
mapperProperty.append(mapperNames[i]);
mapperProperty.append(".class");
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseTemplateMapper.java Tue Oct 20 17:08:10 2015
@@ -90,7 +90,7 @@ public abstract class BaseTemplateMapper
if (components[components.length -1 ].indexOf(TemplateService.EXTENSION_SEPARATOR) < 0)
{
- StringBuffer resBuf = new StringBuffer();
+ StringBuilder resBuf = new StringBuilder();
resBuf.append(res);
String [] templateComponents = StringUtils.split(template, String.valueOf(TemplateService.TEMPLATE_PARTS_SEPARATOR));
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java Tue Oct 20 17:08:10 2015
@@ -127,7 +127,7 @@ public class ClassMapper
for(;;)
{
String pkg = StringUtils.join(components.iterator(), String.valueOf(separator));
- StringBuffer testName = new StringBuffer();
+ StringBuilder testName = new StringBuilder();
log.debug("classPackage is now: " + pkg);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/LayoutTemplateMapper.java Tue Oct 20 17:08:10 2015
@@ -110,7 +110,7 @@ public class LayoutTemplateMapper
log.debug("templatePackage is now: " + templatePackage);
- StringBuffer testName = new StringBuffer();
+ StringBuilder testName = new StringBuilder();
if (!components.isEmpty())
{
@@ -123,7 +123,7 @@ public class LayoutTemplateMapper
: defaultName);
// But the Templating service must look for the name with prefix
- StringBuffer templatePath = new StringBuffer();
+ StringBuilder templatePath = new StringBuilder();
if (StringUtils.isNotEmpty(prefix))
{
templatePath.append(prefix);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java Tue Oct 20 17:08:10 2015
@@ -105,7 +105,7 @@ public class ScreenDefaultTemplateMapper
log.debug("templatePackage is now: " + templatePackage);
- StringBuffer testName = new StringBuffer();
+ StringBuilder testName = new StringBuilder();
if (!components.isEmpty())
{
@@ -118,7 +118,7 @@ public class ScreenDefaultTemplateMapper
: defaultName);
// But the Templating service must look for the name with prefix
- StringBuffer templatePath = new StringBuffer();
+ StringBuilder templatePath = new StringBuilder();
if (StringUtils.isNotEmpty(prefix))
{
templatePath.append(prefix);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java Tue Oct 20 17:08:10 2015
@@ -68,7 +68,7 @@ public class ScreenTemplateMapper
String templatePackage = StringUtils.join(components, String.valueOf(separator));
// But the Templating service must look for the name with prefix
- StringBuffer testPath = new StringBuffer();
+ StringBuilder testPath = new StringBuilder();
if (StringUtils.isNotEmpty(prefix))
{
testPath.append(prefix);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java Tue Oct 20 17:08:10 2015
@@ -283,7 +283,7 @@ public class TurbineUIService
// The following line is okay even for default.
Properties skinProperties = new Properties(defaultSkinProperties);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append('/').append(skinsDirectory);
sb.append('/').append(skinName);
sb.append('/').append(SKIN_PROPS_FILE);
@@ -474,7 +474,7 @@ public class TurbineUIService
private String getSkinResource(ServerData serverData, String skinName,
String subDir, String resourceName)
{
- StringBuffer sb = new StringBuffer(skinsDirectory);
+ StringBuilder sb = new StringBuilder(skinsDirectory);
sb.append("/").append(skinName);
if (subDir != null)
{
@@ -499,7 +499,7 @@ public class TurbineUIService
// Get the resources directory that is specified in the TR.props or
// default to "resources", relative to the webapp.
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(stripSlashes(TurbinePull.getResourcesDirectory()));
sb.append("/");
sb.append(stripSlashes(
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java Tue Oct 20 17:08:10 2015
@@ -153,7 +153,7 @@ public class FormMessage
@Override
public String toString()
{
- StringBuffer sb = new StringBuffer("formName:" + getFormName() + ", fieldNames:");
+ StringBuilder sb = new StringBuilder("formName:" + getFormName() + ", fieldNames:");
for (int i = 0; i< getFieldNames().length; i++){
sb.append(getFieldNames()[i] + " ");
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/GenerateUniqueId.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/GenerateUniqueId.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/GenerateUniqueId.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/GenerateUniqueId.java Tue Oct 20 17:08:10 2015
@@ -84,7 +84,7 @@ public class GenerateUniqueId
*/
static synchronized public String getIdentifier()
{
- StringBuffer sessionId = new StringBuffer();
+ StringBuilder sessionId = new StringBuilder();
// Random value.
long n = randomSource.nextLong();
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/ServerData.java Tue Oct 20 17:08:10 2015
@@ -78,7 +78,7 @@ public class ServerData
{
if (log.isDebugEnabled())
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Constructor(");
sb.append(serverName);
sb.append(", ");
@@ -248,11 +248,11 @@ public class ServerData
}
/**
- * Appends the Host URL to the supplied StringBuffer.
+ * Appends the Host URL to the supplied StringBuilder.
*
- * @param url A StringBuffer object
+ * @param url A StringBuilder object
*/
- public void getHostUrl(StringBuffer url)
+ public void getHostUrl(StringBuilder url)
{
url.append(getServerScheme());
url.append("://");
@@ -276,7 +276,7 @@ public class ServerData
*/
public String toString()
{
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
getHostUrl(url);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java Tue Oct 20 17:08:10 2015
@@ -65,7 +65,7 @@ public class ServletUtils
if (!text.startsWith("/") && !text.startsWith("./")
&& !text.startsWith("\\") && !text.startsWith(".\\"))
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("./");
sb.append(text);
text = sb.toString();
@@ -87,7 +87,7 @@ public class ServletUtils
StringTokenizer tokenizer = new StringTokenizer(text,
separator);
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while (tokenizer.hasMoreTokens())
{
buffer.append(base).append(tokenizer.nextToken());
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java Tue Oct 20 17:08:10 2015
@@ -249,7 +249,7 @@ public class TurbineConfig
if (log.isDebugEnabled())
{
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("TurbineConfig.getRealPath: path '");
sb.append(path);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java Tue Oct 20 17:08:10 2015
@@ -623,9 +623,9 @@ public class HtmlPageAttributes
*/
public String getDefaultDoctype()
{
- Configuration conf = Turbine.getConfiguration();
if (doctype == null)
{
+ Configuration conf = Turbine.getConfiguration();
String tag = conf.getString(
TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_KEY,
TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_DEFAULT);
@@ -647,6 +647,7 @@ public class HtmlPageAttributes
doctype = buildDoctype(tag, identifier, uri);
}
}
+
return doctype;
}
@@ -660,7 +661,7 @@ public class HtmlPageAttributes
*/
private String buildDoctype(String tag, String identifier, String uri)
{
- StringBuffer doctypeBuf = new StringBuffer("<!DOCTYPE ");
+ StringBuilder doctypeBuf = new StringBuilder("<!DOCTYPE ");
doctypeBuf.append(tag);
if (StringUtils.isNotEmpty(identifier))
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateNavigation.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateNavigation.java Tue Oct 20 17:08:10 2015
@@ -23,7 +23,6 @@ package org.apache.turbine.util.template
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.NavigationLoader;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
@@ -105,9 +104,7 @@ public class TemplateNavigation
throw new Exception(returnValue);
}
- ConcreteElement results =
- NavigationLoader.getInstance().eval(data, module);
- returnValue = results.toString();
+ returnValue = NavigationLoader.getInstance().eval(data, module);
}
catch (Exception e)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateScreen.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateScreen.java Tue Oct 20 17:08:10 2015
@@ -23,7 +23,6 @@ package org.apache.turbine.util.template
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.Screen;
import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.services.assemblerbroker.TurbineAssemblerBroker;
@@ -97,11 +96,11 @@ public class TemplateScreen
try
{
- ConcreteElement results = screenLoader.eval(data, this.screen);
+ String results = screenLoader.eval(data, this.screen);
if (results != null)
{
- returnValue = results.toString();
+ returnValue = results;
}
}
catch (Exception e)
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/BaseURI.java Tue Oct 20 17:08:10 2015
@@ -411,9 +411,9 @@ public abstract class BaseURI
* used in the Link output routines of derived classes to
* easily append the correct path.
*
- * @param sb The StringBuffer to store context path and script name.
+ * @param sb The StringBuilder to store context path and script name.
*/
- protected void getContextAndScript(StringBuffer sb)
+ protected void getContextAndScript(StringBuilder sb)
{
String context = getContextPath();
@@ -448,9 +448,9 @@ public abstract class BaseURI
* used in the Link output routines of derived classes to
* easily append the correct server scheme.
*
- * @param sb The StringBuffer to store the scheme and port information.
+ * @param sb The StringBuilder to store the scheme and port information.
*/
- protected void getSchemeAndPort(StringBuffer sb)
+ protected void getSchemeAndPort(StringBuilder sb)
{
// http(s)://<servername>
sb.append(getServerScheme());
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java Tue Oct 20 17:08:10 2015
@@ -123,7 +123,7 @@ public class DataURI
*/
public String getAbsoluteLink()
{
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
getSchemeAndPort(output);
getContextAndScript(output);
@@ -161,7 +161,7 @@ public class DataURI
*/
public String getRelativeLink()
{
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
getContextAndScript(output);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Tue Oct 20 17:08:10 2015
@@ -603,7 +603,7 @@ public class TurbineURI
*/
public String getAbsoluteLink()
{
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
getSchemeAndPort(output);
@@ -636,7 +636,7 @@ public class TurbineURI
*/
public String getRelativeLink()
{
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
buildRelativeLink(output);
@@ -647,11 +647,11 @@ public class TurbineURI
}
/**
- * Add everything needed for a relative link to the passed StringBuffer.
+ * Add everything needed for a relative link to the passed StringBuilder.
*
* @param output A Stringbuffer
*/
- private void buildRelativeLink(StringBuffer output)
+ private void buildRelativeLink(StringBuilder output)
{
getContextAndScript(output);
@@ -747,9 +747,9 @@ public class TurbineURI
/**
* Returns the Path Info data as a String.
*
- * @param output The StringBuffer that should hold the path info.
+ * @param output The StringBuilder that should hold the path info.
*/
- private void getPathInfoAsString(StringBuffer output)
+ private void getPathInfoAsString(StringBuilder output)
{
doEncode(output, dataVectors[PATH_INFO], '/', '/');
}
@@ -757,9 +757,9 @@ public class TurbineURI
/**
* Returns the Query data as a String.
*
- * @param output The StringBuffer that should hold the query data.
+ * @param output The StringBuilder that should hold the query data.
*/
- private void getQueryDataAsString(StringBuffer output)
+ private void getQueryDataAsString(StringBuilder output)
{
doEncode(output, dataVectors[QUERY_DATA], '&', '=');
}
@@ -772,7 +772,7 @@ public class TurbineURI
* @param fieldDelim A char which is used to separate key/value pairs
* @param valueDelim A char which is used to separate key and value
*/
- private void doEncode(StringBuffer output, Collection<URIParam> list, char fieldDelim, char valueDelim)
+ private void doEncode(StringBuilder output, Collection<URIParam> list, char fieldDelim, char valueDelim)
{
if(!list.isEmpty())
{
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java?rev=1709648&r1=1709647&r2=1709648&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java Tue Oct 20 17:08:10 2015
@@ -313,22 +313,6 @@ public class ActionLoaderTest extends Ba
}
@Test
- public void testDoPerformWithRunData() throws Exception
- {
- RunData data = getRunData(request, response, config);
- data.setAction("VelocityActionDoesNothing");
- try
- {
- ActionLoader.getInstance().exec(data, data.getAction());
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Should not have thrown an exception.");
- }
- }
-
- @Test
public void testDoPerformWithPipelineData() throws Exception
{
RunData data = getRunData(request, response, config);