You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/08/13 18:24:12 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/xml/parser Parser.java XercesParser.java
michi 2003/08/13 09:24:12
Modified: src/java/org/apache/lenya/cms/cocoon/transformation
IncludeTransformer.java
src/java/org/apache/lenya/xml DOMParserFactory.java
XPSAssembler.java
src/java/org/apache/lenya/xml/parser Parser.java
XercesParser.java
Log:
CDATA implemented
Revision Changes Path
1.15 +3 -4 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/IncludeTransformer.java
Index: IncludeTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/IncludeTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IncludeTransformer.java 4 Jul 2003 17:45:00 -0000 1.14
+++ IncludeTransformer.java 13 Aug 2003 16:24:11 -0000 1.15
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -68,10 +67,10 @@
/**
- * DOCUMENT ME!
+ * Wrapper for XLink/XInclude Processor
*
* @author Michael Wechner
- * @version 2002.5.30
+ * @version $Id$
*/
public class IncludeTransformer extends AbstractDOMTransformer implements Configurable {
private String domain = "127.0.0.1";
@@ -135,7 +134,7 @@
sitemapPath + sitemap_uri, cocoon_base_request);
}
} catch (Exception e) {
- getLogger().error(".transform(): " + e);
+ getLogger().error(".transform(): " + e, e);
}
return doc;
1.15 +23 -3 cocoon-lenya/src/java/org/apache/lenya/xml/DOMParserFactory.java
Index: DOMParserFactory.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/xml/DOMParserFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMParserFactory.java 23 Jul 2003 13:21:29 -0000 1.14
+++ DOMParserFactory.java 13 Aug 2003 16:24:12 -0000 1.15
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -69,10 +68,10 @@
/**
- * DOCUMENT ME!
+ * Utility class for creating DOM documents
*
* @author Michael Wechner
- * @version 1.9.11
+ * @version $Id$
* @deprecated replaced by DocumentHelper
*/
public class DOMParserFactory {
@@ -219,6 +218,18 @@
}
/**
+ * CDATA
+ *
+ * @param document DOM document
+ * @param data Text
+ *
+ * @return CDATASection
+ */
+ public CDATASection newCDATASection(Document document, String data) {
+ return parser.newCDATASection(document, data);
+ }
+
+ /**
* DOCUMENT ME!
*
* @param document DOCUMENT ME!
@@ -266,6 +277,14 @@
break;
}
+ case Node.CDATA_SECTION_NODE: {
+ CDATASection cdata = newCDATASection(document, original.getNodeValue());
+
+ node = cdata;
+
+ break;
+ }
+
case Node.COMMENT_NODE: {
Comment comment = newCommentNode(document, original.getNodeValue());
@@ -275,6 +294,7 @@
}
default:
+ log.warn(".cloneNode(): Node type not implemented: " + nodeType);
break;
}
1.15 +4 -8 cocoon-lenya/src/java/org/apache/lenya/xml/XPSAssembler.java
Index: XPSAssembler.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/xml/XPSAssembler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XPSAssembler.java 11 Aug 2003 16:03:05 -0000 1.14
+++ XPSAssembler.java 13 Aug 2003 16:24:12 -0000 1.15
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -56,7 +55,6 @@
package org.apache.lenya.xml;
-//import org.apache.lenya.xml.*;
import org.apache.lenya.net.*;
import org.apache.log4j.Category;
@@ -71,10 +69,10 @@
/**
- * DOCUMENT ME!
+ * XLink/XInclude Processor (Nesting, Caching, Java, Exceptions)
*
* @author Michael Wechner
- * @version 2002.5.28 XLink Processor (Nesting, Caching, Java)
+ * @version $Id$
*/
public class XPSAssembler implements XPSInclude {
static Category log = Category.getInstance(XPSAssembler.class);
@@ -435,8 +433,7 @@
NodeList nl = processXLink(xlink, (Element) orgChild, currentInfo);
for (int i = 0; i < nl.getLength(); i++) {
- newChildren.addElement(dpf.cloneNode(newParent.getOwnerDocument(), nl.item(i),
- true));
+ newChildren.addElement(dpf.cloneNode(newParent.getOwnerDocument(), nl.item(i), true));
}
}
@@ -456,8 +453,7 @@
}
case Node.CDATA_SECTION_NODE: {
- //newChildren.addElement(dpf.newCommentNode(newParent.getOwnerDocument(), "CDATA not implemented yet."));
- newChildren.addElement(dpf.newTextNode(newParent.getOwnerDocument(), "CDATA not implemented yet."));
+ newChildren.addElement(dpf.newCDATASection(newParent.getOwnerDocument(), orgChild.getNodeValue()));
break;
}
1.11 +13 -5 cocoon-lenya/src/java/org/apache/lenya/xml/parser/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/xml/parser/Parser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Parser.java 23 Jul 2003 13:21:26 -0000 1.10
+++ Parser.java 13 Aug 2003 16:24:12 -0000 1.11
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -61,11 +60,10 @@
/**
- * DOCUMENT ME!
+ * DOM Parser interface
*
- * @author Michael Wechner, lenya
- * @version 0.4.16
- * @deprecated replaced by DocumentHelper
+ * @author Michael Wechner
+ * @version $Id$
*/
public interface Parser {
/**
@@ -128,6 +126,16 @@
* @return DOCUMENT ME!
*/
Text newTextNode(Document document, String data);
+
+ /**
+ * CDATA
+ *
+ * @param document DOM Document
+ * @param data Text
+ *
+ * @return CDATASection
+ */
+ CDATASection newCDATASection(Document document, String data);
/**
* DOCUMENT ME!
1.13 +15 -5 cocoon-lenya/src/java/org/apache/lenya/xml/parser/XercesParser.java
Index: XercesParser.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/xml/parser/XercesParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XercesParser.java 23 Jul 2003 13:21:26 -0000 1.12
+++ XercesParser.java 13 Aug 2003 16:24:12 -0000 1.13
@@ -1,5 +1,4 @@
/*
-$Id$
<License>
============================================================================
@@ -68,11 +67,10 @@
/**
- * DOCUMENT ME!
+ * Xerces Parser Implementation
*
- * @author Michael Wechner, lenya
- * @version 0.5.5
- * @deprecated replaced by DocumentHelper
+ * @author Michael Wechner
+ * @version $Id$
*/
public class XercesParser implements Parser {
/**
@@ -198,6 +196,18 @@
*/
public Text newTextNode(Document document, String data) {
return new TextImpl((DocumentImpl) document, data);
+ }
+
+ /**
+ * CDATA
+ *
+ * @param document DOM Document
+ * @param data Text
+ *
+ * @return CDATASection
+ */
+ public CDATASection newCDATASection(Document document, String data) {
+ return new CDATASectionImpl((DocumentImpl) document, data);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org