January 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2066 - branches/jbossws-1.2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 07:43:13 -0500 (Wed, 24 Jan 2007) New Revision: 2066 Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml Log: Remove jaxrpc/wseventing Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-24 12:40:53 UTC (rev 2065) +++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-24 12:43:13 UTC (rev 2066) @@ -264,19 +264,6 @@ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" /> </copy> -  - <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wseventing"/> - </copy> -  <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/> <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2065 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 07:40:53 -0500 (Wed, 24 Jan 2007) New Revision: 2065 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml Log: Remove jaxrpc/wseventing Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-01-24 11:30:23 UTC (rev 2064) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-01-24 12:40:53 UTC (rev 2065) @@ -26,7 +26,6 @@ <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/> <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>  - <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="jars"/> <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/> <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/> @@ -54,7 +53,6 @@ <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/> <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>  - <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="tests"/> <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/> <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2064 - in trunk: jbossws-tests and 22 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-24 06:30:23 -0500 (Wed, 24 Jan 2007) New Revision: 2064 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/ClientScenario.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropClientConfig.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropConfigFactory.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoInMessage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoOutMessage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoPortType.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/Notify.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyMessage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ObjectFactory.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ReplyToServlet.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/package-info.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/Echo.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EchoResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointInterface.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/JAXWSBuilderTestCase.java trunk/jbossws-tests/src/main/resources/interop/wsa/ trunk/jbossws-tests/src/main/resources/interop/wsa/META-INF/ trunk/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/jboss-web.xml trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/service.wsdl trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl2.wsdl trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd0.xsd trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd1.xsd trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd2.xsd trunk/jbossws-tests/src/main/resources/jaxws/metadata/ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/jboss-web.xml trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/TestService.wsdl trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/wsdl1.wsdl Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/ClientScenario.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/MTOMTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/SecureMTOMTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10/SignTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesSupport.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesSupport.java trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt Log: Start migrating interop tests to JAX-WS Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -23,38 +23,8 @@ // $Id$ -import java.io.File; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.net.MalformedURLException; -import java.net.URL; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.jws.HandlerChain; -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPMessageHandlers; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.BindingType; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; -import javax.xml.ws.WebFault; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.Action; - +import com.sun.xml.bind.api.JAXBRIContext; +import com.sun.xml.bind.api.TypeReference; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -73,20 +43,38 @@ import org.jboss.ws.metadata.jsr181.HandlerChainFactory; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.TypeMappingMetaData; -import org.jboss.ws.metadata.umdm.TypesMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; +import org.jboss.ws.metadata.umdm.*; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.TypeReference; +import javax.jws.*; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.jws.soap.SOAPMessageHandlers; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.BindingType; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; +import javax.xml.ws.WebFault; +import javax.xml.ws.addressing.Action; +import javax.xml.ws.addressing.AddressingProperties; +import java.io.File; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.net.MalformedURLException; +import java.net.URL; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * Abstract class that represents a JAX-WS metadata builder. @@ -503,7 +491,7 @@ /** * Process operation meta data extensions. */ - private void processMetaExtensions(Method method, EndpointMetaData epMetaData, OperationMetaData opMetaData) + private void processOpMetaExtensions(Method method, EndpointMetaData epMetaData, OperationMetaData opMetaData) { AddressingProperties ADDR = new AddressingPropertiesImpl(); AddressingOpMetaExt addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); @@ -518,11 +506,14 @@ { // TODO: figure out a way to assign message name instead of IN and OUT String tns = epMetaData.getPortName().getNamespaceURI(); + if(tns.length()>0 && !"/".equals(tns.substring(tns.length()-1))) + tns = tns+"/"; + String portTypeName = epMetaData.getPortName().getLocalPart(); - addrExt.setInboundAction(tns + "/" + portTypeName + "/IN"); + addrExt.setInboundAction(tns + portTypeName + "/IN"); if (!opMetaData.isOneWay()) - addrExt.setOutboundAction(tns + "/" + portTypeName + "/OUT"); + addrExt.setOutboundAction(tns + portTypeName + "/OUT"); } opMetaData.addExtension(addrExt); @@ -739,7 +730,7 @@ addFault(opMetaData, exClass); // process op meta data extension - processMetaExtensions(method, epMetaData, opMetaData); + processOpMetaExtensions(method, epMetaData, opMetaData); } protected void processWebMethods(EndpointMetaData epMetaData, Class wsClass) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -142,7 +142,7 @@ // process endpoint meta data extensions processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions); - + // init service endpoint id ObjectName sepID = MetaDataBuilder.createServiceEndpointID(udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); @@ -161,51 +161,51 @@ private EndpointResult processWebService(UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException, IOException { - WebService anWebService = sepClass.getAnnotation(WebService.class); - if (anWebService == null) + WebService endpointImplAnnotation = sepClass.getAnnotation(WebService.class); + if (endpointImplAnnotation == null) throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName()); Class<?> seiClass = null; String seiName; WSDLUtils wsdlUtils = WSDLUtils.getInstance(); - String name = anWebService.name(); + String name = endpointImplAnnotation.name(); if (name.length() == 0) name = WSDLUtils.getJustClassName(sepClass); - String serviceName = anWebService.serviceName(); + String serviceName = endpointImplAnnotation.serviceName(); if (serviceName.length() == 0) serviceName = name + "Service"; - String serviceNS = anWebService.targetNamespace(); + String serviceNS = endpointImplAnnotation.targetNamespace(); if (serviceNS.length() == 0) serviceNS = wsdlUtils.getTypeNamespace(sepClass); - String portName = anWebService.portName(); + String portName = endpointImplAnnotation.portName(); if (portName.length() == 0) portName = name + "Port"; - String wsdlLocation = anWebService.wsdlLocation(); - String interfaceNS = serviceNS; + String wsdlLocation = endpointImplAnnotation.wsdlLocation(); + String interfaceNS = serviceNS; // the default, but a SEI annotation may override this - if (anWebService.endpointInterface().length() > 0) + if (endpointImplAnnotation.endpointInterface().length() > 0) { - seiName = anWebService.endpointInterface(); + seiName = endpointImplAnnotation.endpointInterface(); seiClass = udi.classLoader.loadClass(seiName); - anWebService = seiClass.getAnnotation(WebService.class); + WebService seiAnnotation = seiClass.getAnnotation(WebService.class); - if (anWebService == null) + if (seiAnnotation == null) throw new WSException("Interface does not have a @WebService annotation: " + seiName); - if (anWebService.portName().length() > 0 || anWebService.serviceName().length() > 0 || anWebService.endpointInterface().length() > 0) + if (seiAnnotation.portName().length() > 0 || seiAnnotation.serviceName().length() > 0 || seiAnnotation.endpointInterface().length() > 0) throw new WSException("@WebService[portName,serviceName,endpointInterface] MUST NOT be defined on: " + seiName); - // Redfine the interface or "PortType" name - name = anWebService.name(); + // Redefine the interface or "PortType" name + name = seiAnnotation.name(); if (name.length() == 0) name = WSDLUtils.getJustClassName(seiClass); - interfaceNS = anWebService.targetNamespace(); + interfaceNS = seiAnnotation.targetNamespace(); if (interfaceNS.length() == 0) interfaceNS = wsdlUtils.getTypeNamespace(seiClass); @@ -214,7 +214,7 @@ // when wsdlLocation is defined on the bean if (wsdlLocation.length() == 0) - wsdlLocation = anWebService.wsdlLocation(); + wsdlLocation = seiAnnotation.wsdlLocation(); } // Setup the ServerEndpointMetaData Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -134,7 +134,24 @@ <include name="jaxws-server-handlers.xml"/> </webinf> </war> - + +  + <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war" + webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${tests.output.dir}/resources/interop/wsa"> + <include name="*.*"/> + </fileset> + </war> + +  +  <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -372,7 +389,18 @@ <include name="jaxws-server-jaxb-handlers.xml"/> </webinf> </war> - + +  + <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" + webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/metadata/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF"> + <include name="**/*"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/build.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -202,7 +202,7 @@ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/interop/**"/> + <exclude name="org/jboss/test/ws/interop/microsoft/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> <exclude name="org/jboss/test/ws/jaxrpc/wseventing/**"/> <exclude name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/> @@ -225,7 +225,7 @@ <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${tests.output.dir}/wstools/java"/> - <exclude name="org/jboss/test/ws/interop/**"/> + <exclude name="org/jboss/test/ws/interop/microsoft/**"/> <classpath refid="javac.classpath"/> </javac> </target> Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/ClientScenario.java (from rev 2036, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/ClientScenario.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/ClientScenario.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/ClientScenario.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,78 @@ +/* +* 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.interop; + +import java.net.URL; +import java.util.Map; +import java.util.HashMap; + +/** + * A particular interop test scenario. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Aug 22, 2006 + */ +public class ClientScenario { + + private String name; + private String description; + private URL targetEndpoint; + private Map<String, String> parameterMap; + + public ClientScenario(String name, URL targetEndpoint) { + this.name = name; + this.targetEndpoint = targetEndpoint; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public URL getTargetEndpoint() { + return targetEndpoint; + } + + public String getName() { + return name; + } + + Map<String,String> getParameterMap() { + if(this.parameterMap == null) + parameterMap = new HashMap<String, String>(); + return parameterMap; + } + + public String getParameter(String key) + { + return getParameterMap().get(key); + } + + public String toString() { + return "ClientScenario {name="+name+", endpointURL="+targetEndpoint+", params="+getParameterMap()+"}"; + } + +} Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/ClientScenario.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropClientConfig.java (from rev 2036, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropClientConfig.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropClientConfig.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,85 @@ +/* +* 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.interop; + +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.test.ws.interop.ClientScenario; +import org.w3c.dom.Element; + +import java.net.URL; +import java.util.Iterator; + +/** + * Represents a interop test client configuration model. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Aug 22, 2006 + */ +public class InteropClientConfig { + private Element configRoot; + + public InteropClientConfig(Element configRoot) { + this.configRoot = configRoot; + } + + public ClientScenario getScenario(String name) + { + ClientScenario cs = null; + + try + { + cs = null; + Iterator it = DOMUtils.getChildElements(configRoot); + while(it.hasNext()) + { + Element child = (Element)it.next(); + String scenarioName = DOMUtils.getAttributeValue(child, "name"); + if(name.equals(scenarioName)) + { + // mandatory elements + Element targetEndpoint = DOMUtils.getFirstChildElement(child, "target-endpoint"); + URL endpointURL = new URL(targetEndpoint.getTextContent()); + cs = new ClientScenario(scenarioName, endpointURL); + + // todo: add parameter element parsing here + Iterator parameter = DOMUtils.getChildElements(child, "param"); + while(parameter.hasNext()) + { + Element param = (Element)it.next(); + String key = DOMUtils.getAttributeValue(param, "name"); + String value = DOMUtils.getAttributeValue(param, "value"); + cs.getParameterMap().put(key, value); + } + break; + } + } + } + catch (Exception e) + { + throw new IllegalArgumentException(e.getMessage()); + } + + return cs; + } + +} Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropClientConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropConfigFactory.java (from rev 2036, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropConfigFactory.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropConfigFactory.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,82 @@ +/* +* 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.interop; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropClientConfig; +import org.w3c.dom.Element; + +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; + +/** + * Create an object model frpom test scenario descriptors. + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Aug 22, 2006 + */ +public class InteropConfigFactory { + + private static Logger log = Logger.getLogger(InteropConfigFactory.class); + + public static InteropConfigFactory newInstance() + { + return new InteropConfigFactory(); + } + + public InteropClientConfig createClientConfig() + { + URLClassLoader ctxLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader(); + URL scenariosDescriptor = ctxLoader.findResource("META-INF/scenarios.xml"); + if(scenariosDescriptor!=null) + { + try + { + Element configRoot = DOMUtils.parse( scenariosDescriptor.openStream() ); + return new InteropClientConfig(configRoot); + } + catch (IOException e) + { + throw new IllegalStateException("Error parsing META-INF/scenarios.xml", e); + } + } + else + { + throw new IllegalStateException("Failed to load META-INF/scenarios.xml"); + } + + } + + public ClientScenario createClientScenario(String scenarioName) + { + InteropClientConfig clientConfig = createClientConfig(); + ClientScenario sc = clientConfig.getScenario(scenarioName); + if(null==sc) + sc = clientConfig.getScenario("default"); + + return sc; + } +} Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/InteropConfigFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/ClientScenario.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/ClientScenario.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/ClientScenario.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -1,78 +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.interop.microsoft; - -import java.net.URL; -import java.util.Map; -import java.util.HashMap; - -/** - * A particular interop test scenario. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Aug 22, 2006 - */ -public class ClientScenario { - - private String name; - private String description; - private URL targetEndpoint; - private Map<String, String> parameterMap; - - public ClientScenario(String name, URL targetEndpoint) { - this.name = name; - this.targetEndpoint = targetEndpoint; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public URL getTargetEndpoint() { - return targetEndpoint; - } - - public String getName() { - return name; - } - - Map<String,String> getParameterMap() { - if(this.parameterMap == null) - parameterMap = new HashMap<String, String>(); - return parameterMap; - } - - public String getParameter(String key) - { - return getParameterMap().get(key); - } - - public String toString() { - return "ClientScenario {name="+name+", endpointURL="+targetEndpoint+", params="+getParameterMap()+"}"; - } - -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -1,84 +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.interop.microsoft; - -import org.jboss.ws.core.utils.DOMUtils; -import org.w3c.dom.Element; - -import java.net.URL; -import java.util.Iterator; - -/** - * Represents a interop test client configuration model. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Aug 22, 2006 - */ -public class InteropClientConfig { - private Element configRoot; - - public InteropClientConfig(Element configRoot) { - this.configRoot = configRoot; - } - - public ClientScenario getScenario(String name) - { - ClientScenario cs = null; - - try - { - cs = null; - Iterator it = DOMUtils.getChildElements(configRoot); - while(it.hasNext()) - { - Element child = (Element)it.next(); - String scenarioName = DOMUtils.getAttributeValue(child, "name"); - if(name.equals(scenarioName)) - { - // mandatory elements - Element targetEndpoint = DOMUtils.getFirstChildElement(child, "target-endpoint"); - URL endpointURL = new URL(targetEndpoint.getTextContent()); - cs = new ClientScenario(scenarioName, endpointURL); - - // todo: add parameter element parsing here - Iterator parameter = DOMUtils.getChildElements(child, "param"); - while(parameter.hasNext()) - { - Element param = (Element)it.next(); - String key = DOMUtils.getAttributeValue(param, "name"); - String value = DOMUtils.getAttributeValue(param, "value"); - cs.getParameterMap().put(key, value); - } - break; - } - } - } - catch (Exception e) - { - throw new IllegalArgumentException(e.getMessage()); - } - - return cs; - } - -} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -1,80 +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.interop.microsoft; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.DOMUtils; -import org.w3c.dom.Element; - -import java.io.IOException; -import java.net.URL; -import java.net.URLClassLoader; - -/** - * Create an object model frpom test scenario descriptors. - * - * @author Heiko Braun <heiko.braun(a)jboss.com> - * @version $Id$ - * @since Aug 22, 2006 - */ -public class InteropConfigFactory { - - private static Logger log = Logger.getLogger(InteropConfigFactory.class); - - public static InteropConfigFactory newInstance() - { - return new InteropConfigFactory(); - } - - public InteropClientConfig createClientConfig() - { - URLClassLoader ctxLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader(); - URL scenariosDescriptor = ctxLoader.findResource("META-INF/scenarios.xml"); - if(scenariosDescriptor!=null) - { - try - { - Element configRoot = DOMUtils.parse( scenariosDescriptor.openStream() ); - return new InteropClientConfig(configRoot); - } - catch (IOException e) - { - throw new IllegalStateException("Error parsing META-INF/scenarios.xml", e); - } - } - else - { - throw new IllegalStateException("Failed to load META-INF/scenarios.xml"); - } - - } - - public ClientScenario createClientScenario(String scenarioName) - { - InteropClientConfig clientConfig = createClientConfig(); - ClientScenario sc = clientConfig.getScenario(scenarioName); - if(null==sc) - sc = clientConfig.getScenario("default"); - - return sc; - } -} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -21,8 +21,8 @@ */ package org.jboss.test.ws.interop.microsoft.addressing.sep06.wsa10; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; -import org.jboss.test.ws.interop.microsoft.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.utils.DOMUtils; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -3,8 +3,8 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.microsoft.ClientScenario; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.jaxrpc.StubExt; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/MTOMTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/MTOMTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/MTOMTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -24,8 +24,8 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.microsoft.ClientScenario; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -35,7 +35,7 @@ * * MTOM test scenarios cover essential combinations of MTOM encoding applied to * different data structures, character encodings and WS-Security. - * Scenarios 3.1 � 3.5 cover optimizing binary data in various parts of a message. + * Scenarios 3.1 � 3.5 cover optimizing binary data in various parts of a message. * Scenario 3.6 exercises UTF-16 encoding together with MTOM. * Scenario 3.7 and 3.8 exercise composition of MTOM with Security. * Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/SecureMTOMTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/SecureMTOMTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/mtom/utf8/SecureMTOMTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -24,8 +24,8 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.microsoft.ClientScenario; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10/SignTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10/SignTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10/SignTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -24,8 +24,8 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.microsoft.ClientScenario; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -24,8 +24,8 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.interop.microsoft.ClientScenario; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesSupport.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesSupport.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesSupport.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -1,8 +1,8 @@ package org.jboss.test.ws.interop.microsoft.soapwsdl; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; -import org.jboss.test.ws.interop.microsoft.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; import javax.xml.namespace.QName; import javax.xml.rpc.Stub; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesSupport.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesSupport.java 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesSupport.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -2,8 +2,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.interop.microsoft.soapwsdl.ComplexDataTypesShared.*; -import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; -import org.jboss.test.ws.interop.microsoft.ClientScenario; +import org.jboss.test.ws.interop.InteropConfigFactory; +import org.jboss.test.ws.interop.ClientScenario; import javax.xml.rpc.Stub; import java.util.Calendar; Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,504 @@ +/* + * 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.interop.wsa; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.extensions.addressing.AddressingClientUtil; +import org.w3c.dom.Element; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.addressing.*; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.soap.SOAPFaultException; +import java.io.File; +import java.net.URI; +import java.net.URL; +import java.util.List; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: AddressingTestCase.java 1947 2007-01-12 16:39:05Z heiko.braun(a)jboss.com $ + * @since Sep 28, 2006 + */ +public class AddressingTestCase extends JBossWSTest { + + private EchoPortType echoPort; + private Notify notifyPort; + + final static String WSA_FROM = "http://example.org/node/A"; + final static String WSA_TO = "http://example.org/node/B"; + + private URL wsdlLocation; + + private static AddressingBuilder BUILDER; + private static AddressingConstants CONSTANTS; + + static + { + org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER = AddressingBuilder.getAddressingBuilder(); + org.jboss.test.ws.interop.wsa.AddressingTestCase.CONSTANTS = org.jboss.test.ws.interop.wsa.AddressingTestCase.BUILDER.newAddressingConstants(); + } + + private Element customerParam; + private Element faultParam; + private Element extraStuff; + private Element wsdl1Param; + private Element wsdl2Param; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + this.wsdlLocation = new File("resources/interop/wsa/WEB-INF/wsdl/service.wsdl").toURL(); + + if (echoPort == null || notifyPort==null) + { + Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "WSAddressingCR")); + echoPort = service.getPort(EchoPortType.class); + notifyPort= service.getPort(Notify.class); + configureClient(); + } + + ((StubExt)echoPort).setConfigName("Standard WSAddressing Client"); + ((StubExt)notifyPort).setConfigName("Standard WSAddressing Client"); + + ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo"); + ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify"); + + customerParam = DOMUtils.parse("<customer:CustomerKey xmlns:customer=\"http://example.org/customer\">Key#123456789</customer:CustomerKey>"); + faultParam = DOMUtils.parse("<customer:CustomerKey xmlns:customer=\"http://example.org/customer\">Fault#123456789</customer:CustomerKey>"); + wsdl1Param = DOMUtils.parse("<definitions xmlns=\"http://schemas.xmlsoap.org/wsdl/\">insert WSDL 1.1 here!</definitions>"); + wsdl2Param = DOMUtils.parse("<description xmlns=\"http://www.w3.org/2006/01/wsdl\">insert WSDL 2.0 here!</description>"); + extraStuff = DOMUtils.parse("<customer:extraStuff xmlns:customer=\"http://example.org/customer\">This should be ignored</customer:extraStuff>"); + } + + private void configureClient() { + + /* + TODO: allow scenario loading from TestCase class loader + InteropConfigFactory factory = InteropConfigFactory.newInstance(); + ClientScenario scenario = factory.createClientScenario(System.getProperty("client.scenario")); + if(scenario!=null) + { + log.info("Using scenario: " + scenario); + AddressingTestCase.setTargetAddress((BindingProvider)notifyPort, scenario.getTargetEndpoint().toString()); + AddressingTestCase.setTargetAddress((BindingProvider)echoPort, scenario.getParameter("echoPort")); + } + else + { + throw new IllegalStateException("Failed to load client scenario"); + } + */ + } + + /** + * Certain MSFT testcases require the connection to be closed + * since remoting cannot work with particluar HTTP response codes. + */ + private void forceReset() { + /*try + { + echoPort = null; + notifyPort = null; + setUp(); + } + catch (Exception e) + { + throw new IllegalStateException("Failed to reset connection"); + } */ + } + + public void test1100() { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createDefaultProps("http://example.org/action/notify", AddressingTestCase.WSA_TO); + setRequestProperties((BindingProvider)notifyPort, requestProps); + + // invoke service + notifyPort.notify( new NotifyMessage("Message 1100")); + forceReset(); + } + + public void test1101() { + try + { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createDefaultProps("http://example.org/action/notify", AddressingTestCase.WSA_TO); + requestProps.setMessageID( AddressingTestCase.BUILDER.newURI( AddressingClientUtil.generateMessageID())); + + setRequestProperties((BindingProvider)notifyPort, requestProps); + + // invoke service + notifyPort.notify(new NotifyMessage("Message 1101")); + forceReset(); + } + catch (Exception e) + { + fail(e.getMessage()); + } + } + + public void test1102() { + try + { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createOneWayProps("http://example.org/action/notify", AddressingTestCase.WSA_TO); + + setRequestProperties((BindingProvider)notifyPort, requestProps); + + // invoke service + notifyPort.notify(new NotifyMessage("Message 1102")); + forceReset(); + } + catch (Exception e) + { + fail(e.getMessage()); + } + } + + public void test1103() throws Exception { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createDefaultProps( + "http://example.org/action/notify", AddressingTestCase.WSA_TO); + + requestProps.setFaultTo(AddressingTestCase.BUILDER.newEndpointReference(new URI(AddressingTestCase.CONSTANTS.getNoneURI()))); + setRequestProperties((BindingProvider)notifyPort, requestProps); + + notifyPort.notify(new NotifyMessage("Message 1103")); + forceReset(); + } + + public void test1104() throws Exception { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createOneWayProps( + "http://example.org/action/notify", + AddressingTestCase.WSA_TO + ); + + requestProps.setFaultTo(AddressingTestCase.BUILDER.newEndpointReference(new URI(AddressingTestCase.CONSTANTS.getNoneURI()))); + setRequestProperties((BindingProvider)notifyPort, requestProps); + notifyPort.notify(new NotifyMessage("Message 1104")); + forceReset(); + } + + public void test1106() throws Exception { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createOneWayProps( + "http://example.org/action/notify", + AddressingTestCase.WSA_TO + ); + + requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); + setRequestProperties((BindingProvider)notifyPort, requestProps); + + notifyPort.notify(new NotifyMessage("Message 1106")); + forceReset(); + } + + + public void test1107() throws Exception { + // create addressing properties + AddressingProperties requestProps = + AddressingClientUtil.createOneWayProps("http://example.org/action/notify", AddressingTestCase.WSA_TO); + + requestProps.getReplyTo().getMetadata().addElement(wsdl1Param); + requestProps.getReplyTo().getMetadata().addElement(wsdl2Param); + + setRequestProperties((BindingProvider)notifyPort, requestProps); + + notifyPort.notify(new NotifyMessage("Message 1107")); + forceReset(); + } + + // + // One-way message containing a ReplyTo address + // with an element extension and an attribute extension + // of the ReferenceParameters and Metadata elements. + // / + public void test1108() throws Exception { + + AddressingProperties requestProps = + AddressingClientUtil.createOneWayProps("http://example.org/action/notify", AddressingTestCase.WSA_TO); + + requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); + requestProps.getReplyTo().addAttribute(new QName("http://example.org/customer","level"), "premium"); + + requestProps.getReplyTo().getMetadata().addElement(extraStuff); + requestProps.getReplyTo().getMetadata().addAttribute(new QName("http://example.org/customer", "total"), "1"); + + setRequestProperties((BindingProvider)notifyPort, requestProps); + + notifyPort.notify(new NotifyMessage("Message 1108")); + forceReset(); + } + + // + // Two-way message exchange containing an Action. + // All other fields are defaulted. + // The presence of a MessageID in the first message and + // of the corresponding RelatesTo in the second message is tested. + // + public void test1130() throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createDefaultProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + setRequestProperties((BindingProvider)echoPort, requestProps); + + // invoke service + echoPort.echoOp(new EchoInMessage("Message 1130")); + + SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) + getResponseProperties((BindingProvider)echoPort); + + forceReset(); + + Relationship rel = responseProperties.getRelatesTo()[0]; + assertEquals(rel.getID().toString(), requestProps.getMessageID().getURI().toString()); + + } + + // + // Two-way message exchange containing + // an Action, MessageID and a ReplyTo of anonymous. + // All other fields are defaulted. + // + public void test1131 () throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createAnonymousProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + setRequestProperties((BindingProvider)echoPort, requestProps); + + // invoke service + echoPort.echoOp(new EchoInMessage("Message 1131")); + + SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) + getResponseProperties((BindingProvider)echoPort); + forceReset(); + + Relationship rel = responseProperties.getRelatesTo()[0]; + assertEquals(rel.getID().toString(), requestProps.getMessageID().getURI().toString()); + assertTrue(null == responseProperties.getReplyTo()); + + } + + // + // Two-way message exchange containing an Action and a ReplyTo + // with the address set to anonymous. + // The ReplyTo contains at least one Reference Parameter value. + // The reply message is returned on the HTTP response with + // the Reference Parameter value as a first class SOAP header. + // + public void test1132() throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createAnonymousProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); + + setRequestProperties((BindingProvider)echoPort, requestProps); + + // invoke service + echoPort.echoOp(new EchoInMessage("Message 1132")); + + SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) + getResponseProperties((BindingProvider)echoPort); + + forceReset(); + + Relationship rel = responseProperties.getRelatesTo()[0]; + assertEquals(rel.getID().toString(), requestProps.getMessageID().getURI().toString()); + assertTrue(null == responseProperties.getReplyTo()); + List<Object> returnParameters = responseProperties.getReferenceParameters().getElements(); + assertFalse("Reference parameter is missing", returnParameters.isEmpty()); + + } + + // + // Two-way message exchange containing an Action. + // The ReplyTo and FaultTo addresses are both anonymous. + // The ReplyTo and FaultTo contain at least one Reference Parameter value + // which are different. + // A fault message is returned on the HTTP response with the + // FaultTo Reference Parameter value as a first class SOAP header. + // + public void test1133() throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createAnonymousProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + requestProps.setFaultTo(AddressingTestCase.BUILDER.newEndpointReference(new URI(AddressingTestCase.CONSTANTS.getAnonymousURI()))); + + requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); + requestProps.getFaultTo().getReferenceParameters().addElement(faultParam); + + setRequestProperties((BindingProvider)echoPort, requestProps); + + // invoke service + try + { + echoPort.echoOp(new EchoInMessage("Message 1133")); + } + catch (Exception e) + { + boolean isSoapFault = (e.getCause() instanceof SOAPFaultException); + if(!isSoapFault) throw e; + } + + SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) + getResponseProperties((BindingProvider)echoPort); + + forceReset(); + + Relationship rel = responseProperties.getRelatesTo()[0]; + assertEquals(rel.getID().toString(), requestProps.getMessageID().getURI().toString()); + assertTrue(null == responseProperties.getReplyTo()); + List<Object> returnParameters = responseProperties.getReferenceParameters().getElements(); + assertFalse("Reference parameter is missing", returnParameters.isEmpty()); + } + + // + // Two-way message exchange containing an Action and a ReplyTo address, + // but no FaultTo EPR. The ReplyTo address is anonymous. + // The ReplyTo contains at least one Reference Parameter value. + // A fault message is returned on the HTTP response with the + // ReplyTo Reference Parameter value as a first class SOAP header. + // + public void test1134() throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createAnonymousProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + + requestProps.getReplyTo().getReferenceParameters().addElement(customerParam); + + setRequestProperties((BindingProvider)echoPort, requestProps); + + // invoke service + try + { + echoPort.echoOp(new EchoInMessage("Message 1134")); + } + catch (Exception e) + { + boolean isSoapFault = (e.getCause() instanceof SOAPFaultException); + if(!isSoapFault) throw e; + } + + SOAPAddressingProperties responseProperties = (SOAPAddressingProperties) + getResponseProperties((BindingProvider)echoPort); + + forceReset(); + + Relationship rel = responseProperties.getRelatesTo()[0]; + assertEquals(rel.getID().toString(), requestProps.getMessageID().getURI().toString()); + assertTrue(null == responseProperties.getReplyTo()); + List<Object> returnParameters = responseProperties.getReferenceParameters().getElements(); + assertFalse("Reference parameter is missing", returnParameters.isEmpty()); + } + + // + // Two-way message exchange containing a duplicate Reply-To header. + // + public void test1140() throws Exception { + System.out.println("1140: Not supported on the client side"); + } + + // + // Two-way message exchange containing a duplicate To header. + // + public void test1141() throws Exception { + System.out.println("1141: Not supported on the client side"); + } + + // + // Two-way message exchange containing a duplicate Fault-To header. + // + public void test1142() throws Exception { + System.out.println("1142: Not supported on the client side"); + } + + // + // Two-way message exchange containing a duplicate action header. + // + public void test1143() throws Exception { + System.out.println("1143: Not supported on the client side"); + } + + // + // wo-way message exchange containing a duplicate message ID header. + // + public void test1144() throws Exception { + System.out.println("1144: Not supported on the client side"); + } + + // + // Two-way message exchange containing an + // Action and a ReplyTo identifying an endpoint. + // All other fields are defaulted. + // + public void test1150() throws Exception { + AddressingProperties requestProps = + AddressingClientUtil.createDefaultProps("http://example.org/action/echoIn", AddressingTestCase.WSA_TO); + requestProps.setMessageID(AddressingClientUtil.createMessageID()); + requestProps.setReplyTo( + AddressingTestCase.BUILDER.newEndpointReference( + new URI("http://localhost:8080/wsa10/replyTo") + ) + ); + + setRequestProperties((BindingProvider)echoPort, requestProps); + + echoPort.echoOp(new EchoInMessage("Messsage 1150")); + + forceReset(); + + // todo: check echOut results + } + + // + // customize a stubs endpoint url + // + private static void setTargetAddress(BindingProvider bp, String url) { + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url); + } + + private void setRequestProperties(BindingProvider bp, AddressingProperties props) { + bp.getRequestContext().put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props); + } + + private AddressingProperties getResponseProperties(BindingProvider bp) { + return (AddressingProperties)bp.getResponseContext().get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoImpl.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,54 @@ +/* + * 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.interop.wsa; + +import org.jboss.ws.annotation.EndpointConfig; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id: EchoImpl.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $ + * @since Sep 27, 2006 + */ +@WebService( + name = "EchoPortType", + targetNamespace = "http://tempuri.org/", + wsdlLocation = "/WEB-INF/wsdl/service.wsdl", + endpointInterface = "org.jboss.test.ws.interop.wsa.EchoPortType", + portName = "EchoPort" +) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +@EndpointConfig(configName = "Standard WSAddressing Endpoint") +public class EchoImpl implements EchoPortType { + + @WebMethod(operationName = "EchoOp", action = "http://example.org/action/echoIn") + @WebResult(name = "EchoOutMessage", targetNamespace = "http://example.org/echo", partName = "parameters") + public org.jboss.test.ws.interop.wsa.EchoOutMessage echoOp(@WebParam(name = "EchoInMessage", targetNamespace = "http://example.org/echo", partName = "parameters") org.jboss.test.ws.interop.wsa.EchoInMessage parameters) { + System.out.println("EchoImpl: " + parameters.getEchoIn().getValue()); + return new EchoOutMessage( parameters.getEchoIn().getValue() ); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoInMessage.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoInMessage.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoInMessage.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,72 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.*; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for EchoInMessage element declaration. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <element name="EchoInMessage"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="echoIn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "echoIn" +}) +@XmlRootElement(name = "EchoInMessage") +public class EchoInMessage { + + public EchoInMessage(String echoIn) { + this.echoIn = new JAXBElement(new QName("http://example.org/echo", "echoIn"), String.class, echoIn); + } + + public EchoInMessage() { + + } + + @XmlElementRef(name = "echoIn", namespace = "http://example.org/echo", type = JAXBElement.class) + protected JAXBElement<String> echoIn; + + /** + * Gets the value of the echoIn property. + * + * @return + * possible object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public JAXBElement<String> getEchoIn() { + return echoIn; + } + + /** + * Sets the value of the echoIn property. + * + * @param value + * allowed object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public void setEchoIn(JAXBElement<String> value) { + this.echoIn = ((JAXBElement<String> ) value); + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoOutMessage.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoOutMessage.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoOutMessage.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.*; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for EchoOutMessage element declaration. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <element name="EchoOutMessage"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="echoOut" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "echoOut" +}) +@XmlRootElement(name = "EchoOutMessage") +public class EchoOutMessage { + + public EchoOutMessage(String echoOut) { + this.echoOut = new JAXBElement(new QName("http://example.org/echo", "echoOut"), String.class, echoOut); + } + + public EchoOutMessage() { + } + + @XmlElementRef(name = "echoOut", namespace = "http://example.org/echo", type = JAXBElement.class) + protected JAXBElement<String> echoOut; + + /** + * Gets the value of the echoOut property. + * + * @return + * possible object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public JAXBElement<String> getEchoOut() { + return echoOut; + } + + /** + * Sets the value of the echoOut property. + * + * @param value + * allowed object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public void setEchoOut(JAXBElement<String> value) { + this.echoOut = ((JAXBElement<String> ) value); + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoPortType.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoPortType.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/EchoPortType.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "EchoPortType", targetNamespace = "http://example.org/echo", wsdlLocation = "/WEB-INF/wsdl/service.wsdl") +@SOAPBinding(parameterStyle = ParameterStyle.BARE) +public interface EchoPortType { + + + /** + * + * @param parameters + * @return + * returns org.jboss.test.ws.interop.wsa.EchoOutMessage + */ + @WebMethod(operationName = "EchoOp", action = "http://example.org/action/echoIn") + @WebResult(name = "EchoOutMessage", targetNamespace = "http://example.org/echo", partName = "parameters") + public EchoOutMessage echoOp( + @WebParam(name = "EchoInMessage", targetNamespace = "http://example.org/echo", partName = "parameters") + EchoInMessage parameters); + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/Notify.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/Notify.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/Notify.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,33 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "Notify", targetNamespace = "http://example.org/notify", wsdlLocation = "WEB-INF/wsdl/service.wsdl") +@SOAPBinding(parameterStyle = ParameterStyle.BARE) +public interface Notify { + + + /** + * + * @param parameters + */ + @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") + @Oneway + public void notify( + @WebParam(name = "NotifyMessage", targetNamespace = "http://example.org/notify", partName = "parameters") + NotifyMessage parameters); + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,53 @@ +/* + * 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.interop.wsa; + +import org.jboss.ws.annotation.EndpointConfig; + +import javax.jws.WebMethod; +import javax.jws.Oneway; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 23.01.2007 + */ +@WebService( + name = "Notify", + targetNamespace = "http://tempuri.org/", + endpointInterface = "org.jboss.test.ws.interop.wsa.Notify", + wsdlLocation = "/WEB-INF/wsdl/service.wsdl", + portName = "NotifyPort" +) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +@EndpointConfig(configName = "Standard WSAddressing Endpoint") +public class NotifyImpl implements Notify { + + @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") + @Oneway + public void notify(@WebParam(name = "NotifyMessage", targetNamespace = "http://example.org/notify", partName = "parameters") NotifyMessage parameters) { + System.out.println("NotifyImpl: " + parameters.getNotify().getValue()); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyMessage.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyMessage.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/NotifyMessage.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.*; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for NotifyMessage element declaration. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <element name="NotifyMessage"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="notify" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "notify" +}) +@XmlRootElement(name = "NotifyMessage", namespace = "http://example.org/notify") +public class NotifyMessage { + + public NotifyMessage(String notify) { + this.notify = new JAXBElement(new QName("http://example.org/notify", "notify"), String.class, notify); + } + + public NotifyMessage() { + } + + @XmlElementRef(name = "notify", namespace = "http://example.org/notify", type = JAXBElement.class) + protected JAXBElement<String> notify; + + /** + * Gets the value of the notify property. + * + * @return + * possible object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public JAXBElement<String> getNotify() { + return notify; + } + + /** + * Sets the value of the notify property. + * + * @param value + * allowed object is + * {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + public void setNotify(JAXBElement<String> value) { + this.notify = ((JAXBElement<String> ) value); + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ObjectFactory.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ObjectFactory.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ObjectFactory.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,303 @@ + +package org.jboss.test.ws.interop.wsa; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import java.math.BigDecimal; +import java.math.BigInteger; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.interop.wsa package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoOutMessageEchoOut_QNAME = new QName("http://example.org/echo", "echoOut"); + private final static QName _NotifyMessageNotify_QNAME = new QName("http://example.org/notify", "notify"); + private final static QName _EchoInMessageEchoIn_QNAME = new QName("http://example.org/echo", "echoIn"); + private final static QName _UnsignedInt_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedInt"); + private final static QName _Long_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "long"); + private final static QName _Float_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "float"); + private final static QName _Double_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "double"); + private final static QName _Decimal_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "decimal"); + private final static QName _Boolean_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "boolean"); + private final static QName _UnsignedShort_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedShort"); + private final static QName _UnsignedByte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedByte"); + private final static QName _Short_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "short"); + private final static QName _String_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "string"); + private final static QName _AnyType_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "anyType"); + private final static QName _Char_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "char"); + private final static QName _Guid_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "guid"); + private final static QName _AnyURI_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "anyURI"); + private final static QName _Byte_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "byte"); + private final static QName _DateTime_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "dateTime"); + private final static QName _Int_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "int"); + private final static QName _QName_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "QName"); + private final static QName _Duration_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "duration"); + private final static QName _UnsignedLong_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "unsignedLong"); + private final static QName _Base64Binary_QNAME = new QName("http://schemas.microsoft.com/2003/10/Serialization/", "base64Binary"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.interop.wsa + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link EchoOutMessage } + * + */ + public EchoOutMessage createEchoOutMessage() { + return new EchoOutMessage(); + } + + /** + * Create an instance of {@link NotifyMessage } + * + */ + public NotifyMessage createNotifyMessage() { + return new NotifyMessage(); + } + + /** + * Create an instance of {@link EchoInMessage } + * + */ + public EchoInMessage createEchoInMessage() { + return new EchoInMessage(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut", scope = EchoOutMessage.class) + public JAXBElement<String> createEchoOutMessageEchoOut(String value) { + return new JAXBElement<String>(_EchoOutMessageEchoOut_QNAME, String.class, EchoOutMessage.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/notify", name = "notify", scope = NotifyMessage.class) + public JAXBElement<String> createNotifyMessageNotify(String value) { + return new JAXBElement<String>(_NotifyMessageNotify_QNAME, String.class, NotifyMessage.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn", scope = EchoInMessage.class) + public JAXBElement<String> createEchoInMessageEchoIn(String value) { + return new JAXBElement<String>(_EchoInMessageEchoIn_QNAME, String.class, EchoInMessage.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedInt") + public JAXBElement<Long> createUnsignedInt(Long value) { + return new JAXBElement<Long>(_UnsignedInt_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "long") + public JAXBElement<Long> createLong(Long value) { + return new JAXBElement<Long>(_Long_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "float") + public JAXBElement<Float> createFloat(Float value) { + return new JAXBElement<Float>(_Float_QNAME, Float.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Double }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "double") + public JAXBElement<Double> createDouble(Double value) { + return new JAXBElement<Double>(_Double_QNAME, Double.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "decimal") + public JAXBElement<BigDecimal> createDecimal(BigDecimal value) { + return new JAXBElement<BigDecimal>(_Decimal_QNAME, BigDecimal.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "boolean") + public JAXBElement<Boolean> createBoolean(Boolean value) { + return new JAXBElement<Boolean>(_Boolean_QNAME, Boolean.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedShort") + public JAXBElement<Integer> createUnsignedShort(Integer value) { + return new JAXBElement<Integer>(_UnsignedShort_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedByte") + public JAXBElement<Short> createUnsignedByte(Short value) { + return new JAXBElement<Short>(_UnsignedByte_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "short") + public JAXBElement<Short> createShort(Short value) { + return new JAXBElement<Short>(_Short_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "string") + public JAXBElement<String> createString(String value) { + return new JAXBElement<String>(_String_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyType") + public JAXBElement<Object> createAnyType(Object value) { + return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "char") + public JAXBElement<Integer> createChar(Integer value) { + return new JAXBElement<Integer>(_Char_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "guid") + public JAXBElement<String> createGuid(String value) { + return new JAXBElement<String>(_Guid_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "anyURI") + public JAXBElement<String> createAnyURI(String value) { + return new JAXBElement<String>(_AnyURI_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Byte }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "byte") + public JAXBElement<Byte> createByte(Byte value) { + return new JAXBElement<Byte>(_Byte_QNAME, Byte.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "dateTime") + public JAXBElement<XMLGregorianCalendar> createDateTime(XMLGregorianCalendar value) { + return new JAXBElement<XMLGregorianCalendar>(_DateTime_QNAME, XMLGregorianCalendar.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "int") + public JAXBElement<Integer> createInt(Integer value) { + return new JAXBElement<Integer>(_Int_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "QName") + public JAXBElement<QName> createQName(QName value) { + return new JAXBElement<QName>(_QName_QNAME, QName.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "duration") + public JAXBElement<Duration> createDuration(Duration value) { + return new JAXBElement<Duration>(_Duration_QNAME, Duration.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "unsignedLong") + public JAXBElement<BigInteger> createUnsignedLong(BigInteger value) { + return new JAXBElement<BigInteger>(_UnsignedLong_QNAME, BigInteger.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.microsoft.com/2003/10/Serialization/", name = "base64Binary") + public JAXBElement<byte[]> createBase64Binary(byte[] value) { + return new JAXBElement<byte[]>(_Base64Binary_QNAME, byte[].class, null, ((byte[]) value)); + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ReplyToServlet.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ReplyToServlet.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/ReplyToServlet.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,65 @@ +/* + * 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.interop.wsa; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import java.io.IOException; +import java.io.BufferedReader; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 24.01.2007 + */ +public class ReplyToServlet extends HttpServlet { + + protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { + dump(httpServletRequest, httpServletResponse); + } + + protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { + dump(httpServletRequest, httpServletResponse); + } + + private void dump(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + System.out.println("ReplyTo sink:"); + + try { + BufferedReader reader = httpServletRequest.getReader(); + String inputLine; + + while ((inputLine = reader.readLine()) != null) { + System.out.println(inputLine); + } + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + + httpServletResponse.setStatus(200); + } +} + Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/package-info.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/package-info.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/package-info.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://example.org/echo") +package org.jboss.test.ws.interop.wsa; Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/Echo.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/Echo.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/Echo.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.metadata; + +import javax.xml.bind.annotation.XmlType; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 23.01.2007 + */ +@XmlType(name="Echo", namespace = "http://example.org/sei") +public class Echo { + private String message; + + public Echo() { + } + + public Echo(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EchoResponse.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EchoResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EchoResponse.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.metadata; + +import javax.xml.bind.annotation.XmlType; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 23.01.2007 + */ +@XmlType(name="EchoResponse", namespace = "http://example.org/sei") +public class EchoResponse { + private String message; + + public EchoResponse() { + } + + public EchoResponse(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointBean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointBean.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointBean.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.metadata; + +import javax.jws.WebService; +import javax.jws.WebParam; +import javax.jws.WebMethod; +import javax.jws.WebResult; + +/** + * Tes namespace differences at service and portType levels + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.metadata.EndpointInterface", + targetNamespace = "http://example.org/impl", + serviceName = "TestService", + portName = "EndpointInterfacePort", + wsdlLocation = "/WEB-INF/wsdl/TestService.wsdl" +) +public class EndpointBean implements EndpointInterface +{ + @WebMethod + @WebResult(name = "EchoResponse", targetNamespace = "http://example.org/sei") + public EchoResponse echo(@WebParam(name="EchoMessage", targetNamespace = "http://example.org/sei") Echo request) + { + String message = request.getMessage(); + System.out.println(message); + return new EchoResponse(message); + } +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointInterface.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointInterface.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/EndpointInterface.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.metadata; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.WebResult; +import javax.jws.soap.SOAPBinding; + +/** + * Test the JSR-181 annotation: javax.jws.WebService + * This interface is only used in the client deployment. + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService(targetNamespace = "http://example.org/sei") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +public interface EndpointInterface +{ + @WebMethod + @WebResult(name = "EchoResponse", targetNamespace = "http://example.org/sei") + EchoResponse echo(@WebParam(name="EchoMessage", targetNamespace = "http://example.org/sei") Echo request); +} Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/JAXWSBuilderTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/JAXWSBuilderTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/metadata/JAXWSBuilderTestCase.java 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.metadata; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; +import org.jboss.ws.core.StubExt; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.net.URL; +import java.net.URI; +import java.io.File; + +import junit.framework.Test; + +/** + * Test the JAX-WS metadata builder. + * + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 23.01.2007 + */ +public class JAXWSBuilderTestCase extends JBossWSTest { + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JAXWSBuilderTestCase.class, "jaxws-metadata.war"); + } + + /** + * If the @WebService.targetNamespace + * annotation is on a service implementation + * bean that does NOT reference a service + * endpoint interface (through the + * endpointInterface annotation element), + * the targetNamespace is used for both the + * wsdl:portType and the wsdl:service (and + * associated XML elements). + * + * If the @WebService.targetNamespace + * annotation is on a service implementation + * bean that does reference a service endpoint + * interface (through the endpointInterface + * annotation element), the targetNamespace is + * used for only the wsdl:service (and + * associated XML elements). + * + * @throws Exception + */ + public void testSEIDerivedNamespaces() throws Exception + { + // Create the port + URL wsdlURL = new File("resources/jaxws/metadata/WEB-INF/wsdl/TestService.wsdl").toURL(); + QName qname = new QName("http://example.org/impl", "TestService"); + Service service = Service.create(wsdlURL, qname); + EndpointInterface port = service.getPort(EndpointInterface.class); + + String helloWorld = "Hello world!"; + EchoResponse response = port.echo(new Echo(helloWorld)); + assertEquals(helloWorld, response.getMessage()); + + } +} Added: trunk/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,16 @@ +<client-scenarios> + <scenario name="default" description="Testing local WSA endpoints"> + <target-endpoint>http://localhost:8080/wsa10_sep06/notify</target-endpoint> + <param name="echoPort" value="http://localhost:8080/wsa10_sep06/echo"/> + </scenario> + <scenario name="debug-local" description="Testing local WSA endpoints"> + <target-endpoint>http://localhost:8081/wsa10_sep06/notify</target-endpoint> + <param name="echoPort" value="http://localhost:8081/wsa10_sep06/echo"/> + </scenario> + <scenario name="msft-public" decsription="Testing MSFT public interop endpoints"> + <target-endpoint>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</target-endpoint> + </scenario> + <scenario name="msft-public-debug" decsription="Testing MSFT public interop endpoints"> + <target-endpoint>http://localhost:8081/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</target-endpoint> + </scenario> +</client-scenarios> \ No newline at end of file Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/jboss-web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/jboss-web.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/wsa10</context-root> +</jboss-web> \ No newline at end of file Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/web.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>wsaTestService App</display-name> + <servlet> + <servlet-name>EchoEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.interop.wsa.EchoImpl</servlet-class> + </servlet> + <servlet> + <servlet-name>NotifyEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.interop.wsa.NotifyImpl</servlet-class> + </servlet> + <servlet> + <servlet-name>ReplyToSink</servlet-name> + <servlet-class>org.jboss.test.ws.interop.wsa.ReplyToServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ReplyToSink</servlet-name> + <url-pattern>/replyTo</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>EchoEndpoint</servlet-name> + <url-pattern>/echo</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>NotifyEndpoint</servlet-name> + <url-pattern>/notify</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/service.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/service.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/service.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,54 @@ +<wsdl:definitions name='WSAddressingCR' targetNamespace='http://tempuri.org/' xmlns:i0='http://example.org/' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://tempuri.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/09/policy/addressing' xmlns:wsap10='http://www.w3.org/2005/08/addressing' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <wsdl:import location='wsdl1.wsdl' namespace='http://example.org/'/> + <wsdl:types/> + <wsdl:service name='WSAddressingCR'> + <wsdl:port binding='i0:CustomBinding_Notify' name='NotifyPort'> + <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11'/> + <wsa10:EndpointReference> + <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> +  + <wsdl:port binding='i0:CustomBinding_Echo' name='EchoPort'> + <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11'/> + <wsa10:EndpointReference> + <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> +  + <wsdl:port binding='i0:CustomBinding_Echo2' name='EchoPort2'> + <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11...'/> + <wsa10:EndpointReference> + <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11...</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> +  + <wsdl:port binding='i0:CustomBinding_Echo4' name='EchoPort4'> + <soap:address location='http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11...'/> + <wsa10:EndpointReference> + <wsa10:Address>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11...</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> +  + </wsdl:service> +</wsdl:definitions> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,16 @@ +<wsdl:definitions targetNamespace='http://example.org/notify' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/notify' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <wsdl:types> + <xsd:schema targetNamespace='http://example.org/notify/Imports'> + <xsd:import namespace='http://example.org/notify' schemaLocation='xsd0.xsd'/> + <xsd:import namespace='http://schemas.microsoft.com/2003/10/Serialization/' schemaLocation='xsd1.xsd'/> + </xsd:schema> + </wsdl:types> + <wsdl:message name='NotifyMessage'> + <wsdl:part element='tns:NotifyMessage' name='parameters'/> + </wsdl:message> + <wsdl:portType name='Notify'> + <wsdl:operation name='Notify'> + <wsdl:input message='tns:NotifyMessage' name='NotifyMessage' wsaw:Action='http://example.org/action/notify'/> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,164 @@ +<wsdl:definitions targetNamespace='http://example.org/' xmlns:i0='http://example.org/notify' xmlns:i1='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <wsp:Policy wsu:Id='CustomBinding_Notify_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Notify1_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo1_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo2_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo3_policy'> + <wsp:ExactlyOne> + <wsp:All> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo4_policy'> + <wsp:ExactlyOne> + <wsp:All> + <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/> + <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'/> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id='CustomBinding_Echo5_policy'> + <wsp:ExactlyOne> + <wsp:All> + <cdp:CompositeDuplex xmlns:cdp='http://schemas.microsoft.com/net/2006/06/duplex'/> + <ow:OneWay xmlns:ow='http://schemas.microsoft.com/ws/2005/05/routing/policy'/> + <wsaw:UsingAddressing/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import location='wsdl0.wsdl' namespace='http://example.org/notify'/> + <wsdl:import location='wsdl2.wsdl' namespace='http://example.org/echo'/> + <wsdl:types/> + + <wsdl:binding name='CustomBinding_Notify' type='i0:Notify'> + <wsp:PolicyReference URI='#CustomBinding_Notify_policy'/> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> + <wsdl:operation name='Notify'> + <soap:operation soapAction='http://example.org/action/notify' style='document'/> + <wsdl:input name='NotifyMessage'> + <soap:body use='literal'/> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> +  + <wsdl:binding name='CustomBinding_Echo' type='i1:EchoPortType'> + <wsp:PolicyReference URI='#CustomBinding_Echo_policy'/> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> + <wsdl:operation name='EchoOp'> + <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> + <wsdl:input name='EchoInMessage'> + <soap:body use='literal'/> + </wsdl:input> + <wsdl:output name='EchoOutMessage'> + <soap:body use='literal'/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> +  + <wsdl:binding name='CustomBinding_Echo2' type='i1:EchoPortType'> + <wsp:PolicyReference URI='#CustomBinding_Echo2_policy'/> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> + <wsdl:operation name='EchoOp'> + <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> + <wsdl:input name='EchoInMessage'> + <soap:body use='literal'/> + </wsdl:input> + <wsdl:output name='EchoOutMessage'> + <soap:body use='literal'/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> +  + <wsdl:binding name='CustomBinding_Echo4' type='i1:EchoPortType'> + <wsp:PolicyReference URI='#CustomBinding_Echo4_policy'/> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http'/> + <wsdl:operation name='EchoOp'> + <soap:operation soapAction='http://example.org/action/echoIn' style='document'/> + <wsdl:input name='EchoInMessage'> + <soap:body use='literal'/> + </wsdl:input> + <wsdl:output name='EchoOutMessage'> + <soap:body use='literal'/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> +  +</wsdl:definitions> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl2.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl2.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/wsdl2.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,21 @@ +<wsdl:definitions targetNamespace='http://example.org/echo' xmlns:msc='http://schemas.microsoft.com/ws/2005/12/wsdl/contract' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://example.org/echo' xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing' xmlns:wsa10='http://www.w3.org/2005/08/addressing' xmlns:wsap='http://schemas.xmlsoap.org/ws/2004/08/addressing/policy' xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...' xmlns:wsx='http://schemas.xmlsoap.org/ws/2004/09/mex' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <wsdl:types> + <xsd:schema targetNamespace='http://example.org/echo/Imports'> + <xsd:import namespace='http://example.org/echo' schemaLocation='xsd2.xsd'/> + <xsd:import namespace='http://example.org/notify' schemaLocation='xsd0.xsd'/> + <xsd:import namespace='http://schemas.microsoft.com/2003/10/Serialization/' schemaLocation='xsd1.xsd'/> + </xsd:schema> + </wsdl:types> + <wsdl:message name='EchoInMessage'> + <wsdl:part element='tns:EchoInMessage' name='parameters'/> + </wsdl:message> + <wsdl:message name='EchoOutMessage'> + <wsdl:part element='tns:EchoOutMessage' name='parameters'/> + </wsdl:message> + <wsdl:portType name='EchoPortType'> + <wsdl:operation name='EchoOp'> + <wsdl:input message='tns:EchoInMessage' name='EchoInMessage' wsaw:Action='http://example.org/action/echoIn'/> + <wsdl:output message='tns:EchoOutMessage' name='EchoOutMessage' wsaw:Action='http://example.org/action/echoOut'/> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd0.xsd =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd0.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd0.xsd 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,9 @@ +<xs:schema elementFormDefault='qualified' targetNamespace='http://example.org/notify' xmlns:tns='http://example.org/notify' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='NotifyMessage'> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs='0' name='notify' nillable='true' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd1.xsd =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd1.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd1.xsd 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,39 @@ +<xs:schema attributeFormDefault='qualified' elementFormDefault='qualified' targetNamespace='http://schemas.microsoft.com/2003/10/Serialization/' xmlns:tns='http://schemas.microsoft.com/2003/10/Serialization/' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='anyType' nillable='true' type='xs:anyType'/> + <xs:element name='anyURI' nillable='true' type='xs:anyURI'/> + <xs:element name='base64Binary' nillable='true' type='xs:base64Binary'/> + <xs:element name='boolean' nillable='true' type='xs:boolean'/> + <xs:element name='byte' nillable='true' type='xs:byte'/> + <xs:element name='dateTime' nillable='true' type='xs:dateTime'/> + <xs:element name='decimal' nillable='true' type='xs:decimal'/> + <xs:element name='double' nillable='true' type='xs:double'/> + <xs:element name='float' nillable='true' type='xs:float'/> + <xs:element name='int' nillable='true' type='xs:int'/> + <xs:element name='long' nillable='true' type='xs:long'/> + <xs:element name='QName' nillable='true' type='xs:QName'/> + <xs:element name='short' nillable='true' type='xs:short'/> + <xs:element name='string' nillable='true' type='xs:string'/> + <xs:element name='unsignedByte' nillable='true' type='xs:unsignedByte'/> + <xs:element name='unsignedInt' nillable='true' type='xs:unsignedInt'/> + <xs:element name='unsignedLong' nillable='true' type='xs:unsignedLong'/> + <xs:element name='unsignedShort' nillable='true' type='xs:unsignedShort'/> + <xs:element name='char' nillable='true' type='tns:char'/> + <xs:simpleType name='char'> + <xs:restriction base='xs:int'/> + </xs:simpleType> + <xs:element name='duration' nillable='true' type='tns:duration'/> + <xs:simpleType name='duration'> + <xs:restriction base='xs:duration'> + <xs:pattern value='\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?'/> + <xs:minInclusive value='-P10675199DT2H48M5.4775808S'/> + <xs:maxInclusive value='P10675199DT2H48M5.4775807S'/> + </xs:restriction> + </xs:simpleType> + <xs:element name='guid' nillable='true' type='tns:guid'/> + <xs:simpleType name='guid'> + <xs:restriction base='xs:string'> + <xs:pattern value='[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}'/> + </xs:restriction> + </xs:simpleType> + <xs:attribute name='FactoryType' type='xs:QName'/> +</xs:schema> Added: trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd2.xsd =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd2.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/interop/wsa/WEB-INF/wsdl/xsd2.xsd 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,16 @@ +<xs:schema elementFormDefault='qualified' targetNamespace='http://example.org/echo' xmlns:tns='http://example.org/echo' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='EchoInMessage'> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs='0' name='echoIn' nillable='true' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name='EchoOutMessage'> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs='0' name='echoOut' nillable='true' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> Added: trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/jboss-web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/jboss-web.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-metadata</context-root> +</jboss-web> \ No newline at end of file Added: trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/web.xml 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.metadata.EndpointBean</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Added: trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/TestService.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/TestService.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://example.org/impl" + xmlns:tns="http://example.org/impl" + xmlns:t2="http://example.org/sei" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <import location='wsdl1.wsdl' namespace='http://example.org/sei'/> + + <service name="TestService"> + <port name="EndpointInterfacePort" binding="t2:EndpointInterfaceBinding"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxws-metadata"/> + </port> + </service> +</definitions> Added: trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/wsdl1.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/wsdl1.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/metadata/WEB-INF/wsdl/wsdl1.wsdl 2007-01-24 11:30:23 UTC (rev 2064) @@ -0,0 +1,48 @@ +<definitions name="TestService" + targetNamespace="http://example.org/sei" + xmlns:tns="http://example.org/sei" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types> + <xsd:schema targetNamespace="http://example.org/sei"> + <xsd:element name="Echo"> + <xsd:complexType> + <xsd:element name="message" type="xsd:string"/> + </xsd:complexType> + </xsd:element> + <xsd:element name="EchoResponse"> + <xsd:complexType> + <xsd:element name="message" type="xsd:string"/> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </types> + + <message name="EchoMessage"> + <part name="parameters" element="tns:Echo"/> + </message> + <message name="EchoResponseMessage"> + <part name="result" element="tns:EchoResponse"/> + </message> + + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="parameters"> + <input message="tns:EchoMessage"/> + <output message="tns:EchoResponseMessage"/> + </operation> + </portType> + + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> +</definitions> \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-24 11:24:36 UTC (rev 2063) +++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-24 11:30:23 UTC (rev 2064) @@ -1,3 +1,3 @@ -org/jboss/test/ws/interop/** +org/jboss/test/ws/interop/microsoft/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/**

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2063 - in branches/jbossws-1.2.0: integration-jboss40 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:24:36 -0500 (Wed, 24 Jan 2007) New Revision: 2063 Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/integration-jboss40/build.xml Log: Make jboss40 build independent of jboss42.home Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 11:09:22 UTC (rev 2062) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-01-24 11:24:36 UTC (rev 2063) @@ -126,6 +126,18 @@ <path refid="core.classpath"/> </path> +  + <path id="jboss40.integration.classpath"> + <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> + <pathelement location="${jboss40.lib}/jboss-system.jar"/> + <pathelement location="${jboss40.server.lib}/jboss.jar"/> + <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> + <path refid="core.classpath"/> + </path> +  <path id="tomcat.integration.classpath"> <path refid="core.classpath"/> Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 11:09:22 UTC (rev 2062) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 11:24:36 UTC (rev 2063) @@ -55,9 +55,9 @@  <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss40.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss40/**"/> + <include name="org/jboss/ws/integration/jboss42/**"/> <classpath refid="jboss40.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> @@ -115,12 +115,12 @@  - <target name="jboss40-module-jars" depends="core-jars,jboss42-jars"> + <target name="jboss40-module-jars" depends="core-jars">  <mkdir dir="${jboss40.output.lib.dir}"/> <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> - <fileset dir="${jboss42.output.classes.dir}"> + <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2062 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:09:22 -0500 (Wed, 24 Jan 2007) New Revision: 2062 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0/config.xml Log: Add QA job Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0/config.xml 2007-01-24 11:09:16 UTC (rev 2061) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0/config.xml 2007-01-24 11:09:22 UTC (rev 2062) @@ -9,12 +9,12 @@ # # Module settings # -MODULE=QA-AS-4.2 +MODULE=QA-AS-4.0 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME -JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" +JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" # # stop jbossas @@ -27,7 +27,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 +ant $ENVIRONMENT deploy-jboss40 # # start jbossas @@ -63,7 +63,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Test jbossws-(a)version.id@ against JBossAS-4.2</description> + <description>Test jbossws-(a)version.id@ against JBossAS-4.0</description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2061 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:09:16 -0500 (Wed, 24 Jan 2007) New Revision: 2061 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0/ Log: Add QA job Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.0 (from rev 2060, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2)

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2060 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: QA-AS-4.2 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:07:50 -0500 (Wed, 24 Jan 2007) New Revision: 2060 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2/ Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2/config.xml Log: Add QA job Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2 (from rev 2059, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0) Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml 2007-01-24 11:05:29 UTC (rev 2059) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-4.2/config.xml 2007-01-24 11:07:50 UTC (rev 2060) @@ -9,12 +9,12 @@ # # Module settings # -MODULE=QA-AS-5.0 +MODULE=QA-AS-4.2 SVNBASENAME=(a)svn.basename@ HUDSON_HOME=(a)hudson.home@ SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME -JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # stop jbossas @@ -27,7 +27,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT deploy-jboss42 # # start jbossas @@ -63,7 +63,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Test jbossws-(a)version.id@ against JBossAS-5.0</description> + <description>Test jbossws-(a)version.id@ against JBossAS-4.2</description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2059 - in branches/jbossws-1.2.0/build: ant-import and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 06:05:29 -0500 (Wed, 24 Jan 2007) New Revision: 2059 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml Removed: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml branches/jbossws-1.2.0/build/ant.properties.example branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml Log: Add QA job Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 10:31:56 UTC (rev 2058) +++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -73,6 +73,7 @@ <filter token="version.id" value="${version.id}"/> <filter token="hudson.home" value="${hudson.home}"/> <filter token="hudson.mail" value="${hudson.mail}"/> + <filter token="hudson.jdk14" value="${hudson.jdk14}"/> <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> </filterset> Modified: branches/jbossws-1.2.0/build/ant.properties.example =================================================================== --- branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 10:31:56 UTC (rev 2058) +++ branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 11:05:29 UTC (rev 2059) @@ -3,8 +3,9 @@ # # $Id$ -# JBossWS Hudson Root +# JBossWS Hudson #hudson.root=/home/tdiesler/workspace +hudson.jdk14=/usr/java/jdk14 hudson.mail=jbossws-dev(a)lists.jboss.com # Optional JBoss Home Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14 (from rev 2057, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0) Deleted: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -1,32 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -cd Branch_4_0 -rm -f thirdparty/libraries.ent -./build/build.sh clean main - </command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_0</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build JBossAS-4.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml (from rev 2058, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml) =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml (rev 0) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +export JAVA_HOME=(a)hudson.jdk14@ + +cd Branch_4_0 +rm -f thirdparty/libraries.ent +./build/build.sh clean main + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_0</modules> + <useUpdate>true</useUpdate> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build JBossAS-4.0 with jdk-1.4</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -32,7 +32,7 @@ # # deploy to jboss # -ant $ENVIRONMENT deploy-jboss40 +ant $ENVIRONMENT clean deploy-jboss40 # # start jbossas Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 10:31:56 UTC (rev 2058) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -32,7 +32,7 @@ # # deploy to jboss # -ant $ENVIRONMENT deploy-jboss42 +ant $ENVIRONMENT clean deploy-jboss42 # # start jbossas Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -32,7 +32,7 @@ # # deploy to jboss # -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT clean deploy-jboss50 # # start jbossas Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All (from rev 2057, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0) Deleted: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -1,87 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# common script settings -pwd - -# -# Module settings -# -HUDSON_HOME=(a)hudson.home@ -MODULE=JBossWS-AS-5.0 -WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" - -# Assign the SVNDIR -cd $WORKSPACE -cd `ls` -export SVNDIR=`pwd` - -cd $SVNDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop - -# -# deploy to jboss -# -ant $ENVIRONMENT deploy-jboss50 - -# -# start jbossas -# -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 - -# -# execute tests -# -cd $SVNDIR/jbossws-tests -ant $ENVIRONMENT tests | grep FIXME | sort -u - -# -# copy test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$JBOSS_INSTANCE/bin/jboss.sh stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@jbossws.svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against JBossAS-5.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml (from rev 2058, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml) =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml (rev 0) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-Build-All/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -0,0 +1,54 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# common script settings +pwd + +# +# Module settings +# +MODULE=JBossWS-Build-All +SVNBASENAME=(a)svn.basename@ +HUDSON_HOME=(a)hudson.home@ +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME +JBOSS40_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +JBOSS42_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +JBOSS50_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 +ENVIRONMENT="-Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE" + +# +# copy ant.properties +# +cd $SVNBASEDIR/build +cp ant.properties.example ant.properties + +# +# deploy to jboss +# +ant $ENVIRONMENT all +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <modules>@svn.url@</modules> + <useUpdate>true</useUpdate> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build jbossws-(a)version.id@</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0 (from rev 2057, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0) Deleted: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -1,87 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# common script settings -pwd - -# -# Module settings -# -HUDSON_HOME=(a)hudson.home@ -MODULE=JBossWS-AS-5.0 -WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace -JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" - -# Assign the SVNDIR -cd $WORKSPACE -cd `ls` -export SVNDIR=`pwd` - -cd $SVNDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop - -# -# deploy to jboss -# -ant $ENVIRONMENT deploy-jboss50 - -# -# start jbossas -# -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 - -# -# execute tests -# -cd $SVNDIR/jbossws-tests -ant $ENVIRONMENT tests | grep FIXME | sort -u - -# -# copy test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$JBOSS_INSTANCE/bin/jboss.sh stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@jbossws.svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against JBossAS-5.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml (from rev 2058, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml) =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml (rev 0) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-AS-5.0/config.xml 2007-01-24 11:05:29 UTC (rev 2059) @@ -0,0 +1,70 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# common script settings +pwd + +# +# Module settings +# +MODULE=QA-AS-5.0 +SVNBASENAME=(a)svn.basename@ +HUDSON_HOME=(a)hudson.home@ +SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME +JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 +ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" + +# +# stop jbossas +# +cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +chmod +x $JBOSS_INSTANCE/bin/jboss.sh +$JBOSS_INSTANCE/bin/jboss.sh stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT deploy-jboss50 + +# +# start jbossas +# +$JBOSS_INSTANCE/bin/jboss.sh start +sleep 30 + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests + +# +# stop jbossas +# +$JBOSS_INSTANCE/bin/jboss.sh stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Test jbossws-(a)version.id@ against JBossAS-5.0</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2058 - in branches/jbossws-1.2.0/build: ant-import and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-24 05:31:56 -0500 (Wed, 24 Jan 2007) New Revision: 2058 Added: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml branches/jbossws-1.2.0/build/ant.properties.example branches/jbossws-1.2.0/build/build.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml Log: Use svn.basename Added: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml (rev 0) +++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../build" name="JBossWS-Hudson"> + + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + + <target name="init-hudson" depends="prepare"> + + <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/> + <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/hudson-home"/> + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo/> + + <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> + </target> + +  + <target name="hudson-init-tomcat" depends="init-hudson" unless="hudson.tomcat.available"> + + <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + + <mkdir dir="${hudson.root}"/> + <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> + <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> + <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/> + <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/> + +  + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + <copy todir="${hudson.tomcat}"> + <fileset dir="${build.dir}/hudson/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + </target> + +  + <target name="hudson-setup" depends="init-hudson,hudson-init-tomcat" + description="Setup the Hudson QA environment"> + + <exec executable="basename" outputproperty="svn.basename"> + <arg value="${svn.url}"/> + </exec> + +  + <copy todir="${hudson.home}" overwrite="true"> + <fileset dir="${build.dir}/hudson/hudson-home"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filter token="version.id" value="${version.id}"/> + <filter token="hudson.home" value="${hudson.home}"/> + <filter token="hudson.mail" value="${hudson.mail}"/> + <filter token="svn.basename" value="${svn.basename}"/> + <filter token="svn.url" value="${svn.url}"/> + </filterset> + </copy> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup sucessfuly *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> + <arg line="stop"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stoped sucessfuly *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> + + <mkdir dir="${build.output.dir}"/> + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log"> + <arg line="start"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson started sucessfuly *"/> + <echo message="* http://localhost:8180/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + +</project> Property changes on: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -60,10 +60,6 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> - <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/> - <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/> - <property name="hudson.home" value="${hudson.root}/hudson-home"/> - <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> <available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/> @@ -86,7 +82,7 @@ <arg line="--xml"/> </exec> <xmlproperty file="${build.output.dir}/svn-info.xml"/> - <property name="jbossws.svn.url" value="${info.entry.url}"/> + <property name="svn.url" value="${info.entry.url}"/> <echo message="jboss50.home = ${jboss50.home}"/> <echo message="jboss42.home = ${jboss42.home}"/> Modified: branches/jbossws-1.2.0/build/ant.properties.example =================================================================== --- branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 10:31:56 UTC (rev 2058) @@ -4,8 +4,8 @@ # $Id$ # JBossWS Hudson Root -#jbossws.hudson.root=/home/tdiesler/workspace -jbossws.hudson.mail=jbossws-dev(a)lists.jboss.com +#hudson.root=/home/tdiesler/workspace +hudson.mail=jbossws-dev(a)lists.jboss.com # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 @@ -19,7 +19,7 @@ jboss.server.instance=default # Optional Tomcat Home -tomcat.home=/usr/java/tomcat +#tomcat.home=/usr/java/tomcat tomcat.manager.username=manager tomcat.manager.password=manager Modified: branches/jbossws-1.2.0/build/build.xml =================================================================== --- branches/jbossws-1.2.0/build/build.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/build.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -17,6 +17,7 @@ <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-samples.xml"/> + <import file="${basedir}/ant-import/build-hudson.xml"/> <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> @@ -60,83 +61,5 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> - - <target name="hudson-setup" depends="init" description="Setup the Hudson QA environment"> - <echo/> - <echo message="hudson.root = ${hudson.root}"/> - <echo/> - - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> - - <mkdir dir="${hudson.root}"/> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> - <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> - <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/> - <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/> - -  - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - <copy todir="${hudson.tomcat}"> - <fileset dir="${build.dir}/hudson/apache-tomcat"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="hudson.home" value="${hudson.home}"/> - </filterset> - </copy> - -  - <copy todir="${hudson.home}" overwrite="true"> - <fileset dir="${build.dir}/hudson/hudson-home"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="version.id" value="${version.id}"/> - <filter token="hudson.home" value="${hudson.home}"/> - <filter token="jbossws.hudson.mail" value="${jbossws.hudson.mail}"/> - <filter token="jbossws.svn.url" value="${jbossws.svn.url}"/> - </filterset> - </copy> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson setup sucessfuly *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - <target name="hudson-stop" depends="init" description="Stops the Hudson QA environment"> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> - <arg line="stop"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson stoped sucessfuly *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - <target name="hudson-start" depends="init" description="Start the Hudson QA environment"> - - <mkdir dir="${build.output.dir}"/> - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log"> - <arg line="start"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson started sucessfuly *"/> - <echo message="* http://localhost:8180/hudson *"/> - <echo message="*************************************"/> - <echo/> - - </target> - </project> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -11,7 +11,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -11,7 +11,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -11,7 +11,7 @@ </builders> <publishers class="vector"> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -9,25 +9,23 @@ # # Module settings # -HUDSON_HOME=(a)hudson.home@ MODULE=JBossWS-AS-4.0 -WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace -JBOSS42_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +SVNBASENAME=(a)svn.basename@ +HUDSON_HOME=(a)hudson.home@ +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" -# Assign the SVNDIR -cd $WORKSPACE -cd `ls` -export SVNDIR=`pwd` - -cd $SVNDIR/build +# +# copy ant.properties +# +cd $SVNBASEDIR/build cp ant.properties.example ant.properties # # stop jbossas # -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh chmod +x $JBOSS_INSTANCE/bin/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh stop @@ -45,17 +43,10 @@ # # execute tests # -cd $SVNDIR/jbossws-tests -ant $ENVIRONMENT tests | grep FIXME | sort -u +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests # -# copy test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# # stop jbossas # $JBOSS_INSTANCE/bin/jboss.sh stop @@ -64,17 +55,17 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> + <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> - <modules>@jbossws.svn.url@</modules> + <modules>@svn.url@</modules> <useUpdate>true</useUpdate> </scm> <canRoam>true</canRoam> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -9,18 +9,17 @@ # # Module settings # -HUDSON_HOME=(a)hudson.home@ MODULE=JBossWS-AS-4.2 -WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace +SVNBASENAME=(a)svn.basename@ +HUDSON_HOME=(a)hudson.home@ +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" -# Assign the SVNDIR -cd $WORKSPACE -cd `ls` -export SVNDIR=`pwd` - -cd $SVNDIR/build +# +# copy ant.properties +# +cd $SVNBASEDIR/build cp ant.properties.example ant.properties # @@ -45,16 +44,9 @@ # execute tests # cd $SVNDIR/jbossws-tests -ant $ENVIRONMENT tests | grep FIXME | sort -u +ant $ENVIRONMENT tests # -# copy test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# # stop jbossas # $JBOSS_INSTANCE/bin/jboss.sh stop @@ -63,17 +55,17 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> + <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> - <modules>@jbossws.svn.url@</modules> + <modules>@svn.url@</modules> <useUpdate>true</useUpdate> </scm> <canRoam>true</canRoam> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058) @@ -9,24 +9,23 @@ # # Module settings # -HUDSON_HOME=(a)hudson.home@ MODULE=JBossWS-AS-5.0 -WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace +SVNBASENAME=(a)svn.basename@ +HUDSON_HOME=(a)hudson.home@ +SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2 ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" -# Assign the SVNDIR -cd $WORKSPACE -cd `ls` -export SVNDIR=`pwd` - -cd $SVNDIR/build +# +# copy ant.properties +# +cd $SVNBASEDIR/build cp ant.properties.example ant.properties # # stop jbossas # -cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh +cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh chmod +x $JBOSS_INSTANCE/bin/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh stop @@ -44,17 +43,10 @@ # # execute tests # -cd $SVNDIR/jbossws-tests -ant $ENVIRONMENT tests | grep FIXME | sort -u +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests # -# copy test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# # stop jbossas # $JBOSS_INSTANCE/bin/jboss.sh stop @@ -63,17 +55,17 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> + <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients>@jbossws.hudson.mail@</recipients> + <recipients>@hudson.mail@</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> - <modules>@jbossws.svn.url@</modules> + <modules>@svn.url@</modules> <useUpdate>true</useUpdate> </scm> <canRoam>true</canRoam>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2057 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-23 19:56:26 -0500 (Tue, 23 Jan 2007) New Revision: 2057 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml Log: Add dependency on jboss42 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 00:46:04 UTC (rev 2056) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057) @@ -12,8 +12,9 @@ HUDSON_HOME=(a)hudson.home@ MODULE=JBossWS-AS-4.0 WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace +JBOSS42_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS_INSTANCE" # Assign the SVNDIR cd $WORKSPACE

17 years, 9 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