January 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1794 - trunk/integration-jboss42

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 11:14:37 -0500 (Thu, 04 Jan 2007) New Revision: 1794 Modified: trunk/integration-jboss42/build.xml Log: Add jbossretro Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-04 16:14:32 UTC (rev 1793) +++ trunk/integration-jboss42/build.xml 2007-01-04 16:14:37 UTC (rev 1794) @@ -126,6 +126,38 @@ </metainf> </jar> + <jar jarfile="${jboss42.output.lib.dir}/jbossws42-no-ejb3.sar" manifest="${output.etc.dir}/default.mf"> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> + <include name="jboss-jaxws.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy-1.0.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-api-1.0.jar"/> + <include name="wstx-lgpl-2.9.3.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${jboss42.resources.dir}"> + <include name="jbossws.beans/META-INF/jboss-beans.xml"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> + <include name="standard-jaxrpc-client-config.xml"/> + <include name="standard-jaxrpc-endpoint-config.xml"/> + <include name="standard-jaxws-client-config.xml"/> + <include name="standard-jaxws-endpoint-config.xml"/> + </metainf> + <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF-no-ejb3"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + </target>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1793 - in trunk/build: . ant-import

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 11:14:32 -0500 (Thu, 04 Jan 2007) New Revision: 1793 Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/version.properties Log: Add jbossretro Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-04 16:14:28 UTC (rev 1792) +++ trunk/build/ant-import/build-setup.xml 2007-01-04 16:14:32 UTC (rev 1793) @@ -71,6 +71,7 @@ <echo message="jboss50.home = ${jboss50.home}"/> <echo message="jboss42.home = ${jboss42.home}"/> + <echo message="jboss40.home = ${jboss40.home}"/> <echo message="tomcat.home = ${tomcat.home}"/> <echo/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-04 16:14:28 UTC (rev 1792) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-04 16:14:32 UTC (rev 1793) @@ -35,6 +35,7 @@ <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}/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-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -42,6 +43,8 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-04 16:14:28 UTC (rev 1792) +++ trunk/build/version.properties 2007-01-04 16:14:32 UTC (rev 1793) @@ -30,6 +30,7 @@ apache-xerces=2.7.1 hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA +jboss-jbossretro=1.0.2.GA jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1792 - trunk/jbossws-core

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 11:14:28 -0500 (Thu, 04 Jan 2007) New Revision: 1792 Modified: trunk/jbossws-core/build.xml Log: Add jbossretro Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-01-04 16:12:57 UTC (rev 1791) +++ trunk/jbossws-core/build.xml 2007-01-04 16:14:28 UTC (rev 1792) @@ -148,8 +148,6 @@ <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/jboss50/**"/> - <exclude name="org/jboss/ws/integration/tomcat/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1791 - in branches/jbossws-1.0.4.GA_JBWS-1440/src: main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/mapping test/java/org/jboss/test/ws/tools test/java/org/jboss/test/ws/tools/jbws1079 test/resources/tools test/resources/tools/jbws1079

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-04 11:12:57 -0500 (Thu, 04 Jan 2007) New Revision: 1791 Added: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/Anonymous.wsdl branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumber.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/anonymous-mapping.xml branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/wstools-config.xml Removed: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/Anonymous.wsdl branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumber.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/anonymous-mapping.xml branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/wstools-config.xml Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java Log: JBWS-1440 - Incorrect WSDL to Java mapping for anonymous struct. Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 15:31:18 UTC (rev 1790) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -53,7 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.utils.JavaUtils; -import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; /** Class that converts a XSD Type into Java class * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 15:31:18 UTC (rev 1790) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -22,9 +22,7 @@ package org.jboss.ws.tools.helpers; import java.beans.Introspector; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; import javax.xml.namespace.QName; @@ -91,9 +89,7 @@ private WSDLDefinitions wsdlDefinitions = null; private String serviceName = null; private String packageName = null; - private Class serviceEndpointInterface = null; - private String typeNamespace = null; - + private Set<String> registeredTypes = new HashSet<String>(); private LiteralTypeMapping typeMapping = null; @@ -103,18 +99,11 @@ private String parameterStyle; - /** - * A list of types that need java-xml type generation - */ - private List<XSTypeDefinition> queueTypes = new ArrayList<XSTypeDefinition>(); - public MappingFileGeneratorHelper(WSDLDefinitions wsdl, String sname, String pname, Class seiClass, String tns, LiteralTypeMapping ltm, String paramStyle) { this.wsdlDefinitions = wsdl; this.serviceName = sname; - this.packageName = pname; - this.serviceEndpointInterface = seiClass; - this.typeNamespace = tns; + this.packageName = pname; this.typeMapping = ltm; this.wsdlStyle = utils.getWSDLStyle(wsdl); @@ -333,7 +322,7 @@ { WSDLInterfaceOperationInput input = inputs[k]; XSTypeDefinition xt = getXSType(input); - addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), jwm, !isDocStyle()); + addJavaXMLTypeMap(xt, input.getElement().getLocalPart(), "", jwm, !isDocStyle()); } WSDLInterfaceOperationOutput[] outputs = op.getOutputs(); @@ -342,7 +331,7 @@ { WSDLInterfaceOperationOutput output = outputs[k]; XSTypeDefinition xt = getXSType(output); - addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), jwm, !isDocStyle()); + addJavaXMLTypeMap(xt, output.getElement().getLocalPart(), "", jwm, !isDocStyle()); } for (WSDLInterfaceFault fault : wi.getFaults()) @@ -353,7 +342,7 @@ WSDLTypes types = wsdlDefinitions.getWsdlTypes(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(types); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - addJavaXMLTypeMap(xt, xmlName.getLocalPart(), jwm, true); + addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", jwm, true); ExceptionMapping exceptionMapping = new ExceptionMapping(jwm); exceptionMapping.setExceptionType(getJavaTypeAsString(null, xmlType, false, true)); @@ -484,7 +473,7 @@ return xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); } - private void addJavaXMLTypeMap(XSTypeDefinition xt, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray) + private void addJavaXMLTypeMap(XSTypeDefinition xt,String name, String containingElement, JavaWsdlMapping jwm, boolean skipWrapperArray) { JavaXmlTypeMapping jxtm = null; @@ -513,8 +502,8 @@ // Anonymous if (localName == null) { - javaType = getJavaTypeAsString(null, new QName(containingElement), false, true); - localName = ">" + containingElement; + javaType = getJavaTypeAsString(null, new QName(containingElement + name), false, true); + localName = ">" + name; jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); } else @@ -542,7 +531,7 @@ XSSimpleTypeDefinition simple = xc.getSimpleType(); if (simple != null) { - addJavaXMLTypeMap(simple, xc.getName(), jwm, skipWrapperArray); + addJavaXMLTypeMap(simple, xc.getName(), "", jwm, skipWrapperArray); } // Add attributes @@ -587,7 +576,7 @@ XSAttributeUse obj = (XSAttributeUse)attributes.item(i); XSAttributeDeclaration att = obj.getAttrDeclaration(); XSSimpleTypeDefinition simple = att.getTypeDefinition(); - addJavaXMLTypeMap(simple, "none", jxtm.getJavaWsdlMapping(), true); + addJavaXMLTypeMap(simple, "none", "", jxtm.getJavaWsdlMapping(), true); VariableMapping vm = new VariableMapping(jxtm); String name = att.getName(); vm.setXmlAttributeName(name); @@ -612,7 +601,7 @@ { XSElementDeclaration xe = (XSElementDeclaration)xsterm; XSTypeDefinition typeDefinition = xe.getTypeDefinition(); - addJavaXMLTypeMap(typeDefinition, xe.getName(), jwm, true); + addJavaXMLTypeMap(typeDefinition, xe.getName(), xe.getEnclosingCTDefinition().getName(), jwm, true); } } } Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-01-04 15:31:18 UTC (rev 1790) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -311,8 +311,7 @@ MappingFileGenerator mgf = new MappingFileGenerator(wsdl, new LiteralTypeMapping()); mgf.setPackageName(getPackageName(wsdl, glc)); mgf.setServiceName(wsdl.getServices()[0].getName().toString()); - mgf.setParameterStyle(w2jc.parameterStyle); - //mgf.generate(); + mgf.setParameterStyle(w2jc.parameterStyle); JavaWsdlMapping jwm = mgf.generate(); Writer writer = IOUtils.getCharsetFileWriter(new File(outDir + "/" + w2jc.mappingFileName), Constants.DEFAULT_XML_CHARSET); Modified: branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-01-04 15:31:18 UTC (rev 1790) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -219,9 +219,7 @@ MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings(); int lenmppmarr = mppmarr != null ? mppmarr.length : 0; for (int j = 0; j < lenmppmarr; j++) - { - MethodParamPartsMapping mppm = mppmarr[j]; - String paramType = mppm.getParamType(); + { listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); } JavaWriter jw = new JavaWriter(); Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079 (from rev 1452, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,65 +0,0 @@ -/* - * 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.tools.jbws1079; - -import java.io.File; -import java.io.FileInputStream; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 5, 2006 - */ -public class JBWS1079TestCase extends JBossWSTest -{ - - public void testAnonymousType() throws Exception - { - String resourceDir = "resources/tools/jbws1079"; - String toolsDir = "tools/jbws1079"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/anonymous-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/anonymous-mapping.xml")); - assertEquals(exp, was); - - compareSource(resourceDir + "/TelephoneNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumber.java"); - compareSource(resourceDir + "/TelephoneNumberNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumberNumber.java"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java (from rev 1452, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java) Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079 (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/Anonymous.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/Anonymous.wsdl 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/Anonymous.wsdl 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1079' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1079/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1079' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1079/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1079/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='TelephoneNumber'> - <sequence> - <element name='Number'> - <complexType> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/Anonymous.wsdl (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/Anonymous.wsdl) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumber.java =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumber.java 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumber.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1079.TelephoneNumberNumber number; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ -this.number=number; -} -public org.jboss.test.ws.jbws1079.TelephoneNumberNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ this.number=number; } - -} Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumber.java (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumber.java) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumberNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumberNumber(){} - -public TelephoneNumberNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,72 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumberNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/anonymous-mapping.xml (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/anonymous-mapping.xml) Deleted: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/wstools-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/tools/jbws1079/wstools-config.xml 2006-11-16 22:50:57 UTC (rev 1452) +++ branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/wstools-config.xml 2007-01-04 16:12:57 UTC (rev 1791) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1079/Anonymous.wsdl" parameter-style="bare"> - <mapping file="anonymous-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.0.4.GA_JBWS-1440/src/test/resources/tools/jbws1079/wstools-config.xml (from rev 1452, branches/jbossws-1.0/src/test/resources/tools/jbws1079/wstools-config.xml)

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1790 - branches

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-04 10:31:18 -0500 (Thu, 04 Jan 2007) New Revision: 1790 Added: branches/jbossws-1.0.4.GA_JBWS-1440/ Log: Branch for JBWS-1440 Copied: branches/jbossws-1.0.4.GA_JBWS-1440 (from rev 1789, tags/jbossws-1.0.4.GA)

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1789 - in branches/dlofthouse/JBWS-1260/src: main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/tools/jbws1079 test/java/org/jboss/test/ws/tools/jbws1253 test/java/org/jboss/test/ws/tools/jbws1260 test/resources/tools/jbws1079 test/resources/tools/jbws1253 test/resources/tools/jbws1260/scenario_X

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-04 10:06:47 -0500 (Thu, 04 Jan 2007) New Revision: 1789 Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java Removed: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml Log: JBWS-1260 - Fixed test cases broken by the refactoring. Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -33,12 +33,9 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; -import org.apache.xerces.xs.XSAttributeDeclaration; -import org.apache.xerces.xs.XSAttributeUse; import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; -import org.apache.xerces.xs.XSObject; import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSSimpleTypeDefinition; @@ -271,8 +268,8 @@ QName xmlType = outs[m].getXMLType(); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); - boolean primitive = true; + WrappedArray wrappedArray = new WrappedArray(xt); if (wrappedArray.unwrap()) { @@ -285,7 +282,7 @@ xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); Class cls = this.getJavaType(xmlType, primitive); - //buf.append(utils.getHolder(cls).getName()).append(" ").append(getMethodParam(xmlName)); + buf.append(utils.getHolder(cls).getName()).append(" ").append(ToolsUtils.firstLetterLowerCase(xmlName.getLocalPart())); } } @@ -486,7 +483,6 @@ else { String className; - // TODO DAL - Check the need to null check. if (xt == null || xt.getAnonymous()) { className = containingElement; @@ -495,6 +491,7 @@ { className = xmlType.getLocalPart(); } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); @@ -587,10 +584,6 @@ if (unwrapper.array) arraySuffix = "[]"; } - else if (unwrapper.unwrappedAttribute != null) - { - xt = unwrapper.unwrappedAttribute.getTypeDefinition(); - } } boolean primitive = true; @@ -608,18 +601,21 @@ Class cls = getJavaType(xmlType, primitive); - // TODO DAL - Check the real need for the null check. - if (xt != null && xt.getAnonymous() == false) - { - containingElement = xmlType.getLocalPart(); - } - if (xt instanceof XSComplexTypeDefinition) generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement); if (cls == null) { - String className = containingElement; + String className; + if (xt.getAnonymous() == true) + { + className = containingElement; + } + else + { + className = xmlType.getLocalPart(); + } + if (className.charAt(0) == '>') className = className.substring(1); className = utils.firstLetterUpperCase(className); Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -98,7 +98,8 @@ createJavaFile(type, schema, false); } - public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType) throws IOException + public void createJavaFile(XSComplexTypeDefinition type, String containingElement, File loc, String pkgname, XSModel schema, boolean isExceptionType) + throws IOException { if (typeMapping == null) throw new WSException("TypeMapping has not been set"); @@ -547,6 +548,9 @@ // Save the fname in a temp var String tempfname = this.fname; // it will be an anonymous type + if (containingElement == null || containingElement.length() == 0) + containingElement = origType.getName(); + String anonName = containingElement + subname; anonName = utils.firstLetterUpperCase(anonName); this.fname = anonName; Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -265,10 +265,6 @@ xmlType = unwrapper.xmlType; } } - else if (unwrapper.unwrappedAttribute != null) - { - xt = unwrapper.unwrappedAttribute.getTypeDefinition(); - } } //Check it is a holder. If it is, return Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -23,7 +23,6 @@ import javax.xml.namespace.QName; -import org.apache.xerces.xs.XSAttributeDeclaration; import org.apache.xerces.xs.XSComplexTypeDefinition; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSModelGroup; @@ -47,7 +46,6 @@ public WSDLInterfaceOperationOutput[] outputs; public JBossXSModel xsmodel; public QName xmlType; - public XSAttributeDeclaration unwrappedAttribute; public XSElementDeclaration unwrappedElement; public boolean array = false; private boolean wrapped; Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -22,13 +22,11 @@ package org.jboss.test.ws.tools.jbws1079; import java.io.File; -import java.io.FileInputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; /** * @@ -45,12 +43,13 @@ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/anonymous-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/anonymous-mapping.xml")); - assertEquals(exp, was); - + compareSource(resourceDir + "/LookupResponseNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/LookupResponseNumber.java"); + compareSource(resourceDir + "/Person.java", toolsDir + "/org/jboss/test/ws/jbws1079/Person.java"); + compareSource(resourceDir + "/PhoneBook_PortType.java", toolsDir + "/org/jboss/test/ws/jbws1079/PhoneBook_PortType.java"); compareSource(resourceDir + "/TelephoneNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumber.java"); - compareSource(resourceDir + "/TelephoneNumberNumber.java", toolsDir + "/org/jboss/test/ws/jbws1079/TelephoneNumberNumber.java"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/anonymous-mapping.xml", toolsDir + "/anonymous-mapping.xml"); } private static void compareSource(final String expectedName, final String generatedName) throws Exception Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -22,13 +22,11 @@ package org.jboss.test.ws.tools.jbws1253; import java.io.File; -import java.io.FileInputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; /** * Test for a port name which ends 'PortType' @@ -45,10 +43,9 @@ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream(resourceDir + "/myporttype-mapping.xml")); - Element was = DOMUtils.parse(new FileInputStream(toolsDir + "/myporttype-mapping.xml")); - assertEquals(exp, was); - + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); + File expSEI = new File(resourceDir + "/My.java"); File wasSEI = new File(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -844,14 +844,6 @@ protected void generateScenario(final String scenario) throws Exception { - String tests = System.getProperty("client.scenario"); - - if ((tests == null || tests.length() == 0 || tests.contains("-" + scenario)) == false) - { - System.out.println("Skipping test '" + scenario + "' client.scenario=" + tests); - return; - } - String resourceDir = "resources/tools/jbws1260/scenario_" + scenario; String toolsDir = "tools/jbws1260/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1079; + + +public class LookupResponseNumber { + protected java.lang.String areaCode; + protected java.lang.String number; + + public LookupResponseNumber() { + } + + public LookupResponseNumber(java.lang.String areaCode, java.lang.String number) { + this.areaCode = areaCode; + this.number = number; + } + + public java.lang.String getAreaCode() { + return areaCode; + } + + public void setAreaCode(java.lang.String areaCode) { + this.areaCode = areaCode; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/LookupResponseNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1079; + + +public class Person { + protected java.lang.String firstName; + protected java.lang.String surname; + + public Person() { + } + + public Person(java.lang.String firstName, java.lang.String surname) { + this.firstName = firstName; + this.surname = surname; + } + + public java.lang.String getFirstName() { + return firstName; + } + + public void setFirstName(java.lang.String firstName) { + this.firstName = firstName; + } + + public java.lang.String getSurname() { + return surname; + } + + public void setSurname(java.lang.String surname) { + this.surname = surname; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1079; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1079.TelephoneNumber lookup(org.jboss.test.ws.jbws1079.Person parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -1,27 +1,26 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 package org.jboss.test.ws.jbws1079; -public class TelephoneNumber -{ - -protected org.jboss.test.ws.jbws1079.TelephoneNumberNumber number; -public TelephoneNumber(){} - -public TelephoneNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ -this.number=number; +public class TelephoneNumber { + protected org.jboss.test.ws.jbws1079.LookupResponseNumber number; + + public TelephoneNumber() { + } + + public TelephoneNumber(org.jboss.test.ws.jbws1079.LookupResponseNumber number) { + this.number = number; + } + + public org.jboss.test.ws.jbws1079.LookupResponseNumber getNumber() { + return number; + } + + public void setNumber(org.jboss.test.ws.jbws1079.LookupResponseNumber number) { + this.number = number; + } } -public org.jboss.test.ws.jbws1079.TelephoneNumberNumber getNumber() { return number ;} - -public void setNumber(org.jboss.test.ws.jbws1079.TelephoneNumberNumber number){ this.number=number; } - -} Deleted: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/TelephoneNumberNumber.java 2007-01-04 15:06:47 UTC (rev 1789) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Sun Nov 05 12:21:27 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1079; - - -public class TelephoneNumberNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumberNumber(){} - -public TelephoneNumberNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1079/anonymous-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -1,72 +1,77 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1079</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>Number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1079.TelephoneNumberNumber</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1079/types'>typeNS:>Number</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1079'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1079'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1079'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1079.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1079'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1079</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1079/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.LookupResponseNumber</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1079/types:>TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1079.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1079/types">typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1079.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1079">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1079.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1079">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1079">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1079.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1079.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1079">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1253/myporttype-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -1,6 +1,10 @@ <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> <package-type>org.jboss.test.ws.jbws1253</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1253/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1253</package-type> <namespaceURI>http://test.jboss.org/ws/jbws1253</namespaceURI> </package-mapping> <java-xml-type-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-04 14:30:21 UTC (rev 1788) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_X/wrapped-mapping.xml 2007-01-04 15:06:47 UTC (rev 1789) @@ -10,7 +10,7 @@ </package-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:lookup-Name</root-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>Person>Name</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>postcode</java-variable-name> @@ -37,7 +37,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:lookupResponse-Number</root-type-qname> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1260/types'>typeNS:>TelephoneNumber>Number</anonymous-type-qname> <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>postcode</java-variable-name>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1788 - in trunk/jbossws-tests: . src/main/java/org/jboss/test/ws src/main/java/org/jboss/test/ws/jaxrpc/enventry src/main/java/org/jboss/test/ws/jaxrpc/jbws1011 src/main/java/org/jboss/test/ws/jaxrpc/jbws1205 src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb src/main/java/org/jboss/test/ws/jaxrpc/

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:30:21 -0500 (Thu, 04 Jan 2007) New Revision: 1788 Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java Log: Fix tests for jbossas-4.0 Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/build.xml 2007-01-04 14:30:21 UTC (rev 1788) @@ -128,7 +128,6 @@ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> <pathelement location="${jboss.client}/jboss-logging-log4j.jar"/> - <pathelement location="${jboss.client}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/jboss-jaxrpc.jar"/> <pathelement location="${jboss.client}/jboss-jaxws.jar"/> <pathelement location="${jboss.client}/jboss-saaj.jar"/> @@ -146,8 +145,7 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> </path> @@ -157,9 +155,7 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> - <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> + <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -314,7 +310,7 @@ <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -323,7 +319,7 @@ <target name="tests-benchmark" description="Run benchmark unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -341,7 +337,7 @@ <target name="tests-tools" description="Run tools unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -354,7 +350,7 @@ <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.resources.dir}/tests-no-excludes.txt"/> + <param name="excludesfile" value="${tests.excludesfile}"/> </antcall> </target> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTest.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,22 +65,22 @@ } /** True, if -Djbossws.integration.target=tomcat */ - public boolean isTomcat() + public boolean isTargetTomcat() { return JBossWSTestHelper.isTargetTomcat(); } - public boolean isJBoss50() + public boolean isTargetJBoss50() { return JBossWSTestHelper.isTargetJBoss50(); } - public boolean isJBoss42() + public boolean isTargetJBoss42() { return JBossWSTestHelper.isTargetJBoss42(); } - public boolean isJBoss40() + public boolean isTargetJBoss40() { return JBossWSTestHelper.isTargetJBoss40(); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); @@ -57,7 +57,7 @@ public void testHandlers() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -57,7 +57,7 @@ public void testHandlers() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -50,7 +50,7 @@ public void setUp() throws Exception { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); @@ -60,7 +60,7 @@ public void testCall() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -57,7 +57,7 @@ public void testEndpoint() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -49,8 +49,11 @@ */ public void testSOAPMessageToEndpointQueue() throws Exception { - System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); - if (true) return; + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk"); + return; + } String reqMessage = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,7 +48,7 @@ { super.setUp(); - if (endpoint == null && isJBoss50() == false) + if (endpoint == null && isTargetJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); @@ -58,7 +58,7 @@ public void testEchoString() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -72,7 +72,7 @@ public void testEchoSimpleUserType() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -58,7 +58,7 @@ { super.setUp(); - if (call == null && isJBoss50() == false) + if (call == null && isTargetJBoss50() == false) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); @@ -73,7 +73,7 @@ public void testEchoString() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -97,7 +97,7 @@ public void testEchoSimpleUserType() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,7 +65,7 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -96,7 +96,7 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -61,7 +61,7 @@ String hello = "Hello"; String world = "world!"; - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -76,7 +76,7 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -55,7 +55,7 @@ { super.setUp(); - if (port == null && isJBoss50() == false) + if (port == null && isTargetJBoss50() == false) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); @@ -73,7 +73,7 @@ String hello = "Hello"; String world = "world!"; - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -88,7 +88,7 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -56,8 +56,7 @@ if (port == null) { - System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); - if (isTargetJBoss() && false) + if (isTargetJBoss42() || isTargetJBoss40()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); @@ -65,6 +64,9 @@ } else { + if (isTargetJBoss50()) + System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x"); + ServiceFactoryImpl factory = new ServiceFactoryImpl(); URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL(); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -63,7 +63,7 @@ */ public void testRoleSecuredSLSB() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -94,7 +94,7 @@ */ public void testBasicSecuredSLSB() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -110,7 +110,7 @@ public void testBasicSecuredServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -141,7 +141,7 @@ public void testRoleSecuredServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -172,7 +172,7 @@ public void testConfidentialServiceAccess() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -14,10 +14,14 @@ */ package org.jboss.test.ws.jaxrpc.samples.wsbpel.hello; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Call; +import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; /** * Test business process behavior based on web services. @@ -30,32 +34,35 @@ private HelloWorldService service; /* - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); - } + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); + } + */ - protected void setUp() throws Exception - { - if (service == null) - { - if (isTargetServerJBoss()) - { - InitialContext iniCtx = getInitialContext(); - service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - } - else - { - throw new IllegalStateException("Unsupported target server"); - } - } - } - */ + protected void setUp() throws Exception + { + if (service == null) + { + if (isTargetJBoss()) + { + //InitialContext iniCtx = getInitialContext(); + //service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); + } + else + { + throw new IllegalStateException("Unsupported target server"); + } + } + } public void testSayHelloProxy() throws Exception { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); - if (true) return; + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + return; + } Greeter proxy = service.getGreeterPort(); @@ -65,9 +72,12 @@ public void testSayHelloDII() throws Exception { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); - if (true) return; - + if (isTargetJBoss()) + { + System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + return; + } + String portTypeNS = "http://jbpm.org/examples/hello"; Call call = service.createCall(new QName(portTypeNS, "GreeterPort")); call.setOperationName(new QName(portTypeNS, "sayHello")); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -91,8 +91,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0"); + return; + } UserType in0 = new UserType("Kermit"); UserType retObj = port.echoUserType(in0); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -62,7 +62,7 @@ public void testDynamicProxy() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -81,7 +81,7 @@ public void testEJBClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -76,7 +76,7 @@ public void testServletClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -53,8 +53,11 @@ */ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,8 +48,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); @@ -62,8 +65,11 @@ public void testFault() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -52,8 +52,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); @@ -66,8 +69,11 @@ public void testEndpointNoProperties() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } Properties props = System.getProperties(); props.remove("org.jboss.ws.wsse.keyStore"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -41,25 +41,24 @@ */ public class UsernameTestCase extends JBossWSTest { - private static JaxRpcTestService endpoint; + private static JaxRpcTestService port; public static Test suite() { return JBossWSTestSetup.newTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); } - /* protected void setUp() throws Exception { super.setUp(); - if (endpoint == null) + if (port == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); - endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - ((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, "kermit"); - ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog"); + port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); + ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, "kermit"); + ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, "thefrog"); } Properties props = System.getProperties(); @@ -70,44 +69,52 @@ props.remove("org.jboss.ws.wsse.keyStoreType"); props.remove("org.jboss.ws.wsse.trustStoreType"); } - */ public void testEchoString() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; String world = "world!"; - Object retObj = endpoint.echoString(hello, world); + Object retObj = port.echoString(hello, world); assertEquals(hello + world, retObj); } public void testEchoSimpleUserType() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - Object retObj = endpoint.echoSimpleUserType(hello, userType); + Object retObj = port.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); } public void testEchoStringNoUsername() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; - + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + String hello = "Hello"; String world = "world!"; - ((Stub)endpoint)._setProperty(Stub.USERNAME_PROPERTY, null); - ((Stub)endpoint)._setProperty(Stub.PASSWORD_PROPERTY, null); + ((Stub)port)._setProperty(Stub.USERNAME_PROPERTY, null); + ((Stub)port)._setProperty(Stub.PASSWORD_PROPERTY, null); try { - endpoint.echoString(hello, world); + port.echoString(hello, world); fail("Expected exception not thrown"); } catch (RemoteException e) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -48,7 +48,7 @@ */ public void testWebClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -43,8 +43,11 @@ public void testEndpoint() throws Exception { - System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -65,7 +65,7 @@ public void testVirtualFile() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) return; File earFile = new File("libs/jaxws-eardeployment.ear"); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -32,8 +32,6 @@ import javax.management.Attribute; import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -41,6 +39,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestHelper; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; @@ -61,7 +60,7 @@ protected void setUp() throws Exception { - MBeanServerConnection server = getMBeanServer(); + MBeanServerConnection server = JBossWSTestHelper.getServer(); useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", new Boolean(true))); super.setUp(); @@ -70,7 +69,7 @@ protected void tearDown() throws Exception { super.tearDown(); - MBeanServerConnection server = getMBeanServer(); + MBeanServerConnection server = JBossWSTestHelper.getServer(); server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); } }; @@ -78,8 +77,11 @@ public void testWSDLAccess() throws MalformedURLException { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -89,8 +91,11 @@ public void testClientAccess() throws Exception { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } // Create the port URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); @@ -105,19 +110,15 @@ public void testServletAccess() throws Exception { - System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called"); + return; + } - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?param=hello-world"); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } - - private static MBeanServerConnection getMBeanServer() throws NamingException - { - InitialContext iniCtx = new InitialContext(); - MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - return server; - } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -44,7 +44,7 @@ deploy("jaxws-jsr181-webservice01-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -62,7 +62,7 @@ deploy("jaxws-jsr181-webservice02-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; @@ -80,7 +80,7 @@ deploy("jaxws-jsr181-webservice03-ejb21.jar"); try { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -67,16 +67,17 @@ public void testWebService() throws Exception { - System.out.println("FIXME: [JBAS-3825] Fix BASIC authentication"); - if (true) return; + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBAS-3825] Fix BASIC authentication"); + return; + } - assertWSDLAccess(); - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxws-samples-jsr181ejb/EJB3Bean01"); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS); Stub stub = (Stub)port; stub._setProperty(Stub.USERNAME_PROPERTY, "kermit"); @@ -86,12 +87,4 @@ Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -75,7 +75,7 @@ public void testWebService() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -73,7 +73,7 @@ public void testEJB3Client() throws Exception { - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -75,13 +75,13 @@ public void testServletClient() throws Exception { - if (isJBoss50()) + if (isTargetJBoss50()) { System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); return; } - if (isJBoss50() == false) + if (isTargetJBoss50() == false) { System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); return; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-04 14:30:12 UTC (rev 1787) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-04 14:30:21 UTC (rev 1788) @@ -40,7 +40,10 @@ protected String getFixMe() { - return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk"; + if (isTargetJBoss()) + return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase"; + else + return null; } public String getWSDLName()

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1787 - trunk/integration-jboss40

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:30:12 -0500 (Thu, 04 Jan 2007) New Revision: 1787 Modified: trunk/integration-jboss40/build.xml Log: Fix tests for jbossas-4.0 Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-04 14:30:04 UTC (rev 1786) +++ trunk/integration-jboss40/build.xml 2007-01-04 14:30:12 UTC (rev 1787) @@ -79,7 +79,7 @@  - <target name="jboss40-module-jars" depends="core-jars"> + <target name="jboss40-module-jars" depends="core-jars,jboss42-jars">  <mkdir dir="${jboss40.output.lib.dir}"/>

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1786 - in trunk/integration-jboss50/src/main: java/org/jboss/ws/integration/jboss50 resources/jbossws-jboss50-integration.jar/META-INF/services

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:30:04 -0500 (Thu, 04 Jan 2007) New Revision: 1786 Added: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossHttpServer.java trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer Log: Fix tests for jbossas-4.0 Added: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossHttpServer.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossHttpServer.java 2007-01-04 14:29:57 UTC (rev 1785) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossHttpServer.java 2007-01-04 14:30:04 UTC (rev 1786) @@ -0,0 +1,231 @@ +/* + * 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.integration.jboss50; + +//$Id$ + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URL; +import java.util.Map; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.ws.Endpoint; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.HttpContext; +import org.jboss.ws.core.server.HttpServer; +import org.jboss.ws.core.server.ServerConfig; +import org.jboss.ws.core.server.ServerConfigFactory; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; +import org.w3c.dom.Element; + +/** + * A Tomcat HTTP Server + * + * @author Thomas.Diesler(a)jboss.org + * @since 07-Jul-2006 + */ +public class JBossHttpServer extends HttpServer +{ + private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; + + /** Start an instance of this HTTP server */ + @Override + public void start() + { + // verify required properties + } + + /** Create an HTTP context */ + public HttpContext createContext(String contextRoot) + { + return new HttpContext(this, contextRoot); + } + + /** Publish an JAXWS endpoint to the HTTP server */ + @Override + public void publish(HttpContext context, Endpoint endpoint) + { + Class implClass = getImplementorClass(endpoint); + String implName = implClass.getName(); + + try + { + Element webDoc = createWebAppDescriptor(context, endpoint); + Element jbossDoc = createJBossWebAppDescriptor(context, endpoint); + + File tmpWar = null; + try + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig serverConfig = factory.getServerConfig(); + File tmpDir = new File(serverConfig.getServerTempDir().getCanonicalPath() + "/jbossws"); + + String deploymentName = implName.substring(implName.lastIndexOf(".") + 1); + tmpWar = File.createTempFile(deploymentName, ".war", tmpDir); + tmpWar.delete(); + File webInf = new File(tmpWar, "WEB-INF"); + webInf.mkdirs(); + + File webXml = new File(webInf, "web.xml"); + FileWriter fw = new FileWriter(webXml); + new DOMWriter(fw).setPrettyprint(true).print(webDoc); + fw.close(); + + File jbossWebXml = new File(webInf, "jboss-web.xml"); + fw = new FileWriter(jbossWebXml); + new DOMWriter(fw).setPrettyprint(true).print(jbossDoc); + fw.close(); + } + catch (IOException e) + { + throw new WSException("Failed to create webservice war", e); + } + + Map<String, Object> epProps = endpoint.getProperties(); + epProps.put("jbossws-endpoint-war-url", tmpWar); + + URL tmpURL = tmpWar.toURL(); + MBeanServerConnection server = getServer(); + server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { tmpURL }, new String[] { "java.net.URL" }); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException(ex); + } + } + + /** Destroys an JAXWS endpoint on the HTTP server */ + @Override + public void destroy(HttpContext context, Endpoint endpoint) + { + Map<String, Object> epProps = endpoint.getProperties(); + File tmpWar = (File)epProps.get("jbossws-endpoint-war-url"); + if (tmpWar == null) + throw new IllegalStateException("Cannot find endpoint war property"); + + try + { + URL tmpURL = tmpWar.toURL(); + MBeanServerConnection server = getServer(); + server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { tmpURL }, new String[] { "java.net.URL" }); + + tmpWar.delete(); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException(ex); + } + } + + private Class getImplementorClass(Endpoint endpoint) + { + Object implementor = endpoint.getImplementor(); + Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass()); + return implClass; + } + + private MBeanServerConnection getServer() throws NamingException + { + InitialContext iniCtx = new InitialContext(); + MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); + return server; + } + + private Element createWebAppDescriptor(HttpContext context, Endpoint endpoint) + { + Class implClass = getImplementorClass(endpoint); + String implName = implClass.getName(); + + Element webApp = DOMUtils.createElement("web-app"); + + /* + <servlet> + <servlet-name> + <servlet-class> + </servlet> + */ + Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet")); + Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name")); + servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint")); + Element servletClass = (Element)servlet.appendChild(DOMUtils.createElement("servlet-class")); + servletClass.appendChild(DOMUtils.createTextNode(implName)); + + /* + <servlet-mapping> + <servlet-name> + <url-pattern> + </servlet-mapping> + */ + Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping")); + servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name")); + servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint")); + Element urlPatternElement = (Element)servletMapping.appendChild(DOMUtils.createElement("url-pattern")); + + String urlPattern = "/*"; + urlPatternElement.appendChild(DOMUtils.createTextNode(urlPattern)); + + // Add security-constraint in generated web.xml for Endpoint API + // FIXME: JBWS-1069 + + return webApp; + } + + private Element createJBossWebAppDescriptor(HttpContext context, Endpoint endpoint) + { + /* Create a jboss-web + <jboss-web> + <security-domain>java:/jaas/cts</security-domain> + <context-root>/ws/ejbN/</context-root> + </jboss-web> + */ + Element jbossWeb = DOMUtils.createElement("jboss-web"); + + // Get the context root for this deployment + String contextRoot = context.getContextRoot(); + if (contextRoot == null) + throw new WSException("Cannot obtain context root"); + + Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root")); + root.appendChild(DOMUtils.createTextNode(contextRoot)); + + // Add security-constraint in generated web.xml for Endpoint API + // FIXME: JBWS-1069 + + return jbossWeb; + } +} + Property changes on: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossHttpServer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer =================================================================== --- trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer 2007-01-04 14:29:57 UTC (rev 1785) +++ trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer 2007-01-04 14:30:04 UTC (rev 1786) @@ -0,0 +1 @@ +org.jboss.ws.integration.jboss50.JBossHttpServer \ No newline at end of file

17 years, 12 months

1
0
0 / 0

JBossWS SVN: r1785 - in trunk/integration-jboss42/src/main: java/org/jboss/ws/integration/jboss42 resources/jbossws-jboss42-integration.jar/META-INF/services

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-04 09:29:57 -0500 (Thu, 04 Jan 2007) New Revision: 1785 Added: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossHttpServer.java trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java Log: Fix tests for jbossas-4.0 Added: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossHttpServer.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossHttpServer.java 2007-01-04 14:29:49 UTC (rev 1784) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossHttpServer.java 2007-01-04 14:29:57 UTC (rev 1785) @@ -0,0 +1,231 @@ +/* + * 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.integration.jboss42; + +//$Id$ + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URL; +import java.util.Map; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.ws.Endpoint; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.server.HttpContext; +import org.jboss.ws.core.server.HttpServer; +import org.jboss.ws.core.server.ServerConfig; +import org.jboss.ws.core.server.ServerConfigFactory; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMWriter; +import org.w3c.dom.Element; + +/** + * A Tomcat HTTP Server + * + * @author Thomas.Diesler(a)jboss.org + * @since 07-Jul-2006 + */ +public class JBossHttpServer extends HttpServer +{ + private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; + + /** Start an instance of this HTTP server */ + @Override + public void start() + { + // verify required properties + } + + /** Create an HTTP context */ + public HttpContext createContext(String contextRoot) + { + return new HttpContext(this, contextRoot); + } + + /** Publish an JAXWS endpoint to the HTTP server */ + @Override + public void publish(HttpContext context, Endpoint endpoint) + { + Class implClass = getImplementorClass(endpoint); + String implName = implClass.getName(); + + try + { + Element webDoc = createWebAppDescriptor(context, endpoint); + Element jbossDoc = createJBossWebAppDescriptor(context, endpoint); + + File tmpWar = null; + try + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig serverConfig = factory.getServerConfig(); + File tmpDir = new File(serverConfig.getServerTempDir().getCanonicalPath() + "/jbossws"); + + String deploymentName = implName.substring(implName.lastIndexOf(".") + 1); + tmpWar = File.createTempFile(deploymentName, ".war", tmpDir); + tmpWar.delete(); + File webInf = new File(tmpWar, "WEB-INF"); + webInf.mkdirs(); + + File webXml = new File(webInf, "web.xml"); + FileWriter fw = new FileWriter(webXml); + new DOMWriter(fw).setPrettyprint(true).print(webDoc); + fw.close(); + + File jbossWebXml = new File(webInf, "jboss-web.xml"); + fw = new FileWriter(jbossWebXml); + new DOMWriter(fw).setPrettyprint(true).print(jbossDoc); + fw.close(); + } + catch (IOException e) + { + throw new WSException("Failed to create webservice war", e); + } + + Map<String, Object> epProps = endpoint.getProperties(); + epProps.put("jbossws-endpoint-war-url", tmpWar); + + URL tmpURL = tmpWar.toURL(); + MBeanServerConnection server = getServer(); + server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { tmpURL }, new String[] { "java.net.URL" }); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException(ex); + } + } + + /** Destroys an JAXWS endpoint on the HTTP server */ + @Override + public void destroy(HttpContext context, Endpoint endpoint) + { + Map<String, Object> epProps = endpoint.getProperties(); + File tmpWar = (File)epProps.get("jbossws-endpoint-war-url"); + if (tmpWar == null) + throw new IllegalStateException("Cannot find endpoint war property"); + + try + { + URL tmpURL = tmpWar.toURL(); + MBeanServerConnection server = getServer(); + server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { tmpURL }, new String[] { "java.net.URL" }); + + tmpWar.delete(); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new WSException(ex); + } + } + + private Class getImplementorClass(Endpoint endpoint) + { + Object implementor = endpoint.getImplementor(); + Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass()); + return implClass; + } + + private MBeanServerConnection getServer() throws NamingException + { + InitialContext iniCtx = new InitialContext(); + MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); + return server; + } + + private Element createWebAppDescriptor(HttpContext context, Endpoint endpoint) + { + Class implClass = getImplementorClass(endpoint); + String implName = implClass.getName(); + + Element webApp = DOMUtils.createElement("web-app"); + + /* + <servlet> + <servlet-name> + <servlet-class> + </servlet> + */ + Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet")); + Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name")); + servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint")); + Element servletClass = (Element)servlet.appendChild(DOMUtils.createElement("servlet-class")); + servletClass.appendChild(DOMUtils.createTextNode(implName)); + + /* + <servlet-mapping> + <servlet-name> + <url-pattern> + </servlet-mapping> + */ + Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping")); + servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name")); + servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint")); + Element urlPatternElement = (Element)servletMapping.appendChild(DOMUtils.createElement("url-pattern")); + + String urlPattern = "/*"; + urlPatternElement.appendChild(DOMUtils.createTextNode(urlPattern)); + + // Add security-constraint in generated web.xml for Endpoint API + // FIXME: JBWS-1069 + + return webApp; + } + + private Element createJBossWebAppDescriptor(HttpContext context, Endpoint endpoint) + { + /* Create a jboss-web + <jboss-web> + <security-domain>java:/jaas/cts</security-domain> + <context-root>/ws/ejbN/</context-root> + </jboss-web> + */ + Element jbossWeb = DOMUtils.createElement("jboss-web"); + + // Get the context root for this deployment + String contextRoot = context.getContextRoot(); + if (contextRoot == null) + throw new WSException("Cannot obtain context root"); + + Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root")); + root.appendChild(DOMUtils.createTextNode(contextRoot)); + + // Add security-constraint in generated web.xml for Endpoint API + // FIXME: JBWS-1069 + + return jbossWeb; + } +} + Property changes on: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossHttpServer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java 2007-01-04 14:29:49 UTC (rev 1784) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java 2007-01-04 14:29:57 UTC (rev 1785) @@ -42,6 +42,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.core.server.AbstractServiceEndpointInvoker; import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.server.ServiceEndpointInvoker; @@ -171,6 +172,10 @@ Object[] args = epInv.getRequestPayload(); Invocation inv = new Invocation(null, method, args, null, principal, credential); + // EJB2.1 endpoints will only get an JAXRPC context + if ((msgContext instanceof javax.xml.rpc.handler.MessageContext) == false) + msgContext = new SOAPMessageContextJAXRPC(msgContext); + inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); inv.setValue(InvocationKey.SOAP_MESSAGE, msgContext.getSOAPMessage()); inv.setType(InvocationType.SERVICE_ENDPOINT); Added: trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer =================================================================== --- trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer 2007-01-04 14:29:49 UTC (rev 1784) +++ trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar/META-INF/services/org.jboss.ws.core.server.HttpServer 2007-01-04 14:29:57 UTC (rev 1785) @@ -0,0 +1 @@ +org.jboss.ws.integration.jboss42.JBossHttpServer \ No newline at end of file

17 years, 12 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2007