Author: rfeng
Date: Mon Sep 25 15:00:42 2006
New Revision: 449832
URL: http://svn.apache.org/viewvc?view=rev&rev=449832
Log:
Refactor DOMHelper into extension so that it can be shared by other databindings
Add a test case for DataBindingWirePostProcessor
Added:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/spi/databinding/extension/DOMHelper.java
- copied, changed from r449784,
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMHelper.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
(with props)
Removed:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMHelper.java
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMWrapperHandler.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/Object2Node.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOM.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/String2Node.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/DataPipeTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/Node2StringTestCase.java
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
Mon Sep 25 15:00:42 2006
@@ -18,10 +18,10 @@
*/
package org.apache.tuscany.databinding.castor;
-import org.apache.tuscany.core.databinding.xml.DOMHelper;
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.extension.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.exolab.castor.xml.Marshaller;
import org.w3c.dom.Document;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMWrapperHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMWrapperHandler.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMWrapperHandler.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMWrapperHandler.java
Mon Sep 25 15:00:42 2006
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformationException;
import org.apache.tuscany.spi.databinding.WrapperHandler;
+import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.idl.ElementInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/Object2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/Object2Node.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/Object2Node.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/Object2Node.java
Mon Sep 25 15:00:42 2006
@@ -24,6 +24,7 @@
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.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.Java2SimpleTypeTransformer;
import org.apache.tuscany.spi.idl.ElementInfo;
import org.osoa.sca.annotations.Service;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOM.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOM.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOM.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/SAX2DOM.java
Mon Sep 25 15:00:42 2006
@@ -22,6 +22,7 @@
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/String2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/String2Node.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/String2Node.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/String2Node.java
Mon Sep 25 15:00:42 2006
@@ -26,6 +26,7 @@
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.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.osoa.sca.annotations.Service;
import org.w3c.dom.Node;
Copied:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/spi/databinding/extension/DOMHelper.java
(from r449784,
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMHelper.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/spi/databinding/extension/DOMHelper.java?view=diff&rev=449832&p1=incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMHelper.java&r1=449784&p2=incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/spi/databinding/extension/DOMHelper.java&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/core/databinding/xml/DOMHelper.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/spi/databinding/extension/DOMHelper.java
Mon Sep 25 15:00:42 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tuscany.core.databinding.xml;
+package org.apache.tuscany.spi.databinding.extension;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
Mon Sep 25 15:00:42 2006
@@ -31,10 +31,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.core.databinding.impl.DataBindingInteceptor;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
@@ -121,5 +119,13 @@
private static class Foo {
private String bar;
+
+ public String getBar() {
+ return bar;
+ }
+
+ public void setBar(String bar) {
+ this.bar = bar;
+ }
}
}
Added:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java?view=auto&rev=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
(added)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
Mon Sep 25 15:00:42 2006
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.core.databinding.impl;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.databinding.Mediator;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.OutboundInvocationChain;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.easymock.EasyMock;
+import org.w3c.dom.Node;
+
+/**
+ *
+ */
+public class DataBindingWirePostProcessorTestCase extends TestCase {
+ private DataBindingWirePostProcessor processor;
+
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ Mediator mediator = new MediatorImpl();
+ this.processor = new DataBindingWirePostProcessor(mediator);
+ }
+
+ public void testProcess1() {
+ InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
+ OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
+
+ Component component = EasyMock.createMock(Component.class);
+ CompositeComponent composite =
EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(component.getParent()).andReturn(composite);
+ EasyMock.expect(inboundWire.getContainer()).andReturn(component);
+ EasyMock.expect(outboundWire.getContainer()).andReturn(component);
+
+ Map<Operation<?>, OutboundInvocationChain> outboundChains =
+ new HashMap<Operation<?>, OutboundInvocationChain>();
+ DataType<Type> type1 = new DataType<Type>(String.class, String.class);
+ List<DataType<Type>> types = new ArrayList<DataType<Type>>();
+ types.add(type1);
+ DataType<List<DataType<Type>>> inputType1 = new
DataType<List<DataType<Type>>>(Object[].class, types);
+ DataType<Type> outputType1 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op1 = new Operation<Type>("test", inputType1,
outputType1, null);
+ ServiceContract<Type> outboundContract = new JavaServiceContract(null);
+ outboundContract.setDataBinding(String.class.getName());
+ op1.setServiceContract(outboundContract);
+
+ OutboundInvocationChain outboundChain =
EasyMock.createMock(OutboundInvocationChain.class);
+ outboundChains.put(op1, outboundChain);
+
EasyMock.expect(outboundWire.getInvocationChains()).andReturn(outboundChains);
+ outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
EasyMock.anyObject());
+
+ Map<Operation<?>, InboundInvocationChain> inboundChains = new
HashMap<Operation<?>, InboundInvocationChain>();
+ DataType<Type> type2 = new DataType<Type>(Node.class, Node.class);
+ List<DataType<Type>> types2 = new ArrayList<DataType<Type>>();
+ types2.add(type2);
+ DataType<List<DataType<Type>>> inputType2 = new
DataType<List<DataType<Type>>>(Object[].class, types2);
+ DataType<Type> outputType2 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op2 = new Operation<Type>("test", inputType2,
outputType2, null);
+ ServiceContract<Type> inboundContract = new JavaServiceContract(null);
+ inboundContract.setDataBinding(Node.class.getName());
+ op2.setServiceContract(inboundContract);
+
+ InboundInvocationChain inboundChain =
EasyMock.createMock(InboundInvocationChain.class);
+ inboundChains.put(op2, inboundChain);
+
EasyMock.expect(inboundWire.getInvocationChains()).andReturn(inboundChains);
+
+ EasyMock.replay(composite, component, inboundWire, outboundWire,
inboundChain, outboundChain);
+
+ processor.process(outboundWire, inboundWire);
+ }
+
+ public void testProcess2() {
+ InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
+ OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
+
+ Reference reference = EasyMock.createMock(Reference.class);
+ CompositeComponent composite =
EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(reference.getParent()).andReturn(composite);
+
EasyMock.expect(inboundWire.getContainer()).andReturn(reference).anyTimes();
+
EasyMock.expect(outboundWire.getContainer()).andReturn(reference).anyTimes();
+
+ Map<Operation<?>, OutboundInvocationChain> outboundChains =
+ new HashMap<Operation<?>, OutboundInvocationChain>();
+ DataType<Type> type1 = new DataType<Type>(String.class, String.class);
+ List<DataType<Type>> types = new ArrayList<DataType<Type>>();
+ types.add(type1);
+ DataType<List<DataType<Type>>> inputType1 = new
DataType<List<DataType<Type>>>(Object[].class, types);
+ DataType<Type> outputType1 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op1 = new Operation<Type>("test", inputType1,
outputType1, null);
+ ServiceContract<Type> outboundContract = new JavaServiceContract(null);
+ outboundContract.setDataBinding(String.class.getName());
+ op1.setServiceContract(outboundContract);
+
+ OutboundInvocationChain outboundChain =
EasyMock.createMock(OutboundInvocationChain.class);
+ outboundChains.put(op1, outboundChain);
+
EasyMock.expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
+ outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
EasyMock.anyObject());
+
+ Map<Operation<?>, InboundInvocationChain> inboundChains = new
HashMap<Operation<?>, InboundInvocationChain>();
+ DataType<Type> type2 = new DataType<Type>(Node.class, Node.class);
+ List<DataType<Type>> types2 = new ArrayList<DataType<Type>>();
+ types2.add(type2);
+ DataType<List<DataType<Type>>> inputType2 = new
DataType<List<DataType<Type>>>(Object[].class, types2);
+ DataType<Type> outputType2 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op2 = new Operation<Type>("test", inputType2,
outputType2, null);
+ ServiceContract<Type> inboundContract = new JavaServiceContract(null);
+ inboundContract.setDataBinding(Node.class.getName());
+ op2.setServiceContract(inboundContract);
+
+ InboundInvocationChain inboundChain =
EasyMock.createMock(InboundInvocationChain.class);
+ inboundChains.put(op2, inboundChain);
+
EasyMock.expect(inboundWire.getInvocationChains()).andReturn(inboundChains).anyTimes();
+ // inboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
EasyMock.anyObject());
+
+ EasyMock.replay(composite, reference, inboundWire, outboundWire,
inboundChain, outboundChain);
+
+ processor.process(inboundWire, outboundWire);
+ }
+
+ public void testProcess3() {
+ InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
+ OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
+
+ Service service = EasyMock.createMock(Service.class);
+ CompositeComponent composite =
EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(service.getParent()).andReturn(composite);
+
EasyMock.expect(inboundWire.getContainer()).andReturn(service).anyTimes();
+
EasyMock.expect(outboundWire.getContainer()).andReturn(service).anyTimes();
+
+ Map<Operation<?>, OutboundInvocationChain> outboundChains =
+ new HashMap<Operation<?>, OutboundInvocationChain>();
+ DataType<Type> type1 = new DataType<Type>(String.class, String.class);
+ List<DataType<Type>> types = new ArrayList<DataType<Type>>();
+ types.add(type1);
+ DataType<List<DataType<Type>>> inputType1 = new
DataType<List<DataType<Type>>>(Object[].class, types);
+ DataType<Type> outputType1 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op1 = new Operation<Type>("test", inputType1,
outputType1, null);
+ ServiceContract<Type> outboundContract = new JavaServiceContract(null);
+ outboundContract.setDataBinding(String.class.getName());
+ op1.setServiceContract(outboundContract);
+
+ OutboundInvocationChain outboundChain =
EasyMock.createMock(OutboundInvocationChain.class);
+ outboundChains.put(op1, outboundChain);
+
EasyMock.expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
+ // outboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
EasyMock.anyObject());
+
+ Map<Operation<?>, InboundInvocationChain> inboundChains = new
HashMap<Operation<?>, InboundInvocationChain>();
+ DataType<Type> type2 = new DataType<Type>(Node.class, Node.class);
+ List<DataType<Type>> types2 = new ArrayList<DataType<Type>>();
+ types2.add(type2);
+ DataType<List<DataType<Type>>> inputType2 = new
DataType<List<DataType<Type>>>(Object[].class, types2);
+ DataType<Type> outputType2 = new DataType<Type>(String.class,
String.class);
+ Operation<Type> op2 = new Operation<Type>("test", inputType2,
outputType2, null);
+ ServiceContract<Type> inboundContract = new JavaServiceContract(null);
+ inboundContract.setDataBinding(Node.class.getName());
+ op2.setServiceContract(inboundContract);
+
+ InboundInvocationChain inboundChain =
EasyMock.createMock(InboundInvocationChain.class);
+ inboundChains.put(op2, inboundChain);
+
EasyMock.expect(inboundWire.getInvocationChains()).andReturn(inboundChains).anyTimes();
+ inboundChain.addInterceptor(EasyMock.anyInt(), (Interceptor)
EasyMock.anyObject());
+
+ EasyMock.replay(composite, service, inboundWire, outboundWire,
inboundChain, outboundChain);
+
+ processor.process(inboundWire, outboundWire);
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/impl/IDLTransformerTestCase.java
Mon Sep 25 15:00:42 2006
@@ -36,7 +36,6 @@
import org.apache.tuscany.core.databinding.impl.TransformationContextImpl;
import org.apache.tuscany.core.databinding.impl.TransformerRegistryImpl;
import org.apache.tuscany.core.databinding.xml.DOMDataBinding;
-import org.apache.tuscany.core.databinding.xml.DOMHelper;
import org.apache.tuscany.core.databinding.xml.Node2Object;
import org.apache.tuscany.core.databinding.xml.Node2String;
import org.apache.tuscany.core.databinding.xml.Object2Node;
@@ -46,6 +45,7 @@
import org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.model.DataType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/DataPipeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/DataPipeTestCase.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/DataPipeTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/DataPipeTestCase.java
Mon Sep 25 15:00:42 2006
@@ -29,10 +29,10 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.databinding.impl.PipedTransformer;
-import org.apache.tuscany.core.databinding.xml.DOMHelper;
import org.apache.tuscany.core.databinding.xml.Node2Writer;
import org.apache.tuscany.core.databinding.xml.StreamDataPipe;
import org.apache.tuscany.core.databinding.xml.Writer2ReaderDataPipe;
+import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/Node2StringTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/Node2StringTestCase.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/Node2StringTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/core/databinding/xml/Node2StringTestCase.java
Mon Sep 25 15:00:42 2006
@@ -20,8 +20,8 @@
import junit.framework.TestCase;
-import org.apache.tuscany.core.databinding.xml.DOMHelper;
import org.apache.tuscany.core.databinding.xml.Node2String;
+import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java?view=diff&rev=449832&r1=449831&r2=449832
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
Mon Sep 25 15:00:42 2006
@@ -21,10 +21,10 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import org.apache.tuscany.core.databinding.xml.DOMHelper;
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.extension.DOMHelper;
import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]