You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/09/26 23:49:03 UTC
svn commit: r1001528 - in
/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main:
java/org/apache/tuscany/sca/databinding/saxon/ resources/META-INF/services/
Author: nash
Date: Sun Sep 26 21:49:03 2010
New Revision: 1001528
URL: http://svn.apache.org/viewvc?rev=1001528&view=rev
Log:
TUSCANY-3689: Fix corruption of XML document when transformed from XMLStreamReader to NodeInfo
Added:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/XMLStreamReader2NodeInfoTransformer.java
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/XMLStreamReader2NodeInfoTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/XMLStreamReader2NodeInfoTransformer.java?rev=1001528&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/XMLStreamReader2NodeInfoTransformer.java (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/XMLStreamReader2NodeInfoTransformer.java Sun Sep 26 21:49:03 2010
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.tuscany.sca.databinding.saxon;
+
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+
+import net.sf.saxon.Configuration;
+import net.sf.saxon.event.Builder;
+import net.sf.saxon.om.NodeInfo;
+
+import org.apache.tuscany.sca.databinding.DataPipe;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+import org.apache.tuscany.sca.databinding.xml.SAX2DOMPipe;
+import org.apache.tuscany.sca.databinding.xml.StAX2SAXAdapter;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
+
+/**
+ * Transforms an XMLStreamReader to a NodeInfo object needed by Saxon parser.
+ *
+ * Any namespaces that are defined are deleted, because otherwise
+ * the SaxonB parser does not work
+ *
+ * @version $Rev: 671701 $ $Date: 2008-06-26 02:29:06 +0100 (Thu, 26 Jun 2008) $
+ */
+public class XMLStreamReader2NodeInfoTransformer extends BaseTransformer<XMLStreamReader, NodeInfo> implements
+ PullTransformer<XMLStreamReader, NodeInfo> {
+
+ private StAX2SAXAdapter stax2sax = new StAX2SAXAdapter(false);
+ private SAX2DOMPipe sax2dom = new SAX2DOMPipe();
+
+ public NodeInfo transform(XMLStreamReader source, TransformationContext context) {
+ Configuration configuration = SaxonDataBindingHelper.CURR_EXECUTING_CONFIG;
+ if (configuration == null) {
+ configuration = new Configuration();
+ }
+
+ NodeInfo docInfo = null;
+ try {
+ DataPipe<ContentHandler, Node> pipe = sax2dom.newInstance();
+ stax2sax.parse(source, pipe.getSink());
+ Node node = pipe.getResult();
+ source.close();
+ docInfo = Builder.build(new DOMSource(node), null, configuration);
+ } catch (Exception e) {
+ throw new TransformationException(e);
+ }
+ return docInfo;
+ }
+
+ @Override
+ protected Class<XMLStreamReader> getSourceType() {
+ return XMLStreamReader.class;
+ }
+
+ @Override
+ protected Class<NodeInfo> getTargetType() {
+ return NodeInfo.class;
+ }
+
+ @Override
+ public int getWeight() {
+ return 10;
+ }
+
+}
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer?rev=1001528&r1=1001527&r2=1001528&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer Sun Sep 26 21:49:03 2010
@@ -32,3 +32,4 @@ org.apache.tuscany.sca.databinding.saxon
org.apache.tuscany.sca.databinding.saxon.ItemList2ObjectTransformer;source=org.apache.tuscany.sca.databinding.saxon.collection.ItemList,target=java:array,weight=1000
org.apache.tuscany.sca.databinding.saxon.NodeInfo2JavaArrayTransformer;source=net.sf.saxon.om.NodeInfo,target=java:array,weight=1000
org.apache.tuscany.sca.databinding.saxon.Value2JavaArrayTransformer;source=net.sf.saxon.value.Value,target=java:array,weight=1000
+org.apache.tuscany.sca.databinding.saxon.XMLStreamReader2NodeInfoTransformer;source=javax.xml.stream.XMLStreamReader,target=net.sf.saxon.om.NodeInfo,weight=2000