You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rd...@apache.org on 2004/09/09 22:38:22 UTC
cvs commit: jakarta-commons/digester/xdocs index.xml
rdonkin 2004/09/09 13:38:22
Modified: digester RELEASE-NOTES.txt STATUS.html build.xml
checkstyle.xml maven.xml project.xml
digester/src/examples/api build.properties.sample build.xml
readme.txt
digester/src/examples/api/addressbook build.xml example.xml
readme.txt
digester/src/examples/api/catalog build.xml example.xml
readme.txt
digester/src/examples/api/document-markup build.xml
readme.txt
digester/src/examples/plugins/pipeline build.xml
compound.xml readme.txt substitute.xml
uppercase.xml
digester/src/examples/rss build.xml readme.txt
digester/src/examples/rss/src/java/org/apache/commons/digester/rss
rss-example.xml
digester/src/examples/xmlrules readme.txt
digester/src/examples/xmlrules/addressbook build.xml
example.xml readme.txt
digester/src/java overview.html
digester/src/java/org/apache/commons/digester
CallParamRule.java Digester.java
FactoryCreateRule.java package.html
digester/src/java/org/apache/commons/digester/parser
package.html
digester/src/java/org/apache/commons/digester/plugins
package.html
digester/src/java/org/apache/commons/digester/plugins/strategies
package.html
digester/src/java/org/apache/commons/digester/substitution
package.html
digester/src/java/org/apache/commons/digester/xmlrules
DigesterRuleParser.java digester-rules.dtd
package.html
digester/xdocs index.xml
Added: digester/src/examples/plugins/pipeline .cvsignore
build.properties.sample
digester/src/examples/rss .cvsignore build.properties.sample
digester/src/examples/xmlrules/addressbook .cvsignore
build.properties.sample
Removed: digester/src/examples/rss/src/java/org/apache/commons/digester/rss
rss-0.9.dtd rss-0.91.dtd
digester/src/java/org/apache/commons/digester
ArrayStack.java
Log:
Merged in release branch
Revision Changes Path
1.14 +46 -60 jakarta-commons/digester/RELEASE-NOTES.txt
Index: RELEASE-NOTES.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/RELEASE-NOTES.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RELEASE-NOTES.txt 1 May 2004 20:49:56 -0000 1.13
+++ RELEASE-NOTES.txt 9 Sep 2004 20:38:19 -0000 1.14
@@ -10,35 +10,54 @@
============
This is mostly a feature release. A few minor bugs have been fixed (as listed
-below) but Digester 1.5 proved a very stable release.
+below) but Digester 1.5 proved to be a very stable release.
-BACKWARDS INCOMPATIBILITIES
-===========================
+IMPORTANT NOTES
+===============
-ArrayStack
-----------
-Previously, Digester required the collections library, simply for a single
-class: ArrayStack. To avoid depending explicitly on the commons-collections
-library, a copy of this class has been made within the digester library. All
-places which once used the collections version now use the digester version.
-Unfortunately, this will require all user classes which subclass the
-modified classes to be recompiled. The affected classes are:
- CallParamRule (member bodyTextStack)
- Digester (members bodyTexts, params and stack)
- FactoryCreateRule
- xmlrules.DigesterRuleParser
+New License
+-----------
+This release is done under version 2.0 of the Apache License.
+Please see the LICENSE.txt and NOTICE.txt files in the distribution.
-RSS Example
+RSS Support
-----------
-Previously, Digester included example code for processing RSS (Really Simple
-Syndication) streams in the core commons-digester.jar distribution, with the
-code in package "org.apache.commons.digester.rss". This code has been migrated
-to the new source directory "src/examples/rss", complete with a build.xml script
-that can recreate a new JAR file (commons-digester-rss.jar) containing this
-code. The Java package name has not changed, so the only impact on applications
-actually using these classes will be the need to acquire the sources, build the
-new JAR file, and add it toyour classpath.
+The RSS package present in previous distributions of Digester was only ever
+intended to be a "worked example", so the code has been moved to the
+"src/examples/api/rss" directory within the CVS repository, and is no
+longer part of the standard Digester binary distribution. However
+the same package structure has been preserved, so any users who were using the
+rss code in production should just have to compile the example code and
+include that additional jar in the classpath. These classes are still contained
+in the source distribution and so (for those for which such things matter)
+are still officially released (though no longer distributed in the binary).
+
+Examples Added
+--------------
+Several examples have been added to CVS at src/examples, for the enlightenment
+of new Digester users. They can be access either through CVS or by grabbing the
+source distribution.
+
+Author and Version javadoc tags removed
+---------------------------------------
+All @author tags were removed, as per Apache Foundation policy. A list of
+all the developers and contributors involved in Digester can still be
+found via the Digester website, or in the "project.xml" file in the base
+directory of the Digester CVS repository.
+
+All @version tags were removed as they were not considered to be useful.
+Dependencies
+------------
+The 1.6 Digester release supports greater choice for the user in terms of it's
+dependencies. By choosing the correct combination of dependencies, Digester
+can be used with either (incompatible) series of commons-collection releases
+or none at all.
+
+Compatible Dependency Sets:
+ Digester 1.6 + Logging 1.0.x + BeanUtils 1.x + Collections 2.x
+ Digester 1.6 + Logging 1.0.x + BeanUtils 1.x + Collections 3.x
+ Digester 1.6 + Logging 1.0.x + BeanUtils 1.7
NEW FEATURES:
=============
@@ -186,45 +205,12 @@
-----------------------------------------
The subject of this one says it all.
-
-OTHER IMPORTANT NOTES
-======================
-
-New License
------------
-This release is done under version 2.0 of the Apache License.
-Please see the LICENSE.txt and NOTICE.txt files in the distribution.
-
-RSS Support
------------
-The RSS package present in previous distributions of Digester was only ever
-intended to be a "worked example", so the code has been moved to the
-"src/examples/api/rss" directory within the CVS repository, and is no
-longer part of the standard Digester binary distribution. However
-the same package structure has been preserved, so any users who were using the
-rss code in production should just have to compile the example code and
-include that additional jar in the classpath.
-
-Examples Added
---------------
-Several examples have been added to CVS at src/examples, for the enlightenment
-of new Digester users.
-
-Author and Version javadoc tags removed
----------------------------------------
-All @author tags were removed, as per Apache Foundation policy. A list of
-all the developers and contributors involved in Digester can still be
-found via the Digester website, or in the "project.xml" file in the base
-directory of the Digester CVS repository.
-
-All @version tags were removed as they were not considered to be useful.
-
-
Commons Collections dependency
==============================
The commons-collections library has recently undergone a major release (3.0).
Digester has been tested with both commons-collections 2.1 and 3.0 and
-there are no known issues with using either version of this library.
+there are no known issues with using either version of this library. See above
+for the list of compatible dependency sets.
BUGS FROM PREVIOUS RELEASE
1.12 +15 -39 jakarta-commons/digester/STATUS.html
Index: STATUS.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/STATUS.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- STATUS.html 15 Feb 2004 01:02:13 -0000 1.11
+++ STATUS.html 9 Sep 2004 20:38:19 -0000 1.12
@@ -41,8 +41,8 @@
<a name="Dependencies"></a>
<h3>2. DEPENDENCIES</h3>
-<p>The <em>Digester</em> component is dependent upon the following external
-components for development and use:</p>
+<p>The <em>Digester</em> component is dependent upon implementations of the following
+standard components for development and use:</p>
<ul>
<li><a href="http://java.sun.com/j2se">Java Development Kit</a>
(Version 1.2 or later)</li>
@@ -52,17 +52,22 @@
<li><a href="http://java.sun.com/xml">JAXP/1.1 Reference Implementation</a></li>
<li><a href="http://xml.apache.org/xerces-j">Xerces</a> (Version 1.3.1 or later)</li>
</ul></li>
-<li><a href="http://jakarta.apache.org/jakarta-commons/beanutils/">Jakarta Commons BeanUtils</a></li>
-<li><a href="http://jakarta.apache.org/jakarta-commons/collections/">Jakarta
- Commons Collections</a> (this is a runtime inheritance only, inherited
- from Jakarta Commons BeanUtls)</li>
</ul>
-
+<p>
+It is also dependent on a compatible set of
+<a href='http://jakarta.apache.org/commons'>Jakarta Commons</a> library components:
+</p>
+ <table border="1" width="100%" cellspacing="2" cellpadding="3">
+ <tr class="a"><th colspan="4">Compatible Dependency Sets</th></tr>
+ <tr class="b"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.x</td><td>+Collections 2.x</td></tr>
+ <tr class="a"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.x</td><td>+Collections 3.x</td></tr>
+ <tr class="b"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.7</td><td>-</td></tr>
+ </table>
<a name="Release Info"></a>
<h3>3. RELEASE INFO</h3>
-<p>Current Release: Version 1.5</p>
+<p>Current Release: Version 1.6</p>
<a name="Committers"></a>
@@ -80,36 +85,7 @@
<li><a href="mailto:rdonkin@apache.org">Robert Burrell Donkin</a></li>
<li><a href="mailto:tobrien@apache.org">Tim O'Brien</a></li>
<li><a href="mailto:jstrachan@apache.org">James Strachan</a></li>
+<li>Simon Kitching</li>
</ul>
-
-<a name="Action Items"></a>
-<h3>5. ACTION ITEMS</h3>
-
-<p>The following action items need to be completed prior to the next
-release of this component:</p>
-
-<table border="1">
-
- <tr>
- <th width="80%">Action Item</th>
- <th width="20%">Volunteer</th>
- </tr>
-
- <tr>
- <td><strong>Feedback from logging</strong>. Let us know how the logging API
- is working for you.
- <td align="center">YOU ;-)</td>
- </tr>
-
- <tr>
- <td><strong>Install / Use Documentation</strong>. Create simple
- installation and User's Guide documentation for this component.</td>
- <td align="center">Craig</td>
- </tr>
-
-</table>
-
-
-
</body>
</html>
1.54 +34 -3 jakarta-commons/digester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 1 May 2004 20:42:59 -0000 1.53
+++ build.xml 9 Sep 2004 20:38:19 -0000 1.54
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
+
<project name="Digester" default="compile" basedir=".">
@@ -55,7 +71,7 @@
<property name="component.title" value="Digester - XML to Java Object Configuration"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.6-dev"/>
+ <property name="component.version" value="1.6"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="target"/>
@@ -91,6 +107,7 @@
<pathelement location="${jaxp.jaxp.jar}"/>
<pathelement location="${jaxp.parser.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${junit.jar}"/>
</path>
@@ -218,7 +235,19 @@
overview="src/java/overview.html"
doctitle="<h1>${component.title} (Version ${component.version})</h1>"
windowtitle="${component.title} (Version ${component.version})"
- bottom="Copyright (c) 2001-2003 - Apache Software Foundation">
+ bottom='Copyright (c) 2001-2004 - 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.
+ -->'>
<link offline="true" packagelistLoc="${commons-beanutils.api}"
href="http://jakarta.apache.org/commons/beanutils/api/"/>
<link offline="true" packagelistLoc="${commons-collections.api}"
@@ -237,6 +266,8 @@
todir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
<copy file="RELEASE-NOTES.txt"
+ todir="${dist.home}"/>
+ <copy file="NOTICE.txt"
todir="${dist.home}"/>
<jar jarfile="${dist.home}/commons-${component.name}.jar"
basedir="${build.home}/classes"
1.4 +0 -1 jakarta-commons/digester/checkstyle.xml
Index: checkstyle.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/checkstyle.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checkstyle.xml 10 Jan 2004 17:24:26 -0000 1.3
+++ checkstyle.xml 9 Sep 2004 20:38:19 -0000 1.4
@@ -6,7 +6,6 @@
<!-- commons codec customization of default Checkstyle behavior -->
<module name="Checker">
- <property name="basedir" value="src/checkstyle"/>
<property name="localeLanguage" value="en"/>
<module name="TreeWalker">
1.4 +15 -0 jakarta-commons/digester/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 17 Aug 2004 15:38:48 -0000 1.3
+++ maven.xml 9 Sep 2004 20:38:19 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ 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.
+-->
<project default="jar:jar">
<!-- ================================================================== -->
1.22 +1 -1 jakarta-commons/digester/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 9 Apr 2004 19:58:06 -0000 1.21
+++ project.xml 9 Sep 2004 20:38:19 -0000 1.22
@@ -19,7 +19,7 @@
<id>commons-digester</id>
<inceptionYear>2001</inceptionYear>
- <currentVersion>1.6-dev</currentVersion>
+ <currentVersion>1.6</currentVersion>
<name>Digester</name>
<shortDescription>Rule based XML->Java object mapping module</shortDescription>
<description>The Digester package lets you configure an XML->Java object mapping module which triggers certain actions called rules whenever a particular pattern of nested XML elements is recognized.</description>
1.2 +16 -0 jakarta-commons/digester/src/examples/api/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 28 Sep 2003 09:40:51 -0000 1.1
+++ build.properties.sample 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,19 @@
+#####################################################
+# Copyright 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.
+####################################################
+
#
# Example build properties
#
1.2 +15 -0 jakarta-commons/digester/src/examples/api/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Sep 2003 09:40:51 -0000 1.1
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<!--
*******************************************************
API Examples Script
1.3 +16 -0 jakarta-commons/digester/src/examples/api/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readme.txt 25 Sep 2003 20:03:10 -0000 1.2
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.3
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
The subdirectories of this directory provide examples of how to use
the Apache Digester's java API.
1.3 +16 -0 jakarta-commons/digester/src/examples/api/addressbook/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/addressbook/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 17 Apr 2004 10:59:37 -0000 1.2
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.3
@@ -1,3 +1,19 @@
+<!--
+ Copyright 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.
+-->
+
<project name="Example-AddressBook" default="compile" basedir=".">
1.2 +15 -0 jakarta-commons/digester/src/examples/api/addressbook/example.xml
Index: example.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/addressbook/example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.xml 14 Aug 2003 18:25:34 -0000 1.1
+++ example.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<address-book>
<person id="1" category="acquaintance">
1.3 +16 -0 jakarta-commons/digester/src/examples/api/addressbook/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/addressbook/readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readme.txt 28 Sep 2003 09:40:26 -0000 1.2
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.3
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
== overview
The files in this directory are intended as an example of how to use
1.3 +15 -0 jakarta-commons/digester/src/examples/api/catalog/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 17 Apr 2004 11:07:38 -0000 1.2
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.3
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<project name="Example-Catalog" default="compile" basedir=".">
1.2 +15 -0 jakarta-commons/digester/src/examples/api/catalog/example.xml
Index: example.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.xml 25 Sep 2003 20:06:42 -0000 1.1
+++ example.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<!-- catalogue of items in a library. -->
1.4 +15 -0 jakarta-commons/digester/src/examples/api/catalog/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- readme.txt 29 Feb 2004 06:21:14 -0000 1.3
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.4
@@ -1,3 +1,18 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
== overview
The files in this directory are intended as an example of how to use
1.2 +15 -0 jakarta-commons/digester/src/examples/api/document-markup/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/document-markup/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 17 Apr 2004 10:03:06 -0000 1.1
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<project name="Example-Markup" default="compile" basedir=".">
1.2 +16 -0 jakarta-commons/digester/src/examples/api/document-markup/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/document-markup/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 17 Apr 2004 10:03:06 -0000 1.1
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
== overview
The files in this directory are intended as an example of how to use
1.2 +15 -0 jakarta-commons/digester/src/examples/plugins/pipeline/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/plugins/pipeline/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 29 Feb 2004 05:06:57 -0000 1.1
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<project name="Example-Pipeline" default="compile" basedir=".">
1.2 +15 -0 jakarta-commons/digester/src/examples/plugins/pipeline/compound.xml
Index: compound.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/plugins/pipeline/compound.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compound.xml 29 Feb 2004 05:06:57 -0000 1.1
+++ compound.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,4 +1,19 @@
<!--
+ Copyright 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.
+-->
+<!--
- Example compound pipeline
-->
1.2 +16 -0 jakarta-commons/digester/src/examples/plugins/pipeline/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/plugins/pipeline/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 29 Feb 2004 06:27:43 -0000 1.1
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
== overview
The files in this directory are intended as an example of how to use
1.2 +16 -0 jakarta-commons/digester/src/examples/plugins/pipeline/substitute.xml
Index: substitute.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/plugins/pipeline/substitute.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- substitute.xml 29 Feb 2004 05:06:57 -0000 1.1
+++ substitute.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,4 +1,20 @@
<!--
+ Copyright 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.
+-->
+
+<!--
- Example pipeline which uses the SubstituteTransform plugin class
-->
1.2 +15 -0 jakarta-commons/digester/src/examples/plugins/pipeline/uppercase.xml
Index: uppercase.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/plugins/pipeline/uppercase.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uppercase.xml 29 Feb 2004 05:06:57 -0000 1.1
+++ uppercase.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,4 +1,19 @@
<!--
+ Copyright 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.
+-->
+<!--
- Example pipeline which uses the CaseTransform plugin class
-->
1.2 +3 -0 jakarta-commons/digester/src/examples/plugins/pipeline/.cvsignore
1.2 +32 -0 jakarta-commons/digester/src/examples/plugins/pipeline/build.properties.sample
1.2 +16 -6 jakarta-commons/digester/src/examples/rss/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/rss/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 1 May 2004 20:36:11 -0000 1.1
+++ build.xml 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<project name="Digester RSS Example" default="compile" basedir=".">
@@ -216,7 +231,6 @@
author="true"
private="true"
version="true"
- overview="src/java/overview.html"
doctitle="<h1>${component.title} (Version ${component.version})</h1>"
windowtitle="${component.title} (Version ${component.version})"
bottom="Copyright (c) 2001-2004 - Apache Software Foundation">
@@ -237,10 +251,6 @@
<copy file="LICENSE.txt"
todir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
-<!--
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
--->
<jar jarfile="${dist.home}/commons-${component.name}.jar"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"/>
1.2 +22 -0 jakarta-commons/digester/src/examples/rss/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/rss/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 1 May 2004 20:36:11 -0000 1.1
+++ readme.txt 9 Sep 2004 20:38:20 -0000 1.2
@@ -1,6 +1,28 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
This directory contains the example code for parsing RSS (Really Simple
Syndication) newsfeeds, which was originally included directly in the
commons-digester.jar file, in package "org.apache.commons.digester.rss".
The package name has not been changed, so the only impact on applications
relying on these classes will be the need to include an additional JAR
file (commons-digester-rss.jar) in their classpath.
+
+A packaged distribution can be created by using ant:
+
+1 Copy build.properties.sample to build.properties and edit the properties to
+match those on your local system
+2 run ant dist
1.2 +3 -0 jakarta-commons/digester/src/examples/rss/.cvsignore
1.2 +32 -0 jakarta-commons/digester/src/examples/rss/build.properties.sample
1.2 +36 -31 jakarta-commons/digester/src/examples/rss/src/java/org/apache/commons/digester/rss/rss-example.xml
Index: rss-example.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/rss/src/java/org/apache/commons/digester/rss/rss-example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rss-example.xml 1 May 2004 20:36:11 -0000 1.1
+++ rss-example.xml 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 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.
+-->
<!DOCTYPE rss PUBLIC
"-//Netscape Communications//DTD RSS 0.91//EN"
@@ -8,10 +23,9 @@
<channel>
- <title>MozillaZine</title>
- <link>http://www.mozillazine.org</link>
- <description>Your source for Mozilla news, advocacy,
- interviews, builds, and more!</description>
+ <title>Apache</title>
+ <link>http://www.apache.org</link>
+ <description>The Apache Software Foundation</description>
<language>en-US</language>
<rating>(PICS-1.1 "http://www.rsac.org/ratingsv01.html"
2 gen true comment "RSACi North America Server"
@@ -19,46 +33,37 @@
r (n 0 s 0 v 0 l 0))</rating>
<image>
- <title>MozillaZine</title>
- <url>http://www.mozillazine.org/image/mynetscape88.gif</url>
- <link>http://www.mozillazine.org</link>
- <width>88</width>
- <height>31</height>
- <description>Articles, discussions, builds, and more...</description>
+ <title>Apache</title>
+ <url>http://jakarta.apache.org/images/jakarta-logo.gif</url>
+ <link>http://jakarta.apache.org</link>
+ <width>505</width>
+ <height>480</height>
+ <description>The Jakarta project. Open source, serverside java.</description>
</image>
<item>
- <title>Java2 in Navigator 5?</title>
- <link>http://www.mozillazine.org/talkback.html?article=607</link>
- <description>Will Java2 be an integrated part of Navigator 5?
- Read more about it in this discussion...</description>
+ <title>Commons Attributes 2.1 Released</title>
+ <link>http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040815.1</link>
+ <description>The Jakarta Commons team is happy to announce the release of Commons Attributes 2.1.
+ This is the first release of the new Commons-Attributes code.</description>
</item>
<item>
- <title>Communicator 4.61 Out</title>
- <link>http://www.mozillazine.org/talkback.html?article=606</link>
- <description>The latest version of Communicator is now
- available. It includes security enhancements
- and various bug fixes.</description>
+ <title>Cloudscape Becomes Apache Derby</title>
+ <link>http://jakarta.apache.org/site/news/elsewhere-2004-2ndHalf.html#20040803.1</link>
+ <description>IBM has submitted a proposal to the Apache DB project
+ for a Java-based package to be called 'Derby'.</description>
</item>
<item>
- <title>Mozilla Dispenses with Old,
- Proprietary DOM</title>
- <link>http://www.mozillazine.org/talkback.html?article=604</link>
+ <title>Commons BeanUtils 1.7 Released</title>
+ <link>http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040802.1</link>
</item>
<item>
- <title>The Animation Contest is Now Closed</title>
- <link>http://www.mozillazine.org/talkback.html?article=603</link>
+ <title>Commons JXPath 1.2 Released</title>
+ <link>http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040801.2</link>
</item>
-
- <textinput>
- <title>Send</title>
- <description>Comments about MozillaZine?</description>
- <name>responseText</name>
- <link>http://www.mozillazine.org/cgi-bin/sampleonly.cgi</link>
- </textinput>
</channel>
1.2 +16 -0 jakarta-commons/digester/src/examples/xmlrules/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/xmlrules/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 14 Aug 2003 18:26:00 -0000 1.1
+++ readme.txt 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
This directory deals with the xmlrules extension which allows
the digester rules to be configured via an xml file. This allows the
mapping between input xml and java objects to be modified without
1.2 +16 -1 jakarta-commons/digester/src/examples/xmlrules/addressbook/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/xmlrules/addressbook/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 17 Apr 2004 10:54:06 -0000 1.1
+++ build.xml 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 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.
+-->
<project name="Example-AddressBook" default="compile" basedir=".">
@@ -32,7 +47,7 @@
<property name="commons-beanutils.jar" value="${beanutils.home}/dist/commons-beanutils.jar"/>
<property name="commons-collections.jar" value="${collections.home}/dist/commons-collections.jar"/>
<property name="commons-logging.jar" value="${logging.home}/dist/commons-logging.jar"/>
- <property name="commons-digester.jar" value="${digester.home}/dist/commons-digester.jar"/>
+ <property name="commons-digester.jar" value="${digester.home}/dist/commons-digester.jar"/>
<!-- ========== Component Declarations ==================================== -->
1.2 +16 -1 jakarta-commons/digester/src/examples/xmlrules/addressbook/example.xml
Index: example.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/xmlrules/addressbook/example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.xml 17 Apr 2004 10:54:06 -0000 1.1
+++ example.xml 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,4 +1,19 @@
-
+<?xml version='1.0'?>
+<!--
+ Copyright 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.
+-->
<address-book>
<person id="1" category="acquaintance">
<name>Gonzo</name>
1.2 +16 -0 jakarta-commons/digester/src/examples/xmlrules/addressbook/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/examples/xmlrules/addressbook/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 17 Apr 2004 10:54:06 -0000 1.1
+++ readme.txt 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,3 +1,19 @@
+#########################################################################
+# Copyright 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.
+#########################################################################
+
== overview
The files in this directory are intended as an example of how to use
1.2 +2 -0 jakarta-commons/digester/src/examples/xmlrules/addressbook/.cvsignore
1.2 +32 -0 jakarta-commons/digester/src/examples/xmlrules/addressbook/build.properties.sample
1.2 +16 -0 jakarta-commons/digester/src/java/overview.html
Index: overview.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/overview.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- overview.html 29 Apr 2002 21:46:27 -0000 1.1
+++ overview.html 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>Overview Documentation for COMMONS-DIGESTER</title>
1.22 +3 -1 jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java
Index: CallParamRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CallParamRule.java 10 May 2004 06:30:06 -0000 1.21
+++ CallParamRule.java 9 Sep 2004 20:38:21 -0000 1.22
@@ -21,6 +21,8 @@
import org.xml.sax.Attributes;
+import org.apache.commons.collections.ArrayStack;
+
/**
* <p>Rule implementation that saves a parameter for use by a surrounding
1.105 +3 -1 jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
Index: Digester.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- Digester.java 8 Jun 2004 08:26:10 -0000 1.104
+++ Digester.java 9 Sep 2004 20:38:21 -0000 1.105
@@ -37,6 +37,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.collections.ArrayStack;
+
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
1.22 +3 -1 jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java
Index: FactoryCreateRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FactoryCreateRule.java 10 May 2004 06:30:06 -0000 1.21
+++ FactoryCreateRule.java 9 Sep 2004 20:38:21 -0000 1.22
@@ -20,6 +20,8 @@
import org.xml.sax.Attributes;
+import org.apache.commons.collections.ArrayStack;
+
/**
* <p>Rule implementation that uses an {@link ObjectCreationFactory} to create
1.31 +62 -19 jakarta-commons/digester/src/java/org/apache/commons/digester/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/package.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- package.html 19 Apr 2004 09:51:04 -0000 1.30
+++ package.html 9 Sep 2004 20:38:21 -0000 1.31
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>Package Documentation for org.apache.commons.digester Package</title>
@@ -23,31 +39,35 @@
<a href="#doc.RegisteringDTDs">[Registering DTDs]</a>
<a href="#doc.troubleshooting">[Troubleshooting]</a>
<a href="#doc.FAQ">[FAQ]</a>
+<a href="#doc.extensions">[Extensions]</a>
<a href="#doc.Limits">[Known Limitations]</a>
</div>
<a name="doc.Depend"></a>
<h3>External Dependencies</h3>
+<p>The <em>Digester</em> component is dependent upon implementations of the following
+standard libraries:</p>
<ul>
- <li>An XML parser conforming to
- <a href="http://java.sun.com/products/xml">JAXP
- </a>, version 1.1 or later (the first one to support SAX 2.0)
- </li>
- <li>
- <a href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils">
-Beanutils Package (Jakarta Commons)</a>, version 1.5 or later
- </li>
- <li>
- <a href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections">
-Collections Package (Jakarta Commons)</a>, version 2.1 or later
- </li>
- <li>
- <a href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging">
-Commons Logging Package (Jakarta Commons)</a>, version 1.0.2 or later
- </li>
+<li><strong>XML Parser</strong> compatible with the JAXP/1.1 specification.
+ Examples compatible implementations include:
+ <ul>
+ <li><a href="http://java.sun.com/xml">JAXP/1.1 Reference Implementation</a></li>
+ <li><a href="http://xml.apache.org/xerces-j">Xerces</a> (Version 1.3.1 or later)</li>
+ </ul></li>
</ul>
-
+<p>
+It is also dependent on a compatible set of
+<a href='http://jakarta.apache.org/commons'>Jakarta Commons</a> library components:
+</p>
+<blockquote>
+ <table border="1" cellspacing="2" cellpadding="3">
+ <tr class="a"><th colspan="4">Compatible Dependency Sets</th></tr>
+ <tr class="b"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.x</td><td>+Collections 2.x</td></tr>
+ <tr class="a"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.x</td><td>+Collections 3.x</td></tr>
+ <tr class="b"><td>Digester</td><td>+Logging 1.0.x</td><td>+BeanUtils 1.7</td><td>-</td></tr>
+ </table>
+</blockquote>
<a name="doc.Intro"></a>
<h3>Introduction</h3>
@@ -1056,7 +1076,7 @@
<p>
In this case, it is recommended that named stacks are used. In addition to the
two basic stacks, <code>Digester</code> allows rules to use an unlimited number
-of other stacks referred two by an identifying string (the name). (That's where
+of other stacks referred to by an identifying string (the name). (That's where
the term <em>named stack</em> comes from.) These stacks are
accessed through calls to:
</p>
@@ -1071,7 +1091,7 @@
<p>
<strong>Note:</strong> all stack names beginning with <code>org.apache.commons.digester</code>
are reserved for future use by the <code>Digester</code> component. It is also recommended
-that users choose stack names perfixed by the name of their own domain to avoid conflicts
+that users choose stack names prefixed by the name of their own domain to avoid conflicts
with other <code>Rule</code> implementations.
</p>
<a name="doc.RegisteringDTDs"></a>
@@ -1255,6 +1275,29 @@
</p>
</li>
</ul>
+<a name="doc.extensions"></a>
+<h3>Extensions</h3>
+<p>
+Three extension packages are included within the Digester distribution.
+These provide extra functionality extending the core Digester concepts.
+Detailed descriptions are contained within their own package documentation.
+</p>
+<ul>
+ <li>
+<a href='plugins/package-summary.html'>plugins</a> provides a framework for the easy
+dynamic addition of rules during a Digestion. Rules can trigger the dynamic addition
+of other rules in an intuitive fashion.
+ </li>
+ <li>
+<a href='substitution/package-summary.html'>substitution</a> provides for
+manipulation of attributes and element body text before it is processed by the rules.
+ </li>
+ <li>
+<a href='xmlrules/package-summary.html'>xmlrules</a> package contains a
+system allowing digester rule configurations to be specifed through an xml file.
+ </li>
+</ul>
+
<a name="doc.Limits"></a>
<h3>Known Limitations</h3>
<h4>Accessing Public Methods In A Default Access Superclass</h4>
1.2 +18 -2 jakarta-commons/digester/src/java/org/apache/commons/digester/parser/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/parser/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 6 Jan 2004 22:13:58 -0000 1.1
+++ package.html 9 Sep 2004 20:38:21 -0000 1.2
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>Package Documentation for org.apache.commons.digester.parser Package</title>
@@ -7,12 +23,12 @@
<br><br>
<p>
Digester aims to support the widest range possible of parsers.
-Unfortunately, there are a few parser settings which have no been standardized.
+Unfortunately, there are a few parser settings which have not been standardized.
In most cases, the best practice is for the user to configure the parser
themselves and pass it to Digester to use.
</p>
<p>
-There are a few reasonable exceptions which Digesters makes to this general rule.
+There are a few reasonable exceptions which Digester makes to this general rule.
There are a small number of common use cases where insisting that the user
configure the parser may reduce the portability of applications using Digester.
These are outlined below.
1.6 +23 -7 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/package.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- package.html 18 Apr 2004 07:28:36 -0000 1.5
+++ package.html 9 Sep 2004 20:38:21 -0000 1.6
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>An overview of the Digester Plugins module.</title>
@@ -78,7 +94,7 @@
pattern)</code> on the class being "plugged in", or</li>
<li> providing a separate "rule info" class, somewhat in the spirit of
"BeanInfo" classes for java beans, or</li>
-<li> providing an xmlrules file which defines the associated parsing rules./li>
+<li> providing an xmlrules file which defines the associated parsing rules.</li>
</ul>
If a plugin class has a no-parameter constructor, does not expect any subtags,
and is satisfied with mapping any attributes on the parent xml tag to
@@ -92,8 +108,8 @@
<h2> Plugin Declarations </h2>
As well as the syntax shown above, where plugin classnames were defined
-as they were used, plugin classes can be pre-dedeclared (provided the application
-associates a PluginDeclarationRule with a tag for that purpose). Example:
+as they were used, plugin classes can be pre-declared (provided the application
+associates a <code>PluginDeclarationRule</code> with a tag for that purpose). Example:
<p>
The plugin class can be declared once:
<pre>
@@ -104,12 +120,12 @@
<sometag plugin-id="widget" ... >
</pre>
-<h2> Possible Applications </h2>
+<h2> Suggested Applications </h2>
Any application where user-specific operations may need to be performed
that cannot be known in advance by the initial application developer may
-benefit from this module. Applications in the style of the apache projects
-listed at the top of this page (log4j, cocoon, ant) are examples.
+benefit from this module. Applications in the style of the Apache projects
+listed at the top of this page (Log4j, Cocoon, Ant) are examples.
<p>
Note also that plugged-in classes can themselves allow user-defined classes
to be plugged in within their configuration. This allows a very simple
@@ -130,7 +146,7 @@
<code><statement plugin-id="if"></code> cannot become <if>.
<p>
An instance of "PluginRules" must be used as the Rules implementation
-for the digester (see example). However a PluginRules can use any other Rules
+for the Digester (see example). However a PluginRules can use any other Rules
implementation as its rule-matching engine, so this is not a significant issue.
Plugged-in classes may only use the default RulesBase matching for the rules
they add dynamically.
1.3 +16 -0 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/strategies/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/strategies/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 7 Apr 2004 22:16:54 -0000 1.2
+++ package.html 9 Sep 2004 20:38:21 -0000 1.3
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>The digester.plugins.strategies package.</title>
1.3 +16 -0 jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 19 Apr 2004 08:33:15 -0000 1.2
+++ package.html 9 Sep 2004 20:38:21 -0000 1.3
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>Package Documentation for org.apache.commons.digester.substitution Package</title>
1.30 +2 -2 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java
Index: DigesterRuleParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DigesterRuleParser.java 10 May 2004 06:30:08 -0000 1.29
+++ DigesterRuleParser.java 9 Sep 2004 20:38:21 -0000 1.30
@@ -30,7 +30,7 @@
import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.digester.ArrayStack;
+import org.apache.commons.collections.ArrayStack;
import org.apache.commons.digester.AbstractObjectCreationFactory;
import org.apache.commons.digester.BeanPropertySetterRule;
1.13 +18 -1 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
Index: digester-rules.dtd
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- digester-rules.dtd 15 Feb 2004 01:25:34 -0000 1.12
+++ digester-rules.dtd 9 Sep 2004 20:38:21 -0000 1.13
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!-- $Id$
+
+ 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.
+-->
+
<!--
"Digester" component of the Jakarta Commons Subproject
DTD for the definition of Digester rules in XML.
1.5 +16 -0 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/package.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- package.html 15 Feb 2004 01:16:51 -0000 1.4
+++ package.html 9 Sep 2004 20:38:21 -0000 1.5
@@ -1,3 +1,19 @@
+<!-- $Id$
+
+ 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.
+-->
<html>
<head>
<title>Documentation for org.apache.commons.digester.xmlrules</title>
1.8 +50 -0 jakarta-commons/digester/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/xdocs/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.xml 1 Mar 2004 23:28:12 -0000 1.7
+++ index.xml 9 Sep 2004 20:38:21 -0000 1.8
@@ -60,6 +60,55 @@
<section name="Releases">
+ <subsection name='Digester 1.6 Release'>
+ <p>
+Digester 1.6 is an important release adding extra functionality
+as well as fixes for bugs. It represents an important milestone in the evolution
+of the Digester 1 design codebase.
+ </p>
+ <p>
+Digester has a dependency on
+<a href='http://jakarta.apache.org/commons/collections'>Commons Collections</a>.
+This threatens to raise compatibility issues
+now that two incompatible series of releases exist.
+Fortunately, this dependency is only upon a single mature class (ArrayStack) and the versions
+of this class to be found in different versions of the library are binary compatible.
+Therefore a release from the 2.x series or from the 3.x series of commons collections
+will do equally well (even though these libraries are incompatible). The dependency can
+alternatively be satisfied by including the latest BeanUtils release (1.7)
+(which includes the class).
+ </p>
+ <p>
+The dependencies neccessary for Digester 1.6 can be summarized as follows:
+ </p>
+<table>
+<tr>
+<th colspan='4'>Compatible Dependency Sets</th>
+</tr>
+<tr>
+<td>Digester</td>
+<td>+Logging 1.0.x</td>
+<td>+BeanUtils 1.x</td>
+<td>+Collections 2.x</td>
+</tr>
+<tr>
+<td>Digester</td>
+<td>+Logging 1.0.x</td>
+<td>+BeanUtils 1.x</td>
+<td>+Collections 3.x</td>
+</tr>
+<tr>
+<td>Digester</td>
+<td>+Logging 1.0.x</td>
+<td>+BeanUtils 1.7</td>
+<td>-</td>
+</tr>
+</table>
+ <p>
+Digester 1.6.0 release is currently in preparation.
+ </p>
+ </subsection>
+ <subsection name='Older Releases'>
<ul>
<li>Version 1.5 (from mirror) - 27 Apr 2003
<a href="http://jakarta.apache.org/site/binindex.cgi">binary</a>
@@ -76,6 +125,7 @@
<li><a href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.1.1/">Version 1.1.1</a></li>
<li><a href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.0/">Version 1.0</a></li>
</ul>
+ </subsection>
</section>
<section name="Resources">
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org