cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r685960 - in /cxf/trunk: parent/ tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/ tools/corba/src/test/resources/idl/ tools/corba/src/test/resources/wsdl/
Date Thu, 14 Aug 2008 17:00:00 GMT
Author: dkulp
Date: Thu Aug 14 09:59:59 2008
New Revision: 685960

URL: http://svn.apache.org/viewvc?rev=685960&view=rev
Log:
[CXF-1748] Patch from Matteo applied. 
Also update woodstox version and allow parameterizing the vmargs used for forked surefire tests

Added:
    cxf/trunk/tools/corba/src/test/resources/idl/Struct_multiple_dcl.idl
    cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl   (with props)
    cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd   (with props)
Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
    cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=685960&r1=685959&r2=685960&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Aug 14 09:59:59 2008
@@ -36,6 +36,7 @@
         <surefire.fork.mode>once</surefire.fork.mode>
         <surefire.format>brief</surefire.format>
         <surefire.usefile>false</surefire.usefile>
+	<surefire.fork.vmargs>-ea</surefire.fork.vmargs>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
         <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
         <saaj.impl.groupId>com.sun.xml.messaging.saaj</saaj.impl.groupId>
@@ -256,7 +257,7 @@
                         <useFile>${surefire.usefile}</useFile>
                         <forkMode>${surefire.fork.mode}</forkMode>
                         <childDelegation>false</childDelegation>
-                        <argLine>-ea</argLine>
+                        <argLine>${surefire.fork.vmargs}</argLine>
                         <systemProperties>
                             <property>
                                 <name>java.awt.headless</name>
@@ -278,6 +279,10 @@
                                 <name>spring.validation.mode</name>
                                 <value>${spring.validation.mode}</value>
                             </property>
+			    <property>
+			        <name>surefire.fork.vmargs</name>
+				<value>${surefire.fork.vmargs}</value>
+		            </property>
                             <property>
                                 <!-- If we close the port after a client in the same JVM has oppened a keep-alive
                                 connection, on some Linux's, the socket remains consumed until
@@ -538,7 +543,7 @@
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
-                <version>3.2.4</version>
+                <version>3.2.6</version>
                 <exclusions>
                     <exclusion>
                         <groupId>stax</groupId>

Modified: cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java?rev=685960&r1=685959&r2=685960&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java (original)
+++ cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java Thu Aug 14 09:59:59 2008
@@ -98,6 +98,11 @@
     }
     
     @Test
+    public void testStructMultipleDclGeneration() throws Exception {
+        testWSDLGeneration("/idl/Struct_multiple_dcl.idl", "/idl/expected_Struct_multiple_dcl.wsdl");
+    }
+    
+    @Test
     public void testScopedStructGeneration() throws Exception {
         testWSDLGeneration("/idl/scopedStruct.idl", "/idl/expected_scopedStruct.wsdl");
     }

Modified: cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java?rev=685960&r1=685959&r2=685960&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java (original)
+++ cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java Thu Aug 14 09:59:59 2008
@@ -703,5 +703,79 @@
         }
     }    
     
+    @Test
+    public void testRestrictedStruct() throws Exception {
         
+        try {
+            URI fileName = getClass().getResource("/wsdl/restrictedStruct.wsdl").toURI();
+            generator.setWsdlFile(new File(fileName).getAbsolutePath());
+            generator.addInterfaceName("TypeTestPortType");
+            
+            Definition model = generator.generateCORBABinding();
+            Document document = writer.getDocument(model);
+            Element typemap = getElementNode(document, "corba:typeMapping");            
+            assertNotNull(typemap);            
+            assertEquals(7, typemap.getElementsByTagName("corba:struct").getLength());
+            assertEquals(3, typemap.getElementsByTagName("corba:union").getLength());
+        } finally {
+            new File("restrictedStruct-corba.wsdl").deleteOnExit();
+        }
+    }    
+    
+    @Test
+    public void testComplexRestriction() throws Exception {
+        
+        try {
+            URI fileName = getClass().getResource("/wsdl/complexRestriction.wsdl").toURI();
+            generator.setWsdlFile(new File(fileName).getAbsolutePath());
+            generator.addInterfaceName("TypeTestPortType");
+            
+            Definition model = generator.generateCORBABinding();
+            Document document = writer.getDocument(model);
+            Element typemap = getElementNode(document, "corba:typeMapping");            
+            assertNotNull(typemap);            
+            assertEquals(1, typemap.getElementsByTagName("corba:struct").getLength());                       
+        } finally {
+            new File("complexRestriction-corba.wsdl").deleteOnExit();
+        }
+    }    
+    
+    @Test
+    public void testListType() throws Exception {
+        
+        try {
+            URI fileName = getClass().getResource("/wsdl/listType.wsdl").toURI();
+            generator.setWsdlFile(new File(fileName).getAbsolutePath());
+            generator.addInterfaceName("TypeTestPortType");
+            
+            Definition model = generator.generateCORBABinding();
+            Document document = writer.getDocument(model);
+            Element typemap = getElementNode(document, "corba:typeMapping");            
+            assertNotNull(typemap);
+            assertEquals(1, typemap.getElementsByTagName("corba:enum").getLength());
+            assertEquals(1, typemap.getElementsByTagName("corba:sequence").getLength());
+        } finally {
+            new File("listType-corba.wsdl").deleteOnExit();
+        }
+    }    
+    
+    @Test
+    public void testImportSchemaInTypes() throws Exception {
+        
+        try {
+            URI fileName = getClass().getResource("/wsdl/importType.wsdl").toURI();
+            generator.setWsdlFile(new File(fileName).getAbsolutePath());
+            generator.addInterfaceName("TypeTestPortType");
+            
+            Definition model = generator.generateCORBABinding();
+            Document document = writer.getDocument(model);
+            Element typemap = getElementNode(document, "corba:typeMapping");            
+            assertNotNull(typemap);
+            assertEquals(1, typemap.getElementsByTagName("corba:enum").getLength());
+            assertEquals(1, typemap.getElementsByTagName("corba:sequence").getLength());
+        } finally {
+            new File("importType-corba.wsdl").deleteOnExit();
+        }
+    }    
+
 }

Added: cxf/trunk/tools/corba/src/test/resources/idl/Struct_multiple_dcl.idl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idl/Struct_multiple_dcl.idl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/idl/Struct_multiple_dcl.idl (added)
+++ cxf/trunk/tools/corba/src/test/resources/idl/Struct_multiple_dcl.idl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,51 @@
+/* 
+ * 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.
+*/ 
+
+struct s1 {
+    long s1_l1;
+};
+
+struct s2 {
+    long s2_l1, s2_l2;
+    s1 s2_s1; // references previously declared struct
+};
+
+struct s3 {
+    long s3_l1;
+    short s3_s1, s3_s2;
+    s1 s3_s1, s3_s2, s3_s3; // references and multiply declares previously defined struct
+};
+
+struct s4 { 
+    long s4_l1; 
+    short s4_s1, s4_s2, s4_s3;
+    string s4_str1;
+}; 
+
+struct s5 {
+    string s5_s1, s5_s2, s5_s3;
+};
+
+struct s6 {
+    long s6_l1, s6_l2[10];
+    short s6_s1[7], s6_s2, s6_s3;
+    float s6_f1[100], s6_f2[1000];
+    double s6_d1[5], s6_d2[50], s6_d3[500];
+    long long s6_ll1, s6_ll2[3], s6_ll3;
+};

Added: cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl (added)
+++ cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<wsdl:definitions targetNamespace="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns:tns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns:corba="http://cxf.apache.org/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <corba:typeMapping targetNamespace="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap">
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s1:1.0" type="s1" name="s1">
+      <corba:member idltype="corba:long" name="s1_l1" />
+    </corba:struct>
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s2:1.0" type="s2" name="s2">
+      <corba:member idltype="corba:long" name="s2_l1" />
+      <corba:member idltype="corba:long" name="s2_l2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s1" name="s2_s1" />
+    </corba:struct>
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s3:1.0" type="s3" name="s3">
+      <corba:member idltype="corba:long" name="s3_l1" />
+      <corba:member idltype="corba:short" name="s3_s1" />
+      <corba:member idltype="corba:short" name="s3_s2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s1" name="s3_s1" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s1" name="s3_s2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s1" name="s3_s3" />
+    </corba:struct>
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s4:1.0" type="s4" name="s4">
+      <corba:member idltype="corba:long" name="s4_l1" />
+      <corba:member idltype="corba:short" name="s4_s1" />
+      <corba:member idltype="corba:short" name="s4_s2" />
+      <corba:member idltype="corba:short" name="s4_s3" />
+      <corba:member idltype="corba:string" name="s4_str1" />
+    </corba:struct>
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s5:1.0" type="s5" name="s5">
+      <corba:member idltype="corba:string" name="s5_s1" />
+      <corba:member idltype="corba:string" name="s5_s2" />
+      <corba:member idltype="corba:string" name="s5_s3" />
+    </corba:struct>
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="10" elemtype="corba:long" type="ns4:s6._Anon1_s6_l1" name="s6._Anon1_s6_l1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="7" elemtype="corba:short" type="ns4:s6._Anon1_s6_s1" name="s6._Anon1_s6_s1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="100" elemtype="corba:float" type="ns4:s6._Anon1_s6_f1" name="s6._Anon1_s6_f1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="1000" elemtype="corba:float" type="ns4:s6._Anon2_s6_f1" name="s6._Anon2_s6_f1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="5" elemtype="corba:double" type="ns4:s6._Anon1_s6_d1" name="s6._Anon1_s6_d1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="50" elemtype="corba:double" type="ns4:s6._Anon2_s6_d1" name="s6._Anon2_s6_d1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="500" elemtype="corba:double" type="ns4:s6._Anon3_s6_d1" name="s6._Anon3_s6_d1" />
+    <corba:anonarray xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="" elemname="item" bound="3" elemtype="corba:longlong" type="ns4:s6._Anon1_s6_ll1" name="s6._Anon1_s6_ll1" />
+    <corba:struct xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" repositoryID="IDL:s6:1.0" type="s6" name="s6">
+      <corba:member idltype="corba:long" name="s6_l1" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon1_s6_l1" name="s6_l2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon1_s6_s1" name="s6_s1" />
+      <corba:member idltype="corba:short" name="s6_s2" />
+      <corba:member idltype="corba:short" name="s6_s3" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon1_s6_f1" name="s6_f1" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon2_s6_f1" name="s6_f2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon1_s6_d1" name="s6_d1" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon2_s6_d1" name="s6_d2" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon3_s6_d1" name="s6_d3" />
+      <corba:member idltype="corba:longlong" name="s6_ll1" />
+      <corba:member xmlns:ns4="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl/typemap" idltype="ns4:s6._Anon1_s6_ll1" name="s6_ll2" />
+      <corba:member idltype="corba:longlong" name="s6_ll3" />
+    </corba:struct>
+  </corba:typeMapping>
+  <wsdl:types>
+    <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns="http://cxf.apache.org/bindings/corba/idl/Struct_multiple_dcl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+      <xs:complexType name="s1">
+        <xs:sequence>
+          <xs:element name="s1_l1" type="xs:int">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s2">
+        <xs:sequence>
+          <xs:element name="s2_l1" type="xs:int">
+          </xs:element>
+          <xs:element name="s2_l2" type="xs:int">
+          </xs:element>
+          <xs:element name="s2_s1" type="s1">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s3">
+        <xs:sequence>
+          <xs:element name="s3_l1" type="xs:int">
+          </xs:element>
+          <xs:element name="s3_s1" type="xs:short">
+          </xs:element>
+          <xs:element name="s3_s2" type="xs:short">
+          </xs:element>
+          <xs:element name="s3_s1" type="s1">
+          </xs:element>
+          <xs:element name="s3_s2" type="s1">
+          </xs:element>
+          <xs:element name="s3_s3" type="s1">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s4">
+        <xs:sequence>
+          <xs:element name="s4_l1" type="xs:int">
+          </xs:element>
+          <xs:element name="s4_s1" type="xs:short">
+          </xs:element>
+          <xs:element name="s4_s2" type="xs:short">
+          </xs:element>
+          <xs:element name="s4_s3" type="xs:short">
+          </xs:element>
+          <xs:element name="s4_str1" type="xs:string">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s5">
+        <xs:sequence>
+          <xs:element name="s5_s1" type="xs:string">
+          </xs:element>
+          <xs:element name="s5_s2" type="xs:string">
+          </xs:element>
+          <xs:element name="s5_s3" type="xs:string">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon1_s6_l1">
+        <xs:sequence>
+          <xs:element maxOccurs="10" minOccurs="10" name="item" type="xs:int">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon1_s6_s1">
+        <xs:sequence>
+          <xs:element maxOccurs="7" minOccurs="7" name="item" type="xs:short">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon1_s6_f1">
+        <xs:sequence>
+          <xs:element maxOccurs="100" minOccurs="100" name="item" type="xs:float">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon2_s6_f1">
+        <xs:sequence>
+          <xs:element maxOccurs="1000" minOccurs="1000" name="item" type="xs:float">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon1_s6_d1">
+        <xs:sequence>
+          <xs:element maxOccurs="5" minOccurs="5" name="item" type="xs:double">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon2_s6_d1">
+        <xs:sequence>
+          <xs:element maxOccurs="50" minOccurs="50" name="item" type="xs:double">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon3_s6_d1">
+        <xs:sequence>
+          <xs:element maxOccurs="500" minOccurs="500" name="item" type="xs:double">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6._Anon1_s6_ll1">
+        <xs:sequence>
+          <xs:element maxOccurs="3" minOccurs="3" name="item" type="xs:long">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="s6">
+        <xs:sequence>
+          <xs:element name="s6_l1" type="xs:int">
+          </xs:element>
+          <xs:element name="s6_l2" type="s6._Anon1_s6_l1">
+          </xs:element>
+          <xs:element name="s6_s1" type="s6._Anon1_s6_s1">
+          </xs:element>
+          <xs:element name="s6_s2" type="xs:short">
+          </xs:element>
+          <xs:element name="s6_s3" type="xs:short">
+          </xs:element>
+          <xs:element name="s6_f1" type="s6._Anon1_s6_f1">
+          </xs:element>
+          <xs:element name="s6_f2" type="s6._Anon2_s6_f1">
+          </xs:element>
+          <xs:element name="s6_d1" type="s6._Anon1_s6_d1">
+          </xs:element>
+          <xs:element name="s6_d2" type="s6._Anon2_s6_d1">
+          </xs:element>
+          <xs:element name="s6_d3" type="s6._Anon3_s6_d1">
+          </xs:element>
+          <xs:element name="s6_ll1" type="xs:long">
+          </xs:element>
+          <xs:element name="s6_ll2" type="s6._Anon1_s6_ll1">
+          </xs:element>
+          <xs:element name="s6_ll3" type="xs:long">
+          </xs:element>
+        </xs:sequence>
+      </xs:complexType>
+    </xs:schema>
+  </wsdl:types>
+</wsdl:definitions>

Propchange: cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/idl/expected_Struct_multiple_dcl.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"              
+             xmlns:tns="http://schemas.apache.org/tests/type_test" 
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+             targetNamespace="http://schemas.apache.org/tests/type_test">
+    <types>
+        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://schemas.apache.org/tests/type_test" 
+                    elementFormDefault="unqualified" attributeFormDefault="unqualified">
+             
+            <complexType name="ComplexRestriction">
+                <simpleContent>
+                    <restriction base="string">
+                        <maxLength value="10"/>
+                        <minLength value="5"/>
+                    </restriction>
+                </simpleContent>
+            </complexType>        
+            <xsd:element name="ComplexRestriction_x" type="tns:ComplexRestriction"/>
+            <xsd:element name="ComplexRestriction_y" type="tns:ComplexRestriction"/>
+            <xsd:element name="ComplexRestriction_z" type="tns:ComplexRestriction"/>
+            <xsd:element name="ComplexRestriction_return" type="tns:ComplexRestriction"/>
+        </xsd:schema>
+    </types>
+    
+    <message name="test_ComplexRestriction">
+        <part name="x" element="tns:ComplexRestriction_x"/>
+        <part name="y" element="tns:ComplexRestriction_y"/>
+    </message>
+    <message name="test_ComplexRestriction_response">
+        <part name="return" element="tns:ComplexRestriction_return"/>
+        <part name="y" element="tns:ComplexRestriction_y"/>
+        <part name="z" element="tns:ComplexRestriction_z"/>
+    </message>
+    
+    <portType name="TypeTestPortType">
+        <operation name="test_ComplexRestriction">
+            <input name="test_ComplexRestriction" message="tns:test_ComplexRestriction"/>
+            <output name="test_ComplexRestriction_response" message="tns:test_ComplexRestriction_response"/>
+        </operation>
+    </portType>
+    
+</definitions>
+    
+     
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/complexRestriction.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"            
+             xmlns:tns="http://schemas.apache.org/tests/type_test"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:diff="http://schemas.apache.org/tests/different-namespace"
+             xmlns:ref="http://schemas.apache.org/references" name="type_test"
+             targetNamespace="http://schemas.apache.org/tests/type_test">
+    <types>
+        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://schemas.apache.org/tests/type_test">
+            <xsd:import namespace="http://schemas.apache.org/tests/different-namespace" schemaLocation="./importType.xsd"/> 
+            <xsd:element name="ShortEnumList_x" type="diff:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_y" type="diff:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_z" type="diff:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_return" type="diff:ShortEnumList"/>      
+            <xsd:element name="elementRef" type="diff:elementDiffNamespace"/>      
+        </xsd:schema>
+    </types>
+    <message name="test_ShortEnumList">
+        <part name="x" element="tns:ShortEnumList_x"/>
+        <part name="y" element="tns:ShortEnumList_y"/>
+        <part name="L" element="tns:elementRef"/>
+        <part name="O" element="diff:elementDiffNamespace"/>
+    </message>
+    <message name="test_ShortEnumList_response">
+        <part name="return" element="tns:ShortEnumList_return"/>
+        <part name="y" element="tns:ShortEnumList_y"/>
+        <part name="z" element="tns:ShortEnumList_z"/>
+    </message>
+    <message name="test_void"/>
+    <message name="test_void_response"/>
+    
+    <portType name="TypeTestPortType">
+        <operation name="test_ShortEnumList">
+            <input name="test_ShortEnumList" message="tns:test_ShortEnumList"/>
+            <output name="test_ShortEnumList_response" message="tns:test_ShortEnumList_response"/>
+        </operation>  
+        <operation name="test_void">
+            <input name="test_void" message="tns:test_void"/>
+            <output name="test_void_response" message="tns:test_void_response"/>
+        </operation>
+    </portType>
+    
+</definitions>
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd Thu Aug 14 09:59:59 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!--
+ * 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.
+-->
+<xs:schema targetNamespace="http://schemas.apache.org/tests/different-namespace" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns:tns="http://schemas.apache.org/tests/different-namespace" 
+           elementFormDefault="unqualified" 
+           attributeFormDefault="unqualified">
+
+    <xs:simpleType name="ShortEnum">
+        <xs:restriction base="short">
+            <xs:enumeration value="-1"/>
+            <xs:enumeration value="2"/>
+            <xs:enumeration value="-3"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ShortEnumList">
+        <xs:list itemType="tns:ShortEnum"/>
+    </xs:simpleType>      
+    
+    <xs:element name="elementDiffNamespace" type="xs:string"/>          
+    
+</xs:schema>            
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/importType.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"            
+             xmlns:tns="http://schemas.apache.org/tests/type_test"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:ref="http://schemas.apache.org/references" name="type_test"
+             targetNamespace="http://schemas.apache.org/tests/type_test">
+    <types>
+        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
+                    targetNamespace="http://schemas.apache.org/tests/type_test">
+            <simpleType name="ShortEnum">
+                <restriction base="short">
+                    <enumeration value="-1"/>
+                    <enumeration value="2"/>
+                    <enumeration value="-3"/>
+                 </restriction>
+            </simpleType>
+            <simpleType name="ShortEnumList">
+                <list itemType="tns:ShortEnum"/>
+            </simpleType>   
+            <xsd:element name="ShortEnumList_x" type="tns:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_y" type="tns:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_z" type="tns:ShortEnumList"/>
+            <xsd:element name="ShortEnumList_return" type="tns:ShortEnumList"/>      
+        </xsd:schema>
+    </types>
+    <message name="test_ShortEnumList">
+        <part name="x" element="tns:ShortEnumList_x"/>
+        <part name="y" element="tns:ShortEnumList_y"/>
+    </message>
+    <message name="test_ShortEnumList_response">
+        <part name="return" element="tns:ShortEnumList_return"/>
+        <part name="y" element="tns:ShortEnumList_y"/>
+        <part name="z" element="tns:ShortEnumList_z"/>
+    </message>
+    <message name="test_void"/>
+    <message name="test_void_response"/>
+    
+    <portType name="TypeTestPortType">
+        <operation name="test_ShortEnumList">
+            <input name="test_ShortEnumList" message="tns:test_ShortEnumList"/>
+            <output name="test_ShortEnumList_response" message="tns:test_ShortEnumList_response"/>
+        </operation>  
+        <operation name="test_void">
+            <input name="test_void" message="tns:test_void"/>
+            <output name="test_void_response" message="tns:test_void_response"/>
+        </operation>
+    </portType>
+    
+</definitions>
+    
+    
+    
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/listType.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl Thu Aug 14 09:59:59 2008
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+             xmlns:itst="http://tests.apache.org/ittests"
+             xmlns:tns="http://schemas.apache.org/tests/type_test"
+             xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:ref="http://schemas.apache.org/references" name="type_test"
+             targetNamespace="http://schemas.apache.org/tests/type_test">
+    <types>
+        <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.apache.org/tests/type_test">
+    
+        <xsd:include schemaLocation="restrictedStruct_test.xsd"/>
+        <xsd:element name="RestrictedStruct_BaseStruct_x" type="tns:RestrictedStruct_BaseStruct"/>
+        <xsd:element name="RestrictedStruct_BaseStruct_y" type="tns:RestrictedStruct_BaseStruct"/>
+        <xsd:element name="RestrictedStruct_BaseStruct_z" type="tns:RestrictedStruct_BaseStruct"/>
+        <xsd:element name="RestrictedStruct_BaseStruct_return" type="tns:RestrictedStruct_BaseStruct"/>            
+        <xsd:element name="RestrictedAll_BaseAll_x" type="tns:RestrictedAll_BaseAll"/>
+        <xsd:element name="RestrictedAll_BaseAll_y" type="tns:RestrictedAll_BaseAll"/>
+        <xsd:element name="RestrictedAll_BaseAll_z" type="tns:RestrictedAll_BaseAll"/>
+        <xsd:element name="RestrictedAll_BaseAll_return" type="tns:RestrictedAll_BaseAll"/>            
+        <xsd:element name="RestrictedChoice_BaseChoice_x" type="tns:RestrictedChoice_BaseChoice"/>
+        <xsd:element name="RestrictedChoice_BaseChoice_y" type="tns:RestrictedChoice_BaseChoice"/>
+        <xsd:element name="RestrictedChoice_BaseChoice_z" type="tns:RestrictedChoice_BaseChoice"/>
+        <xsd:element name="RestrictedChoice_BaseChoice_return" type="tns:RestrictedChoice_BaseChoice"/>
+        </xsd:schema>
+    </types>
+    <message name="test_RestrictedStruct_BaseStruct">
+        <part name="x" element="tns:RestrictedStruct_BaseStruct_x"/>
+        <part name="y" element="tns:RestrictedStruct_BaseStruct_y"/>
+    </message>
+    <message name="test_RestrictedStruct_BaseStruct_response">
+        <part name="return" element="tns:RestrictedStruct_BaseStruct_return"/>
+        <part name="y" element="tns:RestrictedStruct_BaseStruct_y"/>
+        <part name="z" element="tns:RestrictedStruct_BaseStruct_z"/>
+    </message>    
+    <message name="test_RestrictedAll_BaseAll">
+        <part name="x" element="tns:RestrictedAll_BaseAll_x"/>
+        <part name="y" element="tns:RestrictedAll_BaseAll_y"/>
+    </message>
+    <message name="test_RestrictedAll_BaseAll_response">
+        <part name="return" element="tns:RestrictedAll_BaseAll_return"/>
+        <part name="y" element="tns:RestrictedAll_BaseAll_y"/>
+        <part name="z" element="tns:RestrictedAll_BaseAll_z"/>
+    </message>    
+    <message name="test_RestrictedChoice_BaseChoice">
+        <part name="x" element="tns:RestrictedChoice_BaseChoice_x"/>
+        <part name="y" element="tns:RestrictedChoice_BaseChoice_y"/>
+    </message>
+    <message name="test_RestrictedChoice_BaseChoice_response">
+        <part name="return" element="tns:RestrictedChoice_BaseChoice_return"/>
+        <part name="y" element="tns:RestrictedChoice_BaseChoice_y"/>
+        <part name="z" element="tns:RestrictedChoice_BaseChoice_z"/>
+    </message>
+    
+    <portType name="TypeTestPortType">
+        <operation name="test_RestrictedStruct_BaseStruct">
+            <input name="test_RestrictedStruct_BaseStruct" message="tns:test_RestrictedStruct_BaseStruct"/>
+            <output name="test_RestrictedStruct_BaseStruct_response" message="tns:test_RestrictedStruct_BaseStruct_response"/>
+        </operation>
+        
+        <operation name="test_RestrictedAll_BaseAll">
+            <input name="test_RestrictedAll_BaseAll" message="tns:test_RestrictedAll_BaseAll"/>
+            <output name="test_RestrictedAll_BaseAll_response" message="tns:test_RestrictedAll_BaseAll_response"/>
+        </operation>
+        
+        <operation name="test_RestrictedChoice_BaseChoice">
+            <input name="test_RestrictedChoice_BaseChoice" message="tns:test_RestrictedChoice_BaseChoice"/>
+            <output name="test_RestrictedChoice_BaseChoice_response" message="tns:test_RestrictedChoice_BaseChoice_response"/>
+        </operation>
+    </portType>
+    
+</definitions>            
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd?rev=685960&view=auto
==============================================================================
--- cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd (added)
+++ cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd Thu Aug 14 09:59:59 2008
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+            xmlns:itst="http://tests.apache.org/ittests" 
+            xmlns:wsse="http://schemas.xmlsoap.org/ws/2003/06/secext" 
+            xmlns="http://www.w3.org/2001/XMLSchema" 
+            xmlns:tns="http://schemas.apache.org/tests/type_test" 
+            targetNamespace="http://schemas.apache.org/tests/type_test">
+
+    <complexType name="RestrictedStruct_BaseStruct">
+            <complexContent>
+                <restriction base="tns:SimpleStruct">
+                    <sequence>
+                        <element name="varFloat" type="double"/>
+                        <element name="varInt" type="unsignedLong"/>
+                    </sequence>
+                    <attribute name="varAttrString" type="string"/>
+                </restriction>
+            </complexContent>
+        </complexType>
+    
+        <complexType name="RestrictedAll_BaseAll">
+            <complexContent mixed="false">
+                <restriction base="tns:SimpleAll">
+                    <all>
+                        <element name="varFloat" type="float"/>
+                        <element name="varInt" type="int"/>
+                    </all>
+                    <attribute name="varAttrString" type="string"/>
+                </restriction>
+            </complexContent>
+        </complexType>
+        <complexType name="RestrictedChoice_BaseChoice">
+            <complexContent mixed="false">
+                <restriction base="tns:SimpleChoice">
+                    <choice>
+                        <element name="varFloat" type="float"/>
+                        <element name="varInt" type="int"/>
+                    </choice>
+                </restriction>
+            </complexContent>
+        </complexType>
+        
+        <complexType name="SimpleAll">
+            <all>
+                <element name="varFloat" type="float"/>
+                <element name="varInt" type="int"/>
+                <element name="varString" type="string"/>
+            </all>
+            <attribute name="varAttrString" type="string"/>
+        </complexType>
+        
+        <complexType name="SimpleStruct">
+            <sequence>
+                <element name="varFloat" type="double"/>
+                <element name="varInt" type="unsignedLong"/>
+                <element name="varString" type="string"/>
+            </sequence>
+            <attribute name="varAttrString" type="string"/>
+        </complexType>
+        
+        <complexType name="SimpleChoice">
+            <choice>
+                <element name="varFloat" type="float"/>
+                <element name="varInt" type="int"/>
+               <element name="varString" type="string"/>
+            </choice>
+        </complexType>        
+        
+</xsd:schema>
+     
\ No newline at end of file

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/tools/corba/src/test/resources/wsdl/restrictedStruct_test.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message