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 2016/01/16 18:38:48 UTC
svn commit: r1725011 - in /turbine/core/trunk/src:
java/org/apache/turbine/modules/ java/org/apache/turbine/modules/actions/
java/org/apache/turbine/modules/actions/sessionvalidator/
java/org/apache/turbine/modules/screens/ java/org/apache/turbine/pipe...
Author: tv
Date: Sat Jan 16 17:38:47 2016
New Revision: 1725011
URL: http://svn.apache.org/viewvc?rev=1725011&view=rev
Log:
Roll out injected configuration values
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.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/VelocityErrorScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java Sat Jan 16 17:38:47 2016
@@ -32,6 +32,7 @@ import org.apache.fulcrum.parser.ValuePa
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineActionEvent;
+import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.pipeline.PipelineData;
/**
@@ -101,14 +102,16 @@ public abstract class ActionEvent extend
* If true, the eventSubmit_do<xxx> variable must contain
* a not null value to be executed.
*/
- private boolean submitValueKey = false;
+ @TurbineConfiguration( TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_KEY )
+ private boolean submitValueKey = TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_DEFAULT;
/**
* If true, then exceptions raised in eventSubmit_do<xxx> methods
* as well as in doPerform methods are bubbled up to the Turbine
* servlet's handleException method.
*/
- protected boolean bubbleUpException = true;
+ @TurbineConfiguration( TurbineConstants.ACTION_EVENT_BUBBLE_EXCEPTION_UP )
+ protected boolean bubbleUpException = TurbineConstants.ACTION_EVENT_BUBBLE_EXCEPTION_UP_DEFAULT;
/**
* Cache for the methods to invoke
@@ -116,31 +119,6 @@ public abstract class ActionEvent extend
private MultiKeyMap/* <String, Method> */ methodCache = new MultiKeyMap/* <String, Method> */();
/**
- * C'tor
- */
- public ActionEvent()
- {
- super();
-
- submitValueKey = Turbine.getConfiguration()
- .getBoolean(TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_KEY,
- TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_DEFAULT);
- bubbleUpException = Turbine.getConfiguration()
- .getBoolean(TurbineConstants.ACTION_EVENT_BUBBLE_EXCEPTION_UP,
- TurbineConstants.ACTION_EVENT_BUBBLE_EXCEPTION_UP_DEFAULT);
-
- if (log.isDebugEnabled())
- {
- log.debug(submitValueKey
- ? "ActionEvent accepts only eventSubmit_do Keys with a value != 0"
- : "ActionEvent accepts all eventSubmit_do Keys");
- log.debug(bubbleUpException
- ? "ActionEvent will bubble exceptions up to Turbine.handleException() method"
- : "ActionEvent will not bubble exceptions up.");
- }
- }
-
- /**
* Retrieve a method of the given name and signature. The value is cached.
*
* @param name the name of the method
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java Sat Jan 16 17:38:47 2016
@@ -49,28 +49,28 @@ public class InitContextsAction
private Configuration conf;
/**
- * This action will place the contexts defined in the
- * TurbineResources instance (if any) into the data.contexts
- * Hashtable.
+ * This action will place the contexts defined in the TurbineResources
+ * instance (if any) into the data.contexts Hashtable.
*
- * @param pipelineData The PipelineRunData object for the current request.
- * @exception NamingException could not create InitialContext
+ * @param pipelineData
+ * The PipelineRunData object for the current request.
+ * @exception NamingException
+ * could not create InitialContext
*/
@Override
public void doPerform(PipelineData pipelineData)
- throws NamingException
+ throws NamingException
{
RunData data = getRunData(pipelineData);
// Context properties are specified in lines in the properties
// file that begin with "context.contextname.", allowing
- // multiple named contexts to be used. Everything after the
+ // multiple named contexts to be used. Everything after the
// "contextname." is the name of the property that will be
// used by the InitialContext class to create a new context
// instance.
Hashtable<String, Properties> contextPropsList = new Hashtable<String, Properties>();
- for (Iterator<String> contextKeys = conf.getKeys("context.");
- contextKeys.hasNext();)
+ for (Iterator<String> contextKeys = conf.getKeys("context."); contextKeys.hasNext();)
{
String key = contextKeys.next();
int start = key.indexOf(".") + 1;
@@ -85,8 +85,7 @@ public class InitContextsAction
{
contextProps = new Properties();
}
- contextProps.put(key.substring(end + 1),
- conf.getString(key));
+ contextProps.put(key.substring(end + 1), conf.getString(key));
contextPropsList.put(contextName, contextProps);
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.actio
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,9 +60,14 @@ public class LoginUser
@TurbineService
private SecurityService security;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration conf;
+ @TurbineConfiguration( TurbineConstants.LOGIN_ERROR )
+ private String loginError = "";
+
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_LOGIN )
+ private String templateLogin;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_LOGIN )
+ private String screenLogin;
/**
* Updates the user's LastLogin timestamp, sets their state to
@@ -128,21 +132,18 @@ public class LoginUser
}
// Set Error Message and clean out the user.
- data.setMessage(conf.getString(TurbineConstants.LOGIN_ERROR, ""));
+ data.setMessage(loginError);
User anonymousUser = security.getAnonymousUser();
data.setUser(anonymousUser);
- String loginTemplate = conf.getString(
- TurbineConstants.TEMPLATE_LOGIN);
-
- if (StringUtils.isNotEmpty(loginTemplate))
+ if (StringUtils.isNotEmpty(templateLogin))
{
// We're running in a templating solution
- data.setScreenTemplate(loginTemplate);
+ data.setScreenTemplate(templateLogin);
}
else
{
- data.setScreen(conf.getString(TurbineConstants.SCREEN_LOGIN));
+ data.setScreen(screenLogin);
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.actio
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
@@ -46,9 +45,14 @@ public class LogoutUser
@TurbineService
private SecurityService security;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration conf;
+ @TurbineConfiguration( TurbineConstants.LOGOUT_MESSAGE )
+ private String logoutMessage;
+
+ @TurbineConfiguration( TurbineConstants.ACTION_LOGOUT_KEY )
+ private String actionLogout = TurbineConstants.ACTION_LOGOUT_DEFAULT;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_HOMEPAGE )
+ private String screenHomepage;
/**
* Clears the PipelineData user object back to an anonymous status not
@@ -87,7 +91,7 @@ public class LogoutUser
security.saveUser(user);
}
- data.setMessage(conf.getString(TurbineConstants.LOGOUT_MESSAGE));
+ data.setMessage(logoutMessage);
// This will cause the acl to be removed from the session in
// the Turbine servlet code.
@@ -110,11 +114,9 @@ public class LogoutUser
// - it is recommended that action.logout is set to "LogoutUser" and
// that the session validator does handle setting the screen/template
// for a logged out (read not-logged-in) user.
- if (!conf.getString(TurbineConstants.ACTION_LOGOUT_KEY,
- TurbineConstants.ACTION_LOGOUT_DEFAULT)
- .equals(TurbineConstants.ACTION_LOGOUT_DEFAULT))
+ if (!actionLogout.equals(TurbineConstants.ACTION_LOGOUT_DEFAULT))
{
- data.setScreen(conf.getString(TurbineConstants.SCREEN_HOMEPAGE));
+ data.setScreen(screenHomepage);
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.actio
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -66,8 +65,20 @@ public class DefaultSessionValidator
@TurbineService
private SecurityService security;
- @TurbineConfiguration
- private Configuration conf;
+ @TurbineConfiguration( TurbineConstants.LOGIN_MESSAGE )
+ private String loginMessage;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_LOGIN )
+ private String screenLogin;
+
+ @TurbineConfiguration( TurbineConstants.LOGIN_MESSAGE_NOSCREEN )
+ private String loginMessageNoScreen;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_HOMEPAGE )
+ private String screenHomepage;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_INVALID_STATE )
+ private String screenInvalidState;
/**
* Execute the action. The default is to populate the PipelineData
@@ -103,11 +114,11 @@ public class DefaultSessionValidator
// (e.g. the LogoutUser action).
if (StringUtils.isEmpty(data.getMessage()))
{
- data.setMessage(conf.getString(TurbineConstants.LOGIN_MESSAGE));
+ data.setMessage(loginMessage);
}
// set the screen to be the login page
- data.setScreen(conf.getString(TurbineConstants.SCREEN_LOGIN));
+ data.setScreen(screenLogin);
// We're not doing any actions buddy! (except action.login which
// will have been performed already)
@@ -116,9 +127,8 @@ public class DefaultSessionValidator
if (!data.hasScreen())
{
- data.setMessage(conf.getString(
- TurbineConstants.LOGIN_MESSAGE_NOSCREEN));
- data.setScreen(conf.getString(TurbineConstants.SCREEN_HOMEPAGE));
+ data.setMessage(loginMessageNoScreen);
+ data.setScreen(screenHomepage);
}
if (data.getParameters().containsKey("_session_access_counter"))
@@ -130,8 +140,7 @@ public class DefaultSessionValidator
{
data.getUser().setTemp("prev_screen", data.getScreen());
data.getUser().setTemp("prev_parameters", data.getParameters());
- data.setScreen(conf.getString(
- TurbineConstants.SCREEN_INVALID_STATE));
+ data.setScreen(screenInvalidState);
data.setAction("");
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.actio
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -66,8 +65,23 @@ public class TemplateSecureSessionValida
@TurbineService
private SecurityService security;
- @TurbineConfiguration
- private Configuration conf;
+ @TurbineConfiguration( TurbineConstants.LOGIN_MESSAGE )
+ private String loginMessage;
+
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_LOGIN )
+ private String templateLogin;
+
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_HOMEPAGE )
+ private String templateHomepage;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_HOMEPAGE )
+ private String screenHomepage;
+
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_INVALID_STATE )
+ private String templateInvalidState;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_INVALID_STATE )
+ private String screenInvalidState;
/**
* doPerform is virtually identical to DefaultSessionValidator
@@ -107,16 +121,13 @@ public class TemplateSecureSessionValida
// (e.g. the LogoutUser action).
if (StringUtils.isEmpty(data.getMessage()))
{
- data.setMessage(conf.getString(TurbineConstants.LOGIN_MESSAGE));
+ data.setMessage(loginMessage);
}
// Set the screen template to the login page.
- String loginTemplate =
- conf.getString(TurbineConstants.TEMPLATE_LOGIN);
-
log.debug("Sending User to the Login Screen ("
- + loginTemplate + ")");
- data.getTemplateInfo().setScreenTemplate(loginTemplate);
+ + templateLogin + ")");
+ data.getTemplateInfo().setScreenTemplate(templateLogin);
// We're not doing any actions buddy! (except action.login which
// will have been performed already)
@@ -129,17 +140,13 @@ public class TemplateSecureSessionValida
if (!data.hasScreen() && StringUtils.isEmpty(
data.getTemplateInfo().getScreenTemplate()))
{
- String template = conf.getString(
- TurbineConstants.TEMPLATE_HOMEPAGE);
-
- if (StringUtils.isNotEmpty(template))
+ if (StringUtils.isNotEmpty(templateHomepage))
{
- data.getTemplateInfo().setScreenTemplate(template);
+ data.getTemplateInfo().setScreenTemplate(templateHomepage);
}
else
{
- data.setScreen(conf.getString(
- TurbineConstants.SCREEN_HOMEPAGE));
+ data.setScreen(screenHomepage);
}
}
@@ -161,15 +168,13 @@ public class TemplateSecureSessionValida
data.getUser().setTemp("prev_template",
data.getTemplateInfo().getScreenTemplate()
.replace('/', ','));
- data.getTemplateInfo().setScreenTemplate(conf.getString(
- TurbineConstants.TEMPLATE_INVALID_STATE));
+ data.getTemplateInfo().setScreenTemplate(templateInvalidState);
}
else
{
data.getUser().setTemp("prev_screen",
data.getScreen().replace('/', ','));
- data.setScreen(conf.getString(
- TurbineConstants.SCREEN_INVALID_STATE));
+ data.setScreen(screenInvalidState);
}
data.getUser().setTemp("prev_parameters", data.getParameters());
data.setAction("");
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.actio
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -60,8 +59,17 @@ public class TemplateSessionValidator
@TurbineService
private SecurityService security;
- @TurbineConfiguration
- private Configuration conf;
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_HOMEPAGE )
+ private String templateHomepage;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_HOMEPAGE )
+ private String screenHomepage;
+
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_INVALID_STATE )
+ private String templateInvalidState;
+
+ @TurbineConfiguration( TurbineConstants.SCREEN_INVALID_STATE )
+ private String screenInvalidState;
/**
* Execute the action.
@@ -90,17 +98,13 @@ public class TemplateSessionValidator
if (!data.hasScreen() && StringUtils.isEmpty(
data.getTemplateInfo().getScreenTemplate()))
{
- String template = conf.getString(
- TurbineConstants.TEMPLATE_HOMEPAGE);
-
- if (StringUtils.isNotEmpty(template))
+ if (StringUtils.isNotEmpty(templateHomepage))
{
- data.getTemplateInfo().setScreenTemplate(template);
+ data.getTemplateInfo().setScreenTemplate(templateHomepage);
}
else
{
- data.setScreen(conf.getString(
- TurbineConstants.SCREEN_HOMEPAGE));
+ data.setScreen(screenHomepage);
}
}
// the session_access_counter can be placed as a hidden field in
@@ -119,15 +123,13 @@ public class TemplateSessionValidator
data.getUser().setTemp("prev_template",
data.getTemplateInfo().getScreenTemplate()
.replace('/', ','));
- data.getTemplateInfo().setScreenTemplate(conf.getString(
- TurbineConstants.TEMPLATE_INVALID_STATE));
+ data.getTemplateInfo().setScreenTemplate(templateInvalidState);
}
else
{
data.getUser().setTemp("prev_screen",
data.getScreen().replace('/', ','));
- data.setScreen(conf.getString(
- TurbineConstants.SCREEN_INVALID_STATE));
+ data.setScreen(screenInvalidState);
}
data.getUser().setTemp("prev_parameters", data.getParameters());
data.setAction("");
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java Sat Jan 16 17:38:47 2016
@@ -19,8 +19,8 @@ package org.apache.turbine.modules.scree
* under the License.
*/
-import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.pipeline.PipelineData;
/**
@@ -34,6 +34,9 @@ import org.apache.turbine.pipeline.Pipel
public class JspErrorScreen
extends BaseJspScreen
{
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_ERROR_KEY )
+ private String templateError = TurbineConstants.TEMPLATE_ERROR_JSP;
+
/**
* @param pipelineData Turbine information.
* @exception Exception a generic exception.
@@ -42,10 +45,6 @@ public class JspErrorScreen
protected void doBuildTemplate(PipelineData pipelineData)
throws Exception
{
- String errorTemplate = Turbine.getConfiguration()
- .getString(TurbineConstants.TEMPLATE_ERROR_KEY,
- TurbineConstants.TEMPLATE_ERROR_JSP);
-
- setTemplate(pipelineData, errorTemplate);
+ setTemplate(pipelineData, templateError);
}
}
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=1725011&r1=1725010&r2=1725011&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 Sat Jan 16 17:38:47 2016
@@ -79,10 +79,7 @@ public class VelocityCachedScreen
context.put (TurbineConstants.PROCESSING_EXCEPTION_PLACEHOLDER, e.toString());
context.put (TurbineConstants.STACK_TRACE_PLACEHOLDER, ExceptionUtils.getStackTrace(e));
- templateName = conf.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
- TurbineConstants.TEMPLATE_ERROR_VM);
-
- velocity.handleRequest(context, prefix + templateName, data.getOut());
+ velocity.handleRequest(context, prefix + templateError, data.getOut());
}
return null;
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=1725011&r1=1725010&r2=1725011&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 Sat Jan 16 17:38:47 2016
@@ -83,11 +83,7 @@ public class VelocityDirectScreen
context.put (TurbineConstants.PROCESSING_EXCEPTION_PLACEHOLDER, e.toString());
context.put (TurbineConstants.STACK_TRACE_PLACEHOLDER, ExceptionUtils.getStackTrace(e));
- templateName = conf.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
- TurbineConstants.TEMPLATE_ERROR_VM);
-
- velocity.handleRequest(context,
- prefix + templateName,
+ velocity.handleRequest(context, prefix + templateError,
data.getResponse().getOutputStream());
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java Sat Jan 16 17:38:47 2016
@@ -53,9 +53,6 @@ public class VelocityErrorScreen
context.put (TurbineConstants.STACK_TRACE_PLACEHOLDER,
data.getStackTrace());
- String errorTemplate = conf.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
- TurbineConstants.TEMPLATE_ERROR_VM);
-
- setTemplate(pipelineData, errorTemplate);
+ setTemplate(pipelineData, templateError);
}
}
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=1725011&r1=1725010&r2=1725011&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 Sat Jan 16 17:38:47 2016
@@ -19,7 +19,6 @@ package org.apache.turbine.modules.scree
* under the License.
*/
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.turbine.TurbineConstants;
@@ -60,9 +59,8 @@ public class VelocityScreen
@TurbineService
protected TemplateService templateService;
- /** Injected configuration instance */
- @TurbineConfiguration
- protected Configuration conf;
+ @TurbineConfiguration( TurbineConstants.TEMPLATE_ERROR_KEY )
+ protected String templateError = TurbineConstants.TEMPLATE_ERROR_VM;
/**
* Velocity Screens extending this class should override this
@@ -146,10 +144,7 @@ public class VelocityScreen
context.put (TurbineConstants.PROCESSING_EXCEPTION_PLACEHOLDER, e.toString());
context.put (TurbineConstants.STACK_TRACE_PLACEHOLDER, ExceptionUtils.getStackTrace(e));
- templateName = conf.getString(TurbineConstants.TEMPLATE_ERROR_KEY,
- TurbineConstants.TEMPLATE_ERROR_VM);
-
- screenData = velocity.handleRequest(context, prefix + templateName);
+ screenData = velocity.handleRequest(context, prefix + templateError);
}
return screenData;
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java Sat Jan 16 17:38:47 2016
@@ -23,7 +23,6 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
-import org.apache.commons.configuration.Configuration;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineLoader;
@@ -46,9 +45,8 @@ public class DefaultACLCreationValve
@TurbineLoader( Action.class )
private ActionLoader actionLoader;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration config;
+ @TurbineConfiguration( TurbineConstants.ACTION_ACCESS_CONTROLLER_KEY )
+ private String actionAccessController = TurbineConstants.ACTION_ACCESS_CONTROLLER_DEFAULT;
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
@@ -64,10 +62,7 @@ public class DefaultACLCreationValve
// into the session for serialization. Modules can null
// out the ACL to force it to be rebuilt based on more
// information.
- actionLoader.exec(
- pipelineData, config.getString(
- TurbineConstants.ACTION_ACCESS_CONTROLLER_KEY,
- TurbineConstants.ACTION_ACCESS_CONTROLLER_DEFAULT));
+ actionLoader.exec(pipelineData, actionAccessController);
}
catch (Exception e)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java Sat Jan 16 17:38:47 2016
@@ -28,7 +28,6 @@ import java.util.List;
import javax.servlet.http.HttpSession;
-import org.apache.commons.configuration.Configuration;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineLoader;
@@ -55,9 +54,11 @@ public class DefaultLoginValve
@TurbineLoader( Action.class )
private ActionLoader actionLoader;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration config;
+ @TurbineConfiguration( TurbineConstants.ACTION_LOGIN_KEY )
+ private String actionLogin;
+
+ @TurbineConfiguration( TurbineConstants.ACTION_LOGOUT_KEY )
+ private String actionLogout;
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
@@ -96,10 +97,8 @@ public class DefaultLoginValve
// after the logout has taken place.
String actionName = data.getAction();
if (data.hasAction() &&
- actionName.equalsIgnoreCase
- (config.getString(TurbineConstants.ACTION_LOGIN_KEY)) ||
- actionName.equalsIgnoreCase
- (config.getString(TurbineConstants.ACTION_LOGOUT_KEY)))
+ actionName.equalsIgnoreCase(actionLogin) ||
+ actionName.equalsIgnoreCase(actionLogout))
{
// If a User is logging in, we should refresh the
// session here. Invalidating session and starting a
@@ -112,8 +111,7 @@ public class DefaultLoginValve
// associated with the previous User. Currently the
// only keys stored in the session are "turbine.user"
// and "turbine.acl".
- if (actionName.equalsIgnoreCase
- (config.getString(TurbineConstants.ACTION_LOGIN_KEY)))
+ if (actionName.equalsIgnoreCase(actionLogin))
{
@SuppressWarnings("unchecked")
Enumeration<String> names = data.getSession().getAttributeNames();
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java Sat Jan 16 17:38:47 2016
@@ -23,9 +23,8 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
-import org.apache.commons.configuration.Configuration;
-import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
@@ -41,20 +40,8 @@ import org.apache.turbine.util.TurbineEx
public class DefaultSessionTimeoutValve
extends AbstractValve
{
- protected int timeout;
-
- /**
- * Here we can setup objects that are thread safe and can be
- * reused, so we get the timeout from the configuration..
- */
- public DefaultSessionTimeoutValve()
- {
- Configuration cfg = Turbine.getConfiguration();
-
- // Get the session timeout.
- timeout = cfg.getInt(TurbineConstants.SESSION_TIMEOUT_KEY,
- TurbineConstants.SESSION_TIMEOUT_DEFAULT);
- }
+ @TurbineConfiguration( TurbineConstants.SESSION_TIMEOUT_KEY )
+ protected int timeout = TurbineConstants.SESSION_TIMEOUT_DEFAULT;
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java Sat Jan 16 17:38:47 2016
@@ -23,7 +23,6 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
-import org.apache.commons.configuration.Configuration;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineLoader;
@@ -46,9 +45,8 @@ public class DefaultSessionValidationVal
@TurbineLoader( Action.class )
private ActionLoader actionLoader;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration config;
+ @TurbineConfiguration( TurbineConstants.ACTION_SESSION_VALIDATOR_KEY )
+ private String actionSessionValidator = TurbineConstants.ACTION_SESSION_VALIDATOR_DEFAULT;
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
@@ -67,9 +65,7 @@ public class DefaultSessionValidationVal
// screen other than Login, you need to change that within
// TurbineResources.properties...screen.homepage; or, you
// can specify your own SessionValidator action.
- actionLoader.exec(pipelineData, config.getString(
- TurbineConstants.ACTION_SESSION_VALIDATOR_KEY,
- TurbineConstants.ACTION_SESSION_VALIDATOR_DEFAULT));
+ actionLoader.exec(pipelineData, actionSessionValidator);
}
catch (Exception e)
{
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=1725011&r1=1725010&r2=1725011&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 Sat Jan 16 17:38:47 2016
@@ -23,7 +23,6 @@ package org.apache.turbine.pipeline;
import java.io.IOException;
-import org.apache.commons.configuration.Configuration;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineLoader;
@@ -52,9 +51,8 @@ public class ExecutePageValve
@TurbineLoader( Page.class )
private PageLoader pageLoader;
- /** Injected configuration instance */
- @TurbineConfiguration
- private Configuration config;
+ @TurbineConfiguration( TurbineConstants.PAGE_DEFAULT_KEY )
+ private String pageDefault = TurbineConstants.PAGE_DEFAULT_DEFAULT;
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData, ValveContext)
@@ -112,8 +110,7 @@ public class ExecutePageValve
* if they wish but the DefaultPage should work in
* most cases.
*/
- defaultPage = config.getString(TurbineConstants.PAGE_DEFAULT_KEY,
- TurbineConstants.PAGE_DEFAULT_DEFAULT);
+ defaultPage = pageDefault;
}
pageLoader.exec(pipelineData, defaultPage);
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=1725011&r1=1725010&r2=1725011&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 Sat Jan 16 17:38:47 2016
@@ -26,10 +26,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
-import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.services.pull.ApplicationTool;
/**
@@ -121,6 +120,15 @@ public class HtmlPageAttributes
/** Doctype */
private String doctype = null;
+ @TurbineConfiguration( TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_KEY )
+ private String defaultHtmlDoctypeRootElement = TurbineConstants.DEFAULT_HTML_DOCTYPE_ROOT_ELEMENT_DEFAULT;
+
+ @TurbineConfiguration( TurbineConstants.DEFAULT_HTML_DOCTYPE_IDENTIFIER_KEY )
+ private String defaultHtmlDoctypeIdentifier = TurbineConstants.DEFAULT_HTML_DOCTYPE_IDENTIFIER_DEFAULT;
+
+ @TurbineConfiguration( TurbineConstants.DEFAULT_HTML_DOCTYPE_URI_KEY )
+ private String defaultHtmlDoctypeUri = TurbineConstants.DEFAULT_HTML_DOCTYPE_URI_DEFAULT;
+
/**
* Construct a new instance
*/
@@ -625,10 +633,7 @@ public class HtmlPageAttributes
{
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);
+ String tag = defaultHtmlDoctypeRootElement;
if (StringUtils.isEmpty(tag))
{
@@ -636,15 +641,7 @@ public class HtmlPageAttributes
}
else
{
- String identifier = conf.getString(
- TurbineConstants.DEFAULT_HTML_DOCTYPE_IDENTIFIER_KEY,
- TurbineConstants.DEFAULT_HTML_DOCTYPE_IDENTIFIER_DEFAULT);
-
- String uri = conf.getString(
- TurbineConstants.DEFAULT_HTML_DOCTYPE_URI_KEY,
- TurbineConstants.DEFAULT_HTML_DOCTYPE_URI_DEFAULT);
-
- doctype = buildDoctype(tag, identifier, uri);
+ doctype = buildDoctype(tag, defaultHtmlDoctypeIdentifier, defaultHtmlDoctypeUri);
}
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java?rev=1725011&r1=1725010&r2=1725011&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java Sat Jan 16 17:38:47 2016
@@ -1,6 +1,5 @@
package org.apache.turbine.pipeline;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,6 +19,7 @@ package org.apache.turbine.pipeline;
* under the License.
*/
+import static org.junit.Assert.assertEquals;
import java.util.Vector;
@@ -42,14 +42,13 @@ import org.junit.Test;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockServletConfig;
-import static org.junit.Assert.*;
-
/**
* Tests TurbinePipeline.
*
* @author <a href="mailto:epugh@opensourceConnections.com">Eric Pugh</a>
* @author <a href="mailto:peter@courcoux.biz">Peter Courcoux</a>
- * @version $Id$
+ * @version $Id: DefaultSessionTimeoutValveTest.java 1606111 2014-06-27
+ * 14:46:47Z gk $
*/
public class DefaultSessionTimeoutValveTest extends BaseTestCase
{
@@ -59,17 +58,18 @@ public class DefaultSessionTimeoutValveT
private EnhancedMockHttpSession session = null;
private HttpServletResponse response = null;
-
@BeforeClass
- public static void init() {
+ public static void init()
+ {
tc = new TurbineConfig(
- ".",
- "/conf/test/CompleteTurbineResources.properties");
+ ".",
+ "/conf/test/CompleteTurbineResources.properties");
tc.initialize();
}
@Before
- public void setUpBefore() throws Exception {
+ public void setUpBefore() throws Exception
+ {
config = new MockServletConfig();
config.setupNoParameters();
request = new EnhancedMockHttpServletRequest();
@@ -95,7 +95,8 @@ public class DefaultSessionTimeoutValveT
/**
* Tests the Valve.
*/
- @Test public void testDefaults() throws Exception
+ @Test
+ public void testDefaults() throws Exception
{
// reset
Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY,
@@ -103,9 +104,9 @@ public class DefaultSessionTimeoutValveT
Vector<String> v = new Vector<String>();
v.add(URIConstants.CGI_ACTION_PARAM);
request.setupGetParameterNames(v.elements());
- request.setupAddParameter(URIConstants.CGI_ACTION_PARAM,"TestAction");
+ request.setupAddParameter(URIConstants.CGI_ACTION_PARAM, "TestAction");
- PipelineData pipelineData = getPipelineData(request,response,config);
+ PipelineData pipelineData = getPipelineData(request, response, config);
Pipeline pipeline = new TurbinePipeline();
@@ -114,39 +115,35 @@ public class DefaultSessionTimeoutValveT
pipeline.invoke(pipelineData);
- RunData runData = (RunData)pipelineData;
- assertEquals(0,runData.getSession().getMaxInactiveInterval());
-
-
+ RunData runData = (RunData) pipelineData;
+ assertEquals(0, runData.getSession().getMaxInactiveInterval());
}
/**
* Tests the Valve.
*/
- @Test public void testTimeoutSet() throws Exception
+ @Test
+ public void testTimeoutSet() throws Exception
{
-
- Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY,"3600");
- PipelineData pipelineData = getPipelineData(request,response,config);
+ Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY, "3600");
+ PipelineData pipelineData = getPipelineData(request, response, config);
Pipeline pipeline = new TurbinePipeline();
DefaultSessionTimeoutValve valve = new DefaultSessionTimeoutValve();
pipeline.addValve(valve);
+ pipeline.initialize();
pipeline.invoke(pipelineData);
- RunData runData = (RunData)pipelineData;
-
- assertEquals(3600,runData.getSession().getMaxInactiveInterval());
-
+ RunData runData = (RunData) pipelineData;
+ assertEquals(3600, runData.getSession().getMaxInactiveInterval());
}
-
+
@AfterClass
- public static void destroy() {
+ public static void destroy()
+ {
tc.dispose();
}
-
-
}