You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/07/18 07:44:48 UTC
svn commit: r422976 [3/3] - in
/incubator/tuscany/sandbox/chianti/sca/databinding: ./
databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/
databinding-castor/
databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/
data...
Added: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java?rev=422976&view=auto
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java (added)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java Mon Jul 17 22:44:45 2006
@@ -0,0 +1,62 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation or its licensors as applicable
+ *
+ * Licensed 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.databinding.xml;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.databinding.trax.Node2String;
+import org.apache.tuscany.databinding.util.PipedTransformer;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class PushTransformationTestCase extends TestCase {
+ private static final String IPO_XML = "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:ipo=\"http://www.example.com/IPO\""
+ + " xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\"" + " orderDate=\"1999-12-01\">"
+ + " <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">" + " <name>Helen Zoe</name>" + " <street>47 Eden Street</street>"
+ + " <city>Cambridge</city>" + " <postcode>CB1 1JR</postcode>" + " </shipTo>" + " <billTo xsi:type=\"ipo:USAddress\">"
+ + " <name>Robert Smith</name>" + " <street>8 Oak Avenue</street>" + " <city>Old Town</city>" + " <state>PA</state>"
+ + " <zip>95819</zip>" + " </billTo>" + " <items>" + " <item partNum=\"833-AA\">"
+ + " <productName>Lapis necklace</productName>" + " <quantity>1</quantity>" + " <USPrice>99.95</USPrice>"
+ + " <ipo:comment>Want this for the holidays</ipo:comment>" + " <shipDate>1999-12-05</shipDate>" + " </item>" + " </items>"
+ + "</ipo:purchaseOrder>";
+
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testTransformation() {
+ String2XMLStreamReader t1 = new String2XMLStreamReader();
+ XMLStreamReader reader = t1.transform(IPO_XML, null);
+ XMLStreamReader2SAX t2 = new XMLStreamReader2SAX();
+ PipedTransformer<XMLStreamReader, ContentHandler, Node> t3 = new PipedTransformer<XMLStreamReader, ContentHandler, Node>(t2,
+ new SAX2DOMPipe());
+ Node node = t3.transform(reader, null);
+ Assert.assertNotNull(node);
+ Node2String t4= new Node2String();
+ String xml = t4.transform(node, null);
+ Assert.assertTrue(xml!=null && xml.indexOf("<shipDate>1999-12-05</shipDate>")!=-1);
+ }
+
+}
Propchange: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/pom.xml?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/pom.xml Mon Jul 17 22:44:45 2006
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.
-->
<project>
@@ -40,7 +40,7 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<!-- Using 2.0 instead of 2.0.1 for now because the SUN repository has an incorrect reference
- to jaxb-api 2.0.1 -->
+ to jaxb-api 2.0.1 -->
<version>2.0</version>
<scope>test</scope>
</dependency>
@@ -89,12 +89,15 @@
<directory>target/jaxb-source</directory>
<filtering>true</filtering>
</testResource>
+ <testResource>
+ <directory>src/test/java</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
-
- <testSourceDirectory>${project.build.directory}/jaxb-source</testSourceDirectory>
- <plugins>
+ <testSourceDirectory>target/jaxb-source</testSourceDirectory>
+ <plugins>
<plugin>
<groupId>com.sun.tools.xjc.maven2</groupId>
<artifactId>maven-jaxb-plugin</artifactId>
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java Mon Jul 17 22:44:45 2006
@@ -23,11 +23,11 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-public class JAXB2Node implements Transformer<Object, Node> {
+public class JAXB2Node implements PullTransformer<Object, Node> {
private String contextPath;
@@ -52,7 +52,7 @@
return Object.class;
}
- public Class<Node> getResultType() {
+ public Class<Node> getTargetType() {
return Node.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java Mon Jul 17 22:44:45 2006
@@ -21,10 +21,10 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.w3c.dom.Node;
-public class Node2JAXB implements Transformer<Node, Object> {
+public class Node2JAXB implements PullTransformer<Node, Object> {
private String contextPath;
@@ -44,7 +44,7 @@
return Node.class;
}
- public Class<Object> getResultType() {
+ public Class<Object> getTargetType() {
return Object.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java Mon Jul 17 22:44:45 2006
@@ -22,9 +22,9 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
-public class XMLStreamReader2JAXB implements Transformer<XMLStreamReader, Object> {
+public class XMLStreamReader2JAXB implements PullTransformer<XMLStreamReader, Object> {
// TODO: How to pass context information
private String contextPath;
@@ -49,7 +49,7 @@
return XMLStreamReader.class;
}
- public Class<Object> getResultType() {
+ public Class<Object> getTargetType() {
return Object.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/pom.xml?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/pom.xml Mon Jul 17 22:44:45 2006
@@ -48,13 +48,10 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
+ <testSourceDirectory>target/sdo-source</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.tuscany</groupId>
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java Mon Jul 17 22:44:45 2006
@@ -18,12 +18,12 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import commonj.sdo.DataObject;
import commonj.sdo.helper.XMLHelper;
-public class DataObject2String implements Transformer<DataObject, String> {
+public class DataObject2String implements PullTransformer<DataObject, String> {
public String transform(DataObject source, TransformationContext context) {
try {
@@ -37,7 +37,7 @@
return DataObject.class;
}
- public Class<String> getResultType() {
+ public Class<String> getTargetType() {
return String.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java Mon Jul 17 22:44:45 2006
@@ -19,14 +19,14 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.helper.TypeHelper;
-public class DataObject2XMLStreamReader implements Transformer<DataObject, XMLStreamReader> {
+public class DataObject2XMLStreamReader implements PullTransformer<DataObject, XMLStreamReader> {
private XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(TypeHelper.INSTANCE);
public XMLStreamReader transform(DataObject source, TransformationContext context) {
@@ -37,7 +37,7 @@
return DataObject.class;
}
- public Class<XMLStreamReader> getResultType() {
+ public Class<XMLStreamReader> getTargetType() {
return XMLStreamReader.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java Mon Jul 17 22:44:45 2006
@@ -18,12 +18,12 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import commonj.sdo.DataObject;
import commonj.sdo.helper.XMLHelper;
-public class String2DataObject implements Transformer<String, DataObject> {
+public class String2DataObject implements PullTransformer<String, DataObject> {
public DataObject transform(String source, TransformationContext context) {
try {
@@ -37,7 +37,7 @@
return String.class;
}
- public Class<DataObject> getResultType() {
+ public Class<DataObject> getTargetType() {
return DataObject.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java Mon Jul 17 22:44:45 2006
@@ -21,14 +21,14 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
-public class XMLDocument2XMLStreamReader implements Transformer<XMLDocument, XMLStreamReader> {
+public class XMLDocument2XMLStreamReader implements PullTransformer<XMLDocument, XMLStreamReader> {
private XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(TypeHelper.INSTANCE);
/**
@@ -48,7 +48,7 @@
return XMLDocument.class;
}
- public Class<XMLStreamReader> getResultType() {
+ public Class<XMLStreamReader> getTargetType() {
return XMLStreamReader.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java Mon Jul 17 22:44:45 2006
@@ -20,14 +20,14 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.helper.TypeHelper;
-public class XMLStreamReader2DataObject implements Transformer<XMLStreamReader, DataObject> {
+public class XMLStreamReader2DataObject implements PullTransformer<XMLStreamReader, DataObject> {
private XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(TypeHelper.INSTANCE);
public DataObject transform(XMLStreamReader source, TransformationContext context) {
@@ -38,7 +38,7 @@
}
}
- public Class<DataObject> getResultType() {
+ public Class<DataObject> getTargetType() {
return DataObject.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java Mon Jul 17 22:44:45 2006
@@ -20,14 +20,14 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
-public class XMLStreamReader2XMLDocument implements Transformer<XMLStreamReader, XMLDocument> {
+public class XMLStreamReader2XMLDocument implements PullTransformer<XMLStreamReader, XMLDocument> {
private XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(TypeHelper.INSTANCE);
public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
@@ -38,7 +38,7 @@
}
}
- public Class<XMLDocument> getResultType() {
+ public Class<XMLDocument> getTargetType() {
return XMLDocument.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java Mon Jul 17 22:44:45 2006
@@ -54,7 +54,7 @@
protected void setUp() throws Exception {
super.setUp();
- loader = new ImportSDOLoader();
+ loader = new ImportSDOLoader(null);
xmlFactory = XMLInputFactory.newInstance();
deploymentContext = new RootDeploymentContext(getClass().getClassLoader(), xmlFactory, null, null);
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-test/pom.xml?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-test/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-test/pom.xml Mon Jul 17 22:44:45 2006
@@ -97,6 +97,8 @@
<filtering>true</filtering>
</testResource>
</testResources>
+
+ <testSourceDirectory>target/jaxb-source</testSourceDirectory>
<plugins>
<plugin>
@@ -105,7 +107,7 @@
<executions>
<execution>
<id>generate-sdo</id>
- <phase>generate-sources</phase>
+ <phase>generate-test-sources</phase>
<configuration>
<schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
<javaPackage>com.example.ipo.sdo</javaPackage>
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/pom.xml?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/pom.xml Mon Jul 17 22:44:45 2006
@@ -1,100 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed 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.
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
- <version>1.0-chianti-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>databinding-xmlbeans</artifactId>
- <name>Tuscany XmlBeans Data Binding</name>
- <description>Tuscany XmlBeans Data Binding</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>target/xmlbeans-source</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>generate-xmlbeans</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="maven.compile.classpath"/>
- <xmlbean schema="${basedir}/src/test/resources" classpathref="maven.compile.classpath"
- destfile="${project.build.directory}/ipo-xmlbeans.jar" srcgendir="${project.build.directory}/xmlbeans-source"
- javasource="1.5" classgendir="${project.build.directory}/test-classes" />
- </tasks>
- <!--
- <sourceRoot>${project.build.directory}/xmlbeans-source</sourceRoot>
- <testSourceRoot>${project.build.directory}/xmlbeans-source</testSourceRoot>
- -->
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <groupId>org.apache.tuscany.databinding</groupId>
+ <artifactId>databinding</artifactId>
+ <version>1.0-chianti-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>databinding-xmlbeans</artifactId>
+ <name>Tuscany XmlBeans Data Binding</name>
+ <description>Tuscany XmlBeans Data Binding</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.databinding</groupId>
+ <artifactId>databinding-framework</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>target/xmlbeans-source</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-xmlbeans</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="maven.compile.classpath" />
+ <xmlbean schema="${basedir}/src/test/resources" classpathref="maven.compile.classpath"
+ destfile="${project.build.directory}/ipo-xmlbeans.jar"
+ srcgendir="${project.build.directory}/xmlbeans-source" javasource="1.5"
+ classgendir="${project.build.directory}/test-classes" />
+ </tasks>
+ <testSourceRoot>${project.build.directory}/xmlbeans-source</testSourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java Mon Jul 17 22:44:45 2006
@@ -18,12 +18,12 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.w3c.dom.Node;
-public class Node2XmlObject implements Transformer<Node, XmlObject> {
+public class Node2XmlObject implements PullTransformer<Node, XmlObject> {
// private XmlOptions options;
public XmlObject transform(Node source, TransformationContext context) {
@@ -34,7 +34,7 @@
}
}
- public Class<XmlObject> getResultType() {
+ public Class<XmlObject> getTargetType() {
return XmlObject.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java Mon Jul 17 22:44:45 2006
@@ -20,11 +20,11 @@
import org.apache.tuscany.databinding.TransformationContext;
import org.apache.tuscany.databinding.TransformationException;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-public class XMLStreamReader2XmlObject implements Transformer<XMLStreamReader, XmlObject> {
+public class XMLStreamReader2XmlObject implements PullTransformer<XMLStreamReader, XmlObject> {
// private XmlOptions options;
public XmlObject transform(XMLStreamReader source, TransformationContext context) {
@@ -35,7 +35,7 @@
}
}
- public Class<XmlObject> getResultType() {
+ public Class<XmlObject> getTargetType() {
return XmlObject.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java Mon Jul 17 22:44:45 2006
@@ -17,11 +17,11 @@
package org.apache.tuscany.databinding.xmlbeans;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.xmlbeans.XmlObject;
import org.w3c.dom.Node;
-public class XmlObject2Node implements Transformer<XmlObject, Node> {
+public class XmlObject2Node implements PullTransformer<XmlObject, Node> {
// private XmlOptions options;
public Node transform(XmlObject source, TransformationContext context) {
@@ -34,7 +34,7 @@
return XmlObject.class;
}
- public Class<Node> getResultType() {
+ public Class<Node> getTargetType() {
return Node.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java Mon Jul 17 22:44:45 2006
@@ -19,10 +19,10 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.databinding.TransformationContext;
-import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.PullTransformer;
import org.apache.xmlbeans.XmlObject;
-public class XmlObject2XMLStreamReader implements Transformer<XmlObject, XMLStreamReader> {
+public class XmlObject2XMLStreamReader implements PullTransformer<XmlObject, XMLStreamReader> {
// private XmlOptions options;
public XMLStreamReader transform(XmlObject source, TransformationContext context) {
@@ -33,7 +33,7 @@
return XmlObject.class;
}
- public Class<XMLStreamReader> getResultType() {
+ public Class<XMLStreamReader> getTargetType() {
return XMLStreamReader.class;
}
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java Mon Jul 17 22:44:45 2006
@@ -17,6 +17,7 @@
package org.apache.tuscany.databinding.xmlbeans;
import java.io.StringReader;
+import java.net.URL;
import javax.xml.stream.XMLStreamReader;
@@ -26,6 +27,8 @@
import org.apache.xmlbeans.XmlObject;
import org.w3c.dom.Node;
+import com.example.ipo.xmlbeans.PurchaseOrderDocument;
+
public class XmlObjectTestCase extends TestCase {
private static final String IPO_XML = "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:ipo=\"http://www.example.com/IPO\""
@@ -64,11 +67,10 @@
Assert.assertNotNull(object3);
}
- /*
public void testGeneratedXmlObject() throws Exception {
- URL xmlFile = getClass().getClassLoader().getResource("ipo.xml");
+ // URL xmlFile = getClass().getClassLoader().getResource("ipo.xml");
// URL/Stream/Reader to XmlObject
- PurchaseOrderDocument object = PurchaseOrderDocument.Factory.parse(xmlFile);
+ PurchaseOrderDocument object = PurchaseOrderDocument.Factory.parse(new StringReader(IPO_XML));
// XmlObject to XMLStreamReader
XmlObject2XMLStreamReader t1 = new XmlObject2XMLStreamReader();
@@ -76,7 +78,7 @@
// XMLStreamReader to XmlObject
XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
- XmlObject object2 = t2.transform(reader, null);
+ PurchaseOrderDocument object2 = (PurchaseOrderDocument) t2.transform(reader, null);
// XmlObject to Node
XmlObject2Node t3 = new XmlObject2Node();
@@ -84,10 +86,9 @@
// Node to XmlObject
Node2XmlObject t4 = new Node2XmlObject();
- XmlObject object3 = t4.transform(node, null);
+ PurchaseOrderDocument object3 = (PurchaseOrderDocument) t4.transform(node, null);
Assert.assertNotNull(object3);
}
- */
protected void tearDown() throws Exception {
super.tearDown();
Modified: incubator/tuscany/sandbox/chianti/sca/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/databinding/pom.xml?rev=422976&r1=422975&r2=422976&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/databinding/pom.xml (original)
+++ incubator/tuscany/sandbox/chianti/sca/databinding/pom.xml Mon Jul 17 22:44:45 2006
@@ -32,10 +32,10 @@
<module>databinding-axiom</module>
<module>databinding-castor</module>
<module>databinding-framework</module>
- <!--<module>databinding-jaxb</module>
+ <module>databinding-jaxb</module>
<module>databinding-sdo</module>
<module>databinding-test</module>
- <module>databinding-xmlbeans</module>-->
+ <module>databinding-xmlbeans</module>
</modules>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org