Author: rfeng
Date: Wed Oct 4 16:05:39 2006
New Revision: 453059
URL: http://svn.apache.org/viewvc?view=rev&rev=453059
Log:
Add more transformers to the registry and fix several bugs
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/ComponentAImpl.java
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2Node.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2SAX.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2Node.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2SAX.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2OutputStream.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2Writer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2XMLStreamReader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2Node.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2SAX.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOMPipe.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Source2ResultTransformer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StreamDataPipe.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2SAX.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2XMLStreamReader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Writer2ReaderDataPipe.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2Node.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2SAX.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2String.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/resources/org/apache/tuscany/core/databinding.scdl
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/PropertyHelperTestCase.java
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/ComponentAImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/ComponentAImpl.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/ComponentAImpl.java
(original)
+++
incubator/tuscany/java/samples/sca/echo.databinding/src/test/java/echo/ComponentAImpl.java
Wed Oct 4 16:05:39 2006
@@ -32,6 +32,8 @@
private String prefix;
+ private String prefix1;
+
private String bar;
private OMElement omProperty;
@@ -43,7 +45,6 @@
}
public Object call(Object msg) {
- System.out.println("Prefix: " + prefix);
String request = msg + " [" + msg.getClass().getName() + "]";
System.out.println("ComponentA --> Received message: " + request);
Object ret = componentBReference.call(msg);
@@ -63,14 +64,22 @@
@Property(name="prefix")
public void setPrefix(String prefix) {
+ System.out.println("[Property] prefix: " + prefix);
this.prefix = prefix;
}
+ @Property(name="prefix1")
+ public void setPrefix1(String prefix1) {
+ System.out.println("[Property] prefix1: " + prefix1);
+ this.prefix1 = prefix1;
+ }
+
/**
* @param bar the bar to set
*/
@Property(name="bar")
public void setBar(String bar) {
+ System.out.println("[Property] bar: " + bar);
this.bar = bar;
}
Modified:
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/sca/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/sca/default.scdl?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/java/samples/sca/echo.databinding/src/test/resources/META-INF/sca/default.scdl
Wed Oct 4 16:05:39 2006
@@ -32,6 +32,7 @@
<implementation.java class="echo.ComponentAImpl" />
<reference name="componentBReference">ComponentB</reference>
<property name="prefix">ABC</property>
+ <property name="prefix1" source="$messagePrefix"></property>
<property name="bar"
source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
<property name="omProperty"><a><b>XYZ</b></a></property>
</component>
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/DOMXMLStreamReader.java
Wed Oct 4 16:05:39 2006
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
@@ -1213,6 +1214,10 @@
NamedNodeMap nodeMap = rootElement.getAttributes();
for (int i = 0; i < nodeMap.getLength(); i++) {
Attr attr = (Attr)nodeMap.item(i);
+ if
(XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attr.getNamespaceURI())) {
+ // Skip xmlns:xxx
+ continue;
+ }
QName attrName = new QName(attr.getNamespaceURI(),
attr.getLocalName());
NameValuePair pair = new NameValuePair(attrName, attr.getValue());
attributeList.add(pair);
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2Node.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2Node.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2Node.java
Wed Oct 4 16:05:39 2006
@@ -19,13 +19,13 @@
package org.apache.tuscany.core.databinding.xml;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2SAX.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2SAX.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputSource2SAX.java
Wed Oct 4 16:05:39 2006
@@ -18,11 +18,10 @@
*/
package org.apache.tuscany.core.databinding.xml;
-import javax.xml.transform.Transformer;
-
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2Node.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2Node.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2Node.java
Wed Oct 4 16:05:39 2006
@@ -21,13 +21,13 @@
import java.io.InputStream;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXSource;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2SAX.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2SAX.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/InputStream2SAX.java
Wed Oct 4 16:05:39 2006
@@ -20,11 +20,10 @@
import java.io.InputStream;
-import javax.xml.transform.Transformer;
-
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2OutputStream.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2OutputStream.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2OutputStream.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2OutputStream.java
Wed Oct 4 16:05:39 2006
@@ -22,13 +22,13 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2Writer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2Writer.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2Writer.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2Writer.java
Wed Oct 4 16:05:39 2006
@@ -22,13 +22,13 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2XMLStreamReader.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Node2XMLStreamReader.java
Wed Oct 4 16:05:39 2006
@@ -24,12 +24,15 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Transform DOM Node to XML XMLStreamReader
*/
[EMAIL PROTECTED](Transformer.class)
public class Node2XMLStreamReader extends TransformerExtension<Node,
XMLStreamReader> implements
PullTransformer<Node, XMLStreamReader> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2Node.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2Node.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2Node.java
Wed Oct 4 16:05:39 2006
@@ -21,13 +21,13 @@
import java.io.Reader;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2SAX.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2SAX.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Reader2SAX.java
Wed Oct 4 16:05:39 2006
@@ -20,11 +20,10 @@
import java.io.Reader;
-import javax.xml.transform.Transformer;
-
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOMPipe.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOMPipe.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOMPipe.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOMPipe.java
Wed Oct 4 16:05:39 2006
@@ -21,10 +21,13 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.tuscany.spi.databinding.DataPipe;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
[EMAIL PROTECTED](Transformer.class)
public class SAX2DOMPipe extends TransformerExtension<ContentHandler, Node>
implements
DataPipe<ContentHandler, Node> {
private SAX2DOM pipe;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Source2ResultTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Source2ResultTransformer.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Source2ResultTransformer.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Source2ResultTransformer.java
Wed Oct 4 16:05:39 2006
@@ -20,7 +20,6 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import org.apache.tuscany.spi.databinding.PushTransformer;
@@ -32,7 +31,7 @@
/**
* Transform TrAX Source to Result
*/
[EMAIL PROTECTED](Transformer.class)
[EMAIL PROTECTED](org.apache.tuscany.spi.databinding.Transformer.class)
public class Source2ResultTransformer extends TransformerExtension<Source,
Result> implements
PushTransformer<Source, Result> {
private static final TransformerFactory FACTORY =
TransformerFactory.newInstance();
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StreamDataPipe.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StreamDataPipe.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StreamDataPipe.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/StreamDataPipe.java
Wed Oct 4 16:05:39 2006
@@ -24,8 +24,11 @@
import java.io.OutputStream;
import org.apache.tuscany.spi.databinding.DataPipe;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
[EMAIL PROTECTED](Transformer.class)
public class StreamDataPipe extends TransformerExtension<OutputStream,
InputStream> implements
DataPipe<OutputStream, InputStream> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2SAX.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2SAX.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2SAX.java
Wed Oct 4 16:05:39 2006
@@ -20,11 +20,10 @@
import java.io.StringReader;
-import javax.xml.transform.Transformer;
-
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2XMLStreamReader.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/String2XMLStreamReader.java
Wed Oct 4 16:05:39 2006
@@ -24,8 +24,11 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
[EMAIL PROTECTED](Transformer.class)
public class String2XMLStreamReader extends TransformerExtension<String,
XMLStreamReader> implements
PullTransformer<String, XMLStreamReader> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Writer2ReaderDataPipe.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Writer2ReaderDataPipe.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Writer2ReaderDataPipe.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/Writer2ReaderDataPipe.java
Wed Oct 4 16:05:39 2006
@@ -24,8 +24,11 @@
import java.io.Writer;
import org.apache.tuscany.spi.databinding.DataPipe;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
[EMAIL PROTECTED](Transformer.class)
public class Writer2ReaderDataPipe extends TransformerExtension<Writer,
Reader> implements DataPipe<Writer, Reader> {
private StringWriter writer = new StringWriter();
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2Node.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2Node.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2Node.java
Wed Oct 4 16:05:39 2006
@@ -23,12 +23,15 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
/**
* Transform DOM Node to XML XMLStreamReader
*/
[EMAIL PROTECTED](Transformer.class)
public class XMLStreamReader2Node extends
TransformerExtension<XMLStreamReader, Node> implements
PullTransformer<XMLStreamReader, Node> {
private SAX2DOMPipe pipe = new SAX2DOMPipe();
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2SAX.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2SAX.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2SAX.java
Wed Oct 4 16:05:39 2006
@@ -23,12 +23,15 @@
import org.apache.tuscany.spi.databinding.PushTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
import org.xml.sax.ContentHandler;
/**
- *
+ * XMLStreamReader to SAX events
*/
[EMAIL PROTECTED](Transformer.class)
public class XMLStreamReader2SAX extends TransformerExtension<XMLStreamReader,
ContentHandler> implements
PushTransformer<XMLStreamReader, ContentHandler> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2String.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2String.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2String.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/xml/XMLStreamReader2String.java
Wed Oct 4 16:05:39 2006
@@ -24,8 +24,11 @@
import org.apache.tuscany.spi.databinding.PullTransformer;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
[EMAIL PROTECTED](Transformer.class)
public class XMLStreamReader2String extends
TransformerExtension<XMLStreamReader, String> implements
PullTransformer<XMLStreamReader, String> {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
Wed Oct 4 16:05:39 2006
@@ -22,20 +22,18 @@
import java.util.Map;
import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.apache.tuscany.spi.model.InteractionScope;
+import org.apache.tuscany.spi.model.Multiplicity;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
-import org.apache.tuscany.spi.model.InteractionScope;
-import org.apache.tuscany.spi.model.Multiplicity;
/**
* Utility classes to support StAX-based loaders
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/property/PropertyHelper.java
Wed Oct 4 16:05:39 2006
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.net.URI;
import java.net.URL;
+import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.NamespaceContext;
@@ -60,6 +61,8 @@
XPath path = FACTORY.newXPath();
if (nsContext != null) {
path.setNamespaceContext(nsContext);
+ } else {
+ path.setNamespaceContext(new DOMNamespeceContext(node));
}
XPathExpression expression = path.compile(xPathExpression);
Node result = (Node)expression.evaluate(node, XPathConstants.NODE);
@@ -164,6 +167,31 @@
propValue.setValueFactory(new
SimplePropertyObjectFactory(prop, propValue.getValue()));
}
}
+ }
+
+ private static class DOMNamespeceContext implements NamespaceContext {
+ private Node node;
+
+ /**
+ * @param node
+ */
+ public DOMNamespeceContext(Node node) {
+ super();
+ this.node = node;
+ }
+
+ public String getNamespaceURI(String prefix) {
+ return node.lookupNamespaceURI(prefix);
+ }
+
+ public String getPrefix(String namespaceURI) {
+ return node.lookupPrefix(namespaceURI);
+ }
+
+ public Iterator getPrefixes(String namespaceURI) {
+ return null;
+ }
+
}
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/resources/org/apache/tuscany/core/databinding.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/resources/org/apache/tuscany/core/databinding.scdl?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/resources/org/apache/tuscany/core/databinding.scdl
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/resources/org/apache/tuscany/core/databinding.scdl
Wed Oct 4 16:05:39 2006
@@ -18,12 +18,12 @@
name="org.apache.tuscany.core.DataBinding">
<component name="databinding.wirePostProcessor">
- <system:implementation.system
class="org.apache.tuscany.core.databinding.impl.DataBindingWirePostProcessor"/>
- </component>
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.impl.DataBindingWirePostProcessor" />
+ </component>
<component name="databinding.javaInterfaceProcessor">
- <system:implementation.system
class="org.apache.tuscany.core.databinding.impl.DataBindingJavaInterfaceProcessor"/>
- </component>
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.impl.DataBindingJavaInterfaceProcessor"
/>
+ </component>
<!-- DataBinding registry -->
<component name="databinding.registry">
@@ -33,7 +33,7 @@
<!-- DataBinding registry -->
<component name="databinding.mediator">
<system:implementation.system
class="org.apache.tuscany.core.databinding.impl.MediatorImpl" />
- </component>
+ </component>
<!-- Transformer registry -->
<component name="databinding.transformerRegistry" initLevel="90">
@@ -43,21 +43,14 @@
<component name="dataType.loader">
<system:implementation.system
class="org.apache.tuscany.core.databinding.impl.DataTypeLoader" />
</component>
-
+
<!-- Simple databindings -->
<component name="databinding.dom">
<system:implementation.system
class="org.apache.tuscany.core.databinding.impl.SimpleDataBinding" />
<property name="className">org.w3c.dom.Node</property>
</component>
-
+
<!-- Transformers -->
- <component name="transformer.Node2String">
- <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2String" />
- </component>
-
- <component name="transformer.String2Node">
- <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.String2Node" />
- </component>
<component name="transformer.Input2InputTransformer">
<system:implementation.system
class="org.apache.tuscany.core.databinding.impl.Input2InputTransformer" />
@@ -67,11 +60,91 @@
<system:implementation.system
class="org.apache.tuscany.core.databinding.impl.Output2OutputTransformer" />
</component>
+ <component name="transformer.InputSource2Node">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.InputSource2Node" />
+ </component>
+
+ <component name="transformer.InputSource2SAX">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.InputSource2SAX" />
+ </component>
+
+ <component name="transformer.InputStream2Node">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.InputStream2Node" />
+ </component>
+
+ <component name="transformer.InputStream2SAX">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.InputStream2SAX" />
+ </component>
+
<component name="transformer.Node2Object">
<system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2Object" />
</component>
-
+
+ <component name="transformer.Node2OutputStream">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2OutputStream" />
+ </component>
+
+ <component name="transformer.Node2String">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2String" />
+ </component>
+
+ <component name="transformer.Node2Writer">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2Writer" />
+ </component>
+
+ <component name="transformer.Node2XMLStreamReader">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Node2XMLStreamReader" />
+ </component>
+
<component name="transformer.Object2Node">
<system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Object2Node" />
- </component>
+ </component>
+
+ <component name="transformer.Reader2Node">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Reader2Node" />
+ </component>
+
+ <component name="transformer.Reader2SAX">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Reader2SAX" />
+ </component>
+
+ <component name="transformer.SAX2DOMPipe">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.SAX2DOMPipe" />
+ </component>
+
+ <component name="transformer.Source2ResultTransformer">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Source2ResultTransformer" />
+ </component>
+
+ <component name="transformer.StreamDataPipe">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.StreamDataPipe" />
+ </component>
+
+ <component name="transformer.String2Node">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.String2Node" />
+ </component>
+
+ <component name="transformer.String2SAX">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.String2SAX" />
+ </component>
+
+ <component name="transformer.String2XMLStreamReader">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.String2XMLStreamReader" />
+ </component>
+
+ <component name="transformer.Writer2ReaderDataPipe">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.Writer2ReaderDataPipe" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2Node">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.XMLStreamReader2Node" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2SAX">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.XMLStreamReader2SAX" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2String">
+ <system:implementation.system
class="org.apache.tuscany.core.databinding.xml.XMLStreamReader2String" />
+ </component>
</composite>
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/PropertyHelperTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/PropertyHelperTestCase.java?view=diff&rev=453059&r1=453058&r2=453059
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/PropertyHelperTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/property/PropertyHelperTestCase.java
Wed Oct 4 16:05:39 2006
@@ -76,10 +76,14 @@
public void testXPath() throws Exception {
String2Node t = new String2Node();
Node node = t.transform(IPO_XML, null);
+
+ Document doc = PropertyHelper.evaluate(null, node,
"/ipo:purchaseOrder/billTo");
+ assertNotNull(doc);
+
NamespaceContext context = EasyMock.createMock(NamespaceContext.class);
EasyMock.expect(context.getNamespaceURI("ipo")).andReturn("http://www.example.com/IPO";).anyTimes();
EasyMock.replay(context);
- Document doc = PropertyHelper.evaluate(context, node,
"/ipo:purchaseOrder/items");
+ doc = PropertyHelper.evaluate(context, node,
"/ipo:purchaseOrder/items");
assertNotNull(doc);
doc = PropertyHelper.evaluate(context, node,
"/ipo:purchaseOrder/billTo");
assertNotNull(doc);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
