crossley 2002/06/15 22:36:09
Modified: src/documentation/xdocs/userdocs/concepts Tag:
cocoon_2_0_3_branch catalog.xml
src/java/org/apache/cocoon/components/resolver Tag:
cocoon_2_0_3_branch ResolverImpl.java package.html
Log:
Change the references to point to the XML Commons project rather than the old
stuff via Sun.
Revision Changes Path
No revision
No revision
1.2.2.1 +18 -34
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml
Index: catalog.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- catalog.xml 20 Jan 2002 09:42:33 -0000 1.2
+++ catalog.xml 16 Jun 2002 05:36:08 -0000 1.2.2.1
@@ -118,9 +118,9 @@
</p>
<p>
- (Note: That article (and Java classes) evolved to become the Sun
+ (Note: That article (and Java classes) evolved to become the
<code>resolver.zip</code> Java package that has been added to Cocoon
- - a more recent version of the article is available with the Sun download
+ - a more recent version of the article is available at the XML Commons site
(see below). The API javadocs for <code>resolver</code> have further information.
However, you do not need to know the gory details to understand catalogs
and configure them.)
@@ -525,10 +525,15 @@
<s1 title="Implementation notes">
<p>
The SAX <code>Parser</code> interface provides an <code>entityResolver</code>
- hook to allow an application to resolve the external entities. The Sun
- Microsystems Java code "<code>com.sun.resolver</code>" provides a
- <strong>Catalog Resolver</strong>. This is incorporated into Cocoon via
- <code>org.apache.cocoon.components.resolver</code>
+ hook to allow an application to resolve the external entities. This is
+ enabled via
+ <code>org.apache.avalon.excalibur.xml.EntityResolver</code>
+ </p>
+
+ <p>
+ The XML Commons Apache project has <code>org.apache.xml.resolver</code>
+ which provides a <strong>CatalogResolver</strong>. This is incorporated
+ into Cocoon via <code>org.apache.cocoon.components.resolver</code>
</p>
<p>
@@ -545,34 +550,12 @@
<anchor id="dev"/>
<s1 title="Development notes">
- <p>
- Assistance is required with the following outstanding development issues ...
- </p>
-
<ul>
- <li>5) ? What other default entities need to be shipped with the Cocoon
- distribution? We already have some character entity sets (ISO*.pen).
- Probably also need the documentation DTDs.
- </li>
- <li>7)
+ <li>Keep up-to-date with releases of
+ <link href="http://www.oasis-open.org/docbook/xmlcharent/";>XML Character
+ Entities</link> by OASIS.
</li>
</ul>
-
- <p>
- Some core Cocoon FIXME notes can be now be addressed by catalog ...
- </p>
-
- <ul>
- <li>the first FIXME note in document-1.0.dtd re how to include
- entities without hardwiring
- </li>
- <li>there are various other hard-coded pathnames to XML resources
- </li>
- <li>this needs further investigation after basic catalog support is
- fully settled
- </li>
- </ul>
-
</s1>
<anchor id="notes"/>
@@ -651,9 +634,10 @@
<br/> - Issue Three:
<link
href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html";>If
You Can Name It, You Can Claim It!</link></li>
<li>
- <link href="http://www.sun.com/xml/developers/resolver/";>XML Entity and
- URI Resolvers Java classes</link> (from Sun Microsystems) and evolution
- of the Arbortext article.
+ The Apache project
+ <link href="http://xml.apache.org/commons/";>XML Commons</link> provides the
+ "XML Entity and URI Resolvers Java classes" and evolution
+ of the Arbortext article.
</li>
<li>XML-Deviant article 2000-11-29
<link href="http://www.xml.com/pub/a/2000/11/29/deviant.html";>What's in
No revision
No revision
1.9.2.1 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- ResolverImpl.java 22 Feb 2002 07:00:12 -0000 1.9
+++ ResolverImpl.java 16 Jun 2002 05:36:09 -0000 1.9.2.1
@@ -79,8 +79,8 @@
/**
* A component that uses catalogs for resolving entities.
* This implementation uses the XML Entity and URI Resolvers from
- * http://www.sun.com/xml/developers/resolver/
- * published by Sun's Norman Walsh. More information on the catalogs can be
+ * http://xml.apache.org/commons/
+ * published by Norman Walsh. More information on the catalogs can be
* found at
* http://xml.apache.org/cocoon/userdocs/concepts/catalog.html
*
1.1.2.1 +3 -1
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/package.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- package.html 17 Jan 2002 06:15:24 -0000 1.1
+++ package.html 16 Jun 2002 05:36:09 -0000 1.1.2.1
@@ -11,6 +11,8 @@
</p>
<p>
This implementation uses the XML Entity and URI Resolvers
- published by Norman Walsh.
+ published by Norman Walsh at
+ <a href="http://xml.apache.org/commons/";>XML Commons</a>
</p>
</body>
+</html>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
