rleland 2002/11/05 20:48:29
Modified: src/share/org/apache/struts/action ActionMapping.java
DynaActionForm.java
src/share/org/apache/struts/config ActionConfig.java
ApplicationConfig.java
Added: src/share/org/apache/struts/config ModuleConfig.java
src/share/org/apache/struts/config/impl
ModuleConfigImpl.java
src/share/org/apache/struts/upload package.html
Log:
Bug 14054
Initial limited checkin of ApplicationConfig->ModuleConfigImpl rename
and ModuleConfig Interface.
All classes except ActionServlet will use the ModuleConfig Interface.
Initially ActionServlet will directly use the ModuleConfigImpl class
when creating. Later a ModuleConfigFactory
will be introduced.
Revision Changes Path
1.26 +7 -7
jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java
Index: ActionMapping.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ActionMapping.java 5 Jul 2002 22:09:21 -0000 1.25
+++ ActionMapping.java 6 Nov 2002 04:48:28 -0000 1.26
@@ -116,7 +116,7 @@
}
// Check for a globally defined handler
- config = getApplicationConfig().findExceptionConfig(name);
+ config = getModuleConfig().findExceptionConfig(name);
if (config != null) {
return (config);
}
@@ -146,7 +146,7 @@
ForwardConfig config = findForwardConfig(name);
if (config == null) {
- config = getApplicationConfig().findForwardConfig(name);
+ config = getModuleConfig().findForwardConfig(name);
}
return ((ActionForward) config);
@@ -178,7 +178,7 @@
*/
public ActionForward getInputForward() {
- if (getApplicationConfig().getControllerConfig().getInputForward()) {
+ if (getModuleConfig().getControllerConfig().getInputForward()) {
return (findForward(getInput()));
} else {
return (new ActionForward(getInput()));
1.6 +5 -5
jakarta-struts/src/share/org/apache/struts/action/DynaActionForm.java
Index: DynaActionForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DynaActionForm.java 1 Nov 2002 04:54:47 -0000 1.5
+++ DynaActionForm.java 6 Nov 2002 04:48:28 -0000 1.6
@@ -149,7 +149,7 @@
return;
}
FormBeanConfig config =
- mapping.getApplicationConfig().findFormBeanConfig(name);
+ mapping.getModuleConfig().findFormBeanConfig(name);
if (config == null) {
return;
}
1.9 +32 -10
jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java
Index: ActionConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActionConfig.java 22 Sep 2002 06:13:56 -0000 1.8
+++ ActionConfig.java 6 Nov 2002 04:48:29 -0000 1.9
@@ -108,19 +108,41 @@
/**
- * The application configuration with which we are associated.
+ * The module configuration with which we are associated.
*/
- protected ApplicationConfig applicationConfig = null;
+ protected ModuleConfig moduleConfig = null;
- public ApplicationConfig getApplicationConfig() {
- return (this.applicationConfig);
+ /**
+ * The module configuration with which we are associated.
+ * @deprecated {@link #getModuleConfig()}
+ */
+ public ModuleConfig getApplicationConfig() {
+ return (getModuleConfig());
+ }
+
+ /**
+ * The module configuration with which we are associated.
+ */
+ public ModuleConfig getModuleConfig() {
+ return (this.moduleConfig);
}
- public void setApplicationConfig(ApplicationConfig applicationConfig) {
+ /**
+ * The module configuration with which we are associated.
+ * @deprecated {@link #setModuleConfig(ModuleConfig)}
+ */
+ public void setApplicationConfig(ModuleConfig moduleConfig) {
+ setModuleConfig(moduleConfig);
+ }
+
+ /**
+ * The module configuration with which we are associated.
+ */
+ public void setModuleConfig(ModuleConfig moduleConfig) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
- this.applicationConfig = applicationConfig;
+ this.moduleConfig = moduleConfig;
}
1.18 +16 -586
jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java
Index: ApplicationConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ApplicationConfig.java 22 Sep 2002 06:13:56 -0000 1.17
+++ ApplicationConfig.java 6 Nov 2002 04:48:29 -0000 1.18
@@ -63,11 +63,7 @@
package org.apache.struts.config;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-
+import org.apache.struts.config.impl.ModuleConfigImpl;
/**
* <p>The collection of static configuration information that describes a
@@ -83,7 +79,7 @@
* @since Struts 1.1
*/
-public class ApplicationConfig implements Serializable {
+public class ApplicationConfig extends ModuleConfigImpl {
// ----------------------------------------------------------- Constructors
@@ -97,589 +93,23 @@
*/
public ApplicationConfig(String prefix) {
- super();
+ super(prefix);
this.prefix = prefix;
}
-
- // ----------------------------------------------------- Instance Variables
-
-
- /**
- * The set of action configurations for this module, if any,
- * keyed by the <code>path</code> property.
- */
- protected HashMap actionConfigs = new HashMap();
-
-
- /**
- * The set of JDBC data source configurations for this
- * module, if any, keyed by the <code>key</code> property.
- */
- protected HashMap dataSources = new HashMap();
-
-
- /**
- * The set of exception handling configurations for this
- * module, if any, keyed by the <code>type</code> property.
- */
- protected HashMap exceptions = new HashMap();
-
-
- /**
- * The set of form bean configurations for this module, if any,
- * keyed by the <code>name</code> property.
- */
- protected HashMap formBeans = new HashMap();
-
-
- /**
- * The set of global forward configurations for this module, if any,
- * keyed by the <code>name</code> property.
- */
- protected HashMap forwards = new HashMap();
-
-
- /**
- * The set of message resources configurations for this
- * module, if any, keyed by the <code>key</code> property.
- */
- protected HashMap messageResources = new HashMap();
-
-
- /**
- * The set of configured plug-in Actions for this module,
- * if any, in the order they were declared and configured.
- */
- protected ArrayList plugIns = new ArrayList();
-
-
- // ------------------------------------------------------------- Properties
-
-
- /**
- * 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;
-
- public boolean getConfigured() {
- return (this.configured);
- }
-
-
/**
- * The controller configuration object for this module.
+ * Only used while we are deprecating ApplicationConfig.
+ * performs a shallow copy to ensure that any operations
+ * performed on an ApplicationConfig object is
+ * performed on the same underlying
+ * ModuleConfigImpl sub objects
+ * @param moduleConfig
+ * @deprecated Only used while we are deprecating ApplicationConfig to insure
maximum compatability.
*/
- protected ControllerConfig controllerConfig = null;
-
- public ControllerConfig getControllerConfig() {
- if (this.controllerConfig == null) {
- this.controllerConfig = new ControllerConfig();
- }
- return (this.controllerConfig);
- }
-
- public void setControllerConfig(ControllerConfig cc) {
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- this.controllerConfig = cc;
- }
-
-
- /**
- * The prefix of the context-relative portion of the request URI, used to
- * select this configuration versus others supported by the controller
- * servlet. A configuration with a prefix of a zero-length String is the
- * default configuration for this web application.
- */
- protected String prefix = null;
-
- public String getPrefix() {
- return (this.prefix);
- }
-
-
- /**
- * The default class name to be used when creating action mapping
- * instances.
- */
- protected String actionMappingClass =
- "org.apache.struts.action.ActionMapping";
-
- public String getActionMappingClass() {
- return this.actionMappingClass;
+ public ApplicationConfig(ModuleConfigImpl moduleConfig) {
+ super(moduleConfig);
}
-
- public void setActionMappingClass(String actionMappingClass) {
- this.actionMappingClass = actionMappingClass;
- }
-
-
- // --------------------------------------------------------- Public Methods
-
-
- /**
- * Add a new <code>ActionConfig</code> instance to the set associated
- * with this module.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addActionConfig(ActionConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- config.setApplicationConfig(this);
- actionConfigs.put(config.getPath(), config);
-
- }
-
-
- /**
- * Add a new <code>DataSourceConfig</code> instance to the set associated
- * with this module.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addDataSourceConfig(DataSourceConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- dataSources.put(config.getKey(), config);
-
- }
-
-
- /**
- * Add a new <code>ExceptionConfig</code> instance to the set associated
- * with this application.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addExceptionConfig(ExceptionConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- exceptions.put(config.getType(), config);
-
- }
-
-
- /**
- * Add a new <code>FormBeanConfig</code> instance to the set associated
- * with this module.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addFormBeanConfig(FormBeanConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- formBeans.put(config.getName(), config);
-
- }
-
-
- /**
- * Add a new <code>ForwardConfig</code> instance to the set of global
- * forwards associated with this module.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addForwardConfig(ForwardConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- forwards.put(config.getName(), config);
-
- }
-
-
- /**
- * Add a new <code>MessageResourcesConfig</code> instance to the set
- * associated with this module.
- *
- * @param config The new configuration instance to be added
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void addMessageResourcesConfig(MessageResourcesConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- messageResources.put(config.getKey(), config);
-
- }
-
-
- /**
- * Add a newly configured {@link PlugInConfig} instance to the set of
- * plug-in Actions for this module.
- *
- * @param plugInConfig The new configuration instance to be added
- */
- public void addPlugInConfig(PlugInConfig plugInConfig) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- plugIns.add(plugInConfig);
-
- }
-
-
- /**
- * Return the action configuration for the specified path, if any;
- * otherwise return <code>null</code>.
- *
- * @param path Path of the action configuration to return
- */
- public ActionConfig findActionConfig(String path) {
-
- return ((ActionConfig) actionConfigs.get(path));
-
- }
-
-
- /**
- * Return the action configurations for this module. If there are
- * none, a zero-length array is returned.
- */
- public ActionConfig[] findActionConfigs() {
-
- ActionConfig results[] = new ActionConfig[actionConfigs.size()];
- return ((ActionConfig[]) actionConfigs.values().toArray(results));
-
- }
-
-
- /**
- * Return the data source configuration for the specified key, if any;
- * otherwise return <code>null</code>.
- *
- * @param key Key of the data source configuration to return
- */
- public DataSourceConfig findDataSourceConfig(String key) {
-
- return ((DataSourceConfig) dataSources.get(key));
-
- }
-
-
- /**
- * Return the data source configurations for this module. If there
- * are none, a zero-length array is returned.
- */
- public DataSourceConfig[] findDataSourceConfigs() {
-
- DataSourceConfig results[] = new DataSourceConfig[dataSources.size()];
- return ((DataSourceConfig[]) dataSources.values().toArray(results));
-
- }
-
-
- /**
- * Return the exception configuration for the specified type, if any;
- * otherwise return <code>null</code>.
- *
- * @param type Exception class name to find a configuration for
- */
- public ExceptionConfig findExceptionConfig(String type) {
-
- return ((ExceptionConfig) exceptions.get(type));
-
- }
-
-
- /**
- * Return the exception configurations for this module. If there
- * are none, a zero-length array is returned.
- */
- public ExceptionConfig[] findExceptionConfigs() {
-
- ExceptionConfig results[] = new ExceptionConfig[exceptions.size()];
- return ((ExceptionConfig[]) exceptions.values().toArray(results));
-
- }
-
-
- /**
- * Return the form bean configuration for the specified key, if any;
- * otherwise return <code>null</code>.
- *
- * @param name Name of the form bean configuration to return
- */
- public FormBeanConfig findFormBeanConfig(String name) {
-
- return ((FormBeanConfig) formBeans.get(name));
-
- }
-
-
- /**
- * Return the form bean configurations for this module. If there
- * are none, a zero-length array is returned.
- */
- public FormBeanConfig[] findFormBeanConfigs() {
-
- FormBeanConfig results[] = new FormBeanConfig[formBeans.size()];
- return ((FormBeanConfig[]) formBeans.values().toArray(results));
-
- }
-
-
- /**
- * Return the forward configuration for the specified key, if any;
- * otherwise return <code>null</code>.
- *
- * @param name Name of the forward configuration to return
- */
- public ForwardConfig findForwardConfig(String name) {
-
- return ((ForwardConfig) forwards.get(name));
-
- }
-
-
- /**
- * Return the form bean configurations for this module. If there
- * are none, a zero-length array is returned.
- */
- public ForwardConfig[] findForwardConfigs() {
-
- ForwardConfig results[] = new ForwardConfig[forwards.size()];
- return ((ForwardConfig[]) forwards.values().toArray(results));
-
- }
-
-
- /**
- * Return the message resources configuration for the specified key,
- * if any; otherwise return <code>null</code>.
- *
- * @param key Key of the data source configuration to return
- */
- public MessageResourcesConfig findMessageResourcesConfig(String key) {
-
- return ((MessageResourcesConfig) messageResources.get(key));
-
- }
-
-
- /**
- * Return the message resources configurations for this module.
- * If there are none, a zero-length array is returned.
- */
- public MessageResourcesConfig[] findMessageResourcesConfigs() {
-
- MessageResourcesConfig results[] =
- new MessageResourcesConfig[messageResources.size()];
- return ((MessageResourcesConfig[])
- messageResources.values().toArray(results));
-
- }
-
-
- /**
- * Return the configured plug-in actions for this module. If there
- * are none, a zero-length array is returned.
- */
- public PlugInConfig[] findPlugInConfigs() {
-
- PlugInConfig results[] = new PlugInConfig[plugIns.size()];
- return ((PlugInConfig[]) plugIns.toArray(results));
-
- }
-
-
- /**
- * Freeze the configuration of this module. After this method
- * returns, any attempt to modify the configuration will return
- * an IllegalStateException.
- */
- public void freeze() {
-
- this.configured = true;
-
- ActionConfig[] aconfigs = findActionConfigs();
- for (int i = 0; i < aconfigs.length; i++) {
- aconfigs[i].freeze();
- }
-
- getControllerConfig().freeze();
-
- DataSourceConfig[] dsconfigs = findDataSourceConfigs();
- for (int i = 0; i < dsconfigs.length; i++) {
- dsconfigs[i].freeze();
- }
-
- ExceptionConfig[] econfigs = findExceptionConfigs();
- for (int i = 0; i < econfigs.length; i++) {
- econfigs[i].freeze();
- }
-
- FormBeanConfig[] fbconfigs = findFormBeanConfigs();
- for (int i = 0; i < fbconfigs.length; i++) {
- fbconfigs[i].freeze();
- }
-
- ForwardConfig[] fconfigs = findForwardConfigs();
- for (int i = 0; i < fconfigs.length; i++) {
- fconfigs[i].freeze();
- }
-
- MessageResourcesConfig[] mrconfigs = findMessageResourcesConfigs();
- for (int i = 0; i < mrconfigs.length; i++) {
- mrconfigs[i].freeze();
- }
-
- PlugInConfig[] piconfigs = findPlugInConfigs();
- for (int i = 0; i < piconfigs.length; i++) {
- piconfigs[i].freeze();
- }
-
- }
-
-
- /**
- * Remove the specified action configuration instance.
- *
- * @param config ActionConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeActionConfig(ActionConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- config.setApplicationConfig(null);
- actionConfigs.remove(config.getPath());
-
- }
-
-
- /**
- * Remove the specified exception configuration instance.
- *
- * @param config ActionConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeExceptionConfig(ExceptionConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- exceptions.remove(config.getType());
-
- }
-
-
- /**
- * Remove the specified data source configuration instance.
- *
- * @param config DataSourceConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeDataSourceConfig(DataSourceConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- dataSources.remove(config.getKey());
-
- }
-
-
- /**
- * Remove the specified form bean configuration instance.
- *
- * @param config FormBeanConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeFormBeanConfig(FormBeanConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- formBeans.remove(config.getName());
-
- }
-
-
- /**
- * Remove the specified forward configuration instance.
- *
- * @param config ForwardConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeForwardConfig(ForwardConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- forwards.remove(config.getName());
-
- }
-
-
- /**
- * Remove the specified message resources configuration instance.
- *
- * @param config MessageResourcesConfig instance to be removed
- *
- * @exception IllegalStateException if this module configuration
- * has been frozen
- */
- public void removeMessageResourcesConfig(MessageResourcesConfig config) {
-
- if (configured) {
- throw new IllegalStateException("Configuration is frozen");
- }
- messageResources.remove(config.getKey());
-
- }
-
-
- // -------------------------------------------------------- Package Methods
-
-
- // ------------------------------------------------------ Protected Methods
-
}
1.1
jakarta-struts/src/share/org/apache/struts/config/ModuleConfig.java
Index: ModuleConfig.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ModuleConfig.java,v 1.1
2002/11/06 04:48:29 rleland Exp $
* $Revision: 1.1 $
* $Date: 2002/11/06 04:48:29 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.struts.config;
/**
* <p>The collection of static configuration information that describes a
* Struts-based module. Multiple modules are identified by a
* <em>prefix</em> at the beginning of the context
* relative portion of the request URI. If no module prefix can be
* matched, the default configuration (with a prefix equal to a zero-length
* string) is selected, which is elegantly backwards compatible with the
* previous Struts behavior that only supported one module.</p>
*
* @author Rob Leland
* @version $Revision: 1.1 $ $Date: 2002/11/06 04:48:29 $
* @since Struts 1.1
*/
public interface ModuleConfig {
/**
* Has this module been completely configured yet. Once this flag
* has been set, any attempt to modify the configuration will return an
* IllegalStateException.
*/
boolean getConfigured();
/**
* The controller configuration object for this module.
*/
ControllerConfig getControllerConfig();
/**
* The controller configuration object for this module.
*/
void setControllerConfig(ControllerConfig cc);
/**
* The prefix of the context-relative portion of the request URI, used to
* select this configuration versus others supported by the controller
* servlet. A configuration with a prefix of a zero-length String is the
* default configuration for this web module.
*/
String getPrefix();
/**
* The default class name to be used when creating action mapping
* instances.
*/
String getActionMappingClass();
/**
* The default class name to be used when creating action mapping
* instances.
*/
void setActionMappingClass(String actionMappingClass);
/**
* Add a new <code>ActionConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void addActionConfig(ActionConfig config);
/**
* Add a new <code>DataSourceConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void addDataSourceConfig(DataSourceConfig config);
/**
* Add a new <code>ExceptionConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void addExceptionConfig(ExceptionConfig config);
/**
* Add a new <code>FormBeanConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void addFormBeanConfig(FormBeanConfig config);
/**
* Add a new <code>ForwardConfig</code> instance to the set of global
* forwards associated with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void addForwardConfig(ForwardConfig config);
/**
* Add a new <code>MessageResourcesConfig</code> instance to the set
* associated with this module.
*
* @param config The new configuration instance to be added
*
* @exception IllegalStateException if this module configuration
* has been frozen
*/
void addMessageResourcesConfig(MessageResourcesConfig config);
/**
* Add a newly configured {@link PlugInConfig} instance to the set of
* plug-in Actions for this module.
*
* @param plugInConfig The new configuration instance to be added
*/
void addPlugInConfig(PlugInConfig plugInConfig);
/**
* Return the action configuration for the specified path, if any;
* otherwise return <code>null</code>.
*
* @param path Path of the action configuration to return
*/
ActionConfig findActionConfig(String path);
/**
* Return the action configurations for this module. If there are
* none, a zero-length array is returned.
*/
ActionConfig[] findActionConfigs();
/**
* Return the data source configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param key Key of the data source configuration to return
*/
DataSourceConfig findDataSourceConfig(String key);
/**
* Return the data source configurations for this module. If there
* are none, a zero-length array is returned.
*/
DataSourceConfig[] findDataSourceConfigs();
/**
* Return the exception configuration for the specified type, if any;
* otherwise return <code>null</code>.
*
* @param type Exception class name to find a configuration for
*/
ExceptionConfig findExceptionConfig(String type);
/**
* Return the exception configurations for this module. If there
* are none, a zero-length array is returned.
*/
ExceptionConfig[] findExceptionConfigs();
/**
* Return the form bean configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param name Name of the form bean configuration to return
*/
FormBeanConfig findFormBeanConfig(String name);
/**
* Return the form bean configurations for this module. If there
* are none, a zero-length array is returned.
*/
FormBeanConfig[] findFormBeanConfigs();
/**
* Return the forward configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param name Name of the forward configuration to return
*/
ForwardConfig findForwardConfig(String name);
/**
* Return the form bean configurations for this module. If there
* are none, a zero-length array is returned.
*/
ForwardConfig[] findForwardConfigs();
/**
* Return the message resources configuration for the specified key,
* if any; otherwise return <code>null</code>.
*
* @param key Key of the data source configuration to return
*/
MessageResourcesConfig findMessageResourcesConfig(String key);
/**
* Return the message resources configurations for this module.
* If there are none, a zero-length array is returned.
*/
MessageResourcesConfig[] findMessageResourcesConfigs();
/**
* Return the configured plug-in actions for this module. If there
* are none, a zero-length array is returned.
*/
PlugInConfig[] findPlugInConfigs();
/**
* Freeze the configuration of this module. After this method
* returns, any attempt to modify the configuration will return
* an IllegalStateException.
*/
void freeze();
/**
* Remove the specified action configuration instance.
*
* @param config ActionConfig instance to be removed
*
* @exception IllegalStateException if this module configuration
* has been frozen
*/
void removeActionConfig(ActionConfig config);
/**
* Remove the specified exception configuration instance.
*
* @param config ActionConfig instance to be removed
*
* @exception IllegalStateException if this module configuration
* has been frozen
*/
void removeExceptionConfig(ExceptionConfig config);
/**
* Remove the specified data source configuration instance.
*
* @param config DataSourceConfig instance to be removed
*
* @exception IllegalStateException if this module configuration
* has been frozen
*/
void removeDataSourceConfig(DataSourceConfig config);
/**
* Remove the specified form bean configuration instance.
*
* @param config FormBeanConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void removeFormBeanConfig(FormBeanConfig config);
/**
* Remove the specified forward configuration instance.
*
* @param config ForwardConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void removeForwardConfig(ForwardConfig config);
/**
* Remove the specified message resources configuration instance.
*
* @param config MessageResourcesConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
void removeMessageResourcesConfig(MessageResourcesConfig config);
}
1.1
jakarta-struts/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java
Index: ModuleConfigImpl.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/impl/ModuleConfigImpl.java,v
1.1 2002/11/06 04:48:29 rleland Exp $
* $Revision: 1.1 $
* $Date: 2002/11/06 04:48:29 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Struts", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.struts.config.impl;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.ControllerConfig;
import org.apache.struts.config.ActionConfig;
import org.apache.struts.config.DataSourceConfig;
import org.apache.struts.config.ExceptionConfig;
import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.PlugInConfig;
import org.apache.struts.config.MessageResourcesConfig;
import org.apache.struts.config.ForwardConfig;
/**
* <p>The collection of static configuration information that describes a
* Struts-based module. Multiple modules are identified by
* a <em>prefix</em> at the beginning of the context
* relative portion of the request URI. If no module prefix can be
* matched, the default configuration (with a prefix equal to a zero-length
* string) is selected, which is elegantly backwards compatible with the
* previous Struts behavior that only supported one module.</p>
*
*
* @todo Add factory methods to construct ModuleConfig objects.
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2002/11/06 04:48:29 $
* @since Struts 1.1
*/
public class ModuleConfigImpl implements Serializable, ModuleConfig {
/**
* Construct an ModuleConfigImpl object according to the specified
* parameter values.
*
* @param prefix Context-relative URI prefix for this module
*/
public ModuleConfigImpl(String prefix) {
super();
this.actionConfigs = new HashMap();
this.actionMappingClass = "org.apache.struts.action.ActionMapping";
this.configured = false;
this.controllerConfig = null;
this.dataSources = new HashMap();
this.exceptions = new HashMap();
this.formBeans = new HashMap();
this.forwards = new HashMap();
this.messageResources = new HashMap();
this.plugIns = new ArrayList();
this.prefix = prefix;
}
/**
* Only used while we are deprecating ApplicationConfig.
* performs a shallow copy to ensure that any operations
* performed on an ApplicationConfig object is
* performed on the same underlying
* ModuleConfigImpl sub objects
* @param moduleConfig
* @deprecated Only used while we are deprecating ApplicationConfig to insure
maximum compatability.
*/
public ModuleConfigImpl(ModuleConfigImpl moduleConfig) {
super();
this.actionConfigs = moduleConfig.actionConfigs;
this.actionMappingClass = moduleConfig.actionMappingClass;
this.configured = moduleConfig.configured;
this.controllerConfig = moduleConfig.controllerConfig;
this.dataSources = moduleConfig.dataSources;
this.exceptions = moduleConfig.exceptions;
this.formBeans = moduleConfig.formBeans;
this.forwards = moduleConfig.forwards;
this.messageResources = moduleConfig.messageResources;
this.plugIns = moduleConfig.plugIns;
this.prefix = moduleConfig.prefix;
}
// ----------------------------------------------------- Instance Variables
/**
* The set of action configurations for this module, if any,
* keyed by the <code>path</code> property.
*/
protected HashMap actionConfigs = null;
/**
* The set of JDBC data source configurations for this
* module, if any, keyed by the <code>key</code> property.
*/
protected HashMap dataSources = 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
* servlet. A configuration with a prefix of a zero-length String is the
* default configuration for this web module.
*/
protected String prefix = null;
/**
* The default class name to be used when creating action mapping
* instances.
*/
protected String actionMappingClass =
"org.apache.struts.action.ActionMapping";
// --------------------------------------------------------- Public Methods
/**
* Has this module been completely configured yet. Once this flag
* has been set, any attempt to modify the configuration will return an
* IllegalStateException.
*/
public boolean getConfigured() {
return (this.configured);
}
/**
* The controller configuration object for this module.
*/
public ControllerConfig getControllerConfig() {
if (this.controllerConfig == null) {
this.controllerConfig = new ControllerConfig();
}
return (this.controllerConfig);
}
/**
* The controller configuration object for this module.
* @param cc The controller configuration object for this module.
*/
public void setControllerConfig(ControllerConfig cc) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
this.controllerConfig = cc;
}
/**
* The prefix of the context-relative portion of the request URI, used to
* select this configuration versus others supported by the controller
* servlet. A configuration with a prefix of a zero-length String is the
* default configuration for this web module.
*/
public String getPrefix() {
return (this.prefix);
}
/**
* The default class name to be used when creating action mapping
* instances.
*/
public String getActionMappingClass() {
return this.actionMappingClass;
}
/**
* The default class name to be used when creating action mapping
* instances.
* @param actionMappingClass default class name to be used when creating action
mapping
* instances.
*/
public void setActionMappingClass(String actionMappingClass) {
this.actionMappingClass = actionMappingClass;
}
/**
* Add a new <code>ActionConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addActionConfig(ActionConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
config.setModuleConfig(this);
actionConfigs.put(config.getPath(), config);
}
/**
* Add a new <code>DataSourceConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addDataSourceConfig(DataSourceConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
dataSources.put(config.getKey(), config);
}
/**
* Add a new <code>ExceptionConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addExceptionConfig(ExceptionConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
exceptions.put(config.getType(), config);
}
/**
* Add a new <code>FormBeanConfig</code> instance to the set associated
* with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addFormBeanConfig(FormBeanConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
formBeans.put(config.getName(), config);
}
/**
* Add a new <code>ForwardConfig</code> instance to the set of global
* forwards associated with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addForwardConfig(ForwardConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
forwards.put(config.getName(), config);
}
/**
* Add a new <code>MessageResourcesConfig</code> instance to the set
* associated with this module.
*
* @param config The new configuration instance to be added
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void addMessageResourcesConfig(MessageResourcesConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
messageResources.put(config.getKey(), config);
}
/**
* Add a newly configured {@link org.apache.struts.config.PlugInConfig} instance
to the set of
* plug-in Actions for this module.
*
* @param plugInConfig The new configuration instance to be added
*/
public void addPlugInConfig(PlugInConfig plugInConfig) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
plugIns.add(plugInConfig);
}
/**
* Return the action configuration for the specified path, if any;
* otherwise return <code>null</code>.
*
* @param path Path of the action configuration to return
*/
public ActionConfig findActionConfig(String path) {
return ((ActionConfig) actionConfigs.get(path));
}
/**
* Return the action configurations for this module. If there are
* none, a zero-length array is returned.
*/
public ActionConfig[] findActionConfigs() {
ActionConfig results[] = new ActionConfig[actionConfigs.size()];
return ((ActionConfig[]) actionConfigs.values().toArray(results));
}
/**
* Return the data source configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param key Key of the data source configuration to return
*/
public DataSourceConfig findDataSourceConfig(String key) {
return ((DataSourceConfig) dataSources.get(key));
}
/**
* Return the data source configurations for this module. If there
* are none, a zero-length array is returned.
*/
public DataSourceConfig[] findDataSourceConfigs() {
DataSourceConfig results[] = new DataSourceConfig[dataSources.size()];
return ((DataSourceConfig[]) dataSources.values().toArray(results));
}
/**
* Return the exception configuration for the specified type, if any;
* otherwise return <code>null</code>.
*
* @param type Exception class name to find a configuration for
*/
public ExceptionConfig findExceptionConfig(String type) {
return ((ExceptionConfig) exceptions.get(type));
}
/**
* Return the exception configurations for this module. If there
* are none, a zero-length array is returned.
*/
public ExceptionConfig[] findExceptionConfigs() {
ExceptionConfig results[] = new ExceptionConfig[exceptions.size()];
return ((ExceptionConfig[]) exceptions.values().toArray(results));
}
/**
* Return the form bean configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param name Name of the form bean configuration to return
*/
public FormBeanConfig findFormBeanConfig(String name) {
return ((FormBeanConfig) formBeans.get(name));
}
/**
* Return the form bean configurations for this module. If there
* are none, a zero-length array is returned.
*/
public FormBeanConfig[] findFormBeanConfigs() {
FormBeanConfig results[] = new FormBeanConfig[formBeans.size()];
return ((FormBeanConfig[]) formBeans.values().toArray(results));
}
/**
* Return the forward configuration for the specified key, if any;
* otherwise return <code>null</code>.
*
* @param name Name of the forward configuration to return
*/
public ForwardConfig findForwardConfig(String name) {
return ((ForwardConfig) forwards.get(name));
}
/**
* Return the form bean configurations for this module. If there
* are none, a zero-length array is returned.
*/
public ForwardConfig[] findForwardConfigs() {
ForwardConfig results[] = new ForwardConfig[forwards.size()];
return ((ForwardConfig[]) forwards.values().toArray(results));
}
/**
* Return the message resources configuration for the specified key,
* if any; otherwise return <code>null</code>.
*
* @param key Key of the data source configuration to return
*/
public MessageResourcesConfig findMessageResourcesConfig(String key) {
return ((MessageResourcesConfig) messageResources.get(key));
}
/**
* Return the message resources configurations for this module.
* If there are none, a zero-length array is returned.
*/
public MessageResourcesConfig[] findMessageResourcesConfigs() {
MessageResourcesConfig results[] =
new MessageResourcesConfig[messageResources.size()];
return ((MessageResourcesConfig[])
messageResources.values().toArray(results));
}
/**
* Return the configured plug-in actions for this module. If there
* are none, a zero-length array is returned.
*/
public PlugInConfig[] findPlugInConfigs() {
PlugInConfig results[] = new PlugInConfig[plugIns.size()];
return ((PlugInConfig[]) plugIns.toArray(results));
}
/**
* Freeze the configuration of this module. After this method
* returns, any attempt to modify the configuration will return
* an IllegalStateException.
*/
public void freeze() {
this.configured = true;
ActionConfig[] aconfigs = findActionConfigs();
for (int i = 0; i < aconfigs.length; i++) {
aconfigs[i].freeze();
}
getControllerConfig().freeze();
DataSourceConfig[] dsconfigs = findDataSourceConfigs();
for (int i = 0; i < dsconfigs.length; i++) {
dsconfigs[i].freeze();
}
ExceptionConfig[] econfigs = findExceptionConfigs();
for (int i = 0; i < econfigs.length; i++) {
econfigs[i].freeze();
}
FormBeanConfig[] fbconfigs = findFormBeanConfigs();
for (int i = 0; i < fbconfigs.length; i++) {
fbconfigs[i].freeze();
}
ForwardConfig[] fconfigs = findForwardConfigs();
for (int i = 0; i < fconfigs.length; i++) {
fconfigs[i].freeze();
}
MessageResourcesConfig[] mrconfigs = findMessageResourcesConfigs();
for (int i = 0; i < mrconfigs.length; i++) {
mrconfigs[i].freeze();
}
PlugInConfig[] piconfigs = findPlugInConfigs();
for (int i = 0; i < piconfigs.length; i++) {
piconfigs[i].freeze();
}
}
/**
* Remove the specified action configuration instance.
*
* @param config ActionConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeActionConfig(ActionConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
config.setModuleConfig(null);
actionConfigs.remove(config.getPath());
}
/**
* Remove the specified exception configuration instance.
*
* @param config ActionConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeExceptionConfig(ExceptionConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
exceptions.remove(config.getType());
}
/**
* Remove the specified data source configuration instance.
*
* @param config DataSourceConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeDataSourceConfig(DataSourceConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
dataSources.remove(config.getKey());
}
/**
* Remove the specified form bean configuration instance.
*
* @param config FormBeanConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeFormBeanConfig(FormBeanConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
formBeans.remove(config.getName());
}
/**
* Remove the specified forward configuration instance.
*
* @param config ForwardConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeForwardConfig(ForwardConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
forwards.remove(config.getName());
}
/**
* Remove the specified message resources configuration instance.
*
* @param config MessageResourcesConfig instance to be removed
*
* @exception java.lang.IllegalStateException if this module configuration
* has been frozen
*/
public void removeMessageResourcesConfig(MessageResourcesConfig config) {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
}
messageResources.remove(config.getKey());
}
// -------------------------------------------------------- Package Methods
// ------------------------------------------------------ Protected Methods
}
1.1 jakarta-struts/src/share/org/apache/struts/upload/package.html
Index: package.html
===================================================================
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
</head>
<body bgcolor="white">
<p> The upload package facilities to upload files using
multi-part requests.</p>
<br>
<br>
<img src="doc-files/uploadUML.jpg" alt="Upload Package UML" >
<br>
<h2>Package Specification</h2>
##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
<ul>
<li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
</li>
</ul>
<h2>Related Documentation</h2>
For overviews, tutorials, examples, guides, and tool documentation,
please see:
<ul>
<li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
</li>
</ul>
<!-- Put @see and @since tags down here. -->
</body>
</html>
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
