martinc 2002/11/20 19:42:21
Modified: src/share/org/apache/struts/taglib/template PutTag.java
src/share/org/apache/struts/tiles
ActionComponentServlet.java
ComponentDefinition.java DefaultTilesUtilImpl.java
DefinitionsUtil.java TilesPlugin.java
src/share/org/apache/struts/tiles/definition
ComponentDefinitionsFactoryWrapper.java
ReloadableDefinitionsFactory.java
Log:
Replace calls to Class.forName() with RequestUtils.applicationClass().
Add a missing license header to one file.
Revision Changes Path
1.12 +6 -5
jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java
Index: PutTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PutTag.java 12 Nov 2002 03:56:09 -0000 1.11
+++ PutTag.java 21 Nov 2002 03:42:21 -0000 1.12
@@ -68,6 +68,7 @@
import org.apache.struts.Globals;
import org.apache.struts.taglib.template.util.Content;
+import org.apache.struts.util.RequestUtils;
/**
* Tag handler for <template:put>, which puts content into request scope.
@@ -279,7 +280,7 @@
Class klass = null; // can’t name variable "class"
try {
- klass = Class.forName(className);
+ klass = RequestUtils.applicationClass(className);
}
catch(ClassNotFoundException ex) {
pageContext.setAttribute(Globals.EXCEPTION_KEY, ex,
1.5 +6 -4
jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java
Index: ActionComponentServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionComponentServlet.java 12 Nov 2002 03:56:08 -0000 1.4
+++ ActionComponentServlet.java 21 Nov 2002 03:42:21 -0000 1.5
@@ -76,6 +76,7 @@
import org.apache.struts.action.ActionServlet;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.upload.MultipartRequestWrapper;
+import org.apache.struts.util.RequestUtils;
/**
* Action Servlet to be used with Tiles and Struts 1.0.x.
@@ -111,7 +112,8 @@
{
// Check struts version by checkin PlugIn classes existance.
try {
- Class plugInClass = Class.forName("org.apache.struts.action.PlugIn");
+ Class plugInClass = RequestUtils.applicationClass(
+ "org.apache.struts.action.PlugIn");
// Class exist ==> struts 1.1 or greater
log(
"Warning - ActionComponentServlet class: This class is to be used
with Struts1.0.x only. "
1.4 +5 -4
jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java
Index: ComponentDefinition.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentDefinition.java 16 Nov 2002 04:07:54 -0000 1.3
+++ ComponentDefinition.java 21 Nov 2002 03:42:21 -0000 1.4
@@ -67,6 +67,7 @@
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.util.RequestUtils;
/**
* Definition of a template / component attributes.
@@ -571,7 +572,7 @@
{
try
{
- Class requestedClass = Class.forName(classname);
+ Class requestedClass = RequestUtils.applicationClass(classname);
Object instance = requestedClass.newInstance();
/*
if( instance instanceof org.apache.struts.action.Action )
1.3 +5 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java
Index: DefaultTilesUtilImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultTilesUtilImpl.java 16 Nov 2002 06:04:28 -0000 1.2
+++ DefaultTilesUtilImpl.java 21 Nov 2002 03:42:21 -0000 1.3
@@ -72,6 +72,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
+import org.apache.struts.util.RequestUtils;
/**
* Default implementation of TilesUtil.
@@ -175,7 +176,7 @@
{
try
{
- Class factoryClass = Class.forName(classname);
+ Class factoryClass = RequestUtils.applicationClass(classname);
Object factory = factoryClass.newInstance();
// Backward compatibility : if factory classes implements old interface,
1.7 +5 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java
Index: DefinitionsUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefinitionsUtil.java 5 Nov 2002 14:15:53 -0000 1.6
+++ DefinitionsUtil.java 21 Nov 2002 03:42:21 -0000 1.7
@@ -74,6 +74,7 @@
import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
import org.apache.struts.taglib.tiles.ComponentConstants;
+import org.apache.struts.util.RequestUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -261,7 +262,7 @@
{
try
{
- Class factoryClass = Class.forName(classname);
+ Class factoryClass = RequestUtils.applicationClass(classname);
Object factory = factoryClass.newInstance();
// Backward compatibility : if factory classes implements old interface,
// provide appropriate wrapper
1.11 +6 -4
jakarta-struts/src/share/org/apache/struts/tiles/TilesPlugin.java
Index: TilesPlugin.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesPlugin.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TilesPlugin.java 12 Nov 2002 03:56:08 -0000 1.10
+++ TilesPlugin.java 21 Nov 2002 03:42:21 -0000 1.11
@@ -77,6 +77,7 @@
import org.apache.struts.config.ControllerConfig;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.PlugInConfig;
+import org.apache.struts.util.RequestUtils;
/**
* Tiles Plugin used to initialize Tiles.
@@ -301,7 +302,8 @@
// Check if specified classname exist
Class configProcessorClass;
try {
- configProcessorClass = Class.forName(configProcessorClassname);
+ configProcessorClass = RequestUtils.applicationClass(
+ configProcessorClassname);
} catch (java.lang.ClassNotFoundException ex) {
log.fatal(
"Can't set TilesRequestProcessor: bad class name '"
1.2 +64 -1
jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
Index: ComponentDefinitionsFactoryWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentDefinitionsFactoryWrapper.java 11 Jul 2002 16:25:43 -0000 1.1
+++ ComponentDefinitionsFactoryWrapper.java 21 Nov 2002 03:42:21 -0000 1.2
@@ -1,3 +1,65 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * 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.tiles.definition;
import org.apache.struts.tiles.DefinitionsFactory;
@@ -6,6 +68,7 @@
import org.apache.struts.tiles.DefinitionsFactoryConfig;
import org.apache.struts.tiles.DefinitionsFactoryException;
import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.struts.util.RequestUtils;
import javax.servlet.ServletRequest;
import javax.servlet.ServletContext;
@@ -118,7 +181,7 @@
{
try
{
- Class factoryClass = Class.forName(classname);
+ Class factoryClass = RequestUtils.applicationClass(classname);
Object factory = factoryClass.newInstance();
return (ComponentDefinitionsFactory)factory;
}
1.4 +6 -5
jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
Index: ReloadableDefinitionsFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReloadableDefinitionsFactory.java 16 Nov 2002 04:22:22 -0000 1.3
+++ ReloadableDefinitionsFactory.java 21 Nov 2002 03:42:21 -0000 1.4
@@ -76,6 +76,7 @@
import org.apache.struts.tiles.DefinitionsFactoryException;
import org.apache.struts.tiles.FactoryNotFoundException;
import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
+import org.apache.struts.util.RequestUtils;
/**
* A reloadable factory.
@@ -142,7 +143,7 @@
// Try to create from classname
try
{
- Class factoryClass = Class.forName(classname);
+ Class factoryClass = RequestUtils.applicationClass(classname);
ComponentDefinitionsFactory factory =
(ComponentDefinitionsFactory)factoryClass.newInstance();
factory.initFactory( servletContext, properties);
return factory;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
