[jbossws-commits] JBossWS SVN: r2390 - in branches/jbossws-1.2.0: build/ant-import and 18 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-17 09:55:32 -0500 (Sat, 17 Feb 2007) New Revision: 2390 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl Removed: branches/jbossws-1.2.0/jbossws-tests/ant-import/jaxws-tools-delegate.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/hello.jsp Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml branches/jbossws-1.2.0/build/version.properties branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-1.2.0/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml branches/jbossws-1.2.0/jbossws-core/.classpath branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml Log: Add [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI Update to wsdl4j-1.6.2, xerces-2.9.0 Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -45,8 +45,12 @@ <!-- jbossws --> <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> <mkdir dir="${jbossws.repository.dir}/lib"/> + <delete> + <fileset dir="${jbossws.repository.dir}/lib"/> + </delete> <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -38,6 +38,7 @@ <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml =================================================================== --- branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -9,13 +9,8 @@ <artifact id="jboss-saaj.jar"/> <artifact id="jbossws40.sar"/> - <artifact id="jbossws-jboss40-integration.jar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws-jboss42-integration.jar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws-jboss50-integration.jar"/> <artifact id="jbossws50-deployer.zip"/> <import componentref="apache-xmlsec"> @@ -42,13 +37,8 @@ <compatible version="@sun-jaxb@"/> </import> - <!-- - There should be no dependency on core or client jars except for - jbossws propriatary annotations. Do not expose these jars here. - - Instead include jbossws-core.jar and jbossws-jboss??-integration.jar in the test classpath - --> <export> + <include input="jbossws-core.jar"/> <include input="jboss-jaxrpc.jar"/> <include input="jboss-jaxws.jar"/> <include input="jboss-saaj.jar"/> Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/build/version.properties 2007-02-17 14:55:32 UTC (rev 2390) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=1.2.0.GA -repository.id=1.2.0.GA +version.id=1.2.0.CR3 +repository.id=1.2.0.CR3 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws @@ -15,8 +15,8 @@ # thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 -ibm-wsdl4j=1.5.2jboss -javassist=3.4.GA +ibm-wsdl4j=1.6.2 +javassist=3.5.0.CR1 jboss-jbossxb=1.0.0.CR9 jboss-microcontainer=1.0.2 jboss-remoting=2.0.0.GA @@ -29,7 +29,7 @@ apache-logging=1.0.5.GA-jboss apache-tomcat=5.5.20 apache-xalan=j_2.7.0 -apache-xerces=2.7.1 +apache-xerces=2.9.0 dom4j=1.6.1 gnu-getopt=1.0.10 hibernate=3.2.1.GA Modified: branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -25,7 +25,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -25,7 +25,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -23,7 +23,7 @@ <!-- Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -18,15 +18,9 @@ --> <property name="webServiceHost">localhost</property> <property name="alwaysModifySOAPAddress">true</property> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. --> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> </bean> Modified: branches/jbossws-1.2.0/jbossws-core/.classpath =================================================================== --- branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/.classpath 2007-02-17 14:55:32 UTC (rev 2390) @@ -15,7 +15,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-src.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -66,7 +66,7 @@ inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled()); if (inputSource == null) - if(log.isDebugEnabled()) log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); return inputSource; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; // $Id$ @@ -64,11 +64,6 @@ /** * Resolves an external parsed entity. If the entity cannot be * resolved, this method should return null. - * - * @param resourceIdentifier description of the resource to be resolved - * @throws XNIException Thrown on general error. - * @throws IOException Thrown if resolved entity stream cannot be - * opened or some other i/o error occurs. */ public XMLInputSource resolveEntity(XMLResourceIdentifier resId) throws XNIException, IOException { @@ -86,13 +81,13 @@ { XMLInputSource source = getXMLInputSource(inputSource, resId); return source; - } + } } catch (Exception ex) { log.trace(ex); - } - + } + try { String expandedSysId = resId.getExpandedSystemId(); @@ -137,8 +132,7 @@ } // Delegate to JBoss Entity Resolver - XMLInputSource source = getXMLInputSource( - delegate.resolveEntity(null, namespaceURI), resId); + XMLInputSource source = getXMLInputSource(delegate.resolveEntity(null, namespaceURI), resId); if (source != null) return source; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -88,7 +88,8 @@ EntityResolver entityResolver = new JBossWSEntityResolver(); // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + // ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition wsdlDefinition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); return wsdlDefinition; Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -47,8 +47,6 @@ import org.w3c.dom.Element; import org.xml.sax.EntityResolver; -import com.ibm.wsdl.xml.WSDLReaderImpl; - /** * A factory that creates a <code>WSDLDefinitions</code> object from an URL. * @@ -126,7 +124,8 @@ } // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + //((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -157,4 +157,8 @@ { return latestImportURI; } + + public void close() + { + } } Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -188,6 +188,15 @@ </fileset> </war> + <!-- jaxws-jbws1529 --> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> + </classes> + </war> + <!-- jaxws-jsr181-complex --> <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -525,7 +525,7 @@ </metainf> </jar> - <!-- jaxrpc-samples-wsbpel --> + <!-- jaxrpc-samples-wsbpel <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> @@ -554,6 +554,7 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + --> <!-- jaxrpc-samples-wssecurity-sign --> <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> Deleted: branches/jbossws-1.2.0/jbossws-tests/ant-import/jaxws-tools-delegate.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id: build-interop.xml 1948 2007-01-12 16:47:53Z heiko.braun(a)jboss.com $ --> - -<project name="TOOLS-Delegate"> - <macrodef name="call-wsconsume"> - - <attribute name="sourceDir"/> - <attribute name="destDir"/> - <attribute name="wsdlLocation"/> - <attribute name="verbose" default="false"/> - <attribute name="package"/> - - <sequential> - - <echo>-----------------------------------------------</echo> - <echo>Invoking wsimport </echo> - <echo>sourceDir: @{sourceDir}</echo> - <echo>wsdlLocation: @{wsdlLocation}</echo> - <echo>-----------------------------------------------</echo> - - <mkdir dir="@{sourceDir}"/> - <mkdir dir="@{destDir}"/> - -<!-- Config for SUN RI - <property name="ri.home" value="NOT_SET"/> - <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> - <classpath> - <pathelement location="${ri.home}/lib/activation.jar"/> - <pathelement location="${ri.home}/lib/FastInfoset.jar"/> - <pathelement location="${ri.home}/lib/http.jar"/> - <pathelement location="${ri.home}/lib/jaxb-api.jar"/> - <pathelement location="${ri.home}/lib/jaxb-xjc.jar"/> - <pathelement location="${ri.home}/lib/jaxws-api.jar"/> - <pathelement location="${ri.home}/lib/jaxws-rt.jar"/> - <pathelement location="${ri.home}/lib/jaxws-tools.jar"/> - <pathelement location="${ri.home}/lib/jsr173_api.jar"/> - <pathelement location="${ri.home}/lib/jsr181-api.jar"/> - <pathelement location="${ri.home}/lib/jsr250-api.jar"/> - <pathelement location="${ri.home}/lib/resolver.jar"/> - <pathelement location="${ri.home}/lib/saaj-api.jar"/> - <pathelement location="${ri.home}/lib/saaj-impl.jar"/> - <pathelement location="${ri.home}/lib/sjsxp.jar"/> - </classpath> - </taskdef> ---> - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath> - <pathelement location="${core.output.dir}/lib/jbossws-client.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-jaxws.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - </classpath> - </taskdef> - <wsconsume - keep="true" - sourcedestdir="@{sourceDir}" - destdir="@{destDir}" - wsdl="@{wsdlLocation}" - package="@{package}" - verbose="@{verbose}"> - </wsconsume> - - </sequential> - </macrodef> -</project> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -17,8 +17,8 @@ <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - <import file="${basedir}/../jbossws-tests/ant-import/jaxws-tools-delegate.xml"/> <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> @@ -253,6 +253,10 @@ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> @@ -272,30 +276,13 @@ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> <classpath refid="jbpm.bpel.classpath"/> </taskdef> + <!-- [JBWS-1528] Implement abstract ArchiveWsdlLocator.close() <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + --> </target> - <!-- - Create artifacts that need to be compiled with the test cases - --> - <target name="wsdl-java" depends="init"> - <!-- interop --> - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" verbose="false"/> - - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" verbose="false"/> - - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" verbose="false"/> - - <!-- benchmark --> - <call-wsconsume wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.benchmark.jaxws.doclit" verbose="false"/> - </target> - <!-- Generate JAX-RPC sources --> @@ -329,7 +316,7 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" /> + <!--wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/--> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> @@ -379,10 +366,8 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="compile" depends="wsdl-java, post-compile" description="Compile sources"/> + <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> - <target name="post-compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> - <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; +import javax.jws.WebService; + +@WebService (targetNamespace="http://sei-namespace") +public interface JBWS1529 +{ + public String echo(String message) throws UserException; +} \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import javax.jws.WebService; + +// An endpoint implementation that does not define a target namespace +// does NOT inherit the namespace from the referrenced SEI +(a)WebService(endpointInterface=&quot;org.jboss.test.ws.jaxws.jbws1529.JBWS1529&quot;, name="JBWS1529") +public class JBWS1529Impl implements JBWS1529 +{ + public String echo(String message) throws UserException + { + if ("dofault".equals(message)) + throw new UserException(); + + return message; + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * wsdlReader fails with faults defined on jaxws SEI + * + * http://jira.jboss.org/jira/browse/JBWS-1529 + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBWS1529TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; + private JBWS1529 proxy; + +/* + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1529Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1529)service.getPort(JBWS1529.class); + } +*/ + public void testWSDLReader() throws Exception + { + File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); + assertTrue(wsdlFile.exists()); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); + assertNotNull(wsdl); + } + + public void testEcho() throws Exception + { + System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); + //String retStr = proxy.echo("hi there"); + //assertEquals("hi there", retStr); + } +} \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +public class UserException extends Exception +{ +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529 (from rev 2389, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1357) Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <import location='JBWS1529_PortType.wsdl' namespace='http://sei-namespace'/> + <service name='JBWS1529Service'> + <port binding='ns1:JBWS1529Binding' name='JBWS1529Port'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-17 14:55:32 UTC (rev 2390) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://sei-namespace' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://sei-namespace' version='1.0' xmlns:tns='http://sei-namespace' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='UserException' type='tns:UserException'/> + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='UserException'> + <xs:sequence> + <xs:element minOccurs='0' name='message' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='JBWS1529_echo'> + <part element='ns1:echo' name='echo'/> + </message> + <message name='JBWS1529_echoResponse'> + <part element='ns1:echoResponse' name='echoResponse'/> + </message> + <message name='UserException'> + <part element='ns1:UserException' name='UserException'/> + </message> + <portType name='JBWS1529'> + <operation name='echo' parameterOrder='echo'> + <input message='ns1:JBWS1529_echo'/> + <output message='ns1:JBWS1529_echoResponse'/> + <!--fault message='tns:UserException' name='UserException'/--> + <fault message='ns1:UserException' name='UserException'/> + </operation> + </portType> + <binding name='JBWS1529Binding' type='ns1:JBWS1529'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + <fault name='UserException'> + <soap:fault name='UserException' use='literal'/> + </fault> + </operation> + </binding> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1357/WEB-INF/web.xml 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-17 14:55:32 UTC (rev 2390) @@ -6,23 +6,13 @@ version="2.4"> <servlet> - <servlet-name>JBWS1357Service</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1357.JBWS1357Impl</servlet-class> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1529.JBWS1529Impl</servlet-class> </servlet> - <servlet> - <servlet-name>hello_jsp</servlet-name> - <jsp-file>/hello.jsp</jsp-file> - </servlet> - <servlet-mapping> - <servlet-name>JBWS1357Service</servlet-name> - <url-pattern>/JBWS1357Service</url-pattern> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>hello_jsp</servlet-name> - <url-pattern>/hello.jsp</url-pattern> - </servlet-mapping> - </web-app> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/hello.jsp =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1357/hello.jsp 2007-02-16 14:40:55 UTC (rev 2389) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/hello.jsp 2007-02-17 14:55:32 UTC (rev 2390) @@ -1,5 +0,0 @@ -<html> -<body> -<% System.out.println("Hello"); %> -</body> -</html>