craigmcc 01/04/13 19:11:04 Modified: src/share/org/apache/struts/digester CallMethodRule.java CallParamRule.java Digester.java ObjectCreateRule.java Rule.java SetNextRule.java SetPropertiesRule.java SetPropertyRule.java SetTopRule.java Log: Make all of the classes in this package non-final (and tweak the license agreement while we are at it). The need to do this was reported on Bugzilla #1166 by Hal Deadman <[EMAIL PROTECTED]>. The underlying issue in the bug report has not been dealt with yet, so I'm leaving it open for now. Revision Changes Path 1.10 +11 -11 jakarta-struts/src/share/org/apache/struts/digester/CallMethodRule.java Index: CallMethodRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallMethodRule.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CallMethodRule.java 2001/03/11 00:42:47 1.9 +++ CallMethodRule.java 2001/04/14 02:11:02 1.10 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallMethodRule.java,v 1.9 2001/03/11 00:42:47 craigmcc Exp $ - * $Revision: 1.9 $ - * $Date: 2001/03/11 00:42:47 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallMethodRule.java,v 1.10 2001/04/14 02:11:02 craigmcc Exp $ + * $Revision: 1.10 $ + * $Date: 2001/04/14 02:11:02 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -75,10 +75,10 @@ * element. * * @author Craig McClanahan - * @version $Revision: 1.9 $ $Date: 2001/03/11 00:42:47 $ + * @version $Revision: 1.10 $ $Date: 2001/04/14 02:11:02 $ */ -public final class CallMethodRule extends Rule { +public class CallMethodRule extends Rule { // ----------------------------------------------------------- Constructors @@ -175,14 +175,14 @@ /** * The body text collected from this element. */ - private String bodyText = null; + protected String bodyText = null; /** * The method name to call on the parent object. */ - private String methodName = null; + protected String methodName = null; /** @@ -190,13 +190,13 @@ * If this value is zero, a single parameter will be collected from the * body of this element. */ - private int paramCount = 0; + protected int paramCount = 0; /** * The parameter types of the parameters to be collected. */ - private Class paramTypes[] = null; + protected Class paramTypes[] = null; // --------------------------------------------------------- Public Methods 1.4 +10 -10 jakarta-struts/src/share/org/apache/struts/digester/CallParamRule.java Index: CallParamRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallParamRule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CallParamRule.java 2000/08/13 04:40:03 1.3 +++ CallParamRule.java 2001/04/14 02:11:02 1.4 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallParamRule.java,v 1.3 2000/08/13 04:40:03 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2000/08/13 04:40:03 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/CallParamRule.java,v 1.4 2001/04/14 02:11:02 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/04/14 02:11:02 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -73,10 +73,10 @@ * by a surrounding CallMethodRule rule. * * @author Craig McClanahan - * @version $Revision: 1.3 $ $Date: 2000/08/13 04:40:03 $ + * @version $Revision: 1.4 $ $Date: 2001/04/14 02:11:02 $ */ -public final class CallParamRule extends Rule { +public class CallParamRule extends Rule { // ----------------------------------------------------------- Constructors @@ -120,19 +120,19 @@ /** * The attribute from which to save the parameter value */ - private String attributeName = null; + protected String attributeName = null; /** * The body text collected from this element. */ - private String bodyText = null; + protected String bodyText = null; /** * The zero-relative index of the parameter we are saving. */ - private int paramIndex = 0; + protected int paramIndex = 0; // --------------------------------------------------------- Public Methods 1.17 +20 -20 jakarta-struts/src/share/org/apache/struts/digester/Digester.java Index: Digester.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Digester.java 2001/03/13 19:39:48 1.16 +++ Digester.java 2001/04/14 02:11:02 1.17 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.16 2001/03/13 19:39:48 craigmcc Exp $ - * $Revision: 1.16 $ - * $Date: 2001/03/13 19:39:48 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Digester.java,v 1.17 2001/04/14 02:11:02 craigmcc Exp $ + * $Revision: 1.17 $ + * $Date: 2001/04/14 02:11:02 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -102,10 +102,10 @@ * even from the same thread.</p> * * @author Craig McClanahan - * @version $Revision: 1.16 $ $Date: 2001/03/13 19:39:48 $ + * @version $Revision: 1.17 $ $Date: 2001/04/14 02:11:02 $ */ -public final class Digester extends HandlerBase { +public class Digester extends HandlerBase { // --------------------------------------------------------- Constructors @@ -127,51 +127,51 @@ /** * The body text of the current element. */ - private StringBuffer bodyText = new StringBuffer(); + protected StringBuffer bodyText = new StringBuffer(); /** * The stack of body text string buffers for surrounding elements. */ - private ArrayStack bodyTexts = new ArrayStack(); + protected ArrayStack bodyTexts = new ArrayStack(); /** * The debugging detail level of this component. */ - private int debug = 0; + protected int debug = 0; /** * The URLs of DTDs that have been registered, keyed by the public * identifier that corresponds. */ - private HashMap dtds = new HashMap(); + protected HashMap dtds = new HashMap(); /** * The Locator associated with our parser. */ - private Locator locator = null; + protected Locator locator = null; /** * The current match pattern for nested element processing. */ - private String match = ""; + protected String match = ""; /** * The SAXParser we will use to parse the input stream. */ - private SAXParser parser = null; + protected SAXParser parser = null; /** * The "root" element of the stack (in other words, the last object * that was popped. */ - private Object root = null; + protected Object root = null; /** @@ -180,19 +180,19 @@ * the value is a List containing the Rules for that pattern, in the * order that they were registered. */ - private HashMap rules = new HashMap(); + protected HashMap rules = new HashMap(); /** * The object stack being constructed. */ - private ArrayStack stack = new ArrayStack(); + protected ArrayStack stack = new ArrayStack(); /** * Do we want to use a validating parser? */ - private boolean validating = false; + protected boolean validating = false; // ----------------------------------------------------------- Properties @@ -1073,7 +1073,7 @@ } - // ------------------------------------------------------ Private Methods + // ------------------------------------------------------ Protected Methods /** @@ -1086,7 +1086,7 @@ * * @param match The current match position */ - private List getRules(String match) { + protected List getRules(String match) { List rulesList = (List) this.rules.get(match); if (rulesList == null) { 1.3 +9 -9 jakarta-struts/src/share/org/apache/struts/digester/ObjectCreateRule.java Index: ObjectCreateRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/ObjectCreateRule.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ObjectCreateRule.java 2000/08/01 20:03:29 1.2 +++ ObjectCreateRule.java 2001/04/14 02:11:02 1.3 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/ObjectCreateRule.java,v 1.2 2000/08/01 20:03:29 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2000/08/01 20:03:29 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/ObjectCreateRule.java,v 1.3 2001/04/14 02:11:02 craigmcc Exp $ + * $Revision: 1.3 $ + * $Date: 2001/04/14 02:11:02 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -72,10 +72,10 @@ * object will be popped * * @author Craig McClanahan - * @version $Revision: 1.2 $ $Date: 2000/08/01 20:03:29 $ + * @version $Revision: 1.3 $ $Date: 2001/04/14 02:11:02 $ */ -public final class ObjectCreateRule extends Rule { +public class ObjectCreateRule extends Rule { // ----------------------------------------------------------- Constructors @@ -119,13 +119,13 @@ /** * The attribute containing an override class name if it is present. */ - private String attributeName = null; + protected String attributeName = null; /** * The Java class name of the object to be created. */ - private String className = null; + protected String className = null; // --------------------------------------------------------- Public Methods 1.2 +5 -5 jakarta-struts/src/share/org/apache/struts/digester/Rule.java Index: Rule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Rule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Rule.java 2000/05/31 22:28:12 1.1 +++ Rule.java 2001/04/14 02:11:02 1.2 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Rule.java,v 1.1 2000/05/31 22:28:12 craigmcc Exp $ - * $Revision: 1.1 $ - * $Date: 2000/05/31 22:28:12 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/Rule.java,v 1.2 2001/04/14 02:11:02 craigmcc Exp $ + * $Revision: 1.2 $ + * $Date: 2001/04/14 02:11:02 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -71,7 +71,7 @@ * a corresponding nested pattern of XML elements has been matched. * * @author Craig McClanahan - * @version $Revision: 1.1 $ $Date: 2000/05/31 22:28:12 $ + * @version $Revision: 1.2 $ $Date: 2001/04/14 02:11:02 $ */ public abstract class Rule { 1.4 +9 -9 jakarta-struts/src/share/org/apache/struts/digester/SetNextRule.java Index: SetNextRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetNextRule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SetNextRule.java 2001/01/23 03:35:52 1.3 +++ SetNextRule.java 2001/04/14 02:11:03 1.4 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetNextRule.java,v 1.3 2001/01/23 03:35:52 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2001/01/23 03:35:52 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetNextRule.java,v 1.4 2001/04/14 02:11:03 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/04/14 02:11:03 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -73,10 +73,10 @@ * commonly used to establish parent-child relationships. * * @author Craig McClanahan - * @version $Revision: 1.3 $ $Date: 2001/01/23 03:35:52 $ + * @version $Revision: 1.4 $ $Date: 2001/04/14 02:11:03 $ */ -public final class SetNextRule extends Rule { +public class SetNextRule extends Rule { // ----------------------------------------------------------- Constructors @@ -123,13 +123,13 @@ /** * The method name to call on the parent object. */ - private String methodName = null; + protected String methodName = null; /** * The Java class name of the parameter type expected by the method. */ - private String paramType = null; + protected String paramType = null; // --------------------------------------------------------- Public Methods 1.4 +7 -7 jakarta-struts/src/share/org/apache/struts/digester/SetPropertiesRule.java Index: SetPropertiesRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertiesRule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SetPropertiesRule.java 2001/01/07 22:43:30 1.3 +++ SetPropertiesRule.java 2001/04/14 02:11:03 1.4 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertiesRule.java,v 1.3 2001/01/07 22:43:30 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2001/01/07 22:43:30 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertiesRule.java,v 1.4 2001/04/14 02:11:03 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/04/14 02:11:03 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -73,10 +73,10 @@ * stack, based on attributes with corresponding names. * * @author Craig McClanahan - * @version $Revision: 1.3 $ $Date: 2001/01/07 22:43:30 $ + * @version $Revision: 1.4 $ $Date: 2001/04/14 02:11:03 $ */ -public final class SetPropertiesRule extends Rule { +public class SetPropertiesRule extends Rule { // ----------------------------------------------------------- Constructors 1.4 +8 -8 jakarta-struts/src/share/org/apache/struts/digester/SetPropertyRule.java Index: SetPropertyRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertyRule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SetPropertyRule.java 2001/01/07 22:43:30 1.3 +++ SetPropertyRule.java 2001/04/14 02:11:03 1.4 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertyRule.java,v 1.3 2001/01/07 22:43:30 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2001/01/07 22:43:30 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetPropertyRule.java,v 1.4 2001/04/14 02:11:03 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2001/04/14 02:11:03 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,10 +73,10 @@ * top of the stack, based on attributes with specified names. * * @author Craig McClanahan - * @version $Revision: 1.3 $ $Date: 2001/01/07 22:43:30 $ + * @version $Revision: 1.4 $ $Date: 2001/04/14 02:11:03 $ */ -public final class SetPropertyRule extends Rule { +public class SetPropertyRule extends Rule { // ----------------------------------------------------------- Constructors @@ -107,13 +107,13 @@ /** * The attribute that will contain the property name. */ - private String name = null; + protected String name = null; /** * The attribute that will contain the property value. */ - private String value = null; + protected String value = null; // --------------------------------------------------------- Public Methods 1.5 +9 -9 jakarta-struts/src/share/org/apache/struts/digester/SetTopRule.java Index: SetTopRule.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetTopRule.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SetTopRule.java 2001/01/23 03:50:02 1.4 +++ SetTopRule.java 2001/04/14 02:11:03 1.5 @@ -1,13 +1,13 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetTopRule.java,v 1.4 2001/01/23 03:50:02 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2001/01/23 03:50:02 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/digester/SetTopRule.java,v 1.5 2001/04/14 02:11:03 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/04/14 02:11:03 $ * * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software + * 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] @@ -72,10 +72,10 @@ * object, passing the (top-1) (child) object as an argument. * * @author Craig McClanahan - * @version $Revision: 1.4 $ $Date: 2001/01/23 03:50:02 $ + * @version $Revision: 1.5 $ $Date: 2001/04/14 02:11:03 $ */ -public final class SetTopRule extends Rule { +public class SetTopRule extends Rule { // ----------------------------------------------------------- Constructors @@ -122,13 +122,13 @@ /** * The method name to call on the parent object. */ - private String methodName = null; + protected String methodName = null; /** * The Java class name of the parameter type expected by the method. */ - private String paramType = null; + protected String paramType = null; // --------------------------------------------------------- Public Methods