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 2006/08/17 07:42:34 UTC

svn commit: r432153 - in /incubator/tuscany/java/sca/databinding/databinding-test: ./ src/test/java/org/apache/tuscany/databinding/ src/test/java/org/apache/tuscany/databinding/sample/ src/test/resources/META-INF/ src/test/resources/META-INF/sca/

Author: rfeng
Date: Wed Aug 16 22:42:34 2006
New Revision: 432153

URL: http://svn.apache.org/viewvc?rev=432153&view=rev
Log:
Applied my own patch sent before vacation and some other SDO binding adjustments for Axis2 integration

Added:
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java   (with props)
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java   (with props)
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java   (with props)
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java   (with props)
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl
Modified:
    incubator/tuscany/java/sca/databinding/databinding-test/pom.xml
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
    incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java

Modified: incubator/tuscany/java/sca/databinding/databinding-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/pom.xml?rev=432153&r1=432152&r2=432153&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/pom.xml Wed Aug 16 22:42:34 2006
@@ -27,7 +27,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>databinding-test</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
     <name>Data Binding Integration Test</name>
 	<description>Data Binding Integration Test</description>
 
@@ -68,13 +68,25 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
             <version>2.0</version>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
+            <artifactId>test</artifactId>
+            <version>${sca.version}</version>
+            <scope>test</scope>
+        </dependency>    
 	</dependencies>
-
+    
 	<repositories>
 		<repository>
 			<snapshots>
@@ -103,8 +115,6 @@
 			</testResource>
 		</testResources>
         
-        <testSourceDirectory>target/jaxb-source</testSourceDirectory>
-
 		<plugins>
 			<plugin>
 				<groupId>org.apache.tuscany</groupId>
@@ -112,7 +122,7 @@
 				<executions>
 					<execution>
 						<id>generate-sdo</id>
-						<phase>generate-test-sources</phase>
+						<phase>generate-sources</phase>
 						<configuration>
 							<schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
 							<javaPackage>com.example.ipo.sdo</javaPackage>
@@ -126,35 +136,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-
-			<!-- 
-				<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>xmlbeans-maven-plugin</artifactId>
-				<executions>
-				<execution>
-				<goals>
-				<goal>xmlbeans</goal>
-				</goals>
-				</execution>
-				</executions>
-				<inherited>true</inherited>
-				<configuration>
-				<schemaDirectory>
-				${basedir}/src/test/resources
-				</schemaDirectory>
-				<sourceGenerationDirectory>
-				${project.build.directory}/xmlbeans-source
-				</sourceGenerationDirectory>
-				<xmlConfigs>
-				<xmlConfig implementation="java.io.File">
-				${basedir}/src/test/resources/xmlbeans/ipo.xsdconfig
-				</xmlConfig>
-				</xmlConfigs>
-				</configuration>
-				</plugin>
-			-->
 
 			<plugin>
 				<groupId>com.sun.tools.xjc.maven2</groupId>

Modified: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java?rev=432153&r1=432152&r2=432153&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java Wed Aug 16 22:42:34 2006
@@ -18,6 +18,10 @@
  */
 package org.apache.tuscany.databinding;
 
+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.stream.XMLStreamReader;
@@ -26,6 +30,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.databinding.jaxb.JAXB2Node;
+import org.apache.tuscany.databinding.jaxb.JAXBContextHelper;
 import org.apache.tuscany.databinding.jaxb.XMLStreamReader2JAXB;
 import org.apache.tuscany.databinding.xmlbeans.Node2XmlObject;
 import org.apache.tuscany.databinding.xmlbeans.XmlObject2XMLStreamReader;
@@ -34,15 +39,15 @@
 
 public class JAXBTestCase 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>";
+            + "  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>";
 
     private String contextPath = "com.example.ipo.jaxb";
 
@@ -50,7 +55,7 @@
         super.setUp();
     }
 
-    public void testXmlObject() throws Exception {
+    public void testTransform() throws Exception {
         // URL/Stream/Reader to XmlObject
         XmlObject object = XmlObject.Factory.parse(new StringReader(IPO_XML));
 
@@ -58,16 +63,32 @@
         XmlObject2XMLStreamReader t1 = new XmlObject2XMLStreamReader();
         XMLStreamReader reader = t1.transform(object, null);
 
+        DataBinding targetContext = createMock(DataBinding.class);
+        expect(targetContext.getAttribute(JAXBContextHelper.JAXB_CONTEXT_PATH)).andReturn(contextPath).anyTimes();
+        replay(targetContext);
+
+        TransformationContext tContext = createMock(TransformationContext.class);
+        expect(tContext.getTargetDataBinding()).andReturn(targetContext).anyTimes();
+        replay(tContext);
+
         // XMLStreamReader to JAXB
-        XMLStreamReader2JAXB t2 = new XMLStreamReader2JAXB(contextPath);
-        Object object2 = t2.transform(reader, null);
+        XMLStreamReader2JAXB t2 = new XMLStreamReader2JAXB();
+        Object object2 = t2.transform(reader, tContext);
 
-        JAXB2Node t3 = new JAXB2Node(contextPath);
-        Node node = t3.transform(object2, null);
+        DataBinding sourceContext = createMock(DataBinding.class);
+        expect(sourceContext.getAttribute(JAXBContextHelper.JAXB_CONTEXT_PATH)).andReturn(contextPath).anyTimes();
+        replay(sourceContext);
+
+        TransformationContext tContext1 = createMock(TransformationContext.class);
+        expect(tContext1.getSourceDataBinding()).andReturn(sourceContext).anyTimes();
+        replay(tContext1);
+
+        JAXB2Node t3 = new JAXB2Node();
+        Node node = t3.transform(object2, tContext1);
 
         Node2XmlObject t4 = new Node2XmlObject();
         XmlObject object3 = t4.transform(node, null);
-        
+
         Assert.assertNotNull(object3);
 
     }

Modified: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java?rev=432153&r1=432152&r2=432153&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java Wed Aug 16 22:42:34 2006
@@ -18,6 +18,10 @@
  */
 package org.apache.tuscany.databinding;
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
 import java.io.StringReader;
 import java.net.URL;
 import java.util.ArrayList;
@@ -32,6 +36,7 @@
 import org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement;
 import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
 import org.apache.tuscany.databinding.jaxb.JAXB2Node;
+import org.apache.tuscany.databinding.jaxb.JAXBContextHelper;
 import org.apache.tuscany.databinding.jaxb.Node2JAXB;
 import org.apache.tuscany.databinding.jaxb.XMLStreamReader2JAXB;
 import org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader;
@@ -56,15 +61,15 @@
 
 public class TransformationTestCase 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>";
+            + "  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>";
 
     private TransformerRegistry registry;
 
@@ -77,9 +82,9 @@
         List<Transformer> transformers = new ArrayList<Transformer>();
 
         // Adding JAXB transformers
-        transformers.add(new JAXB2Node(contextPath));
-        transformers.add(new Node2JAXB(contextPath));
-        transformers.add(new XMLStreamReader2JAXB(contextPath));
+        transformers.add(new JAXB2Node());
+        transformers.add(new Node2JAXB());
+        transformers.add(new XMLStreamReader2JAXB());
 
         // Adding XMLBeans transformers
         transformers.add(new XmlObject2Node());
@@ -124,12 +129,14 @@
         // URL/Stream/Reader to XmlObject
         XmlObject object = XmlObject.Factory.parse(new StringReader(IPO_XML));
 
-        List<Transformer> path = registry.getTransformerChain(XmlObject.class, DataObject.class);
+        List<Transformer> path = registry.getTransformerChain(XmlObject.class.getName(), DataObject.class.getName());
         System.out.println("Path: " + path);
 
+        TransformationContext tContext = createTransformationContext();
+
         Object result = object;
         for (Transformer transformer : path) {
-            result = transformer.transform(result, null);
+            result = ((PullTransformer) transformer).transform(result, tContext);
         }
         System.out.println("Result: " + result);
         Assert.assertNotNull(result);
@@ -146,12 +153,14 @@
         // URL/Stream/Reader to XmlObject
         XMLDocument object = XMLHelper.INSTANCE.load(xmlFile.openStream());
 
-        List<Transformer> path = registry.getTransformerChain(XMLDocument.class, Node.class);
+        List<Transformer> path = registry.getTransformerChain(XMLDocument.class.getName(), Node.class.getName());
         System.out.println("Path: " + path);
 
+        TransformationContext tContext = createTransformationContext();
+
         Object result = object;
         for (Transformer transformer : path) {
-            result = transformer.transform(result, null);
+            result = ((PullTransformer) transformer).transform(result, tContext);
         }
         System.out.println("Result: " + result);
         Assert.assertNotNull(result);
@@ -168,17 +177,36 @@
         // URL/Stream/Reader to XmlObject
         XMLDocument object = XMLHelper.INSTANCE.load(xmlFile.openStream());
 
-        List<Transformer> path = registry.getTransformerChain(XMLDocument.class, Object.class);
+        List<Transformer> path = registry.getTransformerChain(XMLDocument.class.getName(), Object.class.getName());
         System.out.println("Path: " + path);
 
+        TransformationContext tContext = createTransformationContext();
+
         Object result = object;
         for (Transformer transformer : path) {
-            result = transformer.transform(result, null);
+            result = ((PullTransformer) transformer).transform(result, tContext);
         }
         System.out.println("Result: " + result);
         Assert.assertNotNull(result);
         Assert.assertTrue(result instanceof Object);
 
+    }
+
+    private TransformationContext createTransformationContext() {
+        DataBinding targetContext = createMock(DataBinding.class);
+        expect(targetContext.getAttribute(JAXBContextHelper.JAXB_CONTEXT_PATH)).andReturn(contextPath).anyTimes();
+        replay(targetContext);
+
+        TransformationContext tContext = createMock(TransformationContext.class);
+        expect(tContext.getTargetDataBinding()).andReturn(targetContext).anyTimes();
+
+        DataBinding sourceContext = createMock(DataBinding.class);
+        expect(sourceContext.getAttribute(JAXBContextHelper.JAXB_CONTEXT_PATH)).andReturn(contextPath).anyTimes();
+        replay(sourceContext);
+
+        expect(tContext.getSourceDataBinding()).andReturn(sourceContext).anyTimes();
+        replay(tContext);
+        return tContext;
     }
 
     protected void tearDown() throws Exception {

Modified: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java?rev=432153&r1=432152&r2=432153&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java Wed Aug 16 22:42:34 2006
@@ -48,7 +48,7 @@
         super.setUp();
     }
 
-    public void testXmlObject() throws Exception {
+    public void testTransform() throws Exception {
         XmlObject object = XmlObject.Factory.parse(new StringReader(IPO_XML));
 
         // XmlObject to XMLStreamReader

Added: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java?rev=432153&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java (added)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java Wed Aug 16 22:42:34 2006
@@ -0,0 +1,25 @@
+/**
+ *
+ * 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.sample;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface Client {
+    void call(String msg);
+}

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java?rev=432153&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java (added)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java Wed Aug 16 22:42:34 2006
@@ -0,0 +1,39 @@
+/**
+ *
+ * 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.sample;
+
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClientImpl implements Client {
+
+    private Echo echoReference;
+
+    @Constructor
+    public ClientImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
+        this.echoReference = echoReference;
+    }
+
+    public void call(String msg) {
+        String ret = echoReference.echo(msg);
+        System.out.println("Returned message: "+ ret);
+    }
+}

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java?rev=432153&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java (added)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java Wed Aug 16 22:42:34 2006
@@ -0,0 +1,44 @@
+/**
+ *
+ * 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.sample;
+
+import org.apache.tuscany.test.SCATestCase;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DataBindingBootStrapTest extends SCATestCase {
+
+    private Client client;
+    private Client clientService;
+
+    public void testDataBindingBootstrap() {
+        client.call("foo");
+        clientService.call("foo");
+    }
+
+    protected void setUp() throws Exception {
+        addExtension("databinding", getClass().getClassLoader().getResource("META-INF/sca/databinding.scdl"));
+        super.setUp();
+        CompositeContext context = CurrentCompositeContext.getContext();
+        client = context.locateService(Client.class, "Client");
+        clientService = context.locateService(Client.class, "ClientService");
+    }
+}

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java?rev=432153&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java (added)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java Wed Aug 16 22:42:34 2006
@@ -0,0 +1,25 @@
+/**
+ *
+ * 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.sample;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface Echo {
+    String echo(String msg);
+}

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl?rev=432153&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl (added)
+++ incubator/tuscany/java/sca/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl Wed Aug 16 22:42:34 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2005 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:db="http://tuscany.apache.org/xmlns/databinding/1.0"
+    name="org.apache.tuscany.databinding.sample">
+
+    <service name="ClientService">
+        <interface.java class="org.apache.tuscany.databinding.sample.Client" />
+        <reference>Client</reference>
+        <binding.sca/>
+        <db:databinding name="sdo"/>
+    </service>
+
+    <component name="Client">
+        <implementation.java class="org.apache.tuscany.databinding.sample.ClientImpl" />
+        <reference name="echoReference">EchoReference</reference>
+        <db:databinding name="jaxb"/>
+    </component>
+
+    <reference name="EchoReference">
+        <interface.java interface="org.apache.tuscany.databinding.sample.Echo" />
+        <binding.sca/>
+    </reference>
+
+</composite>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org