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 2008/10/31 17:20:09 UTC
svn commit: r709460 - in
/tuscany/branches/sca-equinox/modules/databinding-jaxb: ./ META-INF/
src/test/java/org/apache/tuscany/sca/databinding/jaxb/
Author: rfeng
Date: Fri Oct 31 09:20:08 2008
New Revision: 709460
URL: http://svn.apache.org/viewvc?rev=709460&view=rev
Log:
Clean dependencies
Added:
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java (contents, props changed)
- copied, changed from r709292, tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme
Removed:
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
tuscany/branches/sca-equinox/modules/databinding-jaxb/pom.xml
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF?rev=709460&r1=709459&r2=709460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb/META-INF/MANIFEST.MF Fri Oct 31 09:20:08 2008
@@ -19,30 +19,35 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA Data Binding for JAXB
-Import-Package: javax.activation,javax.imageio,javax.xml.bind,javax.xm
- l.bind.annotation,javax.xml.bind.attachment,javax.xml.datatype,javax.
- xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.transfor
- m.dom,javax.xml.transform.stream,org.apache.tuscany.sca.contribution.
- resolver;version="1.4",org.apache.tuscany.sca.databinding;version="1.
- 4",org.apache.tuscany.sca.databinding.impl;version="1.4",org.apache.t
- uscany.sca.databinding.jaxb;version="1.4",org.apache.tuscany.sca.data
- binding.util;version="1.4",org.apache.tuscany.sca.databinding.xml;ver
- sion="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org.apac
- he.tuscany.sca.interfacedef.impl;version="1.4",org.apache.tuscany.sca
- .interfacedef.util;version="1.4",org.apache.tuscany.sca.xsd;version="
- 1.4",org.apache.ws.commons.schema.resolver,org.osoa.sca;version="1.4"
- ,org.w3c.dom,org.xml.sax,org.jvnet.jaxb.reflection.model.impl;resolut
- ion:=optional,org.jvnet.jaxb.reflection.runtime;resolution:=optional,
- com.sun.xml.bind.v2.runtime;resolution:=optional,com.sun.xml.bind.v2.
- model.runtime;resolution:=optional,junit.framework;resolution:=option
- al,com.sun.xml.bind.v2.model.impl;resolution:=optional,com.sun.xml.bi
- nd.v2.model.annotation;resolution:=optional,org.jvnet.jaxb.reflection
- .model.core;resolution:=optional,org.jvnet.jaxb.reflection.model.runt
- ime;resolution:=optional,org.junit;resolution:=optional,com.sun.xml.b
- ind.v2.model.core;resolution:=optional,org.jvnet.jaxb.reflection.mode
- l.annotation;resolution:=optional,org.jvnet.jaxb.reflection.runtime.r
- eflect;resolution:=optional,com.sun.xml.bind.v2.runtime.reflect;resol
- ution:=optional
+Import-Package: javax.activation,
+ javax.imageio,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.attachment,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.stream,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.stream,
+ junit.framework;resolution:=optional,
+ org.apache.tuscany.sca.assembly;version="1.4.0",
+ org.apache.tuscany.sca.contribution.resolver;version="1.4",
+ org.apache.tuscany.sca.databinding;version="1.4",
+ org.apache.tuscany.sca.databinding.impl;version="1.4",
+ org.apache.tuscany.sca.databinding.jaxb;version="1.4",
+ org.apache.tuscany.sca.databinding.util;version="1.4",
+ org.apache.tuscany.sca.databinding.xml;version="1.4",
+ org.apache.tuscany.sca.interfacedef;version="1.4",
+ org.apache.tuscany.sca.interfacedef.impl;version="1.4",
+ org.apache.tuscany.sca.interfacedef.util;version="1.4",
+ org.apache.tuscany.sca.policy;version="1.4.0",
+ org.apache.tuscany.sca.xsd;version="1.4",
+ org.apache.ws.commons.schema.resolver,
+ org.junit;resolution:=optional,
+ org.osoa.sca;version="1.4",
+ org.w3c.dom,
+ org.xml.sax
Bundle-SymbolicName: org.apache.tuscany.sca.databinding.jaxb
Bundle-DocURL: http://www.apache.org/
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb/pom.xml?rev=709460&r1=709459&r2=709460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb/pom.xml Fri Oct 31 09:20:08 2008
@@ -59,12 +59,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb.reflection</groupId>
- <artifactId>jaxb2-reflection</artifactId>
- <version>2.1.4</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<repositories>
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java?rev=709460&r1=709459&r2=709460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java Fri Oct 31 09:20:08 2008
@@ -19,32 +19,13 @@
package org.apache.tuscany.sca.databinding.jaxb;
-import java.lang.reflect.Type;
-import java.util.Collections;
-
import javax.xml.bind.JAXBContext;
-import javax.xml.namespace.QName;
-import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.jvnet.jaxb.reflection.model.annotation.RuntimeInlineAnnotationReader;
-import org.jvnet.jaxb.reflection.model.core.Ref;
-import org.jvnet.jaxb.reflection.model.impl.RuntimeModelBuilder;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeClassInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimePropertyInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeTypeInfoSet;
-import org.jvnet.jaxb.reflection.runtime.IllegalAnnotationsException;
-import org.jvnet.jaxb.reflection.runtime.JAXBContextImpl;
import org.w3c.dom.Node;
-import com.example.ipo.jaxb.ObjectFactory;
-import com.example.ipo.jaxb.PurchaseOrderType;
-import com.example.ipo.jaxb.USAddress;
-import com.example.ipo.jaxb.USState;
-
/**
* @version $Rev$ $Date$
*/
@@ -55,40 +36,4 @@
Node schema = JAXBContextHelper.generateSchema(context);
System.out.println(new Node2String().transform(schema, null));
}
-
- /**
- * This is a workaround for the NPE bug in jaxb-reflection
- * @param classes
- * @return
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- private static RuntimeTypeInfoSet create(Class... classes) throws Exception {
- IllegalAnnotationsException.Builder errorListener = new IllegalAnnotationsException.Builder();
- RuntimeInlineAnnotationReader reader = new RuntimeInlineAnnotationReader();
- JAXBContextImpl context =
- new JAXBContextImpl(classes, null, Collections.<Class, Class> emptyMap(), null, false, reader, false, false);
- RuntimeModelBuilder builder =
- new RuntimeModelBuilder(context, reader, Collections.<Class, Class> emptyMap(), null);
- builder.setErrorHandler(errorListener);
- for (Class c : classes)
- builder.getTypeInfo(new Ref<Type, Class>(c));
-
- RuntimeTypeInfoSet r = builder.link();
- errorListener.check();
- return r;
- }
-
- public void testReflection() throws Exception {
- org.jvnet.jaxb.reflection.model.runtime.RuntimeTypeInfoSet model = create(PurchaseOrderType.class);
- RuntimeClassInfo type = (RuntimeClassInfo)model.getTypeInfo(PurchaseOrderType.class);
- Assert.assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), type.getTypeName());
- type = (RuntimeClassInfo)model.getTypeInfo(USAddress.class);
- Assert.assertEquals(new QName("http://www.example.com/IPO", "USAddress"), type.getTypeName());
- RuntimePropertyInfo prop = type.getProperty("state");
- Assert.assertNotNull(prop);
- USAddress address = new ObjectFactory().createUSAddress();
- prop.getAccessor().set(address, USState.CA);
- Assert.assertEquals(USState.CA, address.getState());
- }
}
Copied: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java (from r709292, tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java?p2=tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java&p1=tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme&r1=709292&r2=709460&rev=709460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java Fri Oct 31 09:20:08 2008
@@ -18,10 +18,6 @@
*/
package org.apache.tuscany.sca.databinding.jaxb;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
import java.io.StringReader;
import javax.xml.namespace.QName;
@@ -30,9 +26,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;
-import org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;
-import org.apache.tuscany.sca.databinding.jaxb.Reader2JAXB;
+import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
@@ -86,21 +80,15 @@
DataType targetDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
- TransformationContext tContext = createMock(TransformationContext.class);
- expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
- expect(tContext.getTargetOperation()).andReturn(null).anyTimes();
- replay(tContext);
+ TransformationContext tContext = new TransformationContextImpl();
+ tContext.setTargetDataType(targetDataType);
Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
- TransformationContext tContext1 = createMock(TransformationContext.class);
- expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
- expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
- expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
- expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
- replay(tContext1);
+ TransformationContext tContext1 = new TransformationContextImpl();
+ tContext1.setSourceDataType(sourceDataType);
JAXB2Node t1 = new JAXB2Node();
Node node = t1.transform(object1, tContext1);
@@ -120,22 +108,15 @@
DataType targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
// targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
- TransformationContext tContext = createMock(TransformationContext.class);
- expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
- expect(tContext.getTargetOperation()).andReturn(null).anyTimes();
- replay(tContext);
-
+ TransformationContext tContext = new TransformationContextImpl();
+ tContext.setTargetDataType(targetDataType);
Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
DataType sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
// sourceDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
- TransformationContext tContext1 = createMock(TransformationContext.class);
- expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
- expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
- expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
- expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
- replay(tContext1);
+ TransformationContext tContext1 = new TransformationContextImpl();
+ tContext1.setSourceDataType(sourceDataType);
JAXB2Node t1 = new JAXB2Node();
Node node = t1.transform(object1, tContext1);
@@ -152,12 +133,9 @@
DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
- TransformationContext tContext1 = createMock(TransformationContext.class);
- expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
- expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
- expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
- expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
- replay(tContext1);
+ TransformationContext tContext1 = new TransformationContextImpl();
+ tContext1.setSourceDataType(sourceDataType);
+
JAXB2Node t1 = new JAXB2Node();
PurchaseOrderType po = new ObjectFactory().createPurchaseOrderType();
Propchange: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 31 09:20:08 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme:671193
+/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java.fixme:694855
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java?rev=709460&r1=709459&r2=709460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java Fri Oct 31 09:20:08 2008
@@ -20,30 +20,14 @@
import java.io.StringReader;
import java.io.StringWriter;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Collections;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
import junit.framework.TestCase;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.databinding.jaxb.JAXB2XMLStreamReader;
-
-import com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader;
-import com.sun.xml.bind.v2.model.core.Ref;
-import com.sun.xml.bind.v2.model.impl.RuntimeModelBuilder;
-import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo;
-import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo;
-import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet;
-import com.sun.xml.bind.v2.runtime.IllegalAnnotationsException;
-import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
/**
*
@@ -101,6 +85,7 @@
assertFalse(newBean instanceof MySubBean);
}
+ /*
public void testXMLStreamReader() throws Exception {
JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
@@ -130,6 +115,7 @@
// FIXME :To be implemented
// assertEquals(bean, newBean);
}
+ */
public void testString() throws Exception {
JAXBContext context = JAXBContext.newInstance(String.class);
@@ -216,35 +202,4 @@
assertTrue(e2.getValue() instanceof Exception);
}
*/
-
- private static RuntimeTypeInfoSet create(Class... classes) throws Exception {
- IllegalAnnotationsException.Builder errorListener = new IllegalAnnotationsException.Builder();
- RuntimeInlineAnnotationReader reader = new RuntimeInlineAnnotationReader();
- JAXBContextImpl context =
- new JAXBContextImpl(classes, null, Collections.<Class, Class> emptyMap(), null, false, reader, false, false);
- RuntimeModelBuilder builder =
- new RuntimeModelBuilder(context, reader, Collections.<Class, Class> emptyMap(), null);
- builder.setErrorHandler(errorListener);
- for (Class c : classes)
- builder.getTypeInfo(new Ref<Type, Class>(c));
-
- RuntimeTypeInfoSet r = builder.link();
- errorListener.check();
- return r;
- }
-
- public void testReflection() throws Exception {
- MyBean bean = new MyBean();
- RuntimeTypeInfoSet model = create(MyBean.class);
- RuntimeClassInfo clsInfo = (RuntimeClassInfo)model.getTypeInfo(MyBean.class);
- for (RuntimePropertyInfo p : clsInfo.getProperties()) {
- // System.out.print(p.getName());
- // System.out.println(" " + p.isCollection());
- if (p.getName().equals("notes")) {
- Collection c = (Collection)p.getAccessor().get(bean);
- c.add("123");
- }
- }
-
- }
}