Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 35883 invoked from network); 24 Aug 2005 05:13:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Aug 2005 05:13:28 -0000 Received: (qmail 91387 invoked by uid 500); 24 Aug 2005 05:13:27 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 91327 invoked by uid 500); 24 Aug 2005 05:13:26 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 91314 invoked by uid 99); 24 Aug 2005 05:13:26 -0000 X-ASF-Spam-Status: No, hits=-9.3 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 23 Aug 2005 22:13:26 -0700 Received: (qmail 35872 invoked by uid 65534); 24 Aug 2005 05:13:26 -0000 Message-ID: <20050824051326.35871.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r239533 - in /webservices/axis/trunk/java/modules/wsdl: src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java test-resources/ping.wsdl test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Date: Wed, 24 Aug 2005 05:13:25 -0000 To: axis-cvs@ws.apache.org From: ajith@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ajith Date: Tue Aug 23 22:12:59 2005 New Revision: 239533 URL: http://svn.apache.org/viewcvs?rev=239533&view=rev Log: Last night's change seems to be an incorrect way of handling schema's. Reverted some changes in the XMLBeans extension The WSDL2Java test has been updated to include a new WSDL Added: webservices/axis/trunk/java/modules/wsdl/test-resources/ping.wsdl Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=239533&r1=239532&r2=239533&view=diff ============================================================================== --- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original) +++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Tue Aug 23 22:12:59 2005 @@ -57,7 +57,7 @@ //get the types from the types section WSDLTypes typesList = configuration.getWom().getTypes(); - //check for the imported types + //check for the imported types. Any imported types are supposed to be here also if (typesList == null) { //there are no types to be code generated //However if the type mapper is left empty it will be a problem for the other @@ -69,9 +69,9 @@ List typesArray = typesList.getExtensibilityElements(); WSDLExtensibilityElement extensiblityElt; SchemaTypeSystem sts; - Vector schemabaseURIList=new Vector(); + //Vector schemabaseURIList=new Vector(); Vector xmlObjectsVector= new Vector(); - String schemaBaseURI ; + //String schemaBaseURI ; //create the type mapper JavaTypeMapper mapper = new JavaTypeMapper(); @@ -90,15 +90,10 @@ //compile these schemas while (!importedSchemaStack.isEmpty()){ javax.wsdl.extensions.schema.Schema tempSchema = (javax.wsdl.extensions.schema.Schema) importedSchemaStack.pop(); - schemaBaseURI = tempSchema.getDocumentBaseURI(); - //prevent the readdition of schama's that has already being added - if (!schemabaseURIList.contains(schemaBaseURI)){ - schemabaseURIList.add(schemaBaseURI); - xmlObjectsVector.add( - XmlObject.Factory.parse( - tempSchema.getElement() - ,options)); - } + xmlObjectsVector.add( + XmlObject.Factory.parse( + tempSchema.getElement() + ,options)); } Added: webservices/axis/trunk/java/modules/wsdl/test-resources/ping.wsdl URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test-resources/ping.wsdl?rev=239533&view=auto ============================================================================== --- webservices/axis/trunk/java/modules/wsdl/test-resources/ping.wsdl (added) +++ webservices/axis/trunk/java/modules/wsdl/test-resources/ping.wsdl Tue Aug 23 22:12:59 2005 @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java?rev=239533&r1=239532&r2=239533&view=diff ============================================================================== --- webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java (original) +++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/codegen/WSDL2JavaTest.java Tue Aug 23 22:12:59 2005 @@ -70,18 +70,30 @@ // The directory is now empty so delete it return dir.delete(); } - /** - * Test for the WSAT wsdl - */ - public void testCodeGenerationWSAT(){ + /** + * Test for the WSAT wsdl + */ + public void testCodeGenerationWSAT(){ - try { - generateAndCompile("wsat.wsdl"); - } catch (CodeGenerationException e) { - fail("Exception while codegeneration test!"+ e.getMessage()); + try { + generateAndCompile("wsat.wsdl"); + } catch (CodeGenerationException e) { + fail("Exception while codegeneration test!"+ e.getMessage()); + } } - } + + /** + * Test for the ping WSDL + */ + public void testCodeGenerationPing(){ + + try { + generateAndCompile("ping.wsdl"); + } catch (CodeGenerationException e) { + fail("Exception while codegeneration test!"+ e.getMessage()); + } + } /** * Test for the interoptestdoclit.wsdl