Return-Path: 
 <axis-cvs-return-30060-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 10484 invoked from network); 25 Jun 2009 20:14:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 25 Jun 2009 20:14:31 -0000
Received: (qmail 2082 invoked by uid 500); 25 Jun 2009 20:13:42 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 1415 invoked by uid 500); 25 Jun 2009 20:13:39 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 607 invoked by uid 500); 25 Jun 2009 20:13:37 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 98774 invoked by uid 99); 25 Jun 2009 20:01:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2009 20:01:18 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2009 20:01:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 42D83238888D; Thu, 25 Jun 2009 20:00:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r788496 - in
 /webservices/axis2/trunk/java/modules/adb-codegen:
 ./ test-resources/testsuite/unqualified/
 test/org/apache/axis2/schema/unqualified/
Date: Thu, 25 Jun 2009 20:00:55 -0000
To: axis2-cvs@ws.apache.org
From: veithen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090625200056.42D83238888D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: veithen
Date: Thu Jun 25 20:00:55 2009
New Revision: 788496

URL: http://svn.apache.org/viewvc?rev=788496&view=rev
Log:
Added regression test for AXIS2-4374.

Added:
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd   (with props)
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd   (with props)
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd   (with props)
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd   (with props)
Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
    webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java

Modified: webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml?rev=788496&r1=788495&r2=788496&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml Thu Jun 25 20:00:55 2009
@@ -82,6 +82,7 @@
 			<arg file="${testsuite.source.dir}/chameleon.xsd"/>
 			<arg file="${testsuite.source.dir}/nonamespace.xsd"/> <!-- compile only; no tests -->
 			<arg file="${testsuite.source.dir}/unqualified.xsd"/>
+			<arg file="${testsuite.source.dir}/unqualified/companyservice.xsd"/>
 			<arg file="${schema.generated.src.dir}"/>
 		</java>
 		<java classname="org.apache.axis2.schema.XSD2Java" fork="true">

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd?rev=788496&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd Thu Jun 25 20:00:55 2009
@@ -0,0 +1,31 @@
+<?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 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://apache.org/axis2/schema/unqualified/company"
+           xmlns:tns="http://apache.org/axis2/schema/unqualified/company"
+           xmlns:comType="http://apache.org/axis2/schema/unqualified/companyType"
+           elementFormDefault="unqualified">
+
+    <xs:import namespace="http://apache.org/axis2/schema/unqualified/companyType" schemaLocation="companytype.xsd"/>
+
+    <xs:element name="companyId" type="comType:String_Type"/>
+    <xs:element name="userId" type="comType:String_Type"/>
+    <xs:element name="address" type="comType:address_type"/>
+</xs:schema>
\ No newline at end of file

Propchange: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/company.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd?rev=788496&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd Thu Jun 25 20:00:55 2009
@@ -0,0 +1,41 @@
+<?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.
+  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://apache.org/axis2/schema/unqualified/companyFlow"
+        xmlns:tns="http://apache.org/axis2/schema/unqualified/companyFlow"
+        elementFormDefault="unqualified"
+        xmlns:com="http://apache.org/axis2/schema/unqualified/company">
+
+    <import namespace="http://apache.org/axis2/schema/unqualified/company" schemaLocation="company.xsd"/>
+    
+    <complexType name="companyRequest">
+        <sequence>
+            <element ref="com:companyId"/>
+        </sequence>
+    </complexType>
+
+    <complexType name="companyResponse">
+        <sequence>
+            <element ref="com:companyId" minOccurs="0"/>
+            <element ref="com:userId"/>
+            <element ref="com:address"/>
+        </sequence>
+    </complexType>
+</schema>

Propchange: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyflow.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd?rev=788496&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd Thu Jun 25 20:00:55 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+  ~ 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 targetNamespace="http://apache.org/axis2/schema/unqualified/companyService"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:compflow="http://apache.org/axis2/schema/unqualified/companyFlow">
+
+    <xsd:import namespace="http://apache.org/axis2/schema/unqualified/companyFlow" schemaLocation="companyflow.xsd" />
+
+    <xsd:element name="getCompanyDetailsRequest">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="in" type="compflow:companyRequest" />
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="getCompanyDetailsResponse">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="out" type="compflow:companyResponse" />
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+</xsd:schema>

Propchange: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companyservice.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd?rev=788496&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd Thu Jun 25 20:00:55 2009
@@ -0,0 +1,41 @@
+<?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 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://apache.org/axis2/schema/unqualified/companyType"
+           xmlns:tns="http://apache.org/axis2/schema/unqualified/companyType"
+           elementFormDefault="unqualified">
+
+    <xs:complexType name="address_type">
+        <xs:sequence>
+            <xs:element name="address1" type="tns:String_Type" minOccurs="0"/>
+            <xs:element name="address2" type="tns:String_Type" minOccurs="0"/>
+            <xs:element name="address3" type="tns:String_Type" minOccurs="0"/>
+            <xs:element name="address4" type="tns:String_Type" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="String_Type">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="isUpdated" type="xs:boolean" default="false"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file

Propchange: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/unqualified/companytype.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java?rev=788496&r1=788495&r2=788496&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/UnqualifiedTest.java Thu Jun 25 20:00:55 2009
@@ -20,12 +20,45 @@
 package org.apache.axis2.schema.unqualified;
 
 import org.apache.axis2.schema.AbstractTestCase;
+import org.apache.axis2.schema.unqualified.companyflow.CompanyResponse;
+import org.apache.axis2.schema.unqualified.companyservice.GetCompanyDetailsResponse;
+import org.apache.axis2.schema.unqualified.companytype.Address_type;
+import org.apache.axis2.schema.unqualified.companytype.String_Type;
 
 public class UnqualifiedTest extends AbstractTestCase {
-    public void test() throws Exception {
+    public void testTestElement() throws Exception {
         TestElement testElement = new TestElement();
         testElement.setElement1("element1");
         testElement.setElement2("element2");
         testSerializeDeserialize(testElement);
     }
+    
+    /**
+     * Regression test for AXIS2-4374.
+     * 
+     * @throws Exception
+     */
+    public void testGetCompanyDetailsResponse() throws Exception {
+        String_Type companyId = new String_Type();
+        companyId.setString("112233");
+        
+        String_Type userId = new String_Type();
+        userId.setString("user");
+        
+        String_Type address1 = new String_Type();
+        address1.setString("Fenchurch street");
+        
+        Address_type address = new Address_type();
+        address.setAddress1(address1);
+        
+        CompanyResponse company = new CompanyResponse();
+        company.setCompanyId(companyId);
+        company.setUserId(userId);
+        company.setAddress(address);
+        
+        GetCompanyDetailsResponse response = new GetCompanyDetailsResponse();
+        response.setOut(company);
+        
+        testSerializeDeserialize(response);
+    }
 }