You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/02/24 07:20:12 UTC
svn commit: r511222 - in /incubator/tuscany/branches/sca-java-integration:
sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/
sca/services/databinding/databinding-xmlbeans/
testing/sca/itest/databinding/src/tes...
Author: rfeng
Date: Fri Feb 23 22:20:11 2007
New Revision: 511222
URL: http://svn.apache.org/viewvc?view=rev&rev=511222
Log:
[sca-integration-branch] Fix TUSCANY-1138
Removed:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/META-INF/tuscany/
Modified:
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java?view=diff&rev=511222&r1=511221&r2=511222
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java Fri Feb 23 22:20:11 2007
@@ -107,17 +107,15 @@
@SuppressWarnings("unchecked")
public static Object createReturnValue(DataType dataType, Object value) {
- Class<?> cls = (Class)dataType.getPhysical();
- XmlRootElement element = cls.getAnnotation(XmlRootElement.class);
- if (element == null) {
+ Class<?> cls = getJavaType(dataType);
+ if (cls == JAXBElement.class) {
+ return createJAXBElement(dataType, value);
+ } else {
if (value instanceof JAXBElement) {
return ((JAXBElement)value).getValue();
} else {
return value;
}
- } else {
- QName root = new QName(element.namespace(), element.name());
- return new JAXBElement(root, (Class)dataType.getPhysical(), value);
}
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/pom.xml?view=diff&rev=511222&r1=511221&r2=511222
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/pom.xml Fri Feb 23 22:20:11 2007
@@ -38,7 +38,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java?view=diff&rev=511222&r1=511221&r2=511222
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java Fri Feb 23 22:20:11 2007
@@ -25,6 +25,7 @@
import java.io.StringReader;
import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -33,6 +34,7 @@
import org.apache.tuscany.databinding.sdo.String2DataObject;
import org.apache.tuscany.databinding.xmlbeans.XMLStreamReader2XmlObject;
import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.idl.XMLType;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
@@ -81,7 +83,7 @@
@SuppressWarnings("unchecked")
public void testDataBindingBootstrap() throws Exception {
- DataType targetDataType = new DataType<Class>(Object.class, null);
+ DataType targetDataType = new DataType<XMLType>(Object.class, XMLType.UNKNOWN);
targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
TransformationContext tContext = createMock(TransformationContext.class);
expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
@@ -91,23 +93,26 @@
DataObject po1 = t1.transform(IPO_XML, null);
client.call(po1);
- XMLStreamReader reader =
- XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
+ PurchaseOrderDocument.Factory.newInstance();
+
+ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
PurchaseOrderDocument po2 = (PurchaseOrderDocument)t2.transform(reader, null);
client.call(po2.getPurchaseOrder());
+ QName root = new QName("http://www.example.com/IPO", "purchaseOrder");
+ DataType targetDataType1 = new DataType<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
+ TransformationContext tContext1 = createMock(TransformationContext.class);
+ expect(tContext1.getTargetDataType()).andReturn(targetDataType1).anyTimes();
+ replay(tContext1);
Reader2JAXB t3 = new Reader2JAXB();
- JAXBElement<PurchaseOrderType> po3 =
- (JAXBElement<PurchaseOrderType>)t3.transform(new StringReader(IPO_XML), tContext);
- client.call(po3.getValue());
+ PurchaseOrderType po3 = (PurchaseOrderType)t3.transform(new StringReader(IPO_XML), tContext1);
+ client.call(po3);
}
protected void setUp() throws Exception {
setApplicationSCDL(getClass(), "META-INF/sca/default.scdl");
- addExtension("test-extensions", getClass().getClassLoader()
- .getResource("META-INF/tuscany/test-extensions.scdl"));
super.setUp();
CompositeContext context = CurrentCompositeContext.getContext();
client = context.locateService(Client.class, "Client");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org