You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/05/17 05:57:43 UTC
cvs commit: cocoon-2.0/src/java/org/apache/cocoon/components/source XMLDBSource.java
vgritsenko 2003/05/16 20:57:43
Modified: . changes.xml
src/java/org/apache/cocoon/components/source
XMLDBSource.java
Log:
backport xmldb source namespaces bug fix from 2.1
Revision Changes Path
1.12 +4 -1 cocoon-2.0/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/cocoon-2.0/changes.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- changes.xml 15 May 2003 14:19:04 -0000 1.11
+++ changes.xml 17 May 2003 03:57:43 -0000 1.12
@@ -42,6 +42,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="update" fixes-bug="19978" due-to="Ciro Mondueri" due-to-email="cmr@adinet.com.uy">
+ Fixed namespace handling in XMLDBSource.
+ </action>
<action dev="VG" type="add" fixes-bug="16003">
Added XHTML 1.1 DTD to the entity catalog. Added XHTML 1.1 serializer into the sitemap.
Explained different XHTML 1.0 serializer options.
1.3 +4 -4 cocoon-2.0/src/java/org/apache/cocoon/components/source/XMLDBSource.java
Index: XMLDBSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/source/XMLDBSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDBSource.java 30 Apr 2003 01:50:02 -0000 1.2
+++ XMLDBSource.java 17 May 2003 03:57:43 -0000 1.3
@@ -262,7 +262,7 @@
attributes.addAttribute("", NAME_ATTR, NAME_ATTR, CDATA, collections[i]);
handler.startElement(URI, COLLECTION,
QCOLLECTION, attributes);
- handler.endElement(URI, COLLECTION, COLLECTION);
+ handler.endElement(URI, COLLECTION, QCOLLECTION);
}
// Print child resources
@@ -272,7 +272,7 @@
attributes.addAttribute("", NAME_ATTR, NAME_ATTR, CDATA, resources[i]);
handler.startElement(URI, RESOURCE,
QRESOURCE, attributes);
- handler.endElement(URI, RESOURCE, RESOURCE);
+ handler.endElement(URI, RESOURCE, QRESOURCE);
}
handler.endElement(URI, COLLECTIONS, QCOLLECTIONS);
@@ -333,7 +333,7 @@
result.getContentAsSAX(includeHandler);
- handler.endElement(URI, RESULT, RESULT);
+ handler.endElement(URI, RESULT, QRESULT);
}
handler.endElement(URI, RESULTSET, QRESULTSET);