cvs commit: cocoon-2.1/src/java/org/apache/cocoon/xml/dom DOMStreamer.java
vgritsenko2003/11/21 21:03:00
Modified:src/java/org/apache/cocoon/xml/dom DOMStreamer.java
Log:
imports, braces, align...
Revision ChangesPath
1.13 +31 -22
cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOMStreamer.java 15 Oct 2003 16:10:29 - 1.12
+++ DOMStreamer.java 22 Nov 2003 05:02:59 - 1.13
@@ -50,25 +50,34 @@
*/
package org.apache.cocoon.xml.dom;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+
import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.cocoon.xml.EmbeddedXMLPipe;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.ext.LexicalHandler;
-import org.w3c.dom.*;
-
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.dom.DOMSource;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
+import org.xml.sax.helpers.AttributesImpl;
/**
* The codeDOMStreamer/code is a utility class that will generate SAX
@@ -158,6 +167,7 @@
defaultDOMStreamer.setContentHandler(handler);
namespaceNormalizingDOMStreamer.setContentHandler(handler);
}
+
/**
* Set the codeLexicalHandler/code that will receive XML data.
*/
@@ -170,10 +180,11 @@
* Start the production of SAX events.
*/
public void stream(Node node) throws SAXException {
-if (normalizeNamespaces)
+if (normalizeNamespaces) {
namespaceNormalizingDOMStreamer.stream(node);
-else
+} else {
defaultDOMStreamer.stream(node);
+}
}
public boolean isNormalizeNamespaces() {
@@ -248,20 +259,18 @@
}
Node top = pos;
-
while (null != pos) {
startNode(pos);
Node nextNode = pos.getFirstChild();
-
while (null == nextNode) {
endNode(pos);
-if (top.equals(pos))
+if (top.equals(pos)) {
break;
+}
nextNode = pos.getNextSibling();
-
if (null == nextNode) {
pos = pos.getParentNode();
@@ -733,10 +742,10 @@
ContentHandler handler;
if (node.getNodeType() == Node.DOCUMENT_NODE) {
// Pass all SAX events
-handler = contentHandler;
+handler = contentHandler;
} else {
// Strip start/endDocument
-handler = new EmbeddedXMLPipe(contentHandler);
+handler = new EmbeddedXMLPipe(contentHandler);
}
SAXResult result = new SAXResult(handler);
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
unico 2003/11/22 01:12:14
Modified:tools/src blocks-build.xsl
Log:
include tools.lib jars in javadoc classpath and add avalon meta tag
declaration elements to reduce number of javadoc warnings
Revision ChangesPath
1.40 +18 -4 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- blocks-build.xsl 19 Nov 2003 15:20:16 - 1.39
+++ blocks-build.xsl 22 Nov 2003 09:12:14 - 1.40
@@ -169,6 +169,15 @@
link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
+tag name=avalon.component scope=types description=Avalon
component /
+tag name=avalon.service scope=types
description=Implements service:; /
+!-- FIXME: javadoc or ant seems to not understand these
+tag name=x-avalon.info scope=types
description=Shorthand: /
+tag name=x-avalon.lifestyle scope=types
description=Lifestyle: /
+--
+tag name=avalon.context scope=methods description=Requires
entry: /
+tag name=avalon.dependency scope=methods description=Requires
component: /
+
packageset dir={string('${java}')}
include name=**/
/packageset
@@ -180,10 +189,15 @@
include name=**/
/packageset
/xsl:for-each
-classpath refid=classpath/
-xsl:for-each select=$cocoon-blocks
- classpath
refid={substring-after(@name,'cocoon-block-')}.classpath/
-/xsl:for-each
+classpath
+ fileset dir={string('${tools.lib}')}
+include name=*.jar/
+ /fileset
+ path refid=classpath /
+ xsl:for-each select=$cocoon-blocks
+path
refid={substring-after(@name,'cocoon-block-')}.classpath/
+ /xsl:for-each
+/classpath
/javadoc
/target
cvs commit: cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/source/impl WebDAVSource.java
gcasper 2003/11/22 05:03:38
Modified:src/blocks/webdav/java/org/apache/cocoon/components/source/impl
WebDAVSource.java
Log:
Fixed setSourceProperty and optimized getSourceProperty
Revision ChangesPath
1.12 +17 -15
cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java
Index: WebDAVSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebDAVSource.java 21 Nov 2003 11:48:14 - 1.11
+++ WebDAVSource.java 22 Nov 2003 13:03:38 - 1.12
@@ -93,10 +93,10 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* A source implementation to get access to WebDAV repositories. Use it
@@ -774,20 +774,18 @@
public SourceProperty getSourceProperty (String namespace, String name)
throws SourceException {
+ Vector propNames = new Vector(1);
+ propNames.add(new PropertyName(namespace,name));
Enumeration props= null;
org.apache.webdav.lib.Property prop = null;
try {
- Enumeration responses = this.resource.propfindMethod(0);
+ Enumeration responses = this.resource.propfindMethod(0,
propNames);
while (responses.hasMoreElements()) {
ResponseEntity response =
(ResponseEntity)responses.nextElement();
props = response.getProperties();
- while (props.hasMoreElements()) {
+ if (props.hasMoreElements()) {
prop = (Property) props.nextElement();
-
- if (namespace.equals(prop.getNamespaceURI())
- name.equals(prop.getLocalName())){
- return new SourceProperty(prop.getElement());
- }
+ return new SourceProperty(prop.getElement());
}
}
} catch (Exception e) {
@@ -825,22 +823,26 @@
throws SourceException {
try {
-Document doc = sourceproperty.getValue().getOwnerDocument();
-DocumentFragment frag = doc.createDocumentFragment();
+ Node node = null;
NodeList list = sourceproperty.getValue().getChildNodes();
for (int i=0; ilist.getLength(); i++) {
-if (list.item(i) instanceof Element)
-frag.appendChild(list.item(i));
+if ((list.item(i) instanceof Text
!.equals(list.item(i).getNodeValue()))
+|| list.item(i) instanceof Element) {
+
+node = list.item(i);
+break;
+}
}
Properties format = new Properties();
format.put(OutputKeys.METHOD, xml);
format.put(OutputKeys.OMIT_XML_DECLARATION, yes);
-String prop = XMLUtils.serializeNode(frag, format);
+String prop = XMLUtils.serializeNode(node, format);
this.resource.proppatchMethod(
new
PropertyName(sourceproperty.getNamespace(),sourceproperty.getName()),
prop, true);
+
} catch (Exception e) {
throw new SourceException(Could not set property , e);
}
cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/transformation SourcePropsWritingTransformer.java
gcasper 2003/11/22 05:11:52 Modified:src/blocks/repository/java/org/apache/cocoon/transformation SourcePropsWritingTransformer.java Log: Updated javadocs Revision ChangesPath 1.4 +7 -5 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/transformation/SourcePropsWritingTransformer.java Index: SourcePropsWritingTransformer.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/transformation/SourcePropsWritingTransformer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SourcePropsWritingTransformer.java15 Nov 2003 04:21:29 - 1.3 +++ SourcePropsWritingTransformer.java22 Nov 2003 13:11:52 - 1.4 @@ -67,7 +67,7 @@ import org.xml.sax.SAXException; /** - * This transformer allows you to set properties on an InspectableSource. + * This transformer allows you to set and remove properties on an InspectableSource. * * pInput XML document example:/p * pre @@ -75,10 +75,12 @@ * ... * lt;source:patch xmlns:source=http://apache.org/cocoon/propwrite/1.0gt; * lt;source:sourcegt;webdav://localhost/webdav/step1/repo/contentA.xmllt;/source:sourcegt; - * lt;source:prop name=author namespace=metagt;melt;/source:propgt; - * lt;source:propsgt; + * lt;source:setgt; * lt;myns:author xmlns:myns=metagt;melt;/myns:authorgt; - * lt;/source:propsgt; + * lt;/source:setgt; + * lt;source:removegt; + * lt;myns:title xmlns:myns=meta/gt; + * lt;/source:removegt; * lt;/source:patchgt; * ... * lt;/pagegt;
