You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2005/05/07 18:11:42 UTC
svn commit: r169091 [3/5] - in
/struts/core/trunk/src/share/org/apache/struts: ./ action/ actions/ chain/
chain/commands/ chain/commands/generic/ chain/commands/servlet/
chain/commands/util/ chain/contexts/ config/ config/impl/ mock/ plugins/
upload/ util/ validator/ validator/validwhen/
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
- *
+ * $Id$
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,64 +31,64 @@
/**
- * <p>An ActionContext represents a view of a commons-chain
- * <code>Context</code> which encapsulates access to request
+ * <p>An ActionContext represents a view of a commons-chain
+ * <code>Context</code> which encapsulates access to request
* and session-scoped resources and services</p>
*/
public interface ActionContext extends Context {
public static final String APPLICATION_SCOPE = "application";
-
+
public static final String SESSION_SCOPE = "session";
-
+
public static final String REQUEST_SCOPE = "request";
// -------------------------------
// General Application Support
// -------------------------------
/**
- * Signal to the instance that it will not be used any more, so that any resources which should
+ * Signal to the instance that it will not be used any more, so that any resources which should
* be cleaned up can be cleaned up.
*/
void release();
-
+
/**
- * <p>Return a <code>Map</code> of Application scoped values.</p>
- *
- * <p>This is implemented in analogy with the Application scope in
+ * <p>Return a <code>Map</code> of Application scoped values.</p>
+ *
+ * <p>This is implemented in analogy with the Application scope in
* the Servlet API, but it seems reasonable to expect that any
* Struts implementation will have an equivalent concept.</p>
- *
- * <p>The ultimate meaning of "application scope" is an implementation detail
+ *
+ * <p>The ultimate meaning of "application scope" is an implementation detail
* left unspecified by Struts.</p>
* @return
*/
Map getApplicationScope();
-
+
/**
* <p>Return a <code>Map</code> of Session scoped values. A session
- * is understood as a sequence of requests made by the same user.</p>
- *
- * <p>This is implemented in analogy with the Session scope in
+ * is understood as a sequence of requests made by the same user.</p>
+ *
+ * <p>This is implemented in analogy with the Session scope in
* the Servlet API, but it seems reasonable to expect that any
* Struts implementation will have an equivalent concept.</p>
- *
- * <p>The ultimate meaning of "session scope" is an implementation detail
+ *
+ * <p>The ultimate meaning of "session scope" is an implementation detail
* left unspecified by Struts.</p>
* @return
*/
Map getSessionScope();
-
+
/**
- * <p>Return a <code>Map</code> of request scoped values. A
- * request is understood as the fundamental motivation for any
+ * <p>Return a <code>Map</code> of request scoped values. A
+ * request is understood as the fundamental motivation for any
* particular instance of an <code>ActionContext</code>.</p>
- *
- * <p>This is implemented in analogy with the Request Context in
+ *
+ * <p>This is implemented in analogy with the Request Context in
* the Servlet API, but it seems reasonable to expect that any
* Struts implementation will have an equivalent concept.</p>
- *
- * <p>The ultimate meaning of "request scope" is an implementation detail
+ *
+ * <p>The ultimate meaning of "request scope" is an implementation detail
* left unspecified by Struts.</p>
* @return
*/
@@ -97,25 +97,25 @@
/**
* Return the Map representing the scope identified by <code>scopeName</code>.
* Implementations should support at minimum the names associated with the constants
- * <code>APPLICATION_SCOPE</code>, <code>SESSION_SCOPE</code>, and
+ * <code>APPLICATION_SCOPE</code>, <code>SESSION_SCOPE</code>, and
* <code>REQUEST_SCOPE</code>, but are permitted to support others as well.
* @param scopeName
* @return
*/
Map getScope(String scopeName);
-
+
/**
* <p>Return a <code>Map</code> of parameters submitted by the user
* as part of this request.</p>
- *
- * <p>This is implemented in analogy with the Request parameters of
+ *
+ * <p>This is implemented in analogy with the Request parameters of
* the Servlet API, but it seems reasonable to expect that any
* Struts implementation will have an equivalent concept.</p>
- *
+ *
* @return
*/
Map getParameterMap();
-
+
// -------------------------------
// General Struts properties
// -------------------------------
@@ -130,7 +130,7 @@
/**
* Get the action which has been identified to be executed as part
* of processing this request.
- *
+ *
* @return
*/
Action getAction();
@@ -144,15 +144,15 @@
void setActionForm(ActionForm form);
/**
- * Get the ActionForm instance which will carry any data submitted as
+ * Get the ActionForm instance which will carry any data submitted as
* part of this request.
- *
+ *
* @return
*/
ActionForm getActionForm();
/**
- * Set the ActionConfig class contains the details
+ * Set the ActionConfig class contains the details
* for processing this request.
* @param config
*/
@@ -165,45 +165,45 @@
ActionConfig getActionConfig();
/**
- * Set the ForwardConfig which should be used as the basis of the view segment
+ * Set the ForwardConfig which should be used as the basis of the view segment
* of the overall processing. This is the primary method of "communication" with
* the "view" sub-chain.
- *
+ *
* @param forward
*/
void setForwardConfig(ForwardConfig forward);
/**
* Get the ForwardConfig which has been identified as the basis for view-processing.
- *
+ *
* @return
*/
ForwardConfig getForwardConfig();
/**
* Set the include path which should be processed as part of processing this request.
- *
+ *
* @param forward
*/
void setInclude(String include);
/**
* Get the include path which should be processed as part of processing this request.
- *
+ *
* @return
*/
String getInclude();
/**
* Set the ModuleConfig which is operative for the current request.
- *
+ *
* @param config
*/
void setModuleConfig(ModuleConfig config);
/**
* Get the ModuleConfig which is operative for the current request.
- * @return
+ * @return
*/
ModuleConfig getModuleConfig();
@@ -211,7 +211,7 @@
* Is the ActionForm for this context valid? This <em>does not</em> actually perform
* form validation. It is simply a holder property where processes which perform validation
* can store the results of the validation for other processes' benefit.
- *
+ *
* @return <code>Boolean.TRUE</code> if the form passed validation; <code>Boolean.FALSE</code>
* if the form failed validation; null if the form has not yet been validated.
*/
@@ -228,13 +228,13 @@
* @return
*/
Exception getException();
-
+
/**
* Store an exception in this context for use by other handling code.
* @param e
*/
void setException(Exception e);
-
+
// -------------------------------
// ActionMessage Processing
// -------------------------------
@@ -307,7 +307,7 @@
/**
- * <p>Save the specified messages keys into the appropriate scope
+ * <p>Save the specified messages keys into the appropriate scope
* for use by the <html:messages> tag (if
* messages="true" is set), if any messages are required. Otherwise,
* ensure that the session attribute is not created.</p>
@@ -394,7 +394,7 @@
/**
* <p>Returns <code>Boolean.TRUE</code> if the current form's cancel button was
- * pressed. Rather than evaluating any system state,
+ * pressed. Rather than evaluating any system state,
* this simply reflects the value of the <code>cancelled</code> property,
* assuming it was set elsewhere by some other process.</p>
*
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
- *
+ * $Id$
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@
public static final String MODULE_CONFIG_KEY = Constants.MODULE_CONFIG_KEY;
public static final String EXCEPTION_KEY = Constants.EXCEPTION_KEY;
-
+
public static final String ERROR_ACTION_MESSAGES_KEY = "errors";
public static final String MESSAGE_ACTION_MESSAGES_KEY = "messages";
@@ -77,11 +77,11 @@
public static final String TRANSACTION_TOKEN_KEY = "TRANSACTION_TOKEN_KEY";
public static final String TOKEN_KEY = "TOKEN_KEY";
-
+
protected TokenProcessor token = null;
private Log logger = null;
-
+
public ActionContextBase(Context context) {
super(context);
token = TokenProcessor.getInstance();
@@ -98,14 +98,14 @@
public void release() {
this.token = null;
- };
+ };
- public abstract Map getApplicationScope();
+ public abstract Map getApplicationScope();
public abstract Map getRequestScope();
public abstract Map getSessionScope();
-
+
public Map getScope(String scopeName) {
if (REQUEST_SCOPE.equals(scopeName)) return this.getRequestScope();
if (SESSION_SCOPE.equals(scopeName)) return this.getSessionScope();
@@ -175,11 +175,11 @@
public Exception getException() {
return (Exception) this.get(EXCEPTION_KEY);
}
-
+
public void setException(Exception e) {
this.put(EXCEPTION_KEY, e);
}
-
+
// -------------------------------
// ActionMessage Processing
// -------------------------------
@@ -256,8 +256,8 @@
// Token Processing
// -------------------------------
- /** @todo Is there a problem trying to map this method from Action
- * to ActionContext when we aren't necessarily sure how token
+ /** @todo Is there a problem trying to map this method from Action
+ * to ActionContext when we aren't necessarily sure how token
* processing maps into a context with an ill-defined "session"?
* There's no getToken() method, but maybe there should be. */
public void saveToken() {
@@ -271,7 +271,7 @@
}
protected String getTokenGeneratorId() {
- /** @todo The original implementation was based on the HttpSession identifier;
+ /** @todo The original implementation was based on the HttpSession identifier;
what would be a way to do that without depending on the Servlet API?
*/
return "";
@@ -380,9 +380,9 @@
public ActionForm findOrCreateActionForm(String formName, String scopeName) throws IllegalAccessException, InstantiationException {
return this.findOrCreateActionForm(formName, scopeName, this.getModuleConfig());
}
-
+
/**
- * <p>In the context of the given <code>ModuleConfig</code> and this <code>ActionContext</code>,
+ * <p>In the context of the given <code>ModuleConfig</code> and this <code>ActionContext</code>,
* look for an existing <code>ActionForm</code> in the specified scope. If one is found, return
* it; otherwise, create a new instance, add it to that scope, and then return it.</p>
* @param formName
@@ -393,14 +393,14 @@
*/
public ActionForm findOrCreateActionForm(String formName, String scopeName, ModuleConfig moduleConfig) throws IllegalAccessException, InstantiationException {
Map scope = this.getScope(scopeName);
-
+
ActionForm instance = null;
FormBeanConfig formBeanConfig = moduleConfig.findFormBeanConfig(formName);
if (formBeanConfig == null) {
throw new IllegalArgumentException("No form config found under " + formName + " in module " + moduleConfig.getPrefix() );
}
-
+
instance = (ActionForm) scope.get(formName);
// Can we recycle the existing instance (if any)?
if (instance != null) {
@@ -415,6 +415,6 @@
return form;
}
-
+
}
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/ContextWrapper.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ContextWrapper.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/ContextWrapper.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/ContextWrapper.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
- *
+ * $Id$
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/MockActionContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/MockActionContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/MockActionContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/MockActionContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
* $Id$
- *
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,16 +21,16 @@
import java.util.Map;
/**
- * Implementation of <code>ActionContext</code> which begins with empty maps for
+ * Implementation of <code>ActionContext</code> which begins with empty maps for
* <code>applicationScope</code>, <code>sessionScope</code>, <code>requestScope</code>,
* and <code>parameterMap</code> properties.
- * :TODO Are there any useful "assert" type methods we could add to this?
+ * :TODO Are there any useful "assert" type methods we could add to this?
*/
public class MockActionContext extends ActionContextBase {
private Map applicationScope = new HashMap();
private Map requestScope = new HashMap();
private Map sessionScope = new HashMap();
- private Map parameterMap = new HashMap();
+ private Map parameterMap = new HashMap();
public Map getApplicationScope() {
return applicationScope;
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
- *
+ * $Id$
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
import org.apache.struts.util.MessageResources;
/**
- * Implement ActionContext interface while making Servlet API-specific
+ * Implement ActionContext interface while making Servlet API-specific
* values available.
*/
public class ServletActionContext extends WebActionContext {
@@ -193,6 +193,6 @@
}
-
+
}
Modified: struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/contexts/WebActionContext.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
- *
+ * $Id$
+ *
* Copyright 2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
import org.apache.commons.chain.web.WebContext;
/**
- * Subclass of ActionContextBase which is understood to be wrapping
+ * Subclass of ActionContextBase which is understood to be wrapping
* an instance of <code>org.apache.commons.chain.web.WebContext</code>.
*/
public class WebActionContext extends ActionContextBase {
@@ -41,7 +41,7 @@
public void release() {
super.release();
}
-
+
public Map getApplicationScope()
{
return wcontext().getApplicationScope();
@@ -78,14 +78,14 @@
}
/**
- * <p>Return the map returned by our nested <code>WebContext</code>'s
+ * <p>Return the map returned by our nested <code>WebContext</code>'s
* <code>getParamValues()</code> method. </p>
*/
public Map getParameterMap()
{
return getParamValues();
}
-
+
public Map getSessionScope()
{
return wcontext().getSessionScope();
@@ -113,7 +113,7 @@
}
return mc;
}
-
+
/*
* @todo AbstractSelectModule set the precedent of doing this at the "web context" level
* instead of the ServletWebContext level. Consider whether that's how we want to do it
@@ -131,7 +131,7 @@
}
-
+
public Boolean getCancelled() {
Boolean c = super.getCancelled();
if (c == null) {
Modified: struts/core/trunk/src/share/org/apache/struts/config/ActionConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ActionConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ActionConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ActionConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -133,29 +133,29 @@
/**
- * <p>The path of the ActionConfig that this object should inherit
- * properties from.</p>
+ * <p>The path of the ActionConfig that this object should inherit
+ * properties from.</p>
*/
protected String inherit = null;
/**
- * <p>Returns the path of the ActionConfig that this object should inherit
+ * <p>Returns the path of the ActionConfig that this object should inherit
* properties from.</p>
- *
- * @return the path of the ActionConfig that this object should inherit
+ *
+ * @return the path of the ActionConfig that this object should inherit
* properties from.
- */
+ */
public String getExtends() {
return (this.inherit);
}
/**
- * <p>Set the path of the ActionConfig that this object should inherit
+ * <p>Set the path of the ActionConfig that this object should inherit
* properties from.</p>
- *
- * @param inherit the path of the ActionConfig that this object should
+ *
+ * @param inherit the path of the ActionConfig that this object should
* inherit properties from.
- */
+ */
public void setExtends(String inherit) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
@@ -166,13 +166,13 @@
/**
* Have the inheritance values for this class been applied?
- */
+ */
protected boolean extensionProcessed = false;
public boolean isExtensionProcessed() {
return extensionProcessed;
}
-
+
/**
* Context-relative path of the web application resource that will process
@@ -581,14 +581,14 @@
}
/**
- * The name of a <code>commons-chain</code> command which should
+ * The name of a <code>commons-chain</code> command which should
* be executed as part of the processing of this action.
* @since Struts 1.3.0
*/
protected String command = null;
/**
- * The name of a <code>commons-chain</code> catalog in which <code>command</code>
+ * The name of a <code>commons-chain</code> catalog in which <code>command</code>
* should be sought. If a <code>command</code> is defined and this property is undefined,
* the "default" catalog will be used.
* This is likely to be infrequently
@@ -599,9 +599,9 @@
protected String catalog = null;
/**
- * Get the name of a <code>commons-chain</code> command which should
+ * Get the name of a <code>commons-chain</code> command which should
* be executed as part of the processing of this action.
- * @return name of a <code>commons-chain</code> command which should
+ * @return name of a <code>commons-chain</code> command which should
* be executed as part of the processing of this action.
* @since Struts 1.3.0
*/
@@ -623,9 +623,9 @@
}
/**
- * Set the name of a <code>commons-chain</code> command which should
+ * Set the name of a <code>commons-chain</code> command which should
* be executed as part of the processing of this action.
- * @param command name of a <code>commons-chain</code> command which should
+ * @param command name of a <code>commons-chain</code> command which should
* be executed as part of the processing of this action.
* @since Struts 1.3.0
*/
@@ -642,7 +642,7 @@
* used after a future release of <code>commons-chain</code> supports
* a one-string expression of a catalog/chain combination.
* @param catalog name of a <code>commons-chain</code> catalog in which
- * a specified command should be sought.
+ * a specified command should be sought.
* @since Struts 1.3.0
*/
public void setCatalog(String catalog) {
@@ -654,18 +654,18 @@
// ------------------------------------------------------ Protected Methods
-
-
+
+
/**
* <p>Traces the hierarchy of this object to check if any of the ancestors
* is extending this instance.</p>
- *
+ *
* @param moduleConfig The configuration for the module being configured.
- *
+ *
* @return true if circular inheritance was detected.
- */
+ */
protected boolean checkCircularInheritance(ModuleConfig moduleConfig) {
-
+
String ancestorPath = getExtends();
while (ancestorPath != null) {
// check if we have the same path as an ancestor
@@ -674,7 +674,7 @@
}
// get our ancestor's ancestor
- ActionConfig ancestor =
+ ActionConfig ancestor =
moduleConfig.findActionConfig(ancestorPath);
if (ancestor != null) {
ancestorPath = ancestor.getExtends();
@@ -682,11 +682,11 @@
ancestorPath = null;
}
}
-
+
return false;
}
-
+
/**
* <p>Compare the exception handlers of this action with that of the given
* and copy those that are not present.</p>
@@ -698,13 +698,13 @@
protected void inheritExceptionHandlers(ActionConfig baseConfig)
throws ClassNotFoundException,
IllegalAccessException,
- InstantiationException,
+ InstantiationException,
InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
-
+
// Inherit exception handler configs
ExceptionConfig[] baseHandlers = baseConfig.findExceptionConfigs();
for (int i = 0; i < baseHandlers.length; i++) {
@@ -727,7 +727,7 @@
// process any extension that this config might have
copy.processExtends(getModuleConfig(), this);
-
+
}
}
@@ -737,17 +737,17 @@
/**
* <p>Compare the forwards of this action with that of the given and
* copy those that are not present.</p>
- *
+ *
* @param baseConfig The action config to copy forwards from.
- *
- * @see #inheritFrom(ActionConfig)
- */
- protected void inheritForwards(ActionConfig baseConfig)
- throws ClassNotFoundException,
- IllegalAccessException,
+ *
+ * @see #inheritFrom(ActionConfig)
+ */
+ protected void inheritForwards(ActionConfig baseConfig)
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException,
InvocationTargetException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -757,17 +757,17 @@
for (int i = 0; i < baseForwards.length; i++) {
ForwardConfig baseForward = baseForwards[i];
- // Do we have this forward?
- ForwardConfig copy =
+ // Do we have this forward?
+ ForwardConfig copy =
this.findForwardConfig(baseForward.getName());
-
+
if (copy == null) {
-
+
// We don't have this, so let's copy it
copy = (ForwardConfig) RequestUtils
- .applicationInstance(baseForward.getClass().getName());
+ .applicationInstance(baseForward.getClass().getName());
BeanUtils.copyProperties(copy, baseForward);
-
+
this.addForwardConfig(copy);
} else {
@@ -784,17 +784,17 @@
/**
* <p>Compare the properties of this action with that of the given and
* copy those that are not present.</p>
- *
+ *
* @param baseConfig The action config to copy properties from.
- *
- * @see #inheritFrom(ActionConfig)
- */
- protected void inheritProperties(ActionConfig baseConfig)
- throws ClassNotFoundException,
- IllegalAccessException,
+ *
+ * @see #inheritFrom(ActionConfig)
+ */
+ protected void inheritProperties(ActionConfig baseConfig)
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException,
InvocationTargetException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -804,13 +804,13 @@
Enumeration keys = baseProperties.propertyNames();
while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
-
+
// Check if we have this property before copying it
String value = properties.getProperty(key);
if (value == null) {
value = baseProperties.getProperty(key);
setProperty(key, value);
- }
+ }
}
}
@@ -861,16 +861,16 @@
* for subclassing <code>ActionConfig</code> or <code>ActionMapping</code> by
* providing more than just the single <code>parameter</code> property for passing
* arbitrary configuration information into an action.</p>
- *
+ *
* <p>This method must not be called after configuration is complete, or an
- * <code>IllegalStateException</code> will be thrown. Rather than calling it in Java code,
- * it is used by editing the <code>struts-config</code> file. Specifically, these values can
+ * <code>IllegalStateException</code> will be thrown. Rather than calling it in Java code,
+ * it is used by editing the <code>struts-config</code> file. Specifically, these values can
* be set by using a <code><set-property></code> element nested within the <code><action></code>
* element. The element should use the <code>key</code> attribute, not the <code>name</code>
* attribute: the <code>name</code> attribute is for setting bean properties on a custom subclass
* of <code>ActionConfig</code>.
* </p>
- *
+ *
* <p><b>Example</b>
* <code><pre>
* <action path="/example" type="com.example.MyAction">
@@ -878,7 +878,7 @@
* </action>
* </pre></code>
* </p>
- *
+ *
* @param key the key by which this value will be retrieved
* @param value the value which should be returned when <code>getProperty(key)</code> is
* called with the corresponding <code>key</code>.
@@ -1022,36 +1022,36 @@
/**
- * <p>Inherit values that have not been overridden from the provided
+ * <p>Inherit values that have not been overridden from the provided
* config object. Subclasses overriding this method should verify that
* the given parameter is of a class that contains a property it is trying
* to inherit:</p>
- *
+ *
* <pre>
* if (config instanceof MyCustomConfig) {
* MyCustomConfig myConfig =
* (MyCustomConfig) config;
- *
+ *
* if (getMyCustomProp() == null) {
* setMyCustomProp(myConfig.getMyCustomProp());
- * }
+ * }
* }
* </pre>
- *
- * <p>If the given <code>config</code> is extending another object, those
- * extensions should be resolved before it's used as a parameter to this
+ *
+ * <p>If the given <code>config</code> is extending another object, those
+ * extensions should be resolved before it's used as a parameter to this
* method.</p>
- *
+ *
* @param config The object that this instance will be inheriting
- * its values from.
- * @see #processExtends(ModuleConfig)
- */
+ * its values from.
+ * @see #processExtends(ModuleConfig)
+ */
public void inheritFrom(ActionConfig config)
- throws ClassNotFoundException,
- IllegalAccessException,
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException,
InvocationTargetException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -1060,7 +1060,7 @@
if (getAttribute() == null) {
setAttribute(config.getAttribute());
}
-
+
if (getCatalog() == null) {
setCatalog(config.getCatalog());
}
@@ -1072,7 +1072,7 @@
if (getForward() == null) {
setForward(config.getForward());
}
-
+
if (getInclude() == null) {
setInclude(config.getInclude());
}
@@ -1130,18 +1130,18 @@
inheritProperties(config);
}
-
+
/**
* <p>Inherit configuration information from the ActionConfig that this
* instance is extending. This method verifies that any action config
* object that it inherits from has also had its processExtends() method
* called.</p>
- *
+ *
* @param moduleConfig The {@link ModuleConfig} that this bean is from.
- *
+ *
* @see #inheritFrom(ActionConfig)
- */
- public void processExtends(ModuleConfig moduleConfig)
+ */
+ public void processExtends(ModuleConfig moduleConfig)
throws ClassNotFoundException,
IllegalAccessException,
InstantiationException,
@@ -1154,12 +1154,12 @@
if ((!extensionProcessed) && (ancestorPath != null)) {
ActionConfig baseConfig =
moduleConfig.findActionConfig(ancestorPath);
-
+
if (baseConfig == null) {
throw new NullPointerException("Unable to find "
+ "action for '" + ancestorPath + "' to extend.");
}
-
+
// Check against circular inheritance and make sure the base
// config's own extends has been processed already
if (checkCircularInheritance(moduleConfig)) {
@@ -1167,7 +1167,7 @@
"Circular inheritance detected for action "
+ getPath());
}
-
+
// Make sure the ancestor's own extension has been processed.
if (!baseConfig.isExtensionProcessed()) {
baseConfig.processExtends(moduleConfig);
@@ -1176,10 +1176,10 @@
// Copy values from the base config
inheritFrom(baseConfig);
}
-
+
extensionProcessed = true;
}
-
+
/**
* Remove the specified exception configuration instance.
Modified: struts/core/trunk/src/share/org/apache/struts/config/ActionConfigMatcher.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ActionConfigMatcher.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ActionConfigMatcher.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ActionConfigMatcher.java Sat May 7 09:11:38 2005
@@ -1,21 +1,21 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2003,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.struts.config;
import java.io.Serializable;
@@ -34,7 +34,7 @@
import org.apache.struts.util.WildcardHelper;
/**
- * Matches paths against pre-compiled wildcard expressions pulled from
+ * Matches paths against pre-compiled wildcard expressions pulled from
* action configs. It uses the wildcard matcher from the Apache
* Cocoon project.
*
@@ -42,19 +42,19 @@
*/
public class ActionConfigMatcher implements Serializable {
- /**
- * The logging instance
+ /**
+ * The logging instance
*/
private static final Log log =
LogFactory.getLog(ActionConfigMatcher.class);
-
+
/**
* Handles all wildcard pattern matching.
*/
private static final WildcardHelper wildcard = new WildcardHelper();
-
- /**
- * The compiled paths and their associated ActionConfig's
+
+ /**
+ * The compiled paths and their associated ActionConfig's
*/
private List compiledPaths;
@@ -79,10 +79,10 @@
}
if (log.isDebugEnabled()) {
log.debug("Compiling action config path '" + path + "'");
- }
+ }
pattern = wildcard.compilePattern(path);
compiledPaths.add(new Mapping(pattern, configs[x]));
- }
+ }
}
}
@@ -99,10 +99,10 @@
if (log.isDebugEnabled()) {
log.debug("Attempting to match '" + path
+ "' to a wildcard pattern");
- }
+ }
if (path.length() > 0 && path.charAt(0) == '/') {
path = path.substring(1);
- }
+ }
Mapping m;
HashMap vars = new HashMap();
for (Iterator i = compiledPaths.iterator(); i.hasNext();) {
@@ -114,11 +114,11 @@
vars);
}
}
- }
+ }
return config;
}
-
+
/**
* Clones the ActionConfig and its children, replacing various properties
* with the values of the wildcard-matched strings.
@@ -129,23 +129,23 @@
* @return A cloned ActionConfig with appropriate properties replaced
* with wildcard-matched values
*/
- protected ActionConfig convertActionConfig(String path,
+ protected ActionConfig convertActionConfig(String path,
ActionConfig orig, Map vars) {
ActionConfig config = null;
-
+
try {
config = (ActionConfig) BeanUtils.cloneBean(orig);
}
catch (Exception ex) {
log.warn("Unable to clone action config, recommend not using "
+ "wildcards", ex);
- return null;
+ return null;
}
-
+
config.setName(convertParam(orig.getName(), vars));
if (path.length() == 0 || path.charAt(0) != '/') {
path = "/" + path;
- }
+ }
config.setPath(path);
config.setType(convertParam(orig.getType(), vars));
config.setRoles(convertParam(orig.getRoles(), vars));
@@ -170,14 +170,14 @@
config.removeForwardConfig(fConfigs[x]);
config.addForwardConfig(cfg);
}
-
+
ExceptionConfig[] exConfigs = orig.findExceptionConfigs();
for (int x = 0; x < exConfigs.length; x++) {
config.addExceptionConfig(exConfigs[x]);
}
-
+
config.freeze();
-
+
return config;
}
@@ -204,7 +204,7 @@
entry = (Map.Entry) i.next();
key.setCharAt(1, ((String) entry.getKey()).charAt(0));
keyTmp = key.toString();
-
+
// Replace all instances of the placeholder
while ((x = ret.toString().indexOf(keyTmp)) > -1) {
ret.replace(x, x + 3, (String) entry.getValue());
@@ -233,7 +233,7 @@
public Mapping(int[] pattern, ActionConfig config) {
this.pattern = pattern;
this.config = config;
- }
+ }
/**
* Gets the compiled wildcard pattern.
@@ -251,7 +251,7 @@
*/
public ActionConfig getActionConfig() {
return this.config;
- }
- }
+ }
+ }
}
Modified: struts/core/trunk/src/share/org/apache/struts/config/ConfigHelper.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ConfigHelper.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ConfigHelper.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ConfigHelper.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -148,12 +148,12 @@
ServletContext application,
HttpServletRequest request,
HttpServletResponse response) {
-
+
setApplication(application);
setRequest(request);
setResponse(response);
}
-
+
public ConfigHelper() {
super();
}
@@ -162,11 +162,11 @@
ServletContext application,
HttpServletRequest request,
HttpServletResponse response) {
-
+
super();
this.setResources(application, request, response);
}
-
+
// ------------------------------------------------ Application Context
Modified: struts/core/trunk/src/share/org/apache/struts/config/ConfigHelperInterface.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ConfigHelperInterface.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ConfigHelperInterface.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ConfigHelperInterface.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/ConfigRuleSet.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ConfigRuleSet.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ConfigRuleSet.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ConfigRuleSet.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -260,12 +260,12 @@
}
/**
- * A variant of the standard Digester <code>SetPropertyRule</code>. If the element
- * being processed has a "key" attribute, then the value will be used to call
- * <code>setProperty(key,value)</code> on the object on top of the stack, which
- * will be assumed to be of type <code>ActionConfig</code>. Otherwise, the standard
+ * A variant of the standard Digester <code>SetPropertyRule</code>. If the element
+ * being processed has a "key" attribute, then the value will be used to call
+ * <code>setProperty(key,value)</code> on the object on top of the stack, which
+ * will be assumed to be of type <code>ActionConfig</code>. Otherwise, the standard
* <code>SetPropertyRule</code> behavior is invoked, and the value will
- * be used to set a bean property on the object on top of the Digester stack.
+ * be used to set a bean property on the object on top of the Digester stack.
* In that case, the element being processed is assumed to have attributes
* "property" and "value".
*/
@@ -277,7 +277,7 @@
public void begin(Attributes attributes) throws Exception {
- if (attributes.getIndex("key") == -1) {
+ if (attributes.getIndex("key") == -1) {
super.begin(attributes);
return;
}
Modified: struts/core/trunk/src/share/org/apache/struts/config/ControllerConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ControllerConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ControllerConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ControllerConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/ExceptionConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ExceptionConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ExceptionConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ExceptionConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -369,13 +369,13 @@
// ... and the action config was provided
checkActionConfig &= actionConfig != null;
-
+
// ... and we're not extending a config with the same type value
// (because if we are, that means we're an action-level handler
// extending a global handler).
checkActionConfig &= !ancestorType.equals(getType());
-
+
// We first check in the action config's exception handlers
if (checkActionConfig) {
baseConfig = actionConfig.findExceptionConfig(ancestorType);
Modified: struts/core/trunk/src/share/org/apache/struts/config/FormBeanConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/FormBeanConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/FormBeanConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/FormBeanConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -117,12 +117,12 @@
*/
public void setDynamic(boolean dynamic) {
if (configured) {
- throw new IllegalStateException("Configuration is frozen");
+ throw new IllegalStateException("Configuration is frozen");
}
; // No action required
}
-
+
/**
* The name of the FormBeanConfig that this config inherits configuration
* information from.
@@ -143,13 +143,13 @@
/**
* Have the inheritance values for this class been applied?
- */
+ */
protected boolean extensionProcessed = false;
public boolean isExtensionProcessed() {
return extensionProcessed;
}
-
+
/**
* The unique identifier of this form bean, which is used to reference this
@@ -206,7 +206,7 @@
/**
* <p>Indicates whether a MutableDynaClass is currently restricted.</p>
- * <p>If so, no changes to the existing registration of property names,
+ * <p>If so, no changes to the existing registration of property names,
* data types, readability, or writeability are allowed.</p>
*/
public boolean isRestricted() {
@@ -215,7 +215,7 @@
/**
* <p>Set whether a MutableDynaClass is currently restricted.</p>
- * <p>If so, no changes to the existing registration of property names,
+ * <p>If so, no changes to the existing registration of property names,
* data types, readability, or writeability are allowed.</p>
*/
public void setRestricted(boolean restricted) {
@@ -224,18 +224,18 @@
// ------------------------------------------------------ Protected Methods
-
-
+
+
/**
* <p>Traces the hierarchy of this object to check if any of the ancestors
* is extending this instance.</p>
- *
+ *
* @param moduleConfig The configuration for the module being configured.
- *
+ *
* @return true if circular inheritance was detected.
- */
+ */
protected boolean checkCircularInheritance(ModuleConfig moduleConfig) {
-
+
String ancestorName = getExtends();
while (ancestorName != null) {
// check if we have the same name as an ancestor
@@ -244,29 +244,29 @@
}
// get our ancestor's ancestor
- FormBeanConfig ancestor =
+ FormBeanConfig ancestor =
moduleConfig.findFormBeanConfig(ancestorName);
ancestorName = ancestor.getExtends();
}
-
+
return false;
}
-
+
/**
* <p>Compare the form properties of this bean with that of the given and
* copy those that are not present.</p>
- *
+ *
* @param config The form bean config to copy properties from.
- *
- * @see #inheritFrom(FormBeanConfig)
- */
- protected void inheritFormProperties(FormBeanConfig config)
- throws ClassNotFoundException,
- IllegalAccessException,
+ *
+ * @see #inheritFrom(FormBeanConfig)
+ */
+ protected void inheritFormProperties(FormBeanConfig config)
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException,
InvocationTargetException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -276,20 +276,20 @@
for (int i = 0; i < baseFpcs.length; i++) {
FormPropertyConfig baseFpc = baseFpcs[i];
- // Do we have this prop?
- FormPropertyConfig prop =
+ // Do we have this prop?
+ FormPropertyConfig prop =
this.findFormPropertyConfig(baseFpc.getName());
-
+
if (prop == null) {
-
+
// We don't have this, so let's copy it
prop = (FormPropertyConfig) RequestUtils
- .applicationInstance(baseFpc.getClass().getName());
+ .applicationInstance(baseFpc.getClass().getName());
BeanUtils.copyProperties(prop, baseFpc);
this.addFormPropertyConfig(prop);
}
-
+
}
}
@@ -305,7 +305,7 @@
* form which accepts an <code>ActionContext</code> as an argument is preferred,
* to help sever direct dependencies on the Servlet API. As the ActionContext becomes
* more familiar in Struts, this method will almost certainly be deprecated.</p>
- *
+ *
* @param servlet The action servlet
* @return ActionForm instance
* @exception IllegalAccessException if the Class or the appropriate
@@ -335,7 +335,7 @@
form.setServlet(servlet);
- if (form instanceof DynaBean &&
+ if (form instanceof DynaBean &&
((DynaBean)form).getDynaClass() instanceof MutableDynaClass) {
DynaBean dynaBean = (DynaBean)form;
MutableDynaClass dynaClass = (MutableDynaClass)dynaBean.getDynaClass();
@@ -358,14 +358,14 @@
/**
* <p>Create and return an <code>ActionForm</code> instance appropriate
* to the information in this <code>FormBeanConfig</code>.</p>
- * <p><b>NOTE:</b> If the given <code>ActionContext</code> is not of type
+ * <p><b>NOTE:</b> If the given <code>ActionContext</code> is not of type
* <code>ServletActionContext</code> (or a subclass), then the form which is
- * returned will have a null <code>servlet</code> property. Some of
- * the subclasses of <code>ActionForm</code> included in Struts will
- * later throw a <code>NullPointerException</code> in this case.
+ * returned will have a null <code>servlet</code> property. Some of
+ * the subclasses of <code>ActionForm</code> included in Struts will
+ * later throw a <code>NullPointerException</code> in this case.
* </p>
* <p>TODO: Find a way to control this direct dependency on the Servlet API.</p>
- *
+ *
* @param context The ActionContext.
* @return ActionForm instance
* @exception IllegalAccessException if the Class or the appropriate
@@ -387,8 +387,8 @@
/**
* Is the given <code>ActionForm</code> instance suitable for use as an
- * alternative to calling this <code>FormBeanConfig</code> instance's
- * <code>createActionForm</code> method.
+ * alternative to calling this <code>FormBeanConfig</code> instance's
+ * <code>createActionForm</code> method.
* @param form
* @return
*/
@@ -417,7 +417,7 @@
}
return false;
}
-
+
/**
* Add a new <code>FormPropertyConfig</code> instance to the set associated
* with this module.
@@ -484,36 +484,36 @@
/**
- * <p>Inherit values that have not been overridden from the provided
+ * <p>Inherit values that have not been overridden from the provided
* config object. Subclasses overriding this method should verify that
* the given parameter is of a class that contains a property it is trying
* to inherit:</p>
- *
+ *
* <pre>
* if (config instanceof MyCustomConfig) {
- * MyCustomConfig myConfig =
+ * MyCustomConfig myConfig =
* (MyCustomConfig) config;
- *
+ *
* if (getMyCustomProp() == null) {
* setMyCustomProp(myConfig.getMyCustomProp());
- * }
+ * }
* }
* </pre>
- *
- * <p>If the given <code>config</code> is extending another object, those
- * extensions should be resolved before it's used as a parameter to this
+ *
+ * <p>If the given <code>config</code> is extending another object, those
+ * extensions should be resolved before it's used as a parameter to this
* method.</p>
- *
+ *
* @param config The object that this instance will be inheriting
- * its values from.
- * @see #processExtends(ModuleConfig)
- */
- public void inheritFrom(FormBeanConfig config)
- throws ClassNotFoundException,
- IllegalAccessException,
+ * its values from.
+ * @see #processExtends(ModuleConfig)
+ */
+ public void inheritFrom(FormBeanConfig config)
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException,
InvocationTargetException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -522,7 +522,7 @@
if (getName() == null) {
setName(config.getName());
}
-
+
if (!isRestricted()) {
setRestricted(config.isRestricted());
}
@@ -530,22 +530,22 @@
if (getType() == null) {
setType(config.getType());
}
-
+
inheritFormProperties(config);
}
-
+
/**
* <p>Inherit configuration information from the FormBeanConfig that this
* instance is extending. This method verifies that any form bean config
* object that it inherits from has also had its processExtends() method
* called.</p>
- *
+ *
* @param moduleConfig The {@link ModuleConfig} that this bean is from.
- *
- * @see #inheritFrom(FormBeanConfig)
- */
- public void processExtends(ModuleConfig moduleConfig)
+ *
+ * @see #inheritFrom(FormBeanConfig)
+ */
+ public void processExtends(ModuleConfig moduleConfig)
throws ClassNotFoundException,
IllegalAccessException,
InstantiationException,
@@ -556,22 +556,22 @@
}
String ancestor = getExtends();
if ((!extensionProcessed) && (ancestor != null)) {
- FormBeanConfig baseConfig =
+ FormBeanConfig baseConfig =
moduleConfig.findFormBeanConfig(ancestor);
-
+
if (baseConfig == null) {
throw new NullPointerException("Unable to find "
+ "form bean '" + ancestor + "' to extend.");
}
-
+
// Check against circule inheritance and make sure the base config's
// own extends have been processed already
if (checkCircularInheritance(moduleConfig)) {
throw new IllegalArgumentException(
- "Circular inheritance detected for form bean "
+ "Circular inheritance detected for form bean "
+ getName());
}
-
+
// Make sure the ancestor's own extension has been processed.
if (!baseConfig.isExtensionProcessed()) {
baseConfig.processExtends(moduleConfig);
@@ -580,10 +580,10 @@
// Copy values from the base config
inheritFrom(baseConfig);
}
-
+
extensionProcessed = true;
}
-
+
/**
* Remove the specified form property configuration instance.
Modified: struts/core/trunk/src/share/org/apache/struts/config/FormPropertyConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/FormPropertyConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/FormPropertyConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/FormPropertyConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -161,7 +161,7 @@
}
this.size = size;
}
-
+
/**
@@ -317,42 +317,42 @@
/**
- * <p>Inherit values that have not been overridden from the provided
+ * <p>Inherit values that have not been overridden from the provided
* config object. Subclasses overriding this method should verify that
* the given parameter is of a class that contains a property it is trying
* to inherit:</p>
* <pre>
* if (config instanceof MyCustomFormPropertyConfig) {
- * MyCustomFormPropertyConfig myConfig =
+ * MyCustomFormPropertyConfig myConfig =
* (MyCustomFormPropertyConfig) config;
- *
+ *
* if (getMyCustomProp() == null) {
* setMyCustomProp(myConfig.getMyCustomProp());
- * }
+ * }
* }
* </pre>
- *
+ *
* @param config The object that this instance will be inheriting
- * its values from.
- */
+ * its values from.
+ */
public void inheritFrom(FormPropertyConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
-
+
if (getInitial() == null) {
setInitial(config.getInitial());
}
-
+
if (getName() == null) {
setName(config.getName());
}
-
+
if (getSize() == 0) {
setSize(config.getSize());
}
-
+
if (getType() == null) {
setType(config.getType());
}
Modified: struts/core/trunk/src/share/org/apache/struts/config/ForwardConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ForwardConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ForwardConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ForwardConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -144,7 +144,7 @@
/**
* The name of the ForwardConfig that this object should inherit properties
- * from.
+ * from.
*/
protected String inherit = null;
@@ -162,13 +162,13 @@
/**
* Have the inheritance values for this class been applied?
- */
+ */
protected boolean extensionProcessed = false;
public boolean isExtensionProcessed() {
return extensionProcessed;
}
-
+
/**
* The unique identifier of this forward, which is used to reference it
@@ -281,7 +281,7 @@
this.command = command;
}
-
+
/**
* <p>The name of a <code>commons-chain</code> catalog in which <code>command</code>
* should be looked up. If this value is undefined, then the command will be
@@ -303,39 +303,39 @@
// ------------------------------------------------------ Protected Methods
-
-
+
+
/**
* <p>Traces the hierarchy of this object to check if any of the ancestors
* are extending this instance.</p>
- *
+ *
* @param moduleConfig The {@link ModuleConfig} that this config is from.
* @param actionConfig The {@link ActionConfig} that this config is from,
* if applicable. This parameter must be null if this
* forward config is a global forward.
- *
+ *
* @return true if circular inheritance was detected.
- */
+ */
protected boolean checkCircularInheritance(ModuleConfig moduleConfig,
ActionConfig actionConfig) {
String ancestorName = getExtends();
if (ancestorName == null) {
return false;
}
-
+
// Find our ancestor
ForwardConfig ancestor = null;
-
+
// First check the action config
if (actionConfig != null) {
ancestor = actionConfig.findForwardConfig(ancestorName);
-
+
// If we found *this*, set ancestor to null to check for a global def
if (ancestor == this) {
ancestor = null;
}
}
-
+
// Then check the global forwards
if (ancestor == null) {
ancestor = moduleConfig.findForwardConfig(ancestorName);
@@ -344,9 +344,9 @@
// to null so further searches are only done among
// global forwards.
actionConfig = null;
- }
+ }
}
-
+
while (ancestor != null) {
// Check if an ancestor is extending *this*
if (ancestor == this) {
@@ -355,7 +355,7 @@
// Get our ancestor's ancestor
ancestorName = ancestor.getExtends();
-
+
// check against ancestors extending same named ancestors
if (ancestor.getName().equals(ancestorName)) {
// If the ancestor is extending a config with the same name
@@ -369,61 +369,61 @@
actionConfig = null;
}
}
-
+
ancestor = null;
-
+
// First check the action config
if (actionConfig != null) {
ancestor = actionConfig.findForwardConfig(ancestorName);
}
-
+
// Then check the global forwards
if (ancestor == null) {
ancestor = moduleConfig.findForwardConfig(ancestorName);
if (ancestor != null) {
// Limit further checks to moduleConfig.
actionConfig = null;
- }
+ }
}
}
-
+
return false;
}
-
+
// --------------------------------------------------------- Public Methods
/**
- * <p>Inherit values that have not been overridden from the provided
+ * <p>Inherit values that have not been overridden from the provided
* config object. Subclasses overriding this method should verify that
* the given parameter is of a class that contains a property it is trying
* to inherit:</p>
- *
+ *
* <pre>
* if (config instanceof MyCustomConfig) {
- * MyCustomConfig myConfig =
+ * MyCustomConfig myConfig =
* (MyCustomConfig) config;
- *
+ *
* if (getMyCustomProp() == null) {
* setMyCustomProp(myConfig.getMyCustomProp());
- * }
+ * }
* }
* </pre>
- *
- * <p>If the given <code>config</code> is extending another object, those
- * extensions should be resolved before it's used as a parameter to this
+ *
+ * <p>If the given <code>config</code> is extending another object, those
+ * extensions should be resolved before it's used as a parameter to this
* method.</p>
- *
+ *
* @param config The object that this instance will be inheriting
- * its values from.
- * @see #processExtends(ModuleConfig, ActionConfig)
- */
- public void inheritFrom(ForwardConfig config)
- throws ClassNotFoundException,
- IllegalAccessException,
+ * its values from.
+ * @see #processExtends(ModuleConfig, ActionConfig)
+ */
+ public void inheritFrom(ForwardConfig config)
+ throws ClassNotFoundException,
+ IllegalAccessException,
InstantiationException {
-
+
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
@@ -432,11 +432,11 @@
if (getCatalog() == null) {
setCatalog(config.getCatalog());
}
-
+
if (getCommand() == null) {
setCommand(config.getCommand());
}
-
+
if (!getContextRelative()) {
setContextRelative(config.getContextRelative());
}
@@ -448,33 +448,33 @@
if (getName() == null) {
setName(config.getName());
}
-
+
if (getPath() == null) {
setPath(config.getPath());
}
-
+
if (!getRedirect()) {
setRedirect(config.getRedirect());
}
}
-
+
/**
* <p>Inherit configuration information from the ForwardConfig that this
* instance is extending. This method verifies that any forward config
* object that it inherits from has also had its processExtends() method
* called.</p>
- *
+ *
* @param moduleConfig The {@link ModuleConfig} that this config is from.
* @param actionConfig The {@link ActionConfig} that this config is from,
* if applicable. This must be null for global
* forwards.
- *
- * @see #inheritFrom(ForwardConfig)
- */
+ *
+ * @see #inheritFrom(ForwardConfig)
+ */
public void processExtends(ModuleConfig moduleConfig,
- ActionConfig actionConfig)
+ ActionConfig actionConfig)
throws ClassNotFoundException,
IllegalAccessException,
InstantiationException {
@@ -485,42 +485,42 @@
String ancestorName = getExtends();
if ((!extensionProcessed) && (ancestorName != null)) {
ForwardConfig baseConfig = null;
-
+
// We only check the action config if we're not a global forward
- boolean checkActionConfig =
+ boolean checkActionConfig =
(this != moduleConfig.findForwardConfig(getName()));
-
+
// ... and the action config was provided
checkActionConfig &= actionConfig != null;
-
+
// ... and we're not extending a config with the same name
// (because if we are, that means we're an action-level forward
// extending a global forward).
checkActionConfig &= !ancestorName.equals(getName());
-
+
// We first check in the action config's forwards
if (checkActionConfig) {
baseConfig = actionConfig.findForwardConfig(ancestorName);
}
-
+
// Then check the global forwards
if (baseConfig == null) {
baseConfig = moduleConfig.findForwardConfig(ancestorName);
}
-
+
if (baseConfig == null) {
throw new NullPointerException("Unable to find "
+ "forward '" + ancestorName + "' to extend.");
}
-
+
// Check for circular inheritance and make sure the base config's
// own extends have been processed already
if (checkCircularInheritance(moduleConfig, actionConfig)) {
throw new IllegalArgumentException(
- "Circular inheritance detected for forward "
+ "Circular inheritance detected for forward "
+ getName());
}
-
+
if (!baseConfig.isExtensionProcessed()) {
baseConfig.processExtends(moduleConfig, actionConfig);
}
@@ -528,10 +528,10 @@
// copy values from the base config
inheritFrom(baseConfig);
}
-
+
extensionProcessed = true;
}
-
+
/**
* Freeze the configuration of this component.
Modified: struts/core/trunk/src/share/org/apache/struts/config/MessageResourcesConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/MessageResourcesConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/MessageResourcesConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/MessageResourcesConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/ModuleConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ModuleConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ModuleConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ModuleConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/ModuleConfigFactory.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/ModuleConfigFactory.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/ModuleConfigFactory.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/ModuleConfigFactory.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,12 +25,12 @@
/**
* A factory interface for creating {@link ModuleConfig}s.
*
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date$
*
* @see ModuleConfig
*/
public abstract class ModuleConfigFactory {
-
+
/**
* Create and return a newly instansiated {@link ModuleConfig}.
* This method must be implemented by concrete subclasses.
Modified: struts/core/trunk/src/share/org/apache/struts/config/PlugInConfig.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/PlugInConfig.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/PlugInConfig.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/PlugInConfig.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: struts/core/trunk/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
* @since Struts 1.1
*/
public class ModuleConfigImpl implements Serializable, ModuleConfig {
-
+
/**
* Construct an ModuleConfigImpl object according to the specified
* parameter values.
@@ -138,7 +138,7 @@
* The default class name to be used when creating action form bean
* instances.
*
- * @param actionFormBeanClass default class name to be used when creating
+ * @param actionFormBeanClass default class name to be used when creating
* action form bean instances.
*/
public void setActionFormBeanClass(String actionFormBeanClass) {
@@ -155,7 +155,7 @@
/**
* The default class name to be used when creating action mapping instances.
*
- * @param actionMappingClass default class name to be used when creating
+ * @param actionMappingClass default class name to be used when creating
* action mapping instances.
*/
public void setActionMappingClass(String actionMappingClass) {
@@ -296,13 +296,13 @@
public ActionConfig findActionConfig(String path) {
ActionConfig config = (ActionConfig) actionConfigs.get(path);
-
- // If a direct match cannot be found, try to match action configs
+
+ // If a direct match cannot be found, try to match action configs
// containing wildcard patterns
if (config == null) {
config = matcher.match(path);
}
-
+
return config;
}
@@ -556,61 +556,61 @@
// ----------------------------------------------------- Instance Variables
// Instance Variables at end to make comparing Interface and implementation easier.
-
+
/**
* The set of action configurations for this module, if any,
* keyed by the <code>path</code> property.
*/
protected HashMap actionConfigs = null;
-
+
/**
* The set of action configurations for this module, if any,
* listed in the order in which they are added.
*/
- protected List actionConfigList = null;
-
+ protected List actionConfigList = null;
+
/**
* The set of exception handling configurations for this
* module, if any, keyed by the <code>type</code> property.
*/
protected HashMap exceptions = null;
-
+
/**
* The set of form bean configurations for this module, if any,
* keyed by the <code>name</code> property.
*/
protected HashMap formBeans = null;
-
+
/**
* The set of global forward configurations for this module, if any,
* keyed by the <code>name</code> property.
*/
protected HashMap forwards = null;
-
+
/**
* The set of message resources configurations for this
* module, if any, keyed by the <code>key</code> property.
*/
protected HashMap messageResources = null;
-
+
/**
* The set of configured plug-in Actions for this module,
* if any, in the order they were declared and configured.
*/
protected ArrayList plugIns = null;
-
+
/**
* Has this module been completely configured yet. Once this flag
* has been set, any attempt to modify the configuration will return an
* IllegalStateException.
*/
protected boolean configured = false;
-
+
/**
* The controller configuration object for this module.
*/
protected ControllerConfig controllerConfig = null;
-
+
/**
* The prefix of the context-relative portion of the request URI, used to
* select this configuration versus others supported by the controller
@@ -618,23 +618,23 @@
* default configuration for this web module.
*/
protected String prefix = null;
-
+
/**
* The default class name to be used when creating action form bean
* instances.
*/
protected String actionFormBeanClass = "org.apache.struts.action.ActionFormBean";
-
+
/**
* The default class name to be used when creating action mapping instances.
*/
protected String actionMappingClass = "org.apache.struts.action.ActionMapping";
-
+
/**
* The default class name to be used when creating action forward instances.
*/
protected String actionForwardClass = "org.apache.struts.action.ActionForward";
-
+
/**
* Matches action config paths against compiled wildcard patterns
*/
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockAction.java?rev=169091&r1=169090&r2=169091&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockAction.java Sat May 7 09:11:38 2005
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org