You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by rl...@apache.org on 2002/11/08 06:39:25 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/validator Resources.java ValidatorPlugIn.java
rleland 2002/11/07 21:39:25
Modified: src/share/org/apache/struts/action Action.java
ActionServlet.java
src/share/org/apache/struts/actions SwitchAction.java
src/share/org/apache/struts/taglib/html FormTag.java
ImageTag.java ImgTag.java
src/share/org/apache/struts/tiles TilesRequestProcessor.java
src/share/org/apache/struts/upload
CommonsMultipartRequestHandler.java
DiskMultipartRequestHandler.java
src/share/org/apache/struts/util RequestUtils.java
src/share/org/apache/struts/validator Resources.java
ValidatorPlugIn.java
Log:
Bug 14054
Checked in More ApplicationConfig->ModuleConfig
Revision Changes Path
1.52 +5 -5 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Action.java 7 Nov 2002 05:18:26 -0000 1.51
+++ Action.java 8 Nov 2002 05:39:24 -0000 1.52
@@ -151,7 +151,7 @@
* @since Struts 1.1
* @deprecated Replaced by {@link org.apache.struts.Globals#MODULE_KEY}
*/
- public static final String APPLICATION_KEY = Globals.APPLICATION_KEY;
+ public static final String APPLICATION_KEY = Globals.MODULE_KEY;
/**
1.126 +8 -7 jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ActionServlet.java 1 Nov 2002 13:59:02 -0000 1.125
+++ ActionServlet.java 8 Nov 2002 05:39:24 -0000 1.126
@@ -106,6 +106,7 @@
import org.apache.struts.util.MessageResourcesFactory;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ServletContextWriter;
+import org.apache.struts.Globals;
import org.xml.sax.InputSource;
@@ -767,10 +768,10 @@
(HttpServletRequest request) {
ApplicationConfig config = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
if (config == null) {
config = (ApplicationConfig)
- getServletContext().getAttribute(Action.APPLICATION_KEY);
+ getServletContext().getAttribute(Globals.MODULE_KEY);
}
return (config);
@@ -852,7 +853,7 @@
digester.parse(is);
input.close();
getServletContext().setAttribute
- (Action.APPLICATION_KEY + prefix, config);
+ (Globals.MODULE_KEY + prefix, config);
} catch (Throwable t) {
log.error(internal.getMessage("configParse", path), t);
throw new UnavailableException
1.7 +6 -5 jakarta-struts/src/share/org/apache/struts/actions/SwitchAction.java
Index: SwitchAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/SwitchAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SwitchAction.java 22 Sep 2002 05:58:46 -0000 1.6
+++ SwitchAction.java 8 Nov 2002 05:39:24 -0000 1.7
@@ -72,6 +72,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
+import org.apache.struts.Globals;
/**
@@ -152,7 +153,7 @@
// Switch to the requested application module
RequestUtils.selectApplication(prefix, request,
getServlet().getServletContext());
- if (request.getAttribute(Action.APPLICATION_KEY) == null) {
+ if (request.getAttribute(Globals.MODULE_KEY) == null) {
String message = messages.getMessage("switch.prefix", prefix);
log.error(message);
response.sendError(HttpServletResponse.SC_BAD_REQUEST,
1.31 +15 -14 jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
Index: FormTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FormTag.java 30 Oct 2002 02:31:10 -0000 1.30
+++ FormTag.java 8 Nov 2002 05:39:24 -0000 1.31
@@ -76,11 +76,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
-import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.config.FormBeanConfig;
+import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
+import org.apache.struts.Globals;
/**
@@ -107,7 +108,7 @@
/**
* The application configuration for our module.
*/
- protected ApplicationConfig appConfig = null;
+ protected ModuleConfig moduleConfig = null;
/**
@@ -634,7 +635,7 @@
// New and improved - use the values from the action mapping
bean = RequestUtils.createActionForm(
(HttpServletRequest) pageContext.getRequest(),
- mapping, appConfig, servlet);
+ mapping, moduleConfig, servlet);
}
if (bean instanceof ActionForm) {
((ActionForm) bean).reset
@@ -730,7 +731,7 @@
super.release();
action = null;
- appConfig = null;
+ moduleConfig = null;
enctype = null;
focus = null;
mapping = null;
@@ -792,8 +793,8 @@
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
StringBuffer value = new StringBuffer(request.getContextPath());
- ApplicationConfig config = (ApplicationConfig)
- pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig config = (ModuleConfig)
+ pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
if (config != null) {
value.append(config.getPrefix());
}
@@ -848,9 +849,9 @@
protected void lookup() throws JspException {
// Look up the application module configuration information we need
- appConfig = RequestUtils.getModuleConfig(pageContext);
+ moduleConfig = RequestUtils.getModuleConfig(pageContext);
- if (appConfig == null) {
+ if (moduleConfig == null) {
JspException e = new JspException
(messages.getMessage("formTag.collections"));
pageContext.setAttribute(Action.EXCEPTION_KEY, e,
@@ -862,7 +863,7 @@
// Look up the action mapping we will be submitting to
String mappingName = getActionMappingName();
- mapping = (ActionMapping) appConfig.findActionConfig(mappingName);
+ mapping = (ActionMapping) moduleConfig.findActionConfig(mappingName);
if (mapping == null) {
JspException e = new JspException
(messages.getMessage("formTag.mapping", mappingName));
@@ -888,7 +889,7 @@
// Look up the form bean definition
FormBeanConfig formBeanConfig =
- appConfig.findFormBeanConfig(mapping.getName());
+ moduleConfig.findFormBeanConfig(mapping.getName());
if (formBeanConfig == null) {
JspException e = new JspException
(messages.getMessage("formTag.formBean", mapping.getName()));
1.23 +10 -10 jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
Index: ImageTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ImageTag.java 4 Nov 2002 00:34:38 -0000 1.22
+++ ImageTag.java 8 Nov 2002 05:39:24 -0000 1.23
@@ -66,10 +66,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
-import org.apache.struts.action.Action;
-import org.apache.struts.config.ApplicationConfig;
+import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
+import org.apache.struts.Globals;
/**
@@ -308,8 +308,8 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- ApplicationConfig config = (ApplicationConfig)
- pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig config = (ModuleConfig)
+ pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
if (config == null) {
@@ -328,8 +328,8 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- ApplicationConfig config = (ApplicationConfig)
- pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig config = (ModuleConfig)
+ pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
if (config == null) {
1.22 +10 -10 jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ImgTag.java 2 Nov 2002 00:28:12 -0000 1.21
+++ ImgTag.java 8 Nov 2002 05:39:24 -0000 1.22
@@ -67,11 +67,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
-import org.apache.struts.action.Action;
-import org.apache.struts.config.ApplicationConfig;
+import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
+import org.apache.struts.Globals;
/**
* Generate an IMG tag to the specified image URI.
@@ -523,8 +523,8 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- ApplicationConfig config =
- (ApplicationConfig) pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig config =
+ (ModuleConfig) pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
if (config == null) {
return (request.getContextPath() + this.page);
@@ -540,8 +540,8 @@
RequestUtils.saveException(pageContext, e);
throw e;
}
- ApplicationConfig config =
- (ApplicationConfig) pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig config =
+ (ModuleConfig) pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
if (config == null) {
return (
1.11 +20 -5 jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
Index: TilesRequestProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesRequestProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TilesRequestProcessor.java 8 Nov 2002 04:59:49 -0000 1.10
+++ TilesRequestProcessor.java 8 Nov 2002 05:39:24 -0000 1.11
@@ -66,6 +66,7 @@
import org.apache.struts.action.ActionServlet;
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.config.ApplicationConfig;
+import org.apache.struts.config.ModuleConfig;
import javax.servlet.*;
import javax.servlet.http.*;
@@ -108,12 +109,26 @@
* @param servlet The ActionServlet we are associated with
* @param appConfig The ApplicationConfig we are associated with.
* @throws ServletException If an error occur during initialization
+ * @deprecated use init(ActionServlet, ModuleConfig)
*/
public void init(ActionServlet servlet, ApplicationConfig appConfig)
throws ServletException
{
- super.init(servlet, appConfig);
- initDefinitionsMapping();
+ init(servlet,(ModuleConfig)appConfig);
+ }
+
+ /**
+ * Initialize this request processor instance.
+ *
+ * @param servlet The ActionServlet we are associated with
+ * @param moduleConfig The ApplicationConfig we are associated with.
+ * @throws ServletException If an error occur during initialization
+ */
+ public void init(ActionServlet servlet, ModuleConfig moduleConfig)
+ throws ServletException
+ {
+ super.init(servlet, moduleConfig);
+ initDefinitionsMapping();
}
/**
1.5 +6 -6 jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
Index: CommonsMultipartRequestHandler.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommonsMultipartRequestHandler.java 7 Nov 2002 05:18:26 -0000 1.4
+++ CommonsMultipartRequestHandler.java 8 Nov 2002 05:39:24 -0000 1.5
@@ -78,10 +78,10 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.Globals;
/**
@@ -211,7 +211,7 @@
// Get the app config for the current request.
ModuleConfig ac = (ModuleConfig) request.getAttribute(
- Action.APPLICATION_KEY);
+ Globals.MODULE_KEY);
// Create and configure a FileUpload instance.
FileUpload upload = new FileUpload();
1.21 +5 -5 jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
Index: DiskMultipartRequestHandler.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DiskMultipartRequestHandler.java 7 Nov 2002 05:18:26 -0000 1.20
+++ DiskMultipartRequestHandler.java 8 Nov 2002 05:39:24 -0000 1.21
@@ -70,10 +70,10 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.config.ModuleConfig;
+import org.apache.struts.Globals;
/**
* This is a MultipartRequestHandler that writes file data directly to
@@ -127,7 +127,7 @@
*/
public void handleRequest(HttpServletRequest request) throws ServletException
{
- ModuleConfig moduleConfig = (ModuleConfig) request.getAttribute(Action.APPLICATION_KEY);
+ ModuleConfig moduleConfig = (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
retrieveTempDir(moduleConfig);
try
{
1.69 +21 -20 jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- RequestUtils.java 8 Nov 2002 04:59:49 -0000 1.68
+++ RequestUtils.java 8 Nov 2002 05:39:24 -0000 1.69
@@ -104,6 +104,7 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.upload.MultipartRequestHandler;
+import org.apache.struts.Globals;
/**
@@ -389,12 +390,12 @@
// Look up the application module configuration for this request
ApplicationConfig config = (ApplicationConfig)
- pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
if (config == null) { // Backwards compatibility hack
config = (ApplicationConfig)
pageContext.getServletContext().getAttribute
- (Action.APPLICATION_KEY);
- pageContext.getRequest().setAttribute(Action.APPLICATION_KEY,
+ (Globals.MODULE_KEY);
+ pageContext.getRequest().setAttribute(Globals.MODULE_KEY,
config);
}
@@ -1043,7 +1044,7 @@
}
ApplicationConfig appConfig = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
multipartClass = appConfig.getControllerConfig().getMultipartClass();
// Try to initialize the global request handler
@@ -1179,7 +1180,7 @@
sb.append(action.getPath());
} else if (pattern.startsWith("*.")) {
ApplicationConfig appConfig = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
sb.append(appConfig.getPrefix());
sb.append(action.getPath());
sb.append(pattern.substring(1));
@@ -1219,7 +1220,7 @@
// Calculate a context relative path for this ForwardConfig
ApplicationConfig appConfig = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
String forwardPattern =
appConfig.getControllerConfig().getForwardPattern();
if (forwardPattern == null) {
@@ -1283,7 +1284,7 @@
StringBuffer sb = new StringBuffer();
ApplicationConfig appConfig = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
String pagePattern =
appConfig.getControllerConfig().getPagePattern();
if (pagePattern == null) {
@@ -1411,11 +1412,11 @@
// Expose the resources for this application module
ApplicationConfig config = (ApplicationConfig)
- context.getAttribute(Action.APPLICATION_KEY + prefix);
+ context.getAttribute(Globals.MODULE_KEY + prefix);
if (config != null) {
- request.setAttribute(Action.APPLICATION_KEY, config);
+ request.setAttribute(Globals.MODULE_KEY, config);
} else {
- request.removeAttribute(Action.APPLICATION_KEY);
+ request.removeAttribute(Globals.MODULE_KEY);
}
MessageResources resources = (MessageResources)
context.getAttribute(Action.MESSAGES_KEY + prefix);
@@ -1502,10 +1503,10 @@
*/
public static ApplicationConfig getModuleConfig(PageContext pageContext) {
ApplicationConfig appConfig = (ApplicationConfig)
- pageContext.getRequest().getAttribute(Action.APPLICATION_KEY);
+ pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
if (appConfig == null) { // Backwards compatibility hack
appConfig = (ApplicationConfig)
- pageContext.getServletContext().getAttribute(Action.APPLICATION_KEY);
+ pageContext.getServletContext().getAttribute(Globals.MODULE_KEY);
}
return appConfig;
}
@@ -1519,10 +1520,10 @@
*/
public static ApplicationConfig getModuleConfig(HttpServletRequest request,ServletContext context) {
ApplicationConfig appConfig = (ApplicationConfig)
- request.getAttribute(Action.APPLICATION_KEY);
+ request.getAttribute(Globals.MODULE_KEY);
if (appConfig == null) {
appConfig = (ApplicationConfig)
- context.getAttribute(Action.APPLICATION_KEY);
+ context.getAttribute(Globals.MODULE_KEY);
}
return appConfig;
}
@@ -1546,10 +1547,10 @@
Enumeration names = context.getAttributeNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
- if (!name.startsWith(Action.APPLICATION_KEY)) {
+ if (!name.startsWith(Globals.MODULE_KEY)) {
continue;
}
- String prefix = name.substring(Action.APPLICATION_KEY.length());
+ String prefix = name.substring(Globals.MODULE_KEY.length());
if (prefix.length() > 0) {
list.add(prefix);
}
1.3 +5 -5 jakarta-struts/src/share/org/apache/struts/validator/Resources.java
Index: Resources.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/Resources.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.java 27 Oct 2002 06:44:00 -0000 1.2
+++ Resources.java 8 Nov 2002 05:39:25 -0000 1.3
@@ -125,7 +125,7 @@
*/
public static ValidatorResources getValidatorResources(ServletContext application,HttpServletRequest request) {
return (ValidatorResources) application.getAttribute(ValidatorPlugIn.VALIDATOR_KEY +
- ((ApplicationConfig)request.getAttribute(Globals.APPLICATION_KEY)).getPrefix());
+ ((ApplicationConfig)request.getAttribute(Globals.MODULE_KEY)).getPrefix());
}
/**
1.11 +19 -5 jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java
Index: ValidatorPlugIn.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/ValidatorPlugIn.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ValidatorPlugIn.java 27 Oct 2002 06:44:00 -0000 1.10
+++ ValidatorPlugIn.java 8 Nov 2002 05:39:25 -0000 1.11
@@ -77,6 +77,7 @@
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.PlugIn;
import org.apache.struts.config.ApplicationConfig;
+import org.apache.struts.config.ModuleConfig;
/**
@@ -97,7 +98,7 @@
/**
* The application configuration for our owning module.
*/
- private ApplicationConfig config = null;
+ private ModuleConfig config = null;
/**
@@ -154,6 +155,19 @@
* @exception ServletException if we cannot configure ourselves correctly
*/
public void init(ActionServlet servlet, ApplicationConfig config)
+ throws ServletException {
+ init(servlet,(ModuleConfig)config);
+ }
+
+ /**
+ * Initialize and load our resources.
+ *
+ * @param servlet The ActionServlet for our application
+ * @param config The ModuleConfig for our owning module
+ *
+ * @exception ServletException if we cannot configure ourselves correctly
+ */
+ public void init(ActionServlet servlet, ModuleConfig config)
throws ServletException {
// Remember our associated configuration and servlet
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>