You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/04/25 15:04:35 UTC

svn commit: r532345 - in /incubator/tuscany/java/sca/itest/databindings: common/src/main/resources/generate/ common/src/main/resources/xsd/ interop/ interop/src/main/resources/generate/ jaxbgen/ jaxbgen/src/main/resources/generate/ sdogen/ sdogen/src/m...

Author: slaws
Date: Wed Apr 25 06:04:32 2007
New Revision: 532345

URL: http://svn.apache.org/viewvc?view=rev&rev=532345
Log:
Added a few more types to the databinding tests while looking at the problem of the test locking up

Modified:
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
    incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
    incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
    incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml
    incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
    incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
    incubator/tuscany/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
    incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
    incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml
    incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm Wed Apr 25 06:04:32 2007
@@ -44,25 +44,21 @@
  */
 public class DatabindingTestCase extends TestCase  {
 
-    private static boolean initalised = false;
     private GreeterService greeterClient;
 
     /**
      * Runs before each test method
      */
     protected void setUp() throws Exception {
-        if (!initalised) {
-            SCARuntime.start("greeter.composite");
+        SCARuntime.start("greeter.composite");
             super.setUp();
-            initalised = true;
-        }
     }
 
     /**
      * Runs after each test method
      */
     protected void tearDown() {
-
+        SCARuntime.stop();
     }
 
     /**

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml Wed Apr 25 06:04:32 2007
@@ -20,5 +20,5 @@
 <tns:Annotation xmlns:tns="http://www.apache.org/tuscany/interop"
 	            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	            xsi:schemaLocation="http://www.apache.org/tuscany/interop Annotation.xsd">
-	<SimpleTypeWithName>SimpleTypeWithName</SimpleTypeWithName>
+	<SimpleTypeWithNameElement>SimpleTypeWithName</SimpleTypeWithNameElement>
 </tns:Annotation>

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd Wed Apr 25 06:04:32 2007
@@ -30,7 +30,7 @@
            
   <complexType name="AnnotationComplexType">
     <sequence>
-      <element name="SimpleTypeWithName" type="string"/>
+      <element name="SimpleTypeWithNameElement" type="string"/>
     </sequence>
   </complexType>  
                  

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd Wed Apr 25 06:04:32 2007
@@ -28,11 +28,12 @@
     <attribute name="Attribute" type="string"/>
   </complexType> 
                  
-  <element name="Attribute">
-    <complexType>
-      <sequence>
-        <element name="AttributeElement" type="tns:AttributeType"/>
-      </sequence>
-    </complexType>
-  </element>
+  <complexType name="AttributeComplexType">
+    <sequence>
+       <element name="AttributeElement" type="tns:AttributeType"/>
+    </sequence>
+  </complexType>
+  
+  <element name="Attribute" type="tns:AttributeComplexType"/>
+ 
 </schema>

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd Wed Apr 25 06:04:32 2007
@@ -24,7 +24,7 @@
           
   <attribute name="ReferencedAttribute" type="string"/>    
    
-  <complexType name="AttributeReferenceType">
+  <complexType name="AttributeReferenceComplexType">
     <sequence>
     </sequence> 
     <attribute ref="tns:ReferencedAttribute"/>   
@@ -33,7 +33,7 @@
   <element name="AttributeReference">
     <complexType>
       <sequence>
-        <element name="AttributeReferenceElement" type="tns:AttributeReferenceType"/>
+        <element name="AttributeReferenceElement" type="tns:AttributeReferenceComplexType"/>
       </sequence>
     </complexType>
   </element>

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd Wed Apr 25 06:04:32 2007
@@ -20,10 +20,13 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
         targetNamespace="http://www.apache.org/tuscany/interop" 
         xmlns:tns="http://www.apache.org/tuscany/interop">
-<!--        
-  <include schemaLocation="Annotation.xsd"/>
-  <include schemaLocation="Attribute.xsd"/>
-  <include schemaLocation="AttributeReference.xsd"/>
+        
+<!-- Causes SDO generator to crash
+  <include schemaLocation="../xsd/Annotation.xsd"/>
+-->
+  <include schemaLocation="../xsd/Attribute.xsd"/>
+  <include schemaLocation="../xsd/AttributeReference.xsd"/>
+<!-- 
   <include schemaLocation="AttributeWithDefaultValue.xsd"/>
   <include schemaLocation="AttributeWithFixedValue.xsd"/>
   <include schemaLocation="AttributeWithSDOAliasName.xsd"/>
@@ -113,12 +116,14 @@
   <include schemaLocation="GlobalElementSimpleType.xsd"/>
   <include schemaLocation="Import.xsd"/>
   <include schemaLocation="ImportedSchema.xsd"/>
- -->
+-->
   <include schemaLocation="../xsd/Include.xsd"/>
 <!--
   <include schemaLocation="Notation.xsd"/>
   <include schemaLocation="SDOJavaPackage.xsd"/>
-  <include schemaLocation="SimpleTypeWithAbstract.xsd"/>
+-->
+  <include schemaLocation="../xsd/SimpleTypeWithAbstract.xsd"/>
+<!-- 
   <include schemaLocation="SimpleTypeWithExtendedInstanceClass.xsd"/>
   <include schemaLocation="SimpleTypeWithInstanceClass.xsd"/>
   <include schemaLocation="SimpleTypeWithList.xsd"/>

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd Wed Apr 25 06:04:32 2007
@@ -21,7 +21,8 @@
         targetNamespace="http://www.apache.org/tuscany/interop" 
         xmlns:tns="http://www.apache.org/tuscany/interop">      
         
-  <simpleType name="SimpleTypeWithAbstractType" abstract="true">
+  <!--simpleType name="SimpleTypeWithAbstractType" abstract="true"-->
+  <simpleType name="SimpleTypeWithAbstractType" >
     <restriction base="string"/>
   </simpleType>
 
@@ -29,12 +30,11 @@
     <restriction base="tns:SimpleTypeWithAbstractType"/>
   </simpleType>
                  
-
   <complexType name="SimpleTypeWithAbstractComplexType">
     <sequence>
       <element name="SimpleTypeWithAbstractExtensionElement" type="tns:SimpleTypeWithAbstractExtensionType"/>  
     </sequence>
   </complexType>
 
-  <element name="SimpleTypeWithAbstract" type="SimpleTypeWithAbstractComplexType">
+  <element name="SimpleTypeWithAbstract" type="tns:SimpleTypeWithAbstractComplexType"/>
 </schema>

Modified: incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd (original)
+++ incubator/tuscany/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd Wed Apr 25 06:04:32 2007
@@ -33,5 +33,5 @@
     </sequence>
   </complexType>
 
-  <element name="SimpleTypeWithSDOName" type="SimpleTypeWithSDONameComplexType">
+  <element name="SimpleTypeWithSDOName" type="tns:SimpleTypeWithSDONameComplexType"/>
 </schema>

Modified: incubator/tuscany/java/sca/itest/databindings/interop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/pom.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/pom.xml Wed Apr 25 06:04:32 2007
@@ -60,13 +60,13 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
             <version>${pom.version}</version>
-            <scope>runtime</scope>
+            <scope>compile</scope>
         </dependency>     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
             <version>${pom.version}</version>
-            <scope>runtime</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -132,7 +132,13 @@
             <artifactId>tuscany-interface-java-runtime</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
-        </dependency>         
+        </dependency>  
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>                 
     </dependencies>
 
     <build>

Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml Wed Apr 25 06:04:32 2007
@@ -67,7 +67,66 @@
     <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
     <Factory>InteropFactory</Factory>
     <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>       
+    <Prefix>i</Prefix> 
+    <!-- Type>
+      <TypeName>AnnotationComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createAnnotationComplexType();
+        param.setSimpleTypeWithNameElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithNameElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
+      </ResultComparison>      
+    </Type-->  
+    <Type>
+      <TypeName>AttributeComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
+        attrib.setAttribute("SomeText");
+        param = factory.createAttributeComplexType();
+        param.setAttributeElement(attrib);
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.getAttributeElement().setAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
+      </ResultComparison>      
+    </Type> 
+    <Type>
+      <TypeName>AttributeReferenceComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createAttributeReferenceComplexType();
+        
+        param.setReferencedAttribute("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setReferencedAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
+      </ResultComparison>      
+    </Type>          
+    <Type>
+      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createSimpleTypeWithAbstractComplexType();
+        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
+      </ResultComparison>      
+    </Type>           
     <Type>
       <TypeName>SimpleTypeWithNameComplexType</TypeName>
       <CreateTypeCode>

Modified: incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm Wed Apr 25 06:04:32 2007
@@ -20,7 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
 	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
 	xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-    name="SDOGreeterService">
+    name="InteropGreeterService">
 
     <!-- SDO factory classes -->  
     #foreach( $file in $fileList )

Modified: incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/jaxbgen/pom.xml Wed Apr 25 06:04:32 2007
@@ -103,7 +103,13 @@
             <artifactId>tuscany-interface-java-runtime</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
-        </dependency>          
+        </dependency>        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>           
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>

Modified: incubator/tuscany/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml Wed Apr 25 06:04:32 2007
@@ -80,7 +80,66 @@
     <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>  
     <Factory>ObjectFactory</Factory>
     <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>       
+    <Prefix>i</Prefix>   
+    <!-- Type>
+      <TypeName>AnnotationComplexType</TypeName>
+      <CreateTypeCode>
+        ObjectFactory factory = new ObjectFactory();
+        param = factory.createAnnotationComplexType();
+        param.setSimpleTypeWithNameElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithNameElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
+      </ResultComparison>      
+    </Type-->  
+    <Type>
+      <TypeName>AttributeComplexType</TypeName>
+      <CreateTypeCode>
+        ObjectFactory factory = new ObjectFactory();
+        org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType();
+        attrib.setAttribute("SomeText");
+        param = factory.createAttributeComplexType();
+        param.setAttributeElement(attrib);
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.getAttributeElement().setAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
+      </ResultComparison>      
+    </Type> 
+    <Type>
+      <TypeName>AttributeReferenceComplexType</TypeName>
+      <CreateTypeCode>
+        ObjectFactory factory = new ObjectFactory();
+        param = factory.createAttributeReferenceComplexType();
+        
+        param.setReferencedAttribute("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setReferencedAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
+      </ResultComparison>      
+    </Type>     
+    <Type>
+      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
+      <CreateTypeCode>
+        ObjectFactory factory = new ObjectFactory();
+        param = factory.createSimpleTypeWithAbstractComplexType();
+        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
+      </ResultComparison>      
+    </Type>         
     <Type>
       <TypeName>SimpleTypeWithNameComplexType</TypeName>
       <CreateTypeCode>

Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml Wed Apr 25 06:04:32 2007
@@ -110,6 +110,12 @@
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency> 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
     </dependencies>
 
     <build>

Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml Wed Apr 25 06:04:32 2007
@@ -81,7 +81,66 @@
     <JavaPackage>org.apache.tuscany.interop</JavaPackage>  
     <Factory>InteropFactory</Factory>
     <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>       
+    <Prefix>i</Prefix>
+    <!-- Type>
+      <TypeName>AnnotationComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createAnnotationComplexType();
+        param.setSimpleTypeWithNameElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithNameElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
+      </ResultComparison>      
+    </Type-->  
+    <Type>
+      <TypeName>AttributeComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
+        attrib.setAttribute("SomeText");
+        param = factory.createAttributeComplexType();
+        param.setAttributeElement(attrib);
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.getAttributeElement().setAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
+      </ResultComparison>      
+    </Type> 
+    <Type>
+      <TypeName>AttributeReferenceComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createAttributeReferenceComplexType();
+        
+        param.setReferencedAttribute("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setReferencedAttribute("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
+      </ResultComparison>      
+    </Type>      
+    <Type>
+      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
+      <CreateTypeCode>
+        InteropFactory factory = InteropFactory.INSTANCE;
+        param = factory.createSimpleTypeWithAbstractComplexType();
+        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
+       </CreateTypeCode>
+      <ModifyTypeCode>
+        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
+      </ModifyTypeCode>
+      <ResultComparison>
+        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
+      </ResultComparison>      
+    </Type>            
     <Type>
       <TypeName>SimpleTypeWithNameComplexType</TypeName>
       <CreateTypeCode>

Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm?view=diff&rev=532345&r1=532344&r2=532345
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm Wed Apr 25 06:04:32 2007
@@ -110,6 +110,12 @@
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency> 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
     </dependencies>
 
     <build>



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