dgraham 2003/07/01 20:13:17
Modified: src/share/org/apache/struts/action ActionServlet.java
Log:
Removed references to deprecated ApplicationConfig class.
Revision Changes Path
1.152 +7 -49
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.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ActionServlet.java 2 Jul 2003 03:03:55 -0000 1.151
+++ ActionServlet.java 2 Jul 2003 03:13:16 -0000 1.152
@@ -83,8 +83,8 @@
import javax.sql.DataSource;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.converters.BigDecimalConverter;
import org.apache.commons.beanutils.converters.BigIntegerConverter;
import org.apache.commons.beanutils.converters.BooleanConverter;
@@ -102,7 +102,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
import org.apache.struts.config.ActionConfig;
-import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.config.ConfigRuleSet;
import org.apache.struts.config.ControllerConfig;
import org.apache.struts.config.DataSourceConfig;
@@ -110,9 +109,8 @@
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.config.MessageResourcesConfig;
import org.apache.struts.config.ModuleConfig;
-import org.apache.struts.config.PlugInConfig;
import org.apache.struts.config.ModuleConfigFactory;
-import org.apache.struts.config.impl.ModuleConfigImpl;
+import org.apache.struts.config.PlugInConfig;
import org.apache.struts.util.GenericDataSource;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.MessageResourcesFactory;
@@ -752,25 +750,6 @@
}
-
- /**
- * Return the module configuration object for the currently selected
- * module.
- *
- * @param request The servlet request we are processing
- * @since Struts 1.1
- * @deprecated use [EMAIL PROTECTED] #getModuleConfig(HttpServletRequest)}
- */
- protected ApplicationConfig getApplicationConfig
- (HttpServletRequest request) {
- /* FIXME for Struts 1.2
- Since Struts 1.1 only has one implementation for
- ModuleConfig casting is safe here. Used only for
- transition purposes !
- */
- return new ApplicationConfig((ModuleConfigImpl)getModuleConfig(request));
- }
-
/**
* Return the module configuration object for the currently selected
* module.
@@ -831,28 +810,7 @@
return (processor);
}
-
- /**
- * <p>Initialize the application configuration information for the
- * specified module.</p>
- *
- * @param prefix Module prefix for this module
- * @param path Context-relative resource path for this modules's
- * configuration resource
- *
- * @exception ServletException if initialization cannot be performed
- * @deprecated use [EMAIL PROTECTED] #initModuleConfig(String,String)}
- * @since Struts 1.1
- */
- protected ApplicationConfig initApplicationConfig
- (String prefix, String path) throws ServletException {
- /* FIXME for Struts 1.2
- Since Struts 1.1 only has one implementation for
- ModuleConfig casting is safe here. Used only for
- transition purposes !
- */
- return new
ApplicationConfig((ModuleConfigImpl)initModuleConfig(prefix,path));
- }
+
/**
* <p>Initialize the application configuration information for the
* specified module.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
