rdonkin 2004/07/04 09:40:49 Modified: betwixt/src/java/org/apache/commons/betwixt/digester AddDefaultsRule.java ElementRule.java MappedPropertyRule.java OptionRule.java XMLIntrospectorHelper.java package.html Log: Added in changes from release branch Revision Changes Path 1.13 +2 -2 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AddDefaultsRule.java Index: AddDefaultsRule.java =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/AddDefaultsRule.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- AddDefaultsRule.java 13 Jun 2004 21:32:45 -0000 1.12 +++ AddDefaultsRule.java 4 Jul 2004 16:40:49 -0000 1.13 @@ -35,7 +35,6 @@ * to the current element.</p> * * @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a> - * @version $Revision$ */ public class AddDefaultsRule extends RuleSupport { @@ -134,7 +133,7 @@ * @throws SAXException if the parent for the addDefaults element is not a <element> * or if the top object on the stack is not a <code>XMLBeanInfo</code> or a * <code>ElementDescriptor</code> - * @deprecated replaced [EMAIL PROTECTED] #addDescriptor( Descriptor )} + * @deprecated 0.5 replaced [EMAIL PROTECTED] #addDescriptor( Descriptor )} */ protected void addDescriptor( NodeDescriptor nodeDescriptor ) throws SAXException { addDescriptor( (Descriptor) nodeDescriptor ); @@ -147,6 +146,7 @@ * @throws SAXException if the parent for the addDefaults element is not a <element> * or if the top object on the stack is not a <code>XMLBeanInfo</code> or a * <code>ElementDescriptor</code> + * @since 0.5 */ protected void addDescriptor( Descriptor nodeDescriptor ) throws SAXException { Object top = digester.peek(); 1.16 +3 -1 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/ElementRule.java Index: ElementRule.java =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/ElementRule.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ElementRule.java 13 Jun 2004 21:32:45 -0000 1.15 +++ ElementRule.java 4 Jul 2004 16:40:49 -0000 1.16 @@ -35,7 +35,6 @@ * the <element> elements.</p> * * @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a> - * @version $Id$ */ public class ElementRule extends MappedPropertyRule { @@ -45,6 +44,7 @@ * Sets the log for this class * * @param newLog the new Log implementation for this class to use + * @since 0.5 */ public static final void setLog(Log newLog) { log = newLog; @@ -171,6 +171,7 @@ * Uses the default updater (from the standard java bean property). * * @param elementDescriptor configure this <code>ElementDescriptor</code> + * @since 0.5 */ protected void configureDescriptor(ElementDescriptor elementDescriptor) { configureDescriptor( elementDescriptor, null ); @@ -182,6 +183,7 @@ * * @param elementDescriptor configure this <code>ElementDescriptor</code> * @param updateMethodName custom update method. If null, then use standard + * @since 0.5 */ protected void configureDescriptor( ElementDescriptor elementDescriptor, 1.7 +1 -1 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java Index: MappedPropertyRule.java =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/MappedPropertyRule.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MappedPropertyRule.java 31 Mar 2004 21:11:52 -0000 1.6 +++ MappedPropertyRule.java 4 Jul 2004 16:40:49 -0000 1.7 @@ -26,7 +26,7 @@ * Maybe a lot of this should be moved into <code>BeanUtils</code>.</p> * * @author Robert Burrell Donkin - * @version $Revision$ + * @sinec 0.5 */ public abstract class MappedPropertyRule extends RuleSupport { 1.2 +1 -1 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/OptionRule.java Index: OptionRule.java =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/OptionRule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- OptionRule.java 7 Apr 2004 21:14:06 -0000 1.1 +++ OptionRule.java 4 Jul 2004 16:40:49 -0000 1.2 @@ -25,7 +25,7 @@ * [EMAIL PROTECTED] org.apache.commons.betwixt.Options} * on the current description. * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team</a> - * @version $Revision$ + * @since 0.5 */ public class OptionRule extends Rule { 1.31 +2 -2 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java Index: XMLIntrospectorHelper.java =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- XMLIntrospectorHelper.java 13 Jun 2004 21:32:45 -0000 1.30 +++ XMLIntrospectorHelper.java 4 Jul 2004 16:40:49 -0000 1.31 @@ -48,7 +48,6 @@ * think about whether they need replacing with something different. * @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a> * @author <a href="mailto:[EMAIL PROTECTED]">Martin van den Bemt</a> - * @version $Id$ */ public class XMLIntrospectorHelper { @@ -89,7 +88,7 @@ * @param introspector use this <code>XMLIntrospector</code> * @return a correctly configured <code>NodeDescriptor</code> for the property * @throws IntrospectionException when bean introspection fails - * @deprecated this method has been replaced by [EMAIL PROTECTED] XMLIntrospector#createDescriptor} + * @deprecated 0.5 this method has been replaced by [EMAIL PROTECTED] XMLIntrospector#createDescriptor} */ public static NodeDescriptor createDescriptor( PropertyDescriptor propertyDescriptor, @@ -234,6 +233,7 @@ * If null, then then * @param beanClass the <code>Class</code> from which the update method should be found. * This may be null only when <code>updateMethodName</code> is also null. + * @since 0.5 * @deprecated moved into ElementRule */ public static void configureProperty( 1.2 +15 -0 jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/package.html Index: package.html =================================================================== RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/digester/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package.html 10 Jun 2002 17:53:34 -0000 1.1 +++ package.html 4 Jul 2004 16:40:49 -0000 1.2 @@ -1,4 +1,19 @@ <html> +<!-- + Copyright 2001-2004 The Apache Software Foundation. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <head> </head> <body>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]