Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 2851 invoked from network); 1 Feb 2007 10:59:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Feb 2007 10:59:46 -0000 Received: (qmail 16714 invoked by uid 500); 1 Feb 2007 10:59:51 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 16676 invoked by uid 500); 1 Feb 2007 10:59:51 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 16666 invoked by uid 99); 1 Feb 2007 10:59:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Feb 2007 02:59:50 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Feb 2007 02:59:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D0DBC1A981D; Thu, 1 Feb 2007 02:59:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r502193 [1/4] - in /incubator/cxf/trunk/tools2/wsdlto: core/src/main/java/org/apache/cxf/tools/wsdlto/ databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/fro... Date: Thu, 01 Feb 2007 10:59:15 -0000 To: cxf-commits@incubator.apache.org From: ema@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070201105916.D0DBC1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ema Date: Thu Feb 1 02:59:13 2007 New Revision: 502193 URL: http://svn.apache.org/viewvc?view=rev&rev=502193 Log: [CXF-313]Added test cases for wsdl2java tool Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl.tmp incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/rlw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/rpw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305770/rw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/hello_world.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/hello_world.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/binding1.xml (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/binding2.xml (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/hello_world.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/bfw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/rlw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/rpw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/rw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/sgw-2.wsdl (with props) incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl (with props) Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=502193&r1=502192&r2=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Feb 1 02:59:13 2007 @@ -66,8 +66,7 @@ protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToJavaContainer.class); private static final String DEFAULT_NS2PACKAGE = "http://www.w3.org/2005/08/addressing"; String toolName; - - + public WSDLToJavaContainer(String name, ToolSpec toolspec) throws Exception { super(name, toolspec); this.toolName = name; @@ -254,7 +253,13 @@ public void setPackageAndNamespaces(ToolContext env) { if (env.get(ToolConstants.CFG_PACKAGENAME) != null) { - String[] pns = (String[])env.get(ToolConstants.CFG_PACKAGENAME); + String[] pns = null; + try { + pns = (String[])env.get(ToolConstants.CFG_PACKAGENAME); + } catch (ClassCastException e) { + pns = new String[1]; + pns[0] = (String)env.get(ToolConstants.CFG_PACKAGENAME); + } for (int j = 0; j < pns.length; j++) { int pos = pns[j].indexOf("="); String packagename = pns[j]; Modified: incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?view=diff&rev=502193&r1=502192&r2=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Feb 1 02:59:13 2007 @@ -30,8 +30,10 @@ import javax.wsdl.Definition; import javax.xml.namespace.QName; +import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -54,9 +56,11 @@ import org.apache.cxf.tools.common.ToolContext; import org.apache.cxf.tools.common.ToolException; import org.apache.cxf.tools.util.ClassCollector; +import org.apache.cxf.tools.util.JAXBUtils; import org.apache.cxf.tools.util.URIParserUtil; import org.apache.cxf.tools.wsdlto.core.DataBindingProfile; + public class JAXBDataBinding implements DataBindingProfile { private static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBinding.class); private static S2JJAXBModel rawJaxbModelGenCode; @@ -72,9 +76,8 @@ def = (Definition)env.get(Definition.class); SchemaCompilerImpl schemaCompiler = (SchemaCompilerImpl)XJC.createSchemaCompiler(); - if (env.getPackageName() != null) { - schemaCompiler.setDefaultPackageName(env.getPackageName()); - } + + ClassCollector classCollector = env.get(ClassCollector.class); ClassNameAllocatorImpl allocator = new ClassNameAllocatorImpl(classCollector); allocator.setInterface(serviceInfo.getInterface(), env.mapPackageName(def.getTargetNamespace())); @@ -98,10 +101,11 @@ systemId = def.getDocumentBaseURI(); } String tns = ele.getAttribute("targetNamespace"); + if (StringUtils.isEmpty(tns)) { continue; } - + if (sysIdSchemeMap.containsKey(schema.getElement().getBaseURI())) { systemId = schema.getElement().getBaseURI() + "#" + tns; int index = 0; @@ -112,6 +116,30 @@ } sysIdSchemeMap.put(systemId, ele); + + String excludePkg = null; + + if (env.hasExcludeNamespace(tns)) { + excludePkg = env.getExcludePackageName(tns); + if (excludePkg != null) { + env.getExcludePkgList().add(excludePkg); + } else { + env.getExcludePkgList().add(URIParserUtil.getPackageName(tns)); + } + } + + String pkgName = null; + if (env.hasNamespace(tns) || env.get(ToolConstants.CFG_PACKAGENAME) != null) { + pkgName = env.mapPackageName(tns); + } + + pkgName = pkgName != null ? pkgName : excludePkg; + + if (pkgName != null) { + Node pkgNode = JAXBUtils.innerJaxbPackageBinding(ele, pkgName); + ele.appendChild(pkgNode); + } + schemaCompiler.parseSchema(systemId, ele); } @@ -136,7 +164,7 @@ if (StringUtils.isEmpty(targetNamespace)) { continue; } - String packageName = URIParserUtil.parsePackageName(targetNamespace, null); + String packageName = env.mapPackageName(targetNamespace); if (!addedToClassCollector(packageName)) { allocator.assignClassName(packageName, "*"); } @@ -233,4 +261,48 @@ } + public Node cloneNode(Document document, Node node, boolean deep) throws DOMException { + if (document == null || node == null) { + return null; + } + int type = node.getNodeType(); + + if (node.getOwnerDocument() == document) { + return node.cloneNode(deep); + } + Node clone; + switch (type) { + case Node.CDATA_SECTION_NODE: + clone = document.createCDATASection(node.getNodeValue()); + break; + case Node.COMMENT_NODE: + clone = document.createComment(node.getNodeValue()); + break; + case Node.ENTITY_REFERENCE_NODE: + clone = document.createEntityReference(node.getNodeName()); + break; + case Node.ELEMENT_NODE: + clone = document.createElement(node.getNodeName()); + NamedNodeMap attributes = node.getAttributes(); + for (int i = 0; i < attributes.getLength(); i++) { + ((Element)clone).setAttribute(attributes.item(i).getNodeName(), attributes.item(i) + .getNodeValue()); + } + break; + + case Node.TEXT_NODE: + clone = document.createTextNode(node.getNodeValue()); + break; + default: + return null; + } + if (deep && type == Node.ELEMENT_NODE) { + Node child = node.getFirstChild(); + while (child != null) { + clone.appendChild(cloneNode(document, child, true)); + child = child.getNextSibling(); + } + } + return clone; + } } Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java?view=diff&rev=502193&r1=502192&r2=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java Thu Feb 1 02:59:13 2007 @@ -41,13 +41,14 @@ return true; } - public void generate(ToolContext penv) throws ToolException { + public void generate(ToolContext penv) throws ToolException { this.env = penv; JavaModel javaModel = env.get(JavaModel.class); - + if (passthrough()) { return; } + clearAttributes(); setAttributes("intfs", javaModel.getInterfaces().values()); setAttributes("wsdlLocation", javaModel.getLocation()); Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Thu Feb 1 02:59:13 2007 @@ -0,0 +1,437 @@ +/** + * 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. + */ +package org.apache.cxf.tools.wsdlto.jaxws; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Modifier; + +import javax.jws.WebService; + +import org.apache.cxf.tools.common.ProcessorTestBase; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.toolspec.ToolSpec; +import org.apache.cxf.tools.util.AnnotationUtil; +import org.apache.cxf.tools.wsdlto.WSDLToJava; +import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer; + +public class CodeGenBugTest extends ProcessorTestBase { + + private JAXWSContainer processor; + private ClassLoader classLoader; + + public void setUp() throws Exception { + super.setUp(); + File classFile = new java.io.File(output.getCanonicalPath() + "/classes"); + classFile.mkdir(); + System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath() + + File.separatorChar); + classLoader = AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader()); + env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE); + env.put(ToolConstants.CFG_IMPL, "impl"); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + + InputStream ins = JAXWSContainer.class.getResourceAsStream("jaxws-toolspec.xml"); + ToolSpec toolspec = new ToolSpec(ins, true); + processor = new JAXWSContainer(toolspec); + + } + + public void tearDown() { + super.tearDown(); + processor = null; + env = null; + } + + public void testBug305729() { + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305729/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + assertNotNull("Process message with no part wsdl error", output); + } + + + + public void testBug305773() { + try { + env.put(ToolConstants.CFG_COMPILE, "compile"); + env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305773/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.GreeterImpl"); + + WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class); + assertEquals("Greeter", webServiceAnn.name()); + assertFalse("Impl class should generate portName property value in webService annotation", + webServiceAnn.portName().equals("")); + assertFalse("Impl class should generate serviceName property value in webService annotation", + webServiceAnn.serviceName().equals("")); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void testHangingBug() throws Exception { + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl")); + processor.setContext(env); + processor.execute(true); + } + + public void testBug305700() throws Exception { + env.put(ToolConstants.CFG_COMPILE, "compile"); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + env.put(ToolConstants.CFG_CLIENT, ToolConstants.CFG_CLIENT); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305700/addNumbers.wsdl")); + processor.setContext(env); + processor.execute(true); + } + + public void testNamespacePackageMapping1() throws Exception { + env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf"); + env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types"); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + File org = new File(output, "org"); + assertTrue(org.exists()); + File apache = new File(org, "apache"); + assertTrue(apache.exists()); + File types = new File(apache, "types"); + assertTrue(types.exists()); + + File[] files = apache.listFiles(); + assertEquals(1, files.length); + files = types.listFiles(); + assertEquals(17, files.length); + + Class clz = classLoader.loadClass("org.cxf.Greeter"); + assertTrue("Generate " + clz.getName() + "error", clz.isInterface()); + clz = classLoader.loadClass("org.apache.types.GreetMe"); + } + + + + public void testNamespacePackageMapping2() throws Exception { + env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "org.apache"); + env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types"); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + File org = new File(output, "org"); + assertTrue("org directory is not found", org.exists()); + File apache = new File(org, "apache"); + assertTrue("apache directory is not found", apache.exists()); + File types = new File(apache, "types"); + assertTrue("types directory is not found", types.exists()); + + Class clz = classLoader.loadClass("org.apache.types.GreetMe"); + assertTrue("Generate " + clz.getName() + "error", Modifier.isPublic(clz.getModifiers())); + clz = classLoader.loadClass("org.apache.Greeter"); + } + + public void testNamespacePackageMapping3() throws Exception { + env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf"); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + File org = new File(output, "org"); + assertTrue(org.exists()); + + File cxf = new File(org, "cxf"); + File[] files = cxf.listFiles(); + assertEquals(22, files.length); + + Class clz = classLoader.loadClass("org.cxf.Greeter"); + assertTrue("Generate " + clz.getName() + "error", clz.isInterface()); + } + + public void testBug305772() throws Exception { + env.put(ToolConstants.CFG_COMPILE, "compile"); + env.put(ToolConstants.CFG_ANT, ToolConstants.CFG_ANT); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + // env.put(ToolConstants.CFG_CLIENT, ToolConstants.CFG_CLIENT); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305772/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + File file = new File(output.getCanonicalPath(), "build.xml"); + FileInputStream fileinput = new FileInputStream(file); + java.io.BufferedInputStream filebuffer = new java.io.BufferedInputStream(fileinput); + byte[] buffer = new byte[(int)file.length()]; + filebuffer.read(buffer); + String content = new String(buffer); + assertTrue("wsdl location should be url style in build.xml", content.indexOf("param1=\"file:") > -1); + + } + + + public void testBug305728HelloWorld() { + try { + String[] args = new String[] {"-compile", "-classdir", + output.getCanonicalPath() + "/classes", + "-d", output.getCanonicalPath(), + "-nexclude", + "http://www.w3.org/2005/08/addressing" + + "=org.apache.cxf.ws.addressing", + getLocation("/wsdl2java_wsdl/bug305728/hello_world.wsdl")}; + WSDLToJava.main(args); + } catch (Exception e) { + e.printStackTrace(System.err); + } + + try { + File file = new File(output.getCanonicalPath(), + "org/apache/cxf/ws/addressing/EndpointReferenceType.java"); + + assertFalse("Exclude java file should not be generated : " + file.getCanonicalPath(), file + .exists()); + + file = new File(output.getCanonicalPath() + File.separator + "classes", + "org/apache/cxf/ws/addressing/EndpointReferenceType.class"); + assertFalse("Exclude class should not be generated : " + file.getCanonicalPath(), file.exists()); + + file = new File(output.getCanonicalPath(), + "org/w3/_2005/_08/addressing/EndpointReferenceType.java"); + assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists()); + + file = new File(output.getCanonicalPath() + File.separator + "classes", + "org/w3/_2005/_08/addressing/EndpointReferenceType.class"); + assertFalse("Exclude class should not be generated : " + file.getCanonicalPath(), file.exists()); + + } catch (IOException e) { + e.printStackTrace(); + } + } + + + public void testBug305728HelloWorld2() { + try { + String[] args = new String[] {"-compile", "-classdir", output.getCanonicalPath() + "/classes", + "-d", output.getCanonicalPath(), "-nexclude", + "http://apache.org/hello_world/types", + getLocation("/wsdl2java_wsdl/bug305728/hello_world2.wsdl")}; + WSDLToJava.main(args); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + File file = new File(output.getCanonicalPath(), "org/apache/hello_world/types"); + assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists()); + + file = new File(output.getCanonicalPath() + File.separator + "classes", + "org/apache/hello_world/types"); + + assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists()); + + } catch (IOException e) { + e.printStackTrace(); + } + + } + + public void testExcludeNSWithPackageName() throws Exception { + + String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude", + "http://apache.org/test/types=com.iona", + "-nexclude", "http://apache.org/Invoice", + getLocation("/wsdl2java_wsdl/hello_world_exclude.wsdl")}; + WSDLToJava.main(args); + + assertNotNull(output); + File com = new File(output, "com"); + assertFalse("Generated file has been excluded", com.exists()); + File iona = new File(com, "iona"); + assertFalse("Generated file has been excluded", iona.exists()); + + File org = new File(output, "org"); + File apache = new File(org, "apache"); + File invoice = new File(apache, "Invoice"); + assertFalse("Generated file has been excluded", invoice.exists()); + + } + + + public void testExcludeNSWithoutPackageName() throws Exception { + + String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude", + "http://apache.org/test/types", + getLocation("/wsdl2java_wsdl/hello_world_exclude.wsdl")}; + WSDLToJava.main(args); + + assertNotNull(output); + File com = new File(output, "test"); + assertFalse("Generated file has been excluded", com.exists()); + + } + + + public void testCommandLine() throws Exception { + String[] args = new String[] {"-compile", "-d", output.getCanonicalPath(), "-classdir", + output.getCanonicalPath() + "/classes", "-p", "org.cxf", "-p", + "http://apache.org/hello_world_soap_http/types=org.apache.types", + "-server", "-impl", + getLocation("/wsdl2java_wsdl/hello_world.wsdl")}; + WSDLToJava.main(args); + + Class clz = classLoader.loadClass("org.cxf.Greeter"); + assertTrue("Generate " + clz.getName() + "error", clz.isInterface()); + clz = classLoader.loadClass("org.apache.types.GreetMe"); + } + + + public void testDefaultLoadNSMappingOFF() throws Exception { + String[] args = new String[] {"-dns", "false", "-d", output.getCanonicalPath(), + getLocation("/wsdl2java_wsdl/basic_callback.wsdl")}; + + WSDLToJava.main(args); + + assertNotNull(output); + File org = new File(output, "org"); + assertTrue(org.exists()); + File w3 = new File(org, "w3"); + assertTrue(w3.exists()); + File p2005 = new File(w3, "_2005"); + assertTrue(p2005.exists()); + File p08 = new File(p2005, "_08"); + assertTrue(p08.exists()); + File address = new File(p08, "addressing"); + assertTrue(address.exists()); + + File[] files = address.listFiles(); + assertEquals(11, files.length); + } + + public void testDefaultLoadNSMappingON() throws Exception { + String[] args = new String[] {"-d", output.getCanonicalPath(), + getLocation("/wsdl2java_wsdl/basic_callback.wsdl")}; + + WSDLToJava.main(args); + + assertNotNull(output); + File org = new File(output, "org"); + assertTrue(org.exists()); + File apache = new File(org, "apache"); + assertTrue(apache.exists()); + File cxf = new File(apache, "cxf"); + assertTrue(cxf.exists()); + File ws = new File(cxf, "ws"); + assertTrue(ws.exists()); + File address = new File(ws, "addressing"); + assertTrue(address.exists()); + + File[] files = address.listFiles(); + assertEquals(11, files.length); + } + + /* + //TODO: Need to be fixed + public void testWithNoService() throws Exception { + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld-noservice.wsdl")); + processor.setContext(env); + processor.execute(true); + Class clz = classLoader.loadClass("org.apache.tuscany.samples.helloworldaxis.HelloWorldServiceImpl"); + Method method = clz.getMethod("getGreetings", new Class[] {java.lang.String.class}); + WebResult webResultAnno = AnnotationUtil.getPrivMethodAnnotation(method, WebResult.class); + assertEquals("http://helloworldaxis.samples.tuscany.apache.org", webResultAnno.targetNamespace()); + assertEquals("response", webResultAnno.partName()); + assertEquals("getGreetingsResponse", webResultAnno.name()); + + WebParam webParamAnno = AnnotationUtil.getWebParam(method, "getGreetings"); + assertEquals("http://helloworldaxis.samples.tuscany.apache.org", webParamAnno.targetNamespace()); + assertEquals("request", webParamAnno.partName()); + assertEquals("getGreetings", webParamAnno.name()); + + } + + public void testBug305924ForNestedBinding() { + try { + String[] args = new String[] {"-all", "-compile", "-classdir", + output.getCanonicalPath() + "/classes", "-d", + output.getCanonicalPath(), "-b", + getLocation("/wsdl2java_wsdl/bug305924/binding2.xml"), + getLocation("/wsdl2java_wsdl/bug305924/hello_world.wsdl")}; + WSDLToJava.main(args); + } catch (Exception e) { + e.printStackTrace(System.err); + } + try { + Class clz = classLoader + .loadClass("org.apache.hello_world_soap_http.types.CreateProcess$MyProcess"); + assertNotNull("Customization binding code should be generated", clz); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + + + public void testBug305770() { + try { + env.put(ToolConstants.CFG_COMPILE, "compile"); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305770/Printer.wsdl")); + processor.setContext(env); + processor.execute(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void testBug305924ForExternalBinding() { + try { + String[] args = new String[] {"-all", "-compile", "-classdir", + output.getCanonicalPath() + "/classes", "-d", + output.getCanonicalPath(), "-b", + getLocation("/wsdl2java_wsdl/bug305924/binding1.xml"), + getLocation("/wsdl2java_wsdl/bug305924/hello_world.wsdl")}; + WSDLToJava.main(args); + } catch (Exception e) { + e.printStackTrace(System.err); + } + try { + Class clz = classLoader + .loadClass("org.apache.hello_world_soap_http.types.CreateProcess$MyProcess"); + assertNotNull("Customization binding code should be generated", clz); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + + */ + + + + private String getLocation(String wsdlFile) { + return this.getClass().getResource(wsdlFile).getFile(); + } +} Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java Thu Feb 1 02:59:13 2007 @@ -0,0 +1,112 @@ +/** + * 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. + */ +package org.apache.cxf.tools.wsdlto.jaxws; + +import java.io.File; +import java.io.InputStream; + +import org.apache.cxf.tools.common.ProcessorTestBase; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.toolspec.ToolSpec; +import org.apache.cxf.tools.util.AnnotationUtil; +import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer; + +public class CodeGenOptionTest extends ProcessorTestBase { + private JAXWSContainer processor; + private ClassLoader classLoader; + + public void setUp() throws Exception { + super.setUp(); + File classFile = new java.io.File(output.getCanonicalPath() + "/classes"); + classFile.mkdir(); + System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath() + + File.separatorChar); + classLoader = AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader()); + env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE); + env.put(ToolConstants.CFG_IMPL, "impl"); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + + InputStream ins = JAXWSContainer.class.getResourceAsStream("jaxws-toolspec.xml"); + ToolSpec toolspec = new ToolSpec(ins, true); + processor = new JAXWSContainer(toolspec); + + } + + public void tearDown() { + super.tearDown(); + processor = null; + env = null; + } + + + public void testFlagForGenStandAlone() throws Exception { + env.put(ToolConstants.CFG_GEN_TYPES, ToolConstants.CFG_GEN_TYPES); + env.put(ToolConstants.CFG_GEN_SEI, ToolConstants.CFG_GEN_SEI); + env.put(ToolConstants.CFG_GEN_IMPL, ToolConstants.CFG_GEN_IMPL); + env.put(ToolConstants.CFG_GEN_SERVICE, ToolConstants.CFG_GEN_SERVICE); + env.put(ToolConstants.CFG_GEN_SERVER, ToolConstants.CFG_GEN_SERVER); + env.put(ToolConstants.CFG_GEN_ANT, ToolConstants.CFG_GEN_ANT); + + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + Class greeterServer = classLoader.loadClass("org.apache.hello_world_soap_http.GreeterServer"); + assertNotNull("Server should be generated", greeterServer); + + } + + public void testFlagForGenAdditional() throws Exception { + env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL); + env.put(ToolConstants.CFG_SERVER, ToolConstants.CFG_SERVER); + + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl")); + processor.setContext(env); + processor.execute(true); + + Class greeterServer = classLoader.loadClass("org.apache.hello_world_soap_http.GreeterServer"); + assertNotNull("Server should be generated", greeterServer); + } + + + public void testHelloWorldExternalBindingFile() throws Exception { + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_jaxws_base.wsdl")); + env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/hello_world_jaxws_binding.wsdl")); + processor.setContext(env); + processor.execute(true); + + assertNotNull(output); + + File org = new File(output, "org"); + assertTrue(org.exists()); + File apache = new File(org, "apache"); + assertTrue(apache.exists()); + + Class clz = classLoader.loadClass("org.apache.hello_world_async_soap_http.GreeterAsync"); + assertEquals(3, clz.getMethods().length); + + } + + private String getLocation(String wsdlFile) { + return this.getClass().getResource(wsdlFile).getFile(); + } + + +} Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=502193&r1=502192&r2=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Thu Feb 1 02:59:13 2007 @@ -19,6 +19,7 @@ package org.apache.cxf.tools.wsdlto.jaxws; import java.io.File; +import java.io.InputStream; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -36,11 +37,12 @@ import org.apache.cxf.tools.common.ProcessorTestBase; import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.toolspec.ToolSpec; import org.apache.cxf.tools.util.AnnotationUtil; -import org.apache.cxf.tools.wsdlto.WSDLToJavaContainer; +import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer; public class CodeGenTest extends ProcessorTestBase { - private WSDLToJavaContainer processor; + private JAXWSContainer processor; private ClassLoader classLoader; public void setUp() throws Exception { @@ -54,8 +56,10 @@ env.put(ToolConstants.CFG_IMPL, "impl"); env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); - - processor = new WSDLToJavaContainer("jaxws", null); + InputStream ins = JAXWSContainer.class.getResourceAsStream("jaxws-toolspec.xml"); + ToolSpec toolspec = new ToolSpec(ins, true); + processor = new JAXWSContainer(toolspec); + //processor = new WSDLToJavaContainer("jaxws", null); } @@ -372,7 +376,7 @@ public void testAllNameCollision() throws Exception { env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_collision.wsdl")); - env.setPackageName("org.apache"); + env.put(ToolConstants.CFG_PACKAGENAME, "org.apache"); processor.setContext(env); processor.execute(); @@ -428,7 +432,7 @@ public void testSoapHeader() throws Exception { env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soap_header.wsdl")); - env.setPackageName("org.apache"); + env.put(ToolConstants.CFG_PACKAGENAME, "org.apache"); processor.setContext(env); processor.execute(); @@ -690,7 +694,6 @@ assertTrue("Invalid wsdl should be diagnosed", e.getMessage() .indexOf("Invalid WSDL,wsdl:operation") > -1); } - } public void testWSDLWithEnumType() throws Exception { Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java?view=diff&rev=502193&r1=502192&r2=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java (original) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java Thu Feb 1 02:59:13 2007 @@ -18,8 +18,11 @@ */ package org.apache.cxf.tools.wsdlto.validator; +import java.io.InputStream; + import org.apache.cxf.tools.common.ProcessorTestBase; import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.toolspec.ToolSpec; import org.apache.cxf.tools.wsdlto.WSDLToJavaContainer; import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer; @@ -34,7 +37,9 @@ } public void testXMLFormat() throws Exception { - processor = new JAXWSContainer(null); + InputStream ins = JAXWSContainer.class.getResourceAsStream("jaxws-toolspec.xml"); + ToolSpec toolspec = new ToolSpec(ins, true); + processor = new JAXWSContainer(toolspec); env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_format_root.wsdl")); processor.setContext(env); Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl Thu Feb 1 02:59:13 2007 @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl.tmp URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl.tmp?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl.tmp (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug161/header2.wsdl.tmp Thu Feb 1 02:59:13 2007 @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl Thu Feb 1 02:59:13 2007 @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305700/addNumbers.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl Thu Feb 1 02:59:13 2007 @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl Thu Feb 1 02:59:13 2007 @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd Thu Feb 1 02:59:13 2007 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl?view=auto&rev=502193 ============================================================================== --- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl (added) +++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl Thu Feb 1 02:59:13 2007 @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml