Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 1704 invoked from network); 10 Dec 2005 01:48:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Dec 2005 01:48:22 -0000 Received: (qmail 4979 invoked by uid 500); 10 Dec 2005 01:48:21 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 4955 invoked by uid 500); 10 Dec 2005 01:48:21 -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 4944 invoked by uid 500); 10 Dec 2005 01:48:21 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 4940 invoked by uid 99); 10 Dec 2005 01:48:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2005 17:48:21 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Fri, 09 Dec 2005 17:48:19 -0800 Received: (qmail 1556 invoked by uid 65534); 10 Dec 2005 01:47:59 -0000 Message-ID: <20051210014759.1555.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355688 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/codegen/ core/src/org/apache/axis2/client/ core/src/org/apache/axis2/deployment/repository/util/ integration/test/org/apache/axis2/engine/ tool/src/org/ap... Date: Sat, 10 Dec 2005 01:47:56 -0000 To: axis2-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chinthaka Date: Fri Dec 9 17:47:47 2005 New Revision: 355688 URL: http://svn.apache.org/viewcvs?rev=355688&view=rev Log: Merging two WSDLConstants classes in to one. Removed: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLConstants.java Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/AxisServiceBuilderTest.java webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/java2wsdl/Java2WSDL.java webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original) +++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Fri Dec 9 17:47:47 2005 @@ -21,7 +21,6 @@ import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension; import org.apache.axis2.wsdl.databinding.TypeMapper; import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.wsdl.WSDLDescription; import javax.wsdl.WSDLException; @@ -114,7 +113,7 @@ String uri = ((CommandLineOption) parser.getAllOptions().get( CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue(); //todo check the wsdl URI here - return WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1).build(uri) + return WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1).build(uri) .getDescription(); } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java Fri Dec 9 17:47:47 2005 @@ -16,11 +16,6 @@ package org.apache.axis2.client; -import java.net.URL; -import java.util.Iterator; - -import javax.xml.namespace.QName; - import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.ConfigurationContext; @@ -46,6 +41,10 @@ import org.apache.wsdl.extensions.SOAPAddress; import org.apache.wsdl.extensions.SOAPOperation; +import javax.xml.namespace.QName; +import java.net.URL; +import java.util.Iterator; + public class WSDLMEPClientBuilder { private boolean isoneway= false; private WSDLDescription description; @@ -62,7 +61,7 @@ public void defineDescription(URL wsdlurl)throws AxisFault{ try { - WOMBuilder buider = WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1); + WOMBuilder buider = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1); WSDLVersionWrapper vw = buider.build(wsdlurl.openStream()); description = vw.getDescription(); } catch (Exception e) { Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Fri Dec 9 17:47:47 2005 @@ -16,7 +16,14 @@ package org.apache.axis2.deployment.repository.util; -import org.apache.axis2.deployment.*; +import org.apache.axis2.deployment.DeploymentConstants; +import org.apache.axis2.deployment.DeploymentEngine; +import org.apache.axis2.deployment.DeploymentErrorMsgs; +import org.apache.axis2.deployment.DeploymentException; +import org.apache.axis2.deployment.DescriptionBuilder; +import org.apache.axis2.deployment.ModuleBuilder; +import org.apache.axis2.deployment.ServiceBuilder; +import org.apache.axis2.deployment.ServiceGroupBuilder; import org.apache.axis2.description.AxisDescWSDLComponentFactory; import org.apache.axis2.description.AxisService; import org.apache.axis2.description.AxisServiceGroup; @@ -24,7 +31,6 @@ import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.i18n.Messages; import org.apache.axis2.om.OMElement; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.WSDLVersionWrapper; import org.apache.axis2.wsdl.builder.WOMBuilder; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; @@ -50,7 +56,7 @@ private AxisService processWSDLFile(InputStream in) throws DeploymentException { try { - WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1); + WOMBuilder builder = WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1); WSDLVersionWrapper wsdlVersionWrapper = builder.build(in, new AxisDescWSDLComponentFactory()); WSDLDescription womDescription = wsdlVersionWrapper.getDescription(); Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/AxisServiceBuilderTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/AxisServiceBuilderTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/AxisServiceBuilderTest.java (original) +++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/AxisServiceBuilderTest.java Fri Dec 9 17:47:47 2005 @@ -19,7 +19,6 @@ import junit.framework.TestCase; import org.apache.axis2.description.AxisDescWSDLComponentFactory; import org.apache.axis2.description.AxisService; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,7 +42,7 @@ throw new Exception("Input Stream is null , fileNot Found"); } WSDLDescription womDescription = WOMBuilderFactory.getBuilder( - WSDLConstants.WSDL_1_1) + org.apache.wsdl.WSDLConstants.WSDL_1_1) .build(in, new AxisDescWSDLComponentFactory()) .getDescription(); Iterator iterator = womDescription.getServices().keySet().iterator(); Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java (original) +++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java Fri Dec 9 17:47:47 2005 @@ -16,14 +16,13 @@ package org.apache.axis2.tool.ant; +import org.apache.axis2.util.URLProcessor; import org.apache.axis2.wsdl.WSDLVersionWrapper; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.axis2.wsdl.codegen.CodeGenerationEngine; import org.apache.axis2.wsdl.codegen.CommandLineOption; import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants; import org.apache.axis2.wsdl.codegen.CommandLineOptionParser; -import org.apache.axis2.util.URLProcessor; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -144,7 +143,7 @@ throws WSDLException, IOException { InputStream in = new FileInputStream(new File(wsdlLocation)); WSDLVersionWrapper wsdlvWrap = - WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1).build(in); + WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1).build(in); return wsdlvWrap.getDescription(); } Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original) +++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Fri Dec 9 17:47:47 2005 @@ -16,7 +16,6 @@ package org.apache.axis2.tool.codegen; import org.apache.axis2.tool.codegen.eclipse.util.UIConstants; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.axis2.wsdl.codegen.CommandLineOption; import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants; @@ -149,7 +148,7 @@ in = new FileInputStream(new File(wsdlURI)); } - return WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1).build(in).getDescription(); + return WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1).build(in).getDescription(); } catch (FileNotFoundException e) { throw e; } catch (WSDLException e) { Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java Fri Dec 9 17:47:47 2005 @@ -32,10 +32,10 @@ public static WOMBuilder getBuilder(int wsdlDocumentType) throws WSDLException { - if (wsdlDocumentType == org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) { + if (wsdlDocumentType == WSDLConstants.WSDL_1_1) { return new WSDL1ToWOMBuilder(); } - if (wsdlDocumentType == org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0) { + if (wsdlDocumentType == WSDLConstants.WSDL_2_0) { return new WSDL2ToWOMBuilder(); } throw new WSDLException(WSDLException.INVALID_WSDL, @@ -66,9 +66,9 @@ //Check the target namespace of the WSDL and determine the WSDL version. int version = getWSDLVersion(doc); - if (version == org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) { + if (version == WSDLConstants.WSDL_1_1) { return new WSDL1ToWOMBuilder(); - } else if (version == org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0) { + } else if (version == WSDLConstants.WSDL_2_0) { return new WSDL2ToWOMBuilder(); } @@ -88,10 +88,10 @@ //TODO check weather the namespaces are correct and the / problem too if (WSDLConstants.WSDL2_0_NAMESPACE.equals( doc.getDocumentElement().getNamespaceURI())) { - return org.apache.axis2.wsdl.WSDLConstants.WSDL_2_0; + return WSDLConstants.WSDL_2_0; } else if (WSDLConstants.WSDL1_1_NAMESPACE.equals( doc.getDocumentElement().getNamespaceURI())) { - return org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1; + return WSDLConstants.WSDL_1_1; } throw new WSDLException(WSDLException.OTHER_ERROR, Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/java2wsdl/Java2WSDL.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/java2wsdl/Java2WSDL.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/java2wsdl/Java2WSDL.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/java2wsdl/Java2WSDL.java Fri Dec 9 17:47:47 2005 @@ -1,6 +1,5 @@ package org.apache.axis2.wsdl.java2wsdl; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.writer.WOMWriter; import org.apache.axis2.wsdl.writer.WOMWriterFactory; import org.apache.ws.commons.schema.XmlSchema; @@ -43,7 +42,7 @@ XmlSchema scheam = sg.generateSchema(); WSDLDescription wommodel = new Java2WOM( sg.getTypeTable(), sg.getMethods(), scheam, simpleClassName(className), null, null).generateWOM(); - WOMWriter womWriter = WOMWriterFactory.createWriter(WSDLConstants.WSDL_1_1); + WOMWriter womWriter = WOMWriterFactory.createWriter(org.apache.wsdl.WSDLConstants.WSDL_1_1); womWriter.setdefaultWSDLPrefix("wsdl"); womWriter.writeWOM(wommodel, out); Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMWriterFactory.java Fri Dec 9 17:47:47 2005 @@ -1,6 +1,5 @@ package org.apache.axis2.wsdl.writer; -import org.apache.axis2.wsdl.*; /* * Copyright 2004,2005 The Apache Software Foundation. * @@ -17,12 +16,12 @@ * limitations under the License. */ -public class WOMWriterFactory implements WSDLConstants { +public class WOMWriterFactory { public static WOMWriter createWriter(int WSDLVersion){ - if (WSDL_1_1==WSDLVersion){ + if (org.apache.wsdl.WSDLConstants.WSDL_1_1 ==WSDLVersion){ return new WOMtoWSDL11Writer(); - }else if (WSDL_2_0 == WSDLVersion){ + }else if (org.apache.wsdl.WSDLConstants.WSDL_2_0 == WSDLVersion){ return new WOMtoWSDL20Writer(); }else{ throw new RuntimeException(" Unknown WSDLversion"); Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLConstants.java Fri Dec 9 17:47:47 2005 @@ -131,4 +131,6 @@ public static final String WSDL_USE_ENCODED = "encoded"; + int WSDL_1_1 = 1; + int WSDL_2_0 = 2; } Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WOMInputOutputTest.java Fri Dec 9 17:47:47 2005 @@ -3,7 +3,6 @@ import org.apache.axis2.om.OMElement; import org.apache.axis2.om.OMText; import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.WSDLVersionWrapper; import org.apache.axis2.wsdl.builder.WOMBuilder; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; @@ -57,12 +56,12 @@ public void testInputOutput() throws XMLStreamException { try { // create the WOM from the given WSDL. - WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1); + WOMBuilder builder = WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1); wsdlVersionWrapper = builder.build(testWSDL); // serialize wom and get the xml. ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - WOMWriter womWriter = WOMWriterFactory.createWriter(WSDLConstants.WSDL_1_1); + WOMWriter womWriter = WOMWriterFactory.createWriter(org.apache.wsdl.WSDLConstants.WSDL_1_1); womWriter.writeWOM(wsdlVersionWrapper.getDescription(), byteArrayOutputStream); String actualWSDL = new String(byteArrayOutputStream.toByteArray()); Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/axis2/wsdl/writer/WriterTest.java Fri Dec 9 17:47:47 2005 @@ -1,7 +1,6 @@ package org.apache.axis2.wsdl.writer; import junit.framework.TestCase; -import org.apache.axis2.wsdl.WSDLConstants; import org.apache.axis2.wsdl.builder.WOMBuilder; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.wsdl.WSDLDescription; @@ -27,7 +26,7 @@ protected void setUp() throws Exception { - WOMBuilder builder = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1); + WOMBuilder builder = WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1); // this.description = builder.build("test-resources/BookQuote.wsdl").getDescription(); this.description = builder.build("test-resources/wsat.wsdl").getDescription(); } Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/BindingOperationTest.java Fri Dec 9 17:47:47 2005 @@ -36,7 +36,7 @@ WSDLDescription womDescription; String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath(); - womDescription = WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) + womDescription = WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1) .build(path).getDescription(); assertNotNull(womDescription); Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/CreateSchemaTest.java Fri Dec 9 17:47:47 2005 @@ -16,7 +16,7 @@ package org.apache.wsdl; -import org.apache.axis2.wsdl.*; +import org.apache.axis2.wsdl.WSDLVersionWrapper; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.wsdl.extensions.ExtensionConstants; import org.apache.wsdl.extensions.Schema; @@ -42,7 +42,7 @@ if (null == this.womDescription) { String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath(); wsdlVersionWrapper = - WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) + WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1) .build(path); this.womDescription = wsdlVersionWrapper.getDescription(); } Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java Fri Dec 9 17:47:47 2005 @@ -37,7 +37,7 @@ if (null == this.womDescription) { String path = getTestResourceFile("BookQuote.wsdl").getAbsolutePath(); wsdlVersionWrapper = - WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) + WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1) .build(path); this.womDescription = wsdlVersionWrapper.getDescription(); } Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java Fri Dec 9 17:47:47 2005 @@ -16,7 +16,7 @@ package org.apache.wsdl; -import org.apache.axis2.wsdl.*; +import org.apache.axis2.wsdl.WSDLVersionWrapper; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import org.apache.wsdl.extensions.ExtensionConstants; import org.apache.wsdl.extensions.SOAPOperation; @@ -41,7 +41,7 @@ if (null == this.womDescription) { String path = getTestResourceFile("InteropTestDocLit2.wsdl").getAbsolutePath(); wsdlVersionWrapper = - WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) + WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1) .build(path); this.womDescription = wsdlVersionWrapper.getDescription(); Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java?rev=355688&r1=355687&r2=355688&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java (original) +++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/WOMBuilderTest.java Fri Dec 9 17:47:47 2005 @@ -17,7 +17,7 @@ package org.apache.wsdl; -import org.apache.axis2.wsdl.*; +import org.apache.axis2.wsdl.WSDLVersionWrapper; import org.apache.axis2.wsdl.builder.WOMBuilderFactory; import javax.wsdl.Definition; @@ -42,7 +42,7 @@ if (null == this.womDescription) { String path = getTestResourceFile("InteropTest.wsdl").getAbsolutePath(); wsdlVersionWrapper = - WOMBuilderFactory.getBuilder(org.apache.axis2.wsdl.WSDLConstants.WSDL_1_1) + WOMBuilderFactory.getBuilder(WSDLConstants.WSDL_1_1) .build(path); this.womDescription = wsdlVersionWrapper.getDescription(); }