Umm... this commit removed the java2wsdl stuff from the build (java2/core). However, there are still a bunch of other poms that have a dependency on it. I've restored the java2wsdl module back into the build for now.
Dan mmao wrote: > > Author: mmao > Date: Fri Sep 21 06:06:53 2007 > New Revision: 578093 > > URL: http://svn.apache.org/viewvc?rev=578093&view=rev > Log: > CXF-1000, CXF-990 > > * Stax based xml diff asserts to replace the String based > assertFileEquals, > which broken the tests while migrating from jaxb2.0 to jaxb2.1 > > > > Added: > > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java > > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java > > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/ > > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test.wsdl > > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test2.wsdl > > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test3.wsdl > Modified: > > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java > > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/StAXUtil.java > incubator/cxf/trunk/tools/javato/pom.xml > > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java > > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java > > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java > > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl > > Modified: > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java > (original) > +++ > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java > Fri Sep 21 06:06:53 2007 > @@ -28,16 +28,27 @@ > import java.net.URL; > import java.net.URLClassLoader; > import java.util.ArrayList; > +import java.util.Arrays; > +import java.util.Iterator; > import java.util.List; > import java.util.StringTokenizer; > +import javax.xml.namespace.QName; > > +import org.apache.cxf.common.util.StringUtils; > import org.apache.cxf.helpers.FileUtils; > +import org.apache.cxf.tools.util.StAXUtil; > import org.junit.After; > import org.junit.Assert; > import org.junit.Before; > +import org.junit.ComparisonFailure; > > public class ProcessorTestBase extends Assert { > > + private static final List<String> DEFAULT_IGNORE_ATTR = > Arrays.asList(new String[]{"attributeFormDefault", > + > > "elementFormDefault", > + > > "form"}); > + private static final List<String> DEFAULT_IGNORE_TAG = > Arrays.asList(new String[]{"sequence"}); > + > protected ToolContext env = new ToolContext(); > protected File output; > > @@ -49,7 +60,6 @@ > FileUtils.mkDir(output); > } > > - > @After > public void tearDown() { > FileUtils.removeDir(output); > @@ -79,6 +89,11 @@ > return getClass().getResource(wsdlFile).toString(); > } > > + protected File getResource(String wsdlFile) throws URISyntaxException > { > + return new File(getClass().getResource(wsdlFile).toURI()); > + } > + > + > protected void assertFileEquals(String f1, String f2) { > assertFileEquals(new File(f1), new File(f2)); > } > @@ -179,5 +194,132 @@ > + rtn.substring(headerIndexEnd + endToken.length() + 1); > } > return rtn; > + } > + > + public boolean assertXmlEquals(final File expected, final File > source) throws Exception { > + List<String> attr = Arrays.asList(new > String[]{"attributeFormDefault", "elementFormDefault", "form"}); > + return assertXmlEquals(expected, source, attr); > + } > + > + public boolean assertXmlEquals(final File expected, final File > source, > + final List<String> ignoreAttr) throws > Exception { > + List<Tag> expectedTags = StAXUtil.getTags(expected); > + List<Tag> sourceTags = StAXUtil.getTags(source); > + > + Iterator<Tag> iterator = sourceTags.iterator(); > + > + for (Tag expectedTag : expectedTags) { > + Tag sourceTag = iterator.next(); > + if (!expectedTag.getName().equals(sourceTag.getName())) { > + throw new ComparisonFailure("Tags not equal: ", > + > expectedTag.getName().toString(), > + > sourceTag.getName().toString()); > + } > + for (QName attr : expectedTag.getAttributes()) { > + if (ignoreAttr.contains(attr.getNamespaceURI())) { > + continue; > + } > + > + boolean found = false; > + for (QName attr2 : sourceTag.getAttributes()) { > + if > (attr2.getNamespaceURI().equals(attr.getNamespaceURI())) { > + if > (attr2.getLocalPart().equals(attr.getLocalPart())) { > + found = true; > + } else { > + throw new ComparisonFailure("Attribute not > equal: ", > + attr.toString(), > + > attr2.toString()); > + } > + } > + } > + if (!found) { > + throw new AssertionError("Attribute: " + attr + " is > missing is the source file."); > + } > + } > + > + if (!StringUtils.isEmpty(expectedTag.getText()) > + && !expectedTag.getText().equals(sourceTag.getText())) { > + throw new ComparisonFailure("Text not equal ", > + > expectedTag.getText().toString(), > + > sourceTag.getText().toString()); > + } > + } > + return true; > + } > + > + protected void assertTagEquals(Tag expected, Tag source) { > + assertTagEquals(expected, source, DEFAULT_IGNORE_ATTR, > DEFAULT_IGNORE_TAG); > + } > + > + protected void assertTagEquals(Tag expected, Tag source, > + final List<String> ignoreAttr, > + final List<String> ignoreTag) { > + if (!expected.getName().equals(source.getName())) { > + throw new ComparisonFailure("Tags not equal: ", > + expected.getName().toString(), > + source.getName().toString()); > + } > + > + for (QName attr : expected.getAttributes()) { > + if (ignoreAttr.contains(attr.getNamespaceURI())) { > + continue; > + } > + boolean found = false; > + for (QName attr2 : source.getAttributes()) { > + if > (attr2.getNamespaceURI().equals(attr.getNamespaceURI())) { > + if (attr2.getLocalPart().equals(attr.getLocalPart())) > { > + found = true; > + } else { > + throw new ComparisonFailure("Attribute not equal: > ", > + attr.toString(), > + attr2.toString()); > + } > + } > + } > + if (!found) { > + throw new AssertionError("Attribute: " + attr + " is > missing is the source file."); > + } > + } > + if (!StringUtils.isEmpty(expected.getText()) > + && !expected.getText().equals(source.getText())) { > + throw new ComparisonFailure("Text not equal ", > + expected.getText().toString(), > + source.getText().toString()); > + } > + > + if (!expected.getTags().isEmpty()) { > + for (Tag expectedTag : expected.getTags()) { > + if > (ignoreTag.contains(expectedTag.getName().getLocalPart())) { > + continue; > + } > + Tag sourceTag = getFromSource(source, expectedTag); > + if (sourceTag == null) { > + throw new AssertionError("\n" + expected.toString() > + + " is missing in the source > file"); > + } > + assertTagEquals(expectedTag, sourceTag, ignoreAttr, > ignoreTag); > + } > + } > + } > + > + private Tag getFromSource(Tag sourceTag, Tag expectedTag) { > + for (Tag tag : sourceTag.getTags()) { > + if (tag.equals(expectedTag)) { > + return tag; > + } > + } > + return null; > + } > + > + public void assertWsdlEquals(final File expected, final File source, > List<String> attr, List<String> tag) > + throws Exception { > + Tag expectedTag = StAXUtil.getTagTree(expected, attr); > + Tag sourceTag = StAXUtil.getTagTree(source, attr); > + > + assertTagEquals(expectedTag, sourceTag, attr, tag); > + } > + > + public void assertWsdlEquals(final File expected, final File source) > throws Exception { > + assertWsdlEquals(expected, source, DEFAULT_IGNORE_ATTR, > DEFAULT_IGNORE_TAG); > } > } > > Added: > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java?rev=578093&view=auto > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java > (added) > +++ > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java > Fri Sep 21 06:06:53 2007 > @@ -0,0 +1,165 @@ > +/** > + * 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.common; > + > +import java.util.ArrayList; > +import java.util.HashSet; > +import java.util.List; > +import java.util.Set; > +import javax.xml.namespace.QName; > + > +public class Tag { > + QName name; > + Set<QName> attributes; > + String text; > + > + List<Tag> tags; > + Tag parent; > + > + List<String> ignoreAttr; > + > + > + public List<String> getIgnoreAttr() { > + if (ignoreAttr == null) { > + ignoreAttr = new ArrayList<String>(); > + } > + return ignoreAttr; > + } > + > + public Tag getParent() { > + return this.parent; > + } > + > + public void setParent(Tag nTag) { > + this.parent = nTag; > + } > + > + public List<Tag> getTags() { > + if (tags == null) { > + tags = new ArrayList<Tag>(); > + } > + return tags; > + } > + > + public String getText() { > + return text; > + } > + > + public void setText(String nText) { > + this.text = nText; > + } > + > + public QName getName() { > + return name; > + } > + > + public void setName(QName nName) { > + this.name = nName; > + } > + > + public Set<QName> getAttributes() { > + if (attributes == null) { > + attributes = new HashSet<QName>(); > + } > + return attributes; > + } > + > + private String getIndent(int size) { > + String indent = " "; > + StringBuffer sb = new StringBuffer(); > + for (int i = 0; i < size; i++) { > + sb.append(indent); > + } > + return sb.toString(); > + } > + > + private String formatAttribute(final Tag tag) { > + StringBuffer sb = new StringBuffer(); > + sb.append(tag.getName().getLocalPart()); > + sb.append(" "); > + for (QName attr : tag.getAttributes()) { > + sb.append(attr.getNamespaceURI()); > + sb.append("=\""); > + sb.append(attr.getLocalPart()); > + sb.append("\" "); > + } > + return sb.toString().trim(); > + } > + > + private String formatTag(Tag tag, int indent) { > + StringBuffer sb = new StringBuffer(); > + sb.append(getIndent(indent)); > + sb.append(indent); > + sb.append("<"); > + sb.append(formatAttribute(tag)); > + sb.append(">"); > + if (tag.getParent() != null) { > + sb.append(" (" + tag.getParent().getName().getLocalPart() + > ")"); > + } > + if (text != null) { > + sb.append(text); > + } > + sb.append("\n"); > + > + if (tag.getTags().size() > 0) { > + indent++; > + for (Tag subTag : tag.getTags()) { > + sb.append(formatTag(subTag, indent)); > + } > + } > + return sb.toString(); > + } > + > + public String toString() { > + StringBuffer sb = new StringBuffer(); > + sb.append(formatTag(this, 0)); > + return sb.toString(); > + } > + > + public int hashCode() { > + return getName().hashCode() + getAttributes().hashCode(); > + } > + > + public boolean equals(Object object) { > + if (object == null) { > + return false; > + } > + if (!(object instanceof Tag)) { > + return false; > + } > + > + if (object == this) { > + return true; > + } > + Tag tag = (Tag) object; > + if (!getName().equals(tag.getName())) { > + return false; > + } > + for (QName attr : getAttributes()) { > + if (getIgnoreAttr().contains(attr.getNamespaceURI())) { > + continue; > + } > + if (!tag.getAttributes().contains(attr)) { > + return false; > + } > + } > + return true; > + } > +} > > Modified: > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/StAXUtil.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/StAXUtil.java?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/StAXUtil.java > (original) > +++ > incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/StAXUtil.java > Fri Sep 21 06:06:53 2007 > @@ -19,9 +19,17 @@ > > package org.apache.cxf.tools.util; > > +import java.io.BufferedInputStream; > +import java.io.File; > +import java.io.FileInputStream; > +import java.io.InputStream; > import java.net.URL; > +import java.util.ArrayList; > +import java.util.Arrays; > +import java.util.List; > +import java.util.Stack; > import java.util.logging.Logger; > - > +import javax.xml.namespace.QName; > import javax.xml.stream.XMLInputFactory; > import javax.xml.stream.XMLStreamException; > import javax.xml.stream.XMLStreamReader; > @@ -30,6 +38,8 @@ > > import org.apache.cxf.common.i18n.Message; > import org.apache.cxf.common.logging.LogUtils; > +import org.apache.cxf.staxutils.StaxUtils; > +import org.apache.cxf.tools.common.Tag; > import org.apache.cxf.tools.common.ToolException; > > public final class StAXUtil { > @@ -65,5 +75,112 @@ > Message msg = new Message("FAIL_TO_CREATE_STAX", LOG); > throw new ToolException(msg, e); > } > + } > + > + public static List<Tag> getTags(final File source) throws Exception { > + List<Tag> tags = new ArrayList<Tag>(); > + List<String> ignoreEmptyTags = Arrays.asList(new > String[]{"sequence"}); > + > + InputStream is = new BufferedInputStream(new > FileInputStream(source)); > + XMLStreamReader reader = StaxUtils.createXMLStreamReader(is); > + Tag newTag = null; > + int count = 0; > + QName checkingPoint = null; > + > + Stack<Tag> stack = new Stack<Tag>(); > + > + while (reader.hasNext()) { > + int event = reader.next(); > + > + if (checkingPoint != null) { > + count++; > + } > + > + if (event == XMLStreamReader.START_ELEMENT) { > + newTag = new Tag(); > + newTag.setName(reader.getName()); > + > + if (ignoreEmptyTags.contains(reader.getLocalName())) { > + checkingPoint = reader.getName(); > + } > + > + for (int i = 0; i < reader.getAttributeCount(); i++) { > + newTag.getAttributes().add(new > QName(reader.getAttributeLocalName(i), > + > reader.getAttributeValue(i))); > + } > + stack.push(newTag); > + } > + if (event == XMLStreamReader.CHARACTERS) { > + newTag.setText(reader.getText()); > + } > + > + if (event == XMLStreamReader.END_ELEMENT) { > + Tag startTag = stack.pop(); > + > + if (checkingPoint != null && > checkingPoint.equals(reader.getName())) { > + if (count == 1) { > + //Tag is empty, and it's in the ignore > collection, so we just skip this tag > + } else { > + tags.add(startTag); > + } > + count = 0; > + checkingPoint = null; > + } else { > + tags.add(startTag); > + } > + } > + } > + reader.close(); > + return tags; > + } > + > + public static Tag getTagTree(final File source) throws Exception { > + return getTagTree(source, new ArrayList<String>()); > + } > + > + public static Tag getTagTree(final File source, final List<String> > ignoreAttr) throws Exception { > + Tag root = new Tag(); > + root.setName(new QName("root", "root")); > + > + InputStream is = new BufferedInputStream(new > FileInputStream(source)); > + XMLStreamReader reader = StaxUtils.createXMLStreamReader(is); > + Tag newTag = null; > + > + Tag currentTag = root; > + > + while (reader.hasNext()) { > + int event = reader.next(); > + > + if (event == XMLStreamReader.START_ELEMENT) { > + newTag = new Tag(); > + newTag.setName(reader.getName()); > + if (!ignoreAttr.isEmpty()) { > + newTag.getIgnoreAttr().addAll(ignoreAttr); > + } > + > + for (int i = 0; i < reader.getAttributeCount(); i++) { > + newTag.getAttributes().add(new > QName(reader.getAttributeLocalName(i), > + > reader.getAttributeValue(i))); > + } > + > + newTag.setParent(currentTag); > + currentTag.getTags().add(newTag); > + currentTag = newTag; > + } > + if (event == XMLStreamReader.CHARACTERS) { > + newTag.setText(reader.getText()); > + } > + > + if (event == XMLStreamReader.END_ELEMENT) { > + currentTag = currentTag.getParent(); > + } > + } > + reader.close(); > + return root; > + } > + > + public Tag getLastTag(Tag tag) { > + int lastIndex = tag.getTags().size() - 1; > + return tag.getTags().get(lastIndex); > } > } > > Added: > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java?rev=578093&view=auto > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java > (added) > +++ > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/StAXUtilTest.java > Fri Sep 21 06:06:53 2007 > @@ -0,0 +1,54 @@ > +/** > + * 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.util; > + > +import java.io.File; > + > +import org.apache.cxf.tools.common.ProcessorTestBase; > +import org.apache.cxf.tools.common.Tag; > +import org.junit.Test; > + > +public class StAXUtilTest extends ProcessorTestBase { > + > + @Test > + public void testGetTags() throws Exception { > + File file = new > File(getClass().getResource("resources/test.wsdl").toURI()); > + > + file = getResource("resources/test2.wsdl"); > + Tag tag1 = StAXUtil.getTagTree(file); > + assertEquals(1, tag1.getTags().size()); > + Tag def1 = tag1.getTags().get(0); > + assertEquals(6, def1.getTags().size()); > + Tag types1 = def1.getTags().get(0); > + Tag schema1 = types1.getTags().get(0); > + assertEquals(4, schema1.getTags().size()); > + > + file = getResource("resources/test3.wsdl"); > + Tag tag2 = StAXUtil.getTagTree(file); > + assertEquals(1, tag2.getTags().size()); > + Tag def2 = tag2.getTags().get(0); > + assertEquals(6, def2.getTags().size()); > + Tag types2 = def2.getTags().get(0); > + Tag schema2 = types2.getTags().get(0); > + assertEquals(4, schema2.getTags().size()); > + > + assertTagEquals(schema1, schema2); > + } > +} > > Added: > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test.wsdl > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test.wsdl?rev=578093&view=auto > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test.wsdl > (added) > +++ > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test.wsdl > Fri Sep 21 06:06:53 2007 > @@ -0,0 +1,188 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one > + or more contributor license agreements. See the NOTICE file > + distributed with this work for additional information > + regarding copyright ownership. The ASF licenses this file > + to you under the Apache License, Version 2.0 (the > + "License"); you may not use this file except in compliance > + with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, > + software distributed under the License is distributed on an > + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + KIND, either express or implied. See the License for the > + specific language governing permissions and limitations > + under the License. > +--> > +<wsdl:definitions name="GreeterService" > + targetNamespace="http://apache.org/hello_world_doc_lit"; > + xmlns:tns="http://apache.org/hello_world_doc_lit"; > + xmlns:ns1="http://apache.org/hello_world_doc_lit/types"; > + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; > + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> > + <wsdl:types> > + <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; > + xmlns="http://apache.org/hello_world_doc_lit/types"; > + attributeFormDefault="unqualified" > + elementFormDefault="qualified" > + > targetNamespace="http://apache.org/hello_world_doc_lit/types";> > + <xs:element name="faultDetail"> > + <xs:complexType> > + <xs:sequence> > + <xs:element name="minor" type="xs:short"/> > + <xs:element name="major" type="xs:short"/> > + </xs:sequence> > + </xs:complexType> > + </xs:element> > + <xs:element name="greetMe"> > + <xs:complexType> > + <xs:sequence> > + <xs:element name="requestType" type="xs:string"/> > + </xs:sequence> > + </xs:complexType> > + </xs:element> > + <xs:element name="greetMeOneWay"> > + <xs:complexType> > + <xs:sequence> > + <xs:element name="requestType" type="xs:string"/> > + </xs:sequence> > + </xs:complexType> > + </xs:element> > + <xs:element name="greetMeResponse"> > + <xs:complexType> > + <xs:sequence> > + <xs:element name="responseType" type="xs:string"/> > + </xs:sequence> > + </xs:complexType> > + </xs:element> > + <xs:element name="pingMe"> > + <xs:complexType> > + <xs:sequence/> > + </xs:complexType> > + </xs:element> > + <xs:element name="pingMeResponse"> > + <xs:complexType> > + <xs:sequence/> > + </xs:complexType> > + </xs:element> > + <xs:element name="sayHi"> > + <xs:complexType> > + <xs:sequence/> > + </xs:complexType> > + </xs:element> > + <xs:element name="sayHiResponse"> > + <xs:complexType> > + <xs:sequence> > + <xs:element name="responseType" type="xs:string"/> > + </xs:sequence> > + </xs:complexType> > + </xs:element> > + </xs:schema> > + </wsdl:types> > + <wsdl:message name="sayHiResponse"> > + <wsdl:part name="result" element="ns1:sayHiResponse"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="greetMeResponse"> > + <wsdl:part name="result" element="ns1:greetMeResponse"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="greetMe"> > + <wsdl:part name="parameters" element="ns1:greetMe"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="pingMe"> > + <wsdl:part name="parameters" element="ns1:pingMe"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="pingMeResponse"> > + <wsdl:part name="result" element="ns1:pingMeResponse"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="sayHi"> > + <wsdl:part name="parameters" element="ns1:sayHi"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="PingMeFault"> > + <wsdl:part name="PingMeFault" element="ns1:faultDetail"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="greetMeOneWay"> > + <wsdl:part name="parameters" element="ns1:greetMeOneWay"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:portType name="Greeter"> > + <wsdl:operation name="greetMe"> > + <wsdl:input name="greetMe" message="tns:greetMe"> > + </wsdl:input> > + <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"> > + </wsdl:output> > + </wsdl:operation> > + <wsdl:operation name="greetMeOneWay"> > + <wsdl:input name="greetMeOneWay" message="tns:greetMeOneWay"> > + </wsdl:input> > + </wsdl:operation> > + <wsdl:operation name="sayHi"> > + <wsdl:input name="sayHi" message="tns:sayHi"> > + </wsdl:input> > + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> > + </wsdl:output> > + </wsdl:operation> > + <wsdl:operation name="pingMe"> > + <wsdl:input name="pingMe" message="tns:pingMe"> > + </wsdl:input> > + <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"> > + </wsdl:output> > + <wsdl:fault name="PingMeFault" message="tns:PingMeFault"> > + </wsdl:fault> > + </wsdl:operation> > + </wsdl:portType> > + <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter"> > + <soap:binding style="document" > transport="http://schemas.xmlsoap.org/soap/http"/> > + <wsdl:operation name="greetMe"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="greetMe"> > + <soap:body use="literal"/> > + </wsdl:input> > + <wsdl:output name="greetMeResponse"> > + <soap:body use="literal"/> > + </wsdl:output> > + </wsdl:operation> > + <wsdl:operation name="greetMeOneWay"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="greetMeOneWay"> > + <soap:body use="literal"/> > + </wsdl:input> > + </wsdl:operation> > + <wsdl:operation name="sayHi"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="sayHi"> > + <soap:body use="literal"/> > + </wsdl:input> > + <wsdl:output name="sayHiResponse"> > + <soap:body use="literal"/> > + </wsdl:output> > + </wsdl:operation> > + <wsdl:operation name="pingMe"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="pingMe"> > + <soap:body use="literal"/> > + </wsdl:input> > + <wsdl:output name="pingMeResponse"> > + <soap:body use="literal"/> > + </wsdl:output> > + <wsdl:fault name="PingMeFault"> > + <soap:fault name="PingMeFault" use="literal"/> > + </wsdl:fault> > + </wsdl:operation> > + </wsdl:binding> > + <wsdl:service name="GreeterService"> > + <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding"> > + <soap:address location="http://localhost:9090"/> > + </wsdl:port> > + </wsdl:service> > +</wsdl:definitions> > \ No newline at end of file > > Added: > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test2.wsdl > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test2.wsdl?rev=578093&view=auto > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test2.wsdl > (added) > +++ > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test2.wsdl > Fri Sep 21 06:06:53 2007 > @@ -0,0 +1,72 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > +<wsdl:definitions name="HelloWithNoWebParamService" > targetNamespace="http://apache.org/"; xmlns:tns="http://apache.org/"; > xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; > xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> > + <wsdl:types> > + <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; > xmlns:tns="http://doc.withannotation.fortest.tools.cxf.apache.org/"; > attributeFormDefault="unqualified" elementFormDefault="unqualified" > targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/";> > + <xs:element name="sayHi" type="tns:sayHi"/> > + <xs:element name="sayHiResponse" type="tns:sayHiResponse"/> > + <xs:complexType name="sayHiResponse"> > + <xs:sequence/> > + </xs:complexType> > + <xs:complexType name="sayHi"> > + <xs:sequence> > + <xs:element name="arg0" type="xs:long"/> > + </xs:sequence> > + </xs:complexType> > + </xs:schema> > + <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > xmlns:ns0="http://doc.withannotation.fortest.tools.cxf.apache.org/"; > xmlns:tns="http://apache.org/"; attributeFormDefault="unqualified" > elementFormDefault="unqualified" targetNamespace="http://apache.org/";> > + <xsd:element name="sayHi" nillable="true" type="ns0:sayHi"/> > + <xsd:element name="sayHiResponse" nillable="true" > type="ns0:sayHiResponse"/> > + </xsd:schema> > + </wsdl:types> > + <wsdl:message name="sayHiResponse"> > + <wsdl:part name="result" element="tns:sayHiResponse"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="sayHi"> > + <wsdl:part name="parameters" element="tns:sayHi"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:portType name="Hello"> > + <wsdl:operation name="sayHi"> > + <wsdl:input name="sayHi" message="tns:sayHi"> > + </wsdl:input> > + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> > + </wsdl:output> > + </wsdl:operation> > + </wsdl:portType> > + <wsdl:binding name="HelloWithNoWebParamServiceSoapBinding" > type="tns:Hello"> > + <soap:binding style="document" > transport="http://schemas.xmlsoap.org/soap/http"/> > + <wsdl:operation name="sayHi"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="sayHi"> > + <soap:body use="literal"/> > + </wsdl:input> > + <wsdl:output name="sayHiResponse"> > + <soap:body use="literal"/> > + </wsdl:output> > + </wsdl:operation> > + </wsdl:binding> > + <wsdl:service name="HelloWithNoWebParamService"> > + <wsdl:port name="HelloPort" > binding="tns:HelloWithNoWebParamServiceSoapBinding"> > + <soap:address location="http://localhost:9090"/> > + </wsdl:port> > + </wsdl:service> > +</wsdl:definitions> > > Added: > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test3.wsdl > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test3.wsdl?rev=578093&view=auto > ============================================================================== > --- > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test3.wsdl > (added) > +++ > incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/resources/test3.wsdl > Fri Sep 21 06:06:53 2007 > @@ -0,0 +1,70 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one > + or more contributor license agreements. See the NOTICE file > + distributed with this work for additional information > + regarding copyright ownership. The ASF licenses this file > + to you under the Apache License, Version 2.0 (the > + "License"); you may not use this file except in compliance > + with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, > + software distributed under the License is distributed on an > + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + KIND, either express or implied. See the License for the > + specific language governing permissions and limitations > + under the License. > +--> > +<wsdl:definitions name="HelloWithNoWebParamService" > targetNamespace="http://apache.org/"; xmlns:tns="http://apache.org/"; > xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; > xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> > + <wsdl:types> > + <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; > xmlns:tns="http://doc.withannotation.fortest.tools.cxf.apache.org/"; > attributeFormDefault="unqualified" elementFormDefault="unqualified" > targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/";> > + <xs:element name="sayHi" type="tns:sayHi"/> > + <xs:element name="sayHiResponse" type="tns:sayHiResponse"/> > + <xs:complexType name="sayHi"> > + <xs:sequence> > + <xs:element name="arg0" type="xs:long"/> > + </xs:sequence> > + </xs:complexType> > + <xs:complexType name="sayHiResponse"/> > + </xs:schema> > + <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > xmlns:ns0="http://doc.withannotation.fortest.tools.cxf.apache.org/"; > xmlns:tns="http://apache.org/"; attributeFormDefault="unqualified" > elementFormDefault="unqualified" targetNamespace="http://apache.org/";> > + <xsd:element name="sayHi" nillable="true" type="ns0:sayHi"/> > + <xsd:element name="sayHiResponse" nillable="true" > type="ns0:sayHiResponse"/> > + </xsd:schema> > + </wsdl:types> > + <wsdl:message name="sayHiResponse"> > + <wsdl:part name="result" element="tns:sayHiResponse"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:message name="sayHi"> > + <wsdl:part name="parameters" element="tns:sayHi"> > + </wsdl:part> > + </wsdl:message> > + <wsdl:portType name="Hello"> > + <wsdl:operation name="sayHi"> > + <wsdl:input name="sayHi" message="tns:sayHi"> > + </wsdl:input> > + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> > + </wsdl:output> > + </wsdl:operation> > + </wsdl:portType> > + <wsdl:binding name="HelloWithNoWebParamServiceSoapBinding" > type="tns:Hello"> > + <soap:binding style="document" > transport="http://schemas.xmlsoap.org/soap/http"/> > + <wsdl:operation name="sayHi"> > + <soap:operation soapAction="" style="document"/> > + <wsdl:input name="sayHi"> > + <soap:body use="literal"/> > + </wsdl:input> > + <wsdl:output name="sayHiResponse"> > + <soap:body use="literal"/> > + </wsdl:output> > + </wsdl:operation> > + </wsdl:binding> > + <wsdl:service name="HelloWithNoWebParamService"> > + <wsdl:port name="HelloPort" > binding="tns:HelloWithNoWebParamServiceSoapBinding"> > + <soap:address location="http://localhost:9090"/> > + </wsdl:port> > + </wsdl:service> > +</wsdl:definitions> > \ No newline at end of file > > Modified: incubator/cxf/trunk/tools/javato/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/pom.xml?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- incubator/cxf/trunk/tools/javato/pom.xml (original) > +++ incubator/cxf/trunk/tools/javato/pom.xml Fri Sep 21 06:06:53 2007 > @@ -32,8 +32,6 @@ > </parent> > > <modules> > - <module>core</module> > - <module>test</module> > <module>ws</module> > </modules> > > > Modified: > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java > (original) > +++ > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java > Fri Sep 21 06:06:53 2007 > @@ -91,6 +91,7 @@ > } > > @Test > + @org.junit.Ignore("The test seems failed on Vista") > public void testAegisReconfigureDatabinding() throws Exception { > final String sei = > "org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI"; > String[] args = new String[] {"-wsdl", "-o", output.getPath() + > "/aegis.wsdl", > > Modified: > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java > (original) > +++ > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java > Fri Sep 21 06:06:53 2007 > @@ -89,7 +89,7 @@ > processor.process(); > > String expectedFile = > getClass().getResource("expected/calculator.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "calculator.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "calculator.wsdl")); > > } > > @@ -118,7 +118,7 @@ > processor.process(); > > String expectedFile = > getClass().getResource("expected/hello_soap12.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "hello_soap12.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "hello_soap12.wsdl")); > } > > @Test > @@ -185,7 +185,7 @@ > processor.process(); > > String expectedFile = > getClass().getResource("expected/db.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "db.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "db.wsdl")); > } > > @Test > @@ -209,7 +209,7 @@ > processor.process(); > > String expectedFile = > getClass().getResource("expected/my_hello_soap12.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "my_hello_soap12.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "my_hello_soap12.wsdl")); > } > @Test > public void testGenWrapperBeanClasses() throws Exception { > @@ -304,13 +304,13 @@ > File wsdlFile = new File(output, "rpc-hello.wsdl"); > assertTrue("Generate Wsdl Fail", wsdlFile.exists()); > String expectedFile = > getClass().getResource("expected/rpc-hello-expected.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "rpc-hello.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "rpc-hello.wsdl")); > > } > > > @Test > - public void testXMlBare() { > + public void testXMlBare() throws Exception { > env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + > "/xml-bare.wsdl"); > env.put(ToolConstants.CFG_CLASSNAME, > "org.apache.xml_bare.Greeter"); > processor.setEnvironment(env); > @@ -319,7 +319,7 @@ > File wsdlFile = new File(output, "xml-bare.wsdl"); > assertTrue("Generate Wsdl Fail", wsdlFile.exists()); > String expectedFile = > getClass().getResource("expected/xml-bare-expected.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "/xml-bare.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "/xml-bare.wsdl")); > > } > > @@ -335,12 +335,9 @@ > assertTrue("Generate Wsdl Fail", wsdlFile.exists()); > > String expectedFile = > getClass().getResource("expected/hello_world_fault_expected.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "/fault.wsdl")); > - > + assertWsdlEquals(new File(expectedFile), new File(output, > "/fault.wsdl")); > } > > - > - > @Test > public void testResumeClasspath() throws Exception { > File classFile = new java.io.File(output.getCanonicalPath() + > "/classes"); > @@ -381,7 +378,7 @@ > assertTrue(bindingFile.exists()); > > String expectedFile = > getClass().getResource("expected/echo_date.xjb").getFile(); > - assertFileEquals(new File(expectedFile), bindingFile); > + assertWsdlEquals(new File(expectedFile), bindingFile); > } > > @Test > @@ -397,7 +394,7 @@ > assertTrue(bindingFile.exists()); > > String expectedFile = > getClass().getResource("expected/echo_calendar.xjb").getFile(); > - assertFileEquals(new File(expectedFile), bindingFile); > + assertWsdlEquals(new File(expectedFile), bindingFile); > } > > @Test > @@ -416,6 +413,6 @@ > assertTrue("Generate Wsdl Fail", wsdlFile.exists()); > > String expectedFile = > getClass().getResource("expected/list_expected.wsdl").getFile(); > - assertFileEquals(new File(expectedFile), new File(output, > "/list_test.wsdl")); > + assertWsdlEquals(new File(expectedFile), new File(output, > "/list_test.wsdl")); > } > } > > Modified: > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java > (original) > +++ > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java > Fri Sep 21 06:06:53 2007 > @@ -95,7 +95,7 @@ > > String expectedFile = this.getClass() > > .getResource("expected/expected_doc_lit_wrapped_no_wrapperclass.wsdl").getFile(); > - assertFileEquals(expectedFile, output.getAbsolutePath()); > + assertWsdlEquals(new File(expectedFile), output); > } > > > @@ -112,7 +112,8 @@ > > String expectedFile = > this.getClass().getResource("expected/expected_hello_world_doc_lit.wsdl") > .getFile(); > - assertFileEquals(expectedFile, output.getAbsolutePath()); > + assertWsdlEquals(new File(expectedFile), output); > + //assertFileEquals(expectedFile, output.getAbsolutePath()); > } > > @Test > @@ -144,7 +145,7 @@ > > String expectedFile = this.getClass() > > .getResource("expected/expected_doc_lit_wrapped_no_webparam.wsdl").getFile(); > - assertFileEquals(expectedFile, output.getAbsolutePath()); > + assertWsdlEquals(new File(expectedFile), output); > } > > @Test > @@ -174,7 +175,8 @@ > > String expectedFile = > this.getClass().getResource("expected/expected_hello_world_async.wsdl") > .getFile(); > - assertFileEquals(expectedFile, output.getAbsolutePath()); > + > + assertWsdlEquals(new File(expectedFile), output); > } > > @Test > @@ -190,7 +192,7 @@ > assertTrue(output.exists()); > > String expectedFile = > this.getClass().getResource("expected/expected_rpc_lit.wsdl").getFile(); > - assertFileEquals(expectedFile, file.getAbsolutePath()); > + assertWsdlEquals(new File(expectedFile), file); > } > > > > Modified: > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl?rev=578093&r1=578092&r2=578093&view=diff > ============================================================================== > --- > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl > (original) > +++ > incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_no_webparam.wsdl > Fri Sep 21 06:06:53 2007 > @@ -1,4 +1,22 @@ > <?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Licensed to the Apache Software Foundation (ASF) under one > + or more contributor license agreements. See the NOTICE file > + distributed with this work for additional information > + regarding copyright ownership. The ASF licenses this file > + to you under the Apache License, Version 2.0 (the > + "License"); you may not use this file except in compliance > + with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, > + software distributed under the License is distributed on an > + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + KIND, either express or implied. See the License for the > + specific language governing permissions and limitations > + under the License. > +--> > <wsdl:definitions name="HelloWithNoWebParamService" > targetNamespace="http://apache.org/"; xmlns:tns="http://apache.org/"; > xmlns:xsd="http://www.w3.org/2001/XMLSchema"; > xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; > xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";> > <wsdl:types> > <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; > xmlns:tns="http://doc.withannotation.fortest.tools.cxf.apache.org/"; > attributeFormDefault="unqualified" elementFormDefault="unqualified" > targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/";> > > > -- View this message in context: http://www.nabble.com/svn-commit%3A-r578093---in--incubator-cxf-trunk-tools%3A-common-src-main-java-org-apache-cxf-tools-common--common-src-main-java-org-apache-cxf-tools-util--common-src-test-java-org-apache-cxf-tools-util--common-src-test-java-org-apache-cxf-tools-util-resour...-tf4496032.html#a12827593 Sent from the cxf-commits mailing list archive at Nabble.com.
