craigmcc 01/07/15 17:45:00
Modified: src/example/org/apache/struts/webapp/example
CheckLogonTag.java DatabaseServlet.java
EditRegistrationAction.java
EditSubscriptionAction.java
SaveRegistrationAction.java
SaveSubscriptionAction.java
src/share/org/apache/struts/action ActionFormBeans.java
ActionForwards.java ActionMappings.java
ActionServlet.java
src/share/org/apache/struts/taglib/bean ResourceTag.java
WriteTag.java
src/share/org/apache/struts/taglib/html ErrorsTag.java
MultiboxTag.java OptionsTag.java RadioTag.java
SelectTag.java TextareaTag.java
src/share/org/apache/struts/taglib/logic CompareTagBase.java
IterateTag.java MatchTag.java PresentTag.java
RedirectTag.java
src/share/org/apache/struts/util RequestUtils.java
web/example/WEB-INF web.xml
Log:
Migrate Struts HEAD branch to use the Commons packages (beanutils,
collections, and digester) rather than the Struts internal versions of
these classes, as discussed on the JAKARTA-COMMONS mailing list. In
nearly all cases, this was as simple as changing the import statements.
WARNING: During this conversion, an anomaly was discovered with the
Commons version of Digester (which supports JAXP/1.1, and therefore can be
namespace-aware). At the moment, the Commons version does not match
nested elements correctly *unless* you are running in namespace-aware
mode. This is a bug in the Commons version of Digester, which is
currently worked around in Struts by calling
digester.setNamespaceAware(true);
on any newly constructed digester instance. Applications who create their
own digesters, and are migrating to the new classes, will need to do the
same thing.
WARNING: The Commons version of Digester depends on JAXP/1.1 rather than
JAXP/1.0, so I will also be updating the prerequisite software
requirements. Two parsers known to work successfully are the JAXP/1.1
reference implementation from Sun, and Xerces 1.3.1 from Apache.
Revision Changes Path
1.3 +4 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java
Index: CheckLogonTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckLogonTag.java 2001/04/14 12:53:07 1.2
+++ CheckLogonTag.java 2001/07/16 00:44:50 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java,v
1.2 2001/04/14 12:53:07 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:07 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java,v
1.3 2001/07/16 00:44:50 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/16 00:44:50 $
*
* ====================================================================
*
@@ -70,7 +70,6 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
import org.apache.struts.action.Action;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
@@ -80,7 +79,7 @@
*
* @author Craig R. McClanahan
* @author Marius Barduta
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/16 00:44:50 $
*/
public final class CheckLogonTag extends TagSupport {
1.4 +7 -6
jakarta-struts/src/example/org/apache/struts/webapp/example/DatabaseServlet.java
Index: DatabaseServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/DatabaseServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatabaseServlet.java 2001/04/29 01:14:37 1.3
+++ DatabaseServlet.java 2001/07/16 00:44:50 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/DatabaseServlet.java,v
1.3 2001/04/29 01:14:37 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/04/29 01:14:37 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/DatabaseServlet.java,v
1.4 2001/07/16 00:44:50 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/07/16 00:44:50 $
*
* ====================================================================
*
@@ -79,8 +79,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.util.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.digester.Digester;
import org.apache.struts.util.MessageResources;
@@ -90,7 +90,7 @@
* Demonstration Application.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/04/29 01:14:37 $
+ * @version $Revision: 1.4 $ $Date: 2001/07/16 00:44:50 $
*/
public final class DatabaseServlet
@@ -237,6 +237,7 @@
Digester digester = new Digester();
digester.push(this);
digester.setDebug(debug);
+ digester.setNamespaceAware(true);
digester.setValidating(false);
digester.addObjectCreate("database/user",
"org.apache.struts.webapp.example.User");
1.3 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
Index: EditRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditRegistrationAction.java 2001/04/14 12:53:07 1.2
+++ EditRegistrationAction.java 2001/07/16 00:44:51 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
1.2 2001/04/14 12:53:07 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:07 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
1.3 2001/07/16 00:44:51 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/16 00:44:51 $
*
* ====================================================================
*
@@ -72,13 +72,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
/**
@@ -87,7 +87,7 @@
* User (if any).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/16 00:44:51 $
*/
public final class EditRegistrationAction extends Action {
1.3 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
Index: EditSubscriptionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditSubscriptionAction.java 2001/04/14 12:53:07 1.2
+++ EditSubscriptionAction.java 2001/07/16 00:44:51 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
1.2 2001/04/14 12:53:07 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:07 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
1.3 2001/07/16 00:44:51 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/16 00:44:51 $
*
* ====================================================================
*
@@ -72,13 +72,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
/**
@@ -86,7 +86,7 @@
* <code>SubscriptionForm</code> from the currently specified subscription.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:07 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/16 00:44:51 $
*/
public final class EditSubscriptionAction extends Action {
1.3 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveRegistrationAction.java 2001/04/14 12:53:08 1.2
+++ SaveRegistrationAction.java 2001/07/16 00:44:51 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
1.2 2001/04/14 12:53:08 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:08 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
1.3 2001/07/16 00:44:51 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/16 00:44:51 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -80,7 +81,6 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
/**
@@ -89,7 +89,7 @@
* registration is created, the user is also implicitly logged on.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:08 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/16 00:44:51 $
*/
public final class SaveRegistrationAction extends Action {
1.3 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
Index: SaveSubscriptionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveSubscriptionAction.java 2001/04/14 12:53:08 1.2
+++ SaveSubscriptionAction.java 2001/07/16 00:44:51 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
1.2 2001/04/14 12:53:08 rleland Exp $
- * $Revision: 1.2 $
- * $Date: 2001/04/14 12:53:08 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
1.3 2001/07/16 00:44:51 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/16 00:44:51 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -80,7 +81,6 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
/**
@@ -88,7 +88,7 @@
* updates the mail subscription entered by the user.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/04/14 12:53:08 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/16 00:44:51 $
*/
public final class SaveSubscriptionAction extends Action {
1.4 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java
Index: ActionFormBeans.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionFormBeans.java 2001/02/21 00:35:43 1.3
+++ ActionFormBeans.java 2001/07/16 00:44:52 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java,v 1.3
2001/02/21 00:35:43 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/02/21 00:35:43 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java,v 1.4
2001/07/16 00:44:52 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/07/16 00:44:52 $
*
* ====================================================================
*
@@ -64,7 +64,7 @@
import java.io.Serializable;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
@@ -72,7 +72,7 @@
* administered and searched, while hiding the internal implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/02/21 00:35:43 $
+ * @version $Revision: 1.4 $ $Date: 2001/07/16 00:44:52 $
*/
public class ActionFormBeans implements Serializable {
1.5 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionForwards.java
Index: ActionForwards.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionForwards.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionForwards.java 2001/02/21 00:35:44 1.4
+++ ActionForwards.java 2001/07/16 00:44:52 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionForwards.java,v 1.4
2001/02/21 00:35:44 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/21 00:35:44 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionForwards.java,v 1.5
2001/07/16 00:44:52 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/07/16 00:44:52 $
*
* ====================================================================
*
@@ -64,7 +64,7 @@
import java.io.Serializable;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
@@ -72,7 +72,7 @@
* administered and searched, while hiding the internal implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/02/21 00:35:44 $
+ * @version $Revision: 1.5 $ $Date: 2001/07/16 00:44:52 $
*/
public class ActionForwards implements Serializable {
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java
Index: ActionMappings.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ActionMappings.java 2001/02/21 00:35:45 1.6
+++ ActionMappings.java 2001/07/16 00:44:52 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java,v 1.6
2001/02/21 00:35:45 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/21 00:35:45 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java,v 1.7
2001/07/16 00:44:52 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/07/16 00:44:52 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import java.util.Iterator;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
@@ -76,7 +76,7 @@
* administered and searched, while hiding the internal implementation.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/02/21 00:35:45 $
+ * @version $Revision: 1.7 $ $Date: 2001/07/16 00:44:52 $
*/
public class ActionMappings implements Serializable {
1.73 +15 -11
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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ActionServlet.java 2001/06/25 00:02:27 1.72
+++ ActionServlet.java 2001/07/16 00:44:52 1.73
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.72
2001/06/25 00:02:27 craigmcc Exp $
- * $Revision: 1.72 $
- * $Date: 2001/06/25 00:02:27 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.73
2001/07/16 00:44:52 craigmcc Exp $
+ * $Revision: 1.73 $
+ * $Date: 2001/07/16 00:44:52 $
*
* ====================================================================
*
@@ -80,17 +80,17 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.sql.DataSource;
-import org.apache.struts.digester.Digester;
-import org.apache.struts.digester.Rule;
+import org.apache.commons.collections.FastHashMap;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.Rule;
import org.apache.struts.taglib.html.Constants;
-import org.apache.struts.util.FastHashMap;
+import org.apache.struts.upload.MultipartRequestWrapper;
import org.apache.struts.util.GenericDataSource;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.MessageResourcesFactory;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ServletContextWriter;
-import org.apache.struts.upload.MultipartRequestWrapper;
-import org.xml.sax.AttributeList;
+import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -228,7 +228,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.72 $ $Date: 2001/06/25 00:02:27 $
+ * @version $Revision: 1.73 $ $Date: 2001/07/16 00:44:52 $
*/
public class ActionServlet
@@ -1109,6 +1109,7 @@
Digester digester = new Digester();
digester.push(this);
digester.setDebug(detail);
+ digester.setNamespaceAware(true);
digester.setValidating(validating);
// Register our local copy of the DTDs that we can find
@@ -1335,6 +1336,7 @@
Digester digester = new Digester();
digester.push(this);
digester.setDebug(this.debug);
+ digester.setNamespaceAware(true);
digester.setValidating(false);
// Register our local copy of the DTDs that we can find
@@ -1351,6 +1353,8 @@
digester.addCallParam("web-app/servlet-mapping/url-pattern", 1);
// Process the web application deployment descriptor
+ if (debug >= 1)
+ log("Scanning web.xml for controller servlet mapping");
InputStream input= null;
try {
input =
@@ -2100,12 +2104,12 @@
}
- public void begin(AttributeList attributes) throws Exception {
+ public void begin(Attributes attributes) throws Exception {
// Acquire the key under which this data source will be stored
String key = null;
for (int i = 0; i < attributes.getLength(); i++) {
- if ("key".equals(attributes.getName(i))) {
+ if ("key".equals(attributes.getQName(i))) {
key = attributes.getValue(i);
break;
}
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java
Index: ResourceTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResourceTag.java 2001/02/12 01:26:57 1.7
+++ ResourceTag.java 2001/07/16 00:44:53 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java,v
1.7 2001/02/12 01:26:57 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2001/02/12 01:26:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/ResourceTag.java,v
1.8 2001/07/16 00:44:53 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/07/16 00:44:53 $
*
* ====================================================================
*
@@ -70,8 +70,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -81,7 +81,7 @@
* web application resource.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/02/12 01:26:57 $
+ * @version $Revision: 1.8 $ $Date: 2001/07/16 00:44:53 $
*/
public class ResourceTag extends TagSupport {
1.11 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java
Index: WriteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WriteTag.java 2001/02/12 01:26:58 1.10
+++ WriteTag.java 2001/07/16 00:44:54 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v 1.10
2001/02/12 01:26:58 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/02/12 01:26:58 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v 1.11
2001/07/16 00:44:54 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/07/16 00:44:54 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -77,7 +77,7 @@
* output stream, optionally filtering characters that are sensitive in HTML.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/02/12 01:26:58 $
+ * @version $Revision: 1.11 $ $Date: 2001/07/16 00:44:54 $
*/
public class WriteTag extends TagSupport {
1.11 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java
Index: ErrorsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ErrorsTag.java 2001/06/24 03:33:10 1.10
+++ ErrorsTag.java 2001/07/16 00:44:54 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v 1.10
2001/06/24 03:33:10 rleland Exp $
- * $Revision: 1.10 $
- * $Date: 2001/06/24 03:33:10 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v 1.11
2001/07/16 00:44:54 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/07/16 00:44:54 $
*
* ====================================================================
*
@@ -70,10 +70,10 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.ErrorMessages;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
@@ -98,7 +98,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/06/24 03:33:10 $
+ * @version $Revision: 1.11 $ $Date: 2001/07/16 00:44:54 $
*/
public class ErrorsTag extends TagSupport {
1.9 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
Index: MultiboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MultiboxTag.java 2001/06/10 03:53:31 1.8
+++ MultiboxTag.java 2001/07/16 00:44:55 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.8 2001/06/10 03:53:31 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2001/06/10 03:53:31 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.9 2001/07/16 00:44:55 craigmcc Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/07/16 00:44:55 $
*
* ====================================================================
*
@@ -68,8 +68,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspWriter;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.action.Action;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ResponseUtils;
@@ -83,7 +83,7 @@
*
* @author Ralph Schaer
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/06/10 03:53:31 $
+ * @version $Revision: 1.9 $ $Date: 2001/07/16 00:44:55 $
*/
public class MultiboxTag extends BaseHandlerTag {
1.12 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
Index: OptionsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OptionsTag.java 2001/06/10 03:53:31 1.11
+++ OptionsTag.java 2001/07/16 00:44:55 1.12
@@ -59,19 +59,19 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.IteratorAdapter;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.ResponseUtils;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
/**
1.6 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java
Index: RadioTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RadioTag.java 2001/06/10 03:53:31 1.5
+++ RadioTag.java 2001/07/16 00:44:55 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.5
2001/06/10 03:53:31 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/06/10 03:53:31 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.6
2001/07/16 00:44:55 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/16 00:44:55 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspWriter;
-import org.apache.struts.util.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ResponseUtils;
@@ -77,7 +77,7 @@
* Tag for input fields of type "radio".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/06/10 03:53:31 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/16 00:44:55 $
*/
public class RadioTag extends BaseHandlerTag {
1.6 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java
Index: SelectTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SelectTag.java 2001/06/10 03:53:31 1.5
+++ SelectTag.java 2001/07/16 00:44:55 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.5
2001/06/10 03:53:31 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/06/10 03:53:31 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.6
2001/07/16 00:44:55 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/16 00:44:55 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.util.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -81,7 +81,7 @@
* inside a form tag.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/06/10 03:53:31 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/16 00:44:55 $
*/
public class SelectTag extends BaseHandlerTag {
1.5 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java
Index: TextareaTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextareaTag.java 2001/04/18 23:51:32 1.4
+++ TextareaTag.java 2001/07/16 00:44:55 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.4 2001/04/18 23:51:32 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/04/18 23:51:32 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v
1.5 2001/07/16 00:44:55 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/07/16 00:44:55 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.util.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ResponseUtils;
@@ -78,7 +78,7 @@
* Custom tag for input fields of type "textarea".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/04/18 23:51:32 $
+ * @version $Revision: 1.5 $ $Date: 2001/07/16 00:44:55 $
*/
public class TextareaTag extends BaseInputTag {
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/logic/CompareTagBase.java
Index: CompareTagBase.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/CompareTagBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompareTagBase.java 2001/02/12 21:49:54 1.6
+++ CompareTagBase.java 2001/07/16 00:44:56 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/CompareTagBase.java,v
1.6 2001/02/12 21:49:54 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/12 21:49:54 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/CompareTagBase.java,v
1.7 2001/07/16 00:44:56 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/07/16 00:44:56 $
*
* ====================================================================
*
@@ -68,8 +68,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -78,7 +78,7 @@
* define values for desired1 and desired2.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/02/12 21:49:54 $
+ * @version $Revision: 1.7 $ $Date: 2001/07/16 00:44:56 $
*/
public abstract class CompareTagBase extends ConditionalTagBase {
1.13 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java
Index: IterateTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IterateTag.java 2001/06/14 04:25:32 1.12
+++ IterateTag.java 2001/07/16 00:44:57 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java,v
1.12 2001/06/14 04:25:32 martinc Exp $
- * $Revision: 1.12 $
- * $Date: 2001/06/14 04:25:32 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java,v
1.13 2001/07/16 00:44:57 craigmcc Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/07/16 00:44:57 $
*
* ====================================================================
*
@@ -72,10 +72,9 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
-
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.IteratorAdapter;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -88,7 +87,7 @@
* or a Map (which includes Hashtables) whose elements will be iterated over.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12 $ $Date: 2001/06/14 04:25:32 $
+ * @version $Revision: 1.13 $ $Date: 2001/07/16 00:44:57 $
*/
public class IterateTag extends BodyTagSupport {
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/logic/MatchTag.java
Index: MatchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MatchTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MatchTag.java 2001/02/12 21:49:57 1.7
+++ MatchTag.java 2001/07/16 00:44:57 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MatchTag.java,v 1.7
2001/02/12 21:49:57 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2001/02/12 21:49:57 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MatchTag.java,v 1.8
2001/07/16 00:44:57 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/07/16 00:44:57 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -76,7 +76,7 @@
* is a substring of the specified variable.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/02/12 21:49:57 $
+ * @version $Revision: 1.8 $ $Date: 2001/07/16 00:44:57 $
*/
public class MatchTag extends ConditionalTagBase {
1.9 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java
Index: PresentTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PresentTag.java 2001/06/11 17:35:51 1.8
+++ PresentTag.java 2001/07/16 00:44:57 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java,v
1.8 2001/06/11 17:35:51 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2001/06/11 17:35:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/PresentTag.java,v
1.9 2001/07/16 00:44:57 craigmcc Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/07/16 00:44:57 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -77,7 +77,7 @@
* is present for this request.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/06/11 17:35:51 $
+ * @version $Revision: 1.9 $ $Date: 2001/07/16 00:44:57 $
*/
public class PresentTag extends ConditionalTagBase {
1.11 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java
Index: RedirectTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RedirectTag.java 2001/05/12 20:34:01 1.10
+++ RedirectTag.java 2001/07/16 00:44:57 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
1.10 2001/05/12 20:34:01 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/05/12 20:34:01 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
1.11 2001/07/16 00:44:57 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/07/16 00:44:57 $
*
* ====================================================================
*
@@ -76,11 +76,11 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionForwards;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.ResponseUtils;
@@ -89,7 +89,7 @@
* Generate a URL-encoded redirect to the specified URI.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/05/12 20:34:01 $
+ * @version $Revision: 1.11 $ $Date: 2001/07/16 00:44:57 $
*/
public class RedirectTag extends TagSupport {
1.19 +6 -4
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RequestUtils.java 2001/06/13 03:00:51 1.18
+++ RequestUtils.java 2001/07/16 00:44:59 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.18
2001/06/13 03:00:51 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2001/06/13 03:00:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v 1.19
2001/07/16 00:44:59 craigmcc Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/07/16 00:44:59 $
*
* ====================================================================
*
@@ -79,6 +79,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -95,7 +97,7 @@
* in the Struts controller framework.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/06/13 03:00:51 $
+ * @version $Revision: 1.19 $ $Date: 2001/07/16 00:44:59 $
*/
public class RequestUtils {
1.13 +2 -2 jakarta-struts/web/example/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/web.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web.xml 2001/06/25 00:02:31 1.12
+++ web.xml 2001/07/16 00:44:59 1.13
@@ -33,11 +33,11 @@
</init-param>
<init-param>
<param-name>debug</param-name>
- <param-value>2</param-value>
+ <param-value>3</param-value>
</init-param>
<init-param>
<param-name>detail</param-name>
- <param-value>2</param-value>
+ <param-value>3</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
