February 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2405 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-19 14:55:57 -0500 (Mon, 19 Feb 2007) New Revision: 2405 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java Log: Fix JBWS-1529 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-02-19 19:46:14 UTC (rev 2404) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-02-19 19:55:57 UTC (rev 2405) @@ -369,7 +369,8 @@ for (WSDLInterfaceOperationOutfault fault : operation.getOutfaults()) { QName element = fault.getRef(); - buffer.append("<fault message='" + utils.getFormattedString(element)); + String faultPrefix = wsdl.getPrefix(element.getNamespaceURI()); + buffer.append("<fault message='" + faultPrefix + ":" + element.getLocalPart()); buffer.append("' name='" + element.getLocalPart() + "'/>"); } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-19 19:46:14 UTC (rev 2404) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-19 19:55:57 UTC (rev 2405) @@ -130,13 +130,12 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); - QName ref = new QName(wsdl.getTargetNamespace(), interfaceFault.getName().toString()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(ref); + outfault.setRef(fault.getXmlName()); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(ref); + bindingFault.setRef(fault.getXmlName()); wsdlBinding.addFault(bindingFault); }

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2404 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-19 14:46:14 -0500 (Mon, 19 Feb 2007) New Revision: 2404 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java Log: Correct namespace usage on faults Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-02-19 19:20:33 UTC (rev 2403) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-02-19 19:46:14 UTC (rev 2404) @@ -369,7 +369,8 @@ for (WSDLInterfaceOperationOutfault fault : operation.getOutfaults()) { QName element = fault.getRef(); - buffer.append("<fault message='" + utils.getFormattedString(element)); + String faultPrefix = wsdl.getPrefix(element.getNamespaceURI()); + buffer.append("<fault message='" + faultPrefix + ":" + element.getLocalPart()); buffer.append("' name='" + element.getLocalPart() + "'/>"); }

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2403 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl.

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2007-02-19 14:20:33 -0500 (Mon, 19 Feb 2007) New Revision: 2403 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java Log: Correct namespace usage on faults Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-19 16:43:51 UTC (rev 2402) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-02-19 19:20:33 UTC (rev 2403) @@ -130,13 +130,12 @@ interfaceFault.setName(new NCName(fault.getXmlName().getLocalPart())); wsdlInterface.addFault(interfaceFault); - QName ref = new QName(wsdl.getTargetNamespace(), interfaceFault.getName().toString()); WSDLInterfaceOperationOutfault outfault = new WSDLInterfaceOperationOutfault(interfaceOperation); - outfault.setRef(ref); + outfault.setRef(fault.getXmlName()); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); - bindingFault.setRef(ref); + bindingFault.setRef(fault.getXmlName()); wsdlBinding.addFault(bindingFault); }

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2402 - in branches/jbossws-1.2.0/jbossws-tests: ant-import and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-19 11:43:51 -0500 (Mon, 19 Feb 2007) New Revision: 2402 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/ProtocolHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/ProtocolHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/handlers.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/sun-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/wsdl/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/wsdl/BenchmarkWebService.wsdl Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEEndpoint.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx Log: Added handler scenario to benchmark tests Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -39,10 +39,23 @@ <include name="wsdl/**"/> </webinf> <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> - <include name="jboss-web.xml"/> + <include name="handlers.xml"/> </webinf> </war> + <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> + <include name="handlers.xml"/> + <include name="sun-jaxws.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -253,7 +253,7 @@ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -30,6 +30,7 @@ import javax.naming.NamingException; import javax.xml.rpc.Service; import javax.xml.rpc.Stub; +import javax.xml.rpc.ServiceException; import java.util.Properties; /** @@ -51,13 +52,24 @@ { super.setUp(); - if (endpoint == null) - { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); - endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - - } + try + { + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext("benchmark-client"); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + //((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/jaxrpc-benchmark-doc/jse"); + } + } + catch (NamingException e) + { + e.printStackTrace(); + } + catch (ServiceException e) + { + e.printStackTrace(); + } } public void testEchoSimpleType() throws Exception Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/ProtocolHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/ProtocolHandler.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxrpc/ProtocolHandler.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,71 @@ +/* + * 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.benchmark.jaxrpc; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +public class ProtocolHandler extends GenericHandler +{ + protected QName[] headers; + + public QName[] getHeaders() + { + return headers; + } + + public void init(HandlerInfo info) + { + headers = info.getHeaders(); + } + + public boolean handleRequest(MessageContext msgContext) + { + return saajAccess(msgContext); + } + + public boolean handleResponse(MessageContext msgContext) + { + return saajAccess(msgContext); + } + + private boolean saajAccess(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + System.out.println( "Num body children: " +soapBody.getChildNodes().getLength() ); + return true; + } + catch (SOAPException ex) + { + throw new RuntimeException(ex); + } + } +} Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -62,8 +62,8 @@ endpoint = service.getPort(BenchmarkService.class); ((BindingProvider)endpoint).getRequestContext().put( BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://"+getServerHost()+":8080/jaxws-benchmark-doc" - ); + "http://"+getServerHost()+":8080/jaxws-benchmark-doclit/jse" + ); } } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEEndpoint.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEEndpoint.java 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEEndpoint.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -43,6 +43,7 @@ endpointInterface = "org.jboss.test.ws.benchmark.jaxws.doclit.BenchmarkService" ) public class BenchmarkJSEEndpoint implements BenchmarkService { + @WebMethod @WebResult(name = "result", targetNamespace = "") @RequestWrapper(localName = "echoArrayOfSimpleUserType", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoArrayOfSimpleUserType") Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkJSEHandlerEndpoint.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,131 @@ +/* + * 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.benchmark.jaxws; + +import org.jboss.test.ws.benchmark.jaxws.doclit.*; + +import javax.jws.*; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id:$ + * @since 31.01.2007 + */ +@WebService( + name = "BenchmarkService", + targetNamespace = "http://org.jboss.ws/benchmark", + endpointInterface = "org.jboss.test.ws.benchmark.jaxws.doclit.BenchmarkService" +) +@HandlerChain(file = "WEB-INF/handlers.xml") +public class BenchmarkJSEHandlerEndpoint implements BenchmarkService { + + @WebMethod + @WebResult(name = "result", targetNamespace = "") + @RequestWrapper(localName = "echoArrayOfSimpleUserType", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoArrayOfSimpleUserType") + @ResponseWrapper(localName = "echoArrayOfSimpleUserTypeResponse", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoArrayOfSimpleUserTypeResponse") + public List<SimpleUserType> echoArrayOfSimpleUserType(@WebParam(name = "arrayOfSimpleUserType_1", targetNamespace = "") List<SimpleUserType> arrayOfSimpleUserType1) { + return arrayOfSimpleUserType1; + } + + @WebMethod + @WebResult(name = "result", targetNamespace = "") + @RequestWrapper(localName = "echoSimpleType", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoSimpleType") + @ResponseWrapper(localName = "echoSimpleTypeResponse", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoSimpleTypeResponse") + public SimpleUserType echoSimpleType(@WebParam(name = "SimpleUserType_1", targetNamespace = "") SimpleUserType simpleUserType1) { + return simpleUserType1; + } + + @WebMethod + @WebResult(name = "result", targetNamespace = "") + @RequestWrapper(localName = "echoSynthetic", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoSynthetic") + @ResponseWrapper(localName = "echoSyntheticResponse", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.EchoSyntheticResponse") + public Synthetic echoSynthetic(@WebParam(name = "Synthetic_1", targetNamespace = "") Synthetic synthetic1) { + return synthetic1; + } + + @WebMethod + @WebResult(name = "result", targetNamespace = "") + @RequestWrapper(localName = "getOrder", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.GetOrder") + @ResponseWrapper(localName = "getOrderResponse", targetNamespace = "http://org.jboss.ws/benchmark/types", className = "org.jboss.test.ws.benchmark.jaxws.doclit.GetOrderResponse") + public Order getOrder(@WebParam(name = "int_1", targetNamespace = "") int int1, @WebParam(name = "int_2", targetNamespace = "") int int2) { + return createOrderResponse(int1, int2); + } + + public Order createOrderResponse(int orderId, int customerId) + { + int id = customerId; + + Address ship = new Address(); + ship.setAddress1("Ship StreetAddres " + id); + ship.setAddress2("Street Address Line 2 " + id); + ship.setCity("City " + id); + ship.setFirstName("Ship FirstName " + id); + ship.setLastName("Ship LastName " + id); + ship.setState("State " + id); + ship.setZip("12345"); + Address bill = ship; + + + Customer customer = new Customer(); + customer.setBillingAddress(bill); + customer.setContactFirstName("FirstName " + id); + customer.setContactLastName("LastName " + id); + customer.setContactPhone("089452132355"); + customer.setCreditCardExpirationDate("27-12-04"); + customer.setCreditCardNumber("90879876876876"); + customer.setCustomerId(customerId); + customer.setLastActivityDate(null); + customer.setShippingAddress(ship); + + int numberLineItems = orderId; + + ArrayList lines = new ArrayList(); + + for(int i = 0; i < numberLineItems; i++) + { + // orderId, i+1, i, "Test Product " +i, 1, (float) 1.00 + LineItem line = new LineItem(); + line.setOrderId(orderId); + line.setOrderQuantity(10+i); + line.setProductDescription("Test Product " +i); + line.setProductId(2*i); + line.setUnitPrice((float) 1.00); + lines.add(line); + } + + + // orderId, 1, new GregorianCalendar(), (float) 50, customer, (LineItem[])lines.toArray(new LineItem[0]) + Order order = new Order(); + order.setOrderId(orderId); + order.setOrderDate(null); + order.setOrderTotalAmount((float) 50); + order.setCustomer(customer); + order.getLineItems().addAll(lines); + + return order; + } + +} Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/ProtocolHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/ProtocolHandler.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/benchmark/jaxws/ProtocolHandler.java 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,72 @@ +/* + * 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.benchmark.jaxws; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.util.Set; + +/** + * Some arbitrary SAAJ access to the message + */ +public class ProtocolHandler implements SOAPHandler +{ + public Set getHeaders() + { + return null; + } + + public boolean handleMessage(MessageContext context) + { + return saajAccess(context); + } + + public boolean handleFault(MessageContext context) + { + return saajAccess(context); + } + + public void close(MessageContext context) + { + + } + + private boolean saajAccess(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + System.out.println( "Num body children: " +soapBody.getChildNodes().getLength() ); + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/BenchmarkJSE</service-ref-name> - <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc?wsdl</wsdl-override> + <wsdl-override>http://localhost:8080/jaxrpc-benchmark-doc/jse?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/BenchmarkEJB</service-ref-name> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -9,10 +9,20 @@ <servlet-name>BenchmarkServlet</servlet-name> <servlet-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint</servlet-class> </servlet> - - <servlet-mapping> + + <servlet> + <servlet-name>BenchmarkHandlerServlet</servlet-name> + <servlet-class>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkJSEEndpoint</servlet-class> + </servlet> + + <servlet-mapping> <servlet-name>BenchmarkServlet</servlet-name> - <url-pattern>/*</url-pattern> + <url-pattern>/jse/*</url-pattern> </servlet-mapping> - + + <servlet-mapping> + <servlet-name>BenchmarkHandlerServlet</servlet-name> + <url-pattern>/jseHandler/*</url-pattern> + </servlet-mapping> + </web-app> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxrpc/doclit/WEB-INF/webservices.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -1,23 +1,42 @@ <?xml version='1.0' encoding='UTF-8' ?> <webservices - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://org.jboss.ws/benchmark" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://org.jboss.ws/benchmark" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> + version="1.1"> - <webservice-description> - <webservice-description-name>BenchmarkDocLitJSEWS</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/BenchmarkWebService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>BenchmarkDocLitJSEWS</port-component-name> - <wsdl-port>impl:BenchmarkServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> - <service-impl-bean> - <servlet-link>BenchmarkServlet</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> + <webservice-description> + <webservice-description-name>BenchmarkDocLitJSEWS</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/BenchmarkWebService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>BenchmarkDocLitJSEWS</port-component-name> + <wsdl-port>impl:BenchmarkServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> + <service-impl-bean> + <servlet-link>BenchmarkServlet</servlet-link> + </service-impl-bean> + + </port-component> + </webservice-description> + + <webservice-description> + <webservice-description-name>BenchmarkHandlerDocLitJSEWS</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/BenchmarkWebService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>BenchmarkHandlerDocLitJSEWS</port-component-name> + <wsdl-port>impl:BenchmarkServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.benchmark.jaxrpc.BenchmarkService</service-endpoint-interface> + <service-impl-bean> + <servlet-link>BenchmarkHandlerServlet</servlet-link> + </service-impl-bean> + <handler> + <handler-name>ProtocolHandler</handler-name> + <handler-class>org.jboss.test.ws.benchmark.jaxrpc.ProtocolHandler</handler-class> + </handler> + </port-component> + </webservice-description> </webservices> \ No newline at end of file Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/handlers.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.benchmark.jaxws.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/web.xml 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/web.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -1,18 +1,28 @@ <?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"> +<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>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.benchmark.jaxws.BenchmarkJSEEndpoint</servlet-class> </servlet> - - <servlet-mapping> + + <servlet> + <servlet-name>HandlerEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.benchmark.jaxws.BenchmarkJSEHandlerEndpoint</servlet-class> + </servlet> + + <servlet-mapping> <servlet-name>Endpoint</servlet-name> - <url-pattern>/*</url-pattern> + <url-pattern>/jse/*</url-pattern> </servlet-mapping> - + + <servlet-mapping> + <servlet-name>HandlerEndpoint</servlet-name> + <url-pattern>/jseHandler/*</url-pattern> + </servlet-mapping> + </web-app> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl 2007-02-19 16:43:51 UTC (rev 2402) @@ -1,142 +1,184 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="BenchmarkWebService" targetNamespace="http://org.jboss.ws/benchmark" xmlns:tns="http://org.jboss.ws/benchmark" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns2="http://org.jboss.ws/benchmark/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <types> - <schema targetNamespace="http://org.jboss.ws/benchmark/types" xmlns:tns="http://org.jboss.ws/benchmark/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="echoArrayOfSimpleUserType"> - <sequence> - <element name="arrayOfSimpleUserType_1" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> - <complexType name="SimpleUserType"> - <sequence> - <element name="f" type="float"/> - <element name="i" type="int"/> - <element name="s" type="string" nillable="true"/></sequence></complexType> - <complexType name="echoArrayOfSimpleUserTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> - <complexType name="echoSimpleType"> - <sequence> - <element name="SimpleUserType_1" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> - <complexType name="echoSimpleTypeResponse"> - <sequence> - <element name="result" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> - <complexType name="echoSynthetic"> - <sequence> - <element name="Synthetic_1" type="tns:Synthetic" nillable="true"/></sequence></complexType> - <complexType name="Synthetic"> - <sequence> - <element name="b" type="base64Binary" nillable="true"/> - <element name="s" type="string" nillable="true"/> - <element name="sut" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> - <complexType name="echoSyntheticResponse"> - <sequence> - <element name="result" type="tns:Synthetic" nillable="true"/></sequence></complexType> - <complexType name="getOrder"> - <sequence> - <element name="int_1" type="int"/> - <element name="int_2" type="int"/></sequence></complexType> - <complexType name="getOrderResponse"> - <sequence> - <element name="result" type="tns:Order" nillable="true"/></sequence></complexType> - <complexType name="Order"> - <sequence> - <element name="customer" type="tns:Customer" nillable="true"/> - <element name="lineItems" type="tns:LineItem" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="orderDate" type="dateTime" nillable="true"/> - <element name="orderId" type="int"/> - <element name="orderStatus" type="int"/> - <element name="orderTotalAmount" type="float"/></sequence></complexType> - <complexType name="Customer"> - <sequence> - <element name="billingAddress" type="tns:Address" nillable="true"/> - <element name="contactFirstName" type="string" nillable="true"/> - <element name="contactLastName" type="string" nillable="true"/> - <element name="contactPhone" type="string" nillable="true"/> - <element name="creditCardExpirationDate" type="string" nillable="true"/> - <element name="creditCardNumber" type="string" nillable="true"/> - <element name="customerId" type="int"/> - <element name="lastActivityDate" type="dateTime" nillable="true"/> - <element name="shippingAddress" type="tns:Address" nillable="true"/></sequence></complexType> - <complexType name="Address"> - <sequence> - <element name="address1" type="string" nillable="true"/> - <element name="address2" type="string" nillable="true"/> - <element name="city" type="string" nillable="true"/> - <element name="firstName" type="string" nillable="true"/> - <element name="lastName" type="string" nillable="true"/> - <element name="state" type="string" nillable="true"/> - <element name="zip" type="string" nillable="true"/></sequence></complexType> - <complexType name="LineItem"> - <sequence> - <element name="itemId" type="int"/> - <element name="orderId" type="int"/> - <element name="orderQuantity" type="int"/> - <element name="productDescription" type="string" nillable="true"/> - <element name="productId" type="int"/> - <element name="unitPrice" type="float"/></sequence></complexType> - <element name="echoArrayOfSimpleUserType" type="tns:echoArrayOfSimpleUserType"/> - <element name="echoArrayOfSimpleUserTypeResponse" type="tns:echoArrayOfSimpleUserTypeResponse"/> - <element name="echoSimpleType" type="tns:echoSimpleType"/> - <element name="echoSimpleTypeResponse" type="tns:echoSimpleTypeResponse"/> - <element name="echoSynthetic" type="tns:echoSynthetic"/> - <element name="echoSyntheticResponse" type="tns:echoSyntheticResponse"/> - <element name="getOrder" type="tns:getOrder"/> - <element name="getOrderResponse" type="tns:getOrderResponse"/></schema></types> - <message name="BenchmarkService_echoArrayOfSimpleUserType"> - <part name="parameters" element="ns2:echoArrayOfSimpleUserType"/></message> - <message name="BenchmarkService_echoArrayOfSimpleUserTypeResponse"> - <part name="result" element="ns2:echoArrayOfSimpleUserTypeResponse"/></message> - <message name="BenchmarkService_echoSimpleType"> - <part name="parameters" element="ns2:echoSimpleType"/></message> - <message name="BenchmarkService_echoSimpleTypeResponse"> - <part name="result" element="ns2:echoSimpleTypeResponse"/></message> - <message name="BenchmarkService_echoSynthetic"> - <part name="parameters" element="ns2:echoSynthetic"/></message> - <message name="BenchmarkService_echoSyntheticResponse"> - <part name="result" element="ns2:echoSyntheticResponse"/></message> - <message name="BenchmarkService_getOrder"> - <part name="parameters" element="ns2:getOrder"/></message> - <message name="BenchmarkService_getOrderResponse"> - <part name="result" element="ns2:getOrderResponse"/></message> - <portType name="BenchmarkService"> - <operation name="echoArrayOfSimpleUserType"> - <input message="tns:BenchmarkService_echoArrayOfSimpleUserType"/> - <output message="tns:BenchmarkService_echoArrayOfSimpleUserTypeResponse"/></operation> - <operation name="echoSimpleType"> - <input message="tns:BenchmarkService_echoSimpleType"/> - <output message="tns:BenchmarkService_echoSimpleTypeResponse"/></operation> - <operation name="echoSynthetic"> - <input message="tns:BenchmarkService_echoSynthetic"/> - <output message="tns:BenchmarkService_echoSyntheticResponse"/></operation> - <operation name="getOrder"> - <input message="tns:BenchmarkService_getOrder"/> - <output message="tns:BenchmarkService_getOrderResponse"/></operation></portType> - <binding name="BenchmarkServiceBinding" type="tns:BenchmarkService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <operation name="echoArrayOfSimpleUserType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/></input> - <output> - <soap:body use="literal"/></output></operation> - <operation name="echoSimpleType"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/></input> - <output> - <soap:body use="literal"/></output></operation> - <operation name="echoSynthetic"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/></input> - <output> - <soap:body use="literal"/></output></operation> - <operation name="getOrder"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/></input> - <output> - <soap:body use="literal"/></output></operation></binding> - <service name="BenchmarkWebService"> - <port name="BenchmarkServicePort" binding="tns:BenchmarkServiceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions> + <types> + <schema targetNamespace="http://org.jboss.ws/benchmark/types" xmlns:tns="http://org.jboss.ws/benchmark/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> + <complexType name="echoArrayOfSimpleUserType"> + <sequence> + <element name="arrayOfSimpleUserType_1" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> + <complexType name="SimpleUserType"> + <sequence> + <element name="f" type="float"/> + <element name="i" type="int"/> + <element name="s" type="string" nillable="true"/></sequence></complexType> + <complexType name="echoArrayOfSimpleUserTypeResponse"> + <sequence> + <element name="result" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> + <complexType name="echoSimpleType"> + <sequence> + <element name="SimpleUserType_1" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSimpleTypeResponse"> + <sequence> + <element name="result" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSynthetic"> + <sequence> + <element name="Synthetic_1" type="tns:Synthetic" nillable="true"/></sequence></complexType> + <complexType name="Synthetic"> + <sequence> + <element name="b" type="base64Binary" nillable="true"/> + <element name="s" type="string" nillable="true"/> + <element name="sut" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSyntheticResponse"> + <sequence> + <element name="result" type="tns:Synthetic" nillable="true"/></sequence></complexType> + <complexType name="getOrder"> + <sequence> + <element name="int_1" type="int"/> + <element name="int_2" type="int"/> + </sequence> + </complexType> + <complexType name="getOrderResponse"> + <sequence> + <element name="result" type="tns:Order" nillable="true"/> + </sequence> + </complexType> + <complexType name="Order"> + <sequence> + <element name="customer" type="tns:Customer" nillable="true"/> + <element name="lineItems" type="tns:LineItem" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="orderDate" type="dateTime" nillable="true"/> + <element name="orderId" type="int"/> + <element name="orderStatus" type="int"/> + <element name="orderTotalAmount" type="float"/> + </sequence> + </complexType> + <complexType name="Customer"> + <sequence> + <element name="billingAddress" type="tns:Address" nillable="true"/> + <element name="contactFirstName" type="string" nillable="true"/> + <element name="contactLastName" type="string" nillable="true"/> + <element name="contactPhone" type="string" nillable="true"/> + <element name="creditCardExpirationDate" type="string" nillable="true"/> + <element name="creditCardNumber" type="string" nillable="true"/> + <element name="customerId" type="int"/> + <element name="lastActivityDate" type="dateTime" nillable="true"/> + <element name="shippingAddress" type="tns:Address" nillable="true"/> + </sequence> + </complexType> + <complexType name="Address"> + <sequence> + <element name="address1" type="string" nillable="true"/> + <element name="address2" type="string" nillable="true"/> + <element name="city" type="string" nillable="true"/> + <element name="firstName" type="string" nillable="true"/> + <element name="lastName" type="string" nillable="true"/> + <element name="state" type="string" nillable="true"/> + <element name="zip" type="string" nillable="true"/> + </sequence> + </complexType> + <complexType name="LineItem"> + <sequence> + <element name="itemId" type="int"/> + <element name="orderId" type="int"/> + <element name="orderQuantity" type="int"/> + <element name="productDescription" type="string" nillable="true"/> + <element name="productId" type="int"/> + <element name="unitPrice" type="float"/> + </sequence> + </complexType> + <element name="echoArrayOfSimpleUserType" type="tns:echoArrayOfSimpleUserType"/> + <element name="echoArrayOfSimpleUserTypeResponse" type="tns:echoArrayOfSimpleUserTypeResponse"/> + <element name="echoSimpleType" type="tns:echoSimpleType"/> + <element name="echoSimpleTypeResponse" type="tns:echoSimpleTypeResponse"/> + <element name="echoSynthetic" type="tns:echoSynthetic"/> + <element name="echoSyntheticResponse" type="tns:echoSyntheticResponse"/> + <element name="getOrder" type="tns:getOrder"/> + <element name="getOrderResponse" type="tns:getOrderResponse"/> + </schema> + </types> + + <message name="BenchmarkService_echoArrayOfSimpleUserType"> + <part name="parameters" element="ns2:echoArrayOfSimpleUserType"/> + </message> + <message name="BenchmarkService_echoArrayOfSimpleUserTypeResponse"> + <part name="result" element="ns2:echoArrayOfSimpleUserTypeResponse"/> + </message> + <message name="BenchmarkService_echoSimpleType"> + <part name="parameters" element="ns2:echoSimpleType"/> + </message> + <message name="BenchmarkService_echoSimpleTypeResponse"> + <part name="result" element="ns2:echoSimpleTypeResponse"/> + </message> + <message name="BenchmarkService_echoSynthetic"> + <part name="parameters" element="ns2:echoSynthetic"/> + </message> + <message name="BenchmarkService_echoSyntheticResponse"> + <part name="result" element="ns2:echoSyntheticResponse"/> + </message> + <message name="BenchmarkService_getOrder"> + <part name="parameters" element="ns2:getOrder"/> + </message> + <message name="BenchmarkService_getOrderResponse"> + <part name="result" element="ns2:getOrderResponse"/> + </message> + + <portType name="BenchmarkService"> + <operation name="echoArrayOfSimpleUserType"> + <input message="tns:BenchmarkService_echoArrayOfSimpleUserType"/> + <output message="tns:BenchmarkService_echoArrayOfSimpleUserTypeResponse"/> + </operation> + <operation name="echoSimpleType"> + <input message="tns:BenchmarkService_echoSimpleType"/> + <output message="tns:BenchmarkService_echoSimpleTypeResponse"/> + </operation> + <operation name="echoSynthetic"> + <input message="tns:BenchmarkService_echoSynthetic"/> + <output message="tns:BenchmarkService_echoSyntheticResponse"/> + </operation> + <operation name="getOrder"> + <input message="tns:BenchmarkService_getOrder"/> + <output message="tns:BenchmarkService_getOrderResponse"/> + </operation> + </portType> + + <binding name="BenchmarkServiceBinding" type="tns:BenchmarkService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="echoArrayOfSimpleUserType"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="echoSimpleType"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="echoSynthetic"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="getOrder"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + </operation> + + </binding> + <service name="BenchmarkWebService"> + <port name="BenchmarkServicePort" binding="tns:BenchmarkServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/handlers.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/handlers.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/handlers.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.benchmark.jaxws.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/sun-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/sun-jaxws.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/sun-jaxws.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'> + <endpoint + name='endpoint' + implementation='org.jboss.test.ws.benchmark.jaxws.BenchmarkJSEEndpoint' + url-pattern='/jse'/> + <endpoint + name='endpointHandler' + implementation='org.jboss.test.ws.benchmark.jaxws.BenchmarkJSEEndpoint' + url-pattern='/jseHandler'> + <handler-chains xmlns="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>SOAP11ServerHandler</handler-name> + <handler-class>org.jboss.test.ws.benchmark.jaxws.ProtocolHandler</handler-class> + </handler> + </handler-chain> + </handler-chains> + </endpoint> +</endpoints> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,36 @@ +<?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"> + + <description>endpoint</description> + <display-name>endpoint</display-name> + <listener> + <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class> + </listener> + <servlet> + <description>JAX-WS endpoint - benchmark</description> + <display-name>endpoint</display-name> + <servlet-name>endpoint</servlet-name> + <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <description>JAX-WS endpoint - benchmarkHandler</description> + <display-name>endpointHandler</display-name> + <servlet-name>endpointHandler</servlet-name> + <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>endpoint</servlet-name> + <url-pattern>/jse/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>endpointHandler</servlet-name> + <url-pattern>/jseHandler/*</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>60</session-timeout> + </session-config> +</web-app> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/wsdl/BenchmarkWebService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/wsdl/BenchmarkWebService.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jaxws/doclit/ri/WEB-INF/wsdl/BenchmarkWebService.wsdl 2007-02-19 16:43:51 UTC (rev 2402) @@ -0,0 +1,184 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="BenchmarkWebService" targetNamespace="http://org.jboss.ws/benchmark" xmlns:tns="http://org.jboss.ws/benchmark" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns2="http://org.jboss.ws/benchmark/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types> + <schema targetNamespace="http://org.jboss.ws/benchmark/types" xmlns:tns="http://org.jboss.ws/benchmark/types" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema"> + <complexType name="echoArrayOfSimpleUserType"> + <sequence> + <element name="arrayOfSimpleUserType_1" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> + <complexType name="SimpleUserType"> + <sequence> + <element name="f" type="float"/> + <element name="i" type="int"/> + <element name="s" type="string" nillable="true"/></sequence></complexType> + <complexType name="echoArrayOfSimpleUserTypeResponse"> + <sequence> + <element name="result" type="tns:SimpleUserType" nillable="true" minOccurs="0" maxOccurs="unbounded"/></sequence></complexType> + <complexType name="echoSimpleType"> + <sequence> + <element name="SimpleUserType_1" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSimpleTypeResponse"> + <sequence> + <element name="result" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSynthetic"> + <sequence> + <element name="Synthetic_1" type="tns:Synthetic" nillable="true"/></sequence></complexType> + <complexType name="Synthetic"> + <sequence> + <element name="b" type="base64Binary" nillable="true"/> + <element name="s" type="string" nillable="true"/> + <element name="sut" type="tns:SimpleUserType" nillable="true"/></sequence></complexType> + <complexType name="echoSyntheticResponse"> + <sequence> + <element name="result" type="tns:Synthetic" nillable="true"/></sequence></complexType> + <complexType name="getOrder"> + <sequence> + <element name="int_1" type="int"/> + <element name="int_2" type="int"/> + </sequence> + </complexType> + <complexType name="getOrderResponse"> + <sequence> + <element name="result" type="tns:Order" nillable="true"/> + </sequence> + </complexType> + <complexType name="Order"> + <sequence> + <element name="customer" type="tns:Customer" nillable="true"/> + <element name="lineItems" type="tns:LineItem" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="orderDate" type="dateTime" nillable="true"/> + <element name="orderId" type="int"/> + <element name="orderStatus" type="int"/> + <element name="orderTotalAmount" type="float"/> + </sequence> + </complexType> + <complexType name="Customer"> + <sequence> + <element name="billingAddress" type="tns:Address" nillable="true"/> + <element name="contactFirstName" type="string" nillable="true"/> + <element name="contactLastName" type="string" nillable="true"/> + <element name="contactPhone" type="string" nillable="true"/> + <element name="creditCardExpirationDate" type="string" nillable="true"/> + <element name="creditCardNumber" type="string" nillable="true"/> + <element name="customerId" type="int"/> + <element name="lastActivityDate" type="dateTime" nillable="true"/> + <element name="shippingAddress" type="tns:Address" nillable="true"/> + </sequence> + </complexType> + <complexType name="Address"> + <sequence> + <element name="address1" type="string" nillable="true"/> + <element name="address2" type="string" nillable="true"/> + <element name="city" type="string" nillable="true"/> + <element name="firstName" type="string" nillable="true"/> + <element name="lastName" type="string" nillable="true"/> + <element name="state" type="string" nillable="true"/> + <element name="zip" type="string" nillable="true"/> + </sequence> + </complexType> + <complexType name="LineItem"> + <sequence> + <element name="itemId" type="int"/> + <element name="orderId" type="int"/> + <element name="orderQuantity" type="int"/> + <element name="productDescription" type="string" nillable="true"/> + <element name="productId" type="int"/> + <element name="unitPrice" type="float"/> + </sequence> + </complexType> + <element name="echoArrayOfSimpleUserType" type="tns:echoArrayOfSimpleUserType"/> + <element name="echoArrayOfSimpleUserTypeResponse" type="tns:echoArrayOfSimpleUserTypeResponse"/> + <element name="echoSimpleType" type="tns:echoSimpleType"/> + <element name="echoSimpleTypeResponse" type="tns:echoSimpleTypeResponse"/> + <element name="echoSynthetic" type="tns:echoSynthetic"/> + <element name="echoSyntheticResponse" type="tns:echoSyntheticResponse"/> + <element name="getOrder" type="tns:getOrder"/> + <element name="getOrderResponse" type="tns:getOrderResponse"/> + </schema> + </types> + + <message name="BenchmarkService_echoArrayOfSimpleUserType"> + <part name="parameters" element="ns2:echoArrayOfSimpleUserType"/> + </message> + <message name="BenchmarkService_echoArrayOfSimpleUserTypeResponse"> + <part name="result" element="ns2:echoArrayOfSimpleUserTypeResponse"/> + </message> + <message name="BenchmarkService_echoSimpleType"> + <part name="parameters" element="ns2:echoSimpleType"/> + </message> + <message name="BenchmarkService_echoSimpleTypeResponse"> + <part name="result" element="ns2:echoSimpleTypeResponse"/> + </message> + <message name="BenchmarkService_echoSynthetic"> + <part name="parameters" element="ns2:echoSynthetic"/> + </message> + <message name="BenchmarkService_echoSyntheticResponse"> + <part name="result" element="ns2:echoSyntheticResponse"/> + </message> + <message name="BenchmarkService_getOrder"> + <part name="parameters" element="ns2:getOrder"/> + </message> + <message name="BenchmarkService_getOrderResponse"> + <part name="result" element="ns2:getOrderResponse"/> + </message> + + <portType name="BenchmarkService"> + <operation name="echoArrayOfSimpleUserType"> + <input message="tns:BenchmarkService_echoArrayOfSimpleUserType"/> + <output message="tns:BenchmarkService_echoArrayOfSimpleUserTypeResponse"/> + </operation> + <operation name="echoSimpleType"> + <input message="tns:BenchmarkService_echoSimpleType"/> + <output message="tns:BenchmarkService_echoSimpleTypeResponse"/> + </operation> + <operation name="echoSynthetic"> + <input message="tns:BenchmarkService_echoSynthetic"/> + <output message="tns:BenchmarkService_echoSyntheticResponse"/> + </operation> + <operation name="getOrder"> + <input message="tns:BenchmarkService_getOrder"/> + <output message="tns:BenchmarkService_getOrderResponse"/> + </operation> + </portType> + + <binding name="BenchmarkServiceBinding" type="tns:BenchmarkService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="echoArrayOfSimpleUserType"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="echoSimpleType"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="echoSynthetic"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + + </operation> + <operation name="getOrder"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/></input> + <output> + <soap:body use="literal"/></output> + </operation> + + </binding> + <service name="BenchmarkWebService"> + <port name="BenchmarkServicePort" binding="tns:BenchmarkServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-18 14:54:59 UTC (rev 2401) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-19 16:43:51 UTC (rev 2402) @@ -2,7 +2,18 @@ <hashTree> <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="JBossWS_Benchmark" enabled="true"> <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="Benutzer definierte Variablen" enabled="true"> - <collectionProp name="Arguments.arguments"/> + <collectionProp name="Arguments.arguments"> + <elementProp name="host" elementType="Argument"> + <stringProp name="Argument.metadata">=</stringProp> + <stringProp name="Argument.value">localhost</stringProp> + <stringProp name="Argument.name">host</stringProp> + </elementProp> + <elementProp name="port" elementType="Argument"> + <stringProp name="Argument.metadata">=</stringProp> + <stringProp name="Argument.value">8080</stringProp> + <stringProp name="Argument.name">port</stringProp> + </elementProp> + </collectionProp> </elementProp> <stringProp name="TestPlan.user_define_classpath"></stringProp> <boolProp name="TestPlan.serialize_threadgroups">false</boolProp> @@ -10,14 +21,14 @@ <stringProp name="TestPlan.comments"></stringProp> </TestPlan> <hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1-JAXWS" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="true"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -39,7 +50,7 @@ <env:Header/> <env:Body> <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <int_1>50</int_1> + <int_1>1</int_1> <int_2>1</int_2> </ns1:getOrder> </env:Body> @@ -48,7 +59,7 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxws-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxws-benchmark-doclit/jse</stringProp> </SoapSampler> <hashTree/> <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> @@ -70,11 +81,116 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> + <stringProp name="Assertion.assume_success">false</stringProp> + </ResponseAssertion> <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1984138256">Envelope</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> + <stringProp name="Assertion.assume_success">false</stringProp> + </ResponseAssertion> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <objProp> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>true</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + </value> + <name>saveConfig</name> + </objProp> + <stringProp name="filename"></stringProp> + <boolProp name="ResultCollector.error_logging">false</boolProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model2_JAXWS" enabled="false"> + <longProp name="ThreadGroup.start_time">1144146988000</longProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <stringProp name="LoopController.loops">2000</stringProp> + <boolProp name="LoopController.continue_forever">false</boolProp> + </elementProp> + <longProp name="ThreadGroup.end_time">1144146988000</longProp> + <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + </ThreadGroup> + <hashTree> + <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false"> + <stringProp name="delimiter">,</stringProp> + <stringProp name="variableNames">NumItems,OrderId</stringProp> + <boolProp name="recycle">true</boolProp> + <stringProp name="filename">csvdata.txt</stringProp> + </CSVDataSet> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true"> + <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> + <stringProp name="SoapSampler.xml_data_file"></stringProp> + <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + <env:Header/> + <env:Body> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>25</int_1> + <int_2>1</int_2> + </ns1:getOrder> + </env:Body> +</env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxws-benchmark-doclit/jse</stringProp> + </SoapSampler> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> + <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> + <stringProp name="SoapSampler.xml_data_file"></stringProp> + <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + <env:Header/> + <env:Body> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>1</int_1> + <int_2>1</int_2> + </ns1:getOrder> + </env:Body> +</env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> + </SoapSampler> + <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -125,14 +241,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC2-JAXWS" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model3-JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -140,41 +256,41 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <arrayOfSimpleUserType_1> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxws-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxws-benchmark-doclit/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <arrayOfSimpleUserType_1> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> @@ -184,11 +300,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -239,14 +350,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3-JAXWS" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model4-JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -273,7 +384,7 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxws-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxws-benchmark-doclit/jseHandler</stringProp> </SoapSampler> <hashTree/> <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> @@ -298,11 +409,115 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="49586">200</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> + <stringProp name="Assertion.assume_success">false</stringProp> + </ResponseAssertion> <hashTree/> + <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> + <collectionProp name="Asserion.test_strings"> + <stringProp name="-1984138256">Envelope</stringProp> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> + <stringProp name="Assertion.assume_success">false</stringProp> + </ResponseAssertion> + <hashTree/> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <objProp> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>true</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + </value> + <name>saveConfig</name> + </objProp> + <stringProp name="filename"></stringProp> + <boolProp name="ResultCollector.error_logging">false</boolProp> + </ResultCollector> + <hashTree/> + </hashTree> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model5-JAXWS" enabled="false"> + <longProp name="ThreadGroup.start_time">1144146988000</longProp> + <stringProp name="ThreadGroup.delay"></stringProp> + <stringProp name="ThreadGroup.duration"></stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> + <boolProp name="ThreadGroup.scheduler">false</boolProp> + <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> + <stringProp name="LoopController.loops">2000</stringProp> + <boolProp name="LoopController.continue_forever">false</boolProp> + </elementProp> + <longProp name="ThreadGroup.end_time">1144146988000</longProp> + <stringProp name="ThreadGroup.on_sample_error">continue</stringProp> + <stringProp name="ThreadGroup.ramp_time">1</stringProp> + </ThreadGroup> + <hashTree> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true"> + <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> + <stringProp name="SoapSampler.xml_data_file"></stringProp> + <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + <env:Header/> + <env:Body> + <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <arrayOfSimpleUserType_1> + <f>1.0</f> + <i>1</i> + <s>test</s> + </arrayOfSimpleUserType_1> + </ns1:echoArrayOfSimpleUserType> + </env:Body> +</env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxws-benchmark-doclit/jse</stringProp> + </SoapSampler> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> + <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> + <stringProp name="SoapSampler.xml_data_file"></stringProp> + <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + <env:Header/> + <env:Body> + <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <arrayOfSimpleUserType_1> + <f>1.0</f> + <i>1</i> + <s>test</s> + </arrayOfSimpleUserType_1> + </ns1:echoArrayOfSimpleUserType> + </env:Body> +</env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> + </SoapSampler> + <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -353,14 +568,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4-JAXWS" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -368,49 +583,44 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.1-JAXWS" enabled="true"> + <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false"> + <stringProp name="delimiter">,</stringProp> + <stringProp name="variableNames">NumItems,OrderId</stringProp> + <boolProp name="recycle">true</boolProp> + <stringProp name="filename">csvdata.txt</stringProp> + </CSVDataSet> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header/> - <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <Synthetic_1> - <b>dGVzdA==</b> - <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> - </env:Body></env:Envelope></stringProp> + <env:Header/> + <env:Body> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>1</int_1> + <int_2>1</int_2> + </ns1:getOrder> + </env:Body> +</env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxws-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxrpc-benchmark-doc/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.2" enabled="false"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header/> - <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <Synthetic_1> - <b>dGVzdA==</b> - <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> - </env:Body></env:Envelope></stringProp> + <env:Header/> + <env:Body> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>1</int_1> + <int_2>1</int_2> + </ns1:getOrder> + </env:Body> +</env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> @@ -418,11 +628,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -473,14 +678,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model2_JAXRPC" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -502,7 +707,7 @@ <env:Header/> <env:Body> <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <int_1>50</int_1> + <int_1>25</int_1> <int_2>1</int_2> </ns1:getOrder> </env:Body> @@ -511,7 +716,7 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxrpc-benchmark-doc/jse</stringProp> </SoapSampler> <hashTree/> <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> @@ -533,11 +738,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -588,14 +788,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC2" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model3_JAXRPC" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -603,41 +803,41 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <arrayOfSimpleUserType_1> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxrpc-benchmark-doc/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <arrayOfSimpleUserType_1> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> @@ -647,11 +847,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -672,7 +867,29 @@ <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> <objProp> - <value class="SampleSaveConfiguration" reference="../../../../hashTree[2]/ResultCollector/objProp/value"/> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>true</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + </value> <name>saveConfig</name> </objProp> <stringProp name="filename"></stringProp> @@ -680,14 +897,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model4_JAXRPC" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -714,7 +931,7 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/jaxrpc-benchmark-doc/jseHandler</stringProp> </SoapSampler> <hashTree/> <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> @@ -739,11 +956,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -794,14 +1006,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model5_JAXRPC" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -809,49 +1021,43 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.1" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header/> - <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <Synthetic_1> - <b>dGVzdA==</b> - <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> - </env:Body></env:Envelope></stringProp> + <env:Header/> + <env:Body> + <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <arrayOfSimpleUserType_1> + <f>1.0</f> + <i>1</i> + <s>test</s> + </arrayOfSimpleUserType_1> + </ns1:echoArrayOfSimpleUserType> + </env:Body> +</env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-benchmark-doc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-benchmark-doc/jseHandler</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.2" enabled="false"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header/> - <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <Synthetic_1> - <b>dGVzdA==</b> - <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> - </env:Body></env:Envelope></stringProp> + <env:Header/> + <env:Body> + <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <arrayOfSimpleUserType_1> + <f>1.0</f> + <i>1</i> + <s>test</s> + </arrayOfSimpleUserType_1> + </ns1:echoArrayOfSimpleUserType> + </env:Body> +</env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> @@ -859,11 +1065,6 @@ <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">50</stringProp> - <stringProp name="ConstantTimer.delay">100</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -884,7 +1085,29 @@ <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> <objProp> - <value class="SampleSaveConfiguration" reference="../../../../hashTree[4]/ResultCollector/objProp/value"/> + <value class="SampleSaveConfiguration"> + <time>true</time> + <latency>true</latency> + <timestamp>true</timestamp> + <success>true</success> + <label>true</label> + <code>true</code> + <message>true</message> + <threadName>true</threadName> + <dataType>true</dataType> + <encoding>false</encoding> + <assertions>true</assertions> + <subresults>true</subresults> + <responseData>false</responseData> + <samplerData>false</samplerData> + <xml>true</xml> + <fieldNames>false</fieldNames> + <responseHeaders>false</responseHeaders> + <requestHeaders>false</requestHeaders> + <responseDataOnError>false</responseDataOnError> + <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> + <assertionsResultsToSave>0</assertionsResultsToSave> + </value> <name>saveConfig</name> </objProp> <stringProp name="filename"></stringProp> @@ -892,14 +1115,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="RPC1" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_RI_2.1" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <stringProp name="ThreadGroup.num_threads">3</stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -907,13 +1130,20 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC1.1" enabled="true"> + <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false"> + <stringProp name="delimiter">,</stringProp> + <stringProp name="variableNames">NumItems,OrderId</stringProp> + <boolProp name="recycle">true</boolProp> + <stringProp name="filename">csvdata.txt</stringProp> + </CSVDataSet> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark'> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <int_1>1</int_1> <int_2>1</int_2> </ns1:getOrder> @@ -923,16 +1153,16 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/ri-benchmark-doclit/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC1.2" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark'> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <int_1>1</int_1> <int_2>1</int_2> </ns1:getOrder> @@ -942,14 +1172,9 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc-ejb</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">500</stringProp> - <stringProp name="ConstantTimer.delay">8000</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -1000,14 +1225,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="RPC2" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model2_RI_2.1" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <stringProp name="ThreadGroup.num_threads">8</stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -1015,59 +1240,51 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC2.1" enabled="true"> + <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false"> + <stringProp name="delimiter">,</stringProp> + <stringProp name="variableNames">NumItems,OrderId</stringProp> + <boolProp name="recycle">true</boolProp> + <stringProp name="filename">csvdata.txt</stringProp> + </CSVDataSet> + <hashTree/> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark'> - <arrayOfSimpleUserType_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <value> - <f>1.0</f> - <i>1</i> - <s>test</s> - </value> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>25</int_1> + <int_2>1</int_2> + </ns1:getOrder> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/ri-benchmark-doclit/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC2.2" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoArrayOfSimpleUserType xmlns:ns1='http://org.jboss.ws/benchmark'> - <arrayOfSimpleUserType_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <value> - <f>1.0</f> - <i>1</i> - <s>test</s> - </value> - </arrayOfSimpleUserType_1> - </ns1:echoArrayOfSimpleUserType> + <ns1:getOrder xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <int_1>1</int_1> + <int_2>1</int_2> + </ns1:getOrder> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc-ejb</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">200</stringProp> - <stringProp name="ConstantTimer.delay">1000</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -1086,7 +1303,7 @@ <stringProp name="Assertion.assume_success">false</stringProp> </ResponseAssertion> <hashTree/> - <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> + <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true"> <objProp> <value class="SampleSaveConfiguration"> <time>true</time> @@ -1118,14 +1335,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="RPC3" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model3-RI_2.1" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <stringProp name="ThreadGroup.num_threads">8</stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -1133,14 +1350,14 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC3.1" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark'> - <SimpleUserType_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> @@ -1152,17 +1369,17 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/ri-benchmark-doclit/jse</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC3.2" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark'> - <SimpleUserType_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> <f>1.0</f> <i>1</i> <s>test</s> @@ -1174,14 +1391,9 @@ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc-ejb</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">200</stringProp> - <stringProp name="ConstantTimer.delay">1000</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -1232,14 +1444,14 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="RPC4" enabled="false"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model4-RI_2.1" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <stringProp name="ThreadGroup.num_threads">8</stringProp> + <stringProp name="ThreadGroup.num_threads">10</stringProp> <boolProp name="ThreadGroup.scheduler">false</boolProp> <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true"> - <intProp name="LoopController.loops">-1</intProp> + <stringProp name="LoopController.loops">2000</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -1247,63 +1459,50 @@ <stringProp name="ThreadGroup.ramp_time">1</stringProp> </ThreadGroup> <hashTree> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC4.1" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark'> - <Synthetic_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <b>dGVzdA==</b> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> + <f>1.0</f> + <i>1</i> <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://${host}:${port}/ri-benchmark-doclit/jseHandler</stringProp> </SoapSampler> <hashTree/> - <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC4.2" enabled="true"> + <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> - <ns1:echoSynthetic xmlns:ns1='http://org.jboss.ws/benchmark'> - <Synthetic_1 xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <b>dGVzdA==</b> + <ns1:echoSimpleType xmlns:ns1='http://org.jboss.ws/benchmark/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> + <f>1.0</f> + <i>1</i> <s>test</s> - <sut> - <f>1.0</f> - <i>1</i> - <s>test</s> - </sut> - </Synthetic_1> - </ns1:echoSynthetic> + </SimpleUserType_1> + </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> - <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-rpc-ejb</stringProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/benchmark-doc-ejb</stringProp> </SoapSampler> <hashTree/> - <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> - <stringProp name="RandomTimer.range">200</stringProp> - <stringProp name="ConstantTimer.delay">1000</stringProp> - </GaussianRandomTimer> - <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> <collectionProp name="Asserion.test_strings"> <stringProp name="49586">200</stringProp> @@ -1378,44 +1577,14 @@ <responseDataOnError>false</responseDataOnError> <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> <assertionsResultsToSave>0</assertionsResultsToSave> + <threadCounts>true</threadCounts> </value> <name>saveConfig</name> </objProp> - <stringProp name="filename">/home/hbraun/Desktop/Benchmarks-1.2.0/doc2_1-JAXWS</stringProp> + <stringProp name="filename">/tmp/test.csv</stringProp> <boolProp name="ResultCollector.error_logging">false</boolProp> </ResultCollector> <hashTree/> - <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="false"> - <objProp> - <value class="SampleSaveConfiguration"> - <time>true</time> - <latency>true</latency> - <timestamp>true</timestamp> - <success>true</success> - <label>true</label> - <code>true</code> - <message>true</message> - <threadName>true</threadName> - <dataType>true</dataType> - <encoding>false</encoding> - <assertions>true</assertions> - <subresults>true</subresults> - <responseData>false</responseData> - <samplerData>false</samplerData> - <xml>true</xml> - <fieldNames>false</fieldNames> - <responseHeaders>false</responseHeaders> - <requestHeaders>false</requestHeaders> - <responseDataOnError>false</responseDataOnError> - <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage> - <assertionsResultsToSave>0</assertionsResultsToSave> - </value> - <name>saveConfig</name> - </objProp> - <stringProp name="filename"></stringProp> - <boolProp name="ResultCollector.error_logging">false</boolProp> - </ResultCollector> - <hashTree/> </hashTree> </hashTree> </jmeterTestPlan>

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2401 - branches/jbossws-1.2.0/jbossws-tests/src/main/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 09:54:59 -0500 (Sun, 18 Feb 2007) New Revision: 2401 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Always exclude benchmark Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,7 +1,6 @@ # Always excludes org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,7 +1,6 @@ # Always excludes org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/eardeployment/** Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,7 +1,6 @@ # Always excludes org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,7 +1,6 @@ # Always excludes org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/eardeployment/** Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,5 +1,6 @@ # Always excludes -org/jboss/test/ws/interop/microsoft/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** # Fix before JBoss50 goes final org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-18 13:23:05 UTC (rev 2400) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-18 14:54:59 UTC (rev 2401) @@ -1,7 +1,6 @@ # Always excludes org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxrpc/benchmark/** -org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxrpc/jbws1011/**

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2400 - branches/jbossws-1.2.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 08:23:05 -0500 (Sun, 18 Feb 2007) New Revision: 2400 Modified: branches/jbossws-1.2.0/merge-info.txt Log: Merged to trunk -r2397 Modified: branches/jbossws-1.2.0/merge-info.txt =================================================================== --- branches/jbossws-1.2.0/merge-info.txt 2007-02-18 13:04:30 UTC (rev 2399) +++ branches/jbossws-1.2.0/merge-info.txt 2007-02-18 13:23:05 UTC (rev 2400) @@ -1,5 +1,8 @@ # $Id$ +18-Feb-2007 15:23 UTC +svn merge -r2386:2396 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 + 16-Feb-2007 14:03 UTC svn merge -r2283:2288 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2295:2320 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2399 - tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 08:04:30 -0500 (Sun, 18 Feb 2007) New Revision: 2399 Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java Log: Update to xerces-2.9.0 Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java =================================================================== --- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 13:03:10 UTC (rev 2398) +++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 13:04:30 UTC (rev 2399) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.ShortList; @@ -28,23 +28,22 @@ import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSException; import org.apache.xerces.xs.XSNamedMap; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; - +import org.jboss.util.NotImplementedException; /** * Represents an XS Element Declaration * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since May 3, 2005 */ -public class JBossXSElementDeclaration - extends JBossXSObject - implements XSElementDeclaration +public class JBossXSElementDeclaration extends JBossXSObject implements XSElementDeclaration { protected String targetNamespace = null; protected JBossXSTypeDefinition xstype = null; protected boolean nillable = false; private XSElementDeclaration xsed; - + /** * Sole Annotation object */ @@ -74,31 +73,29 @@ */ public JBossXSElementDeclaration(XSElementDeclaration xe) { - if(xe == null) - throw new IllegalArgumentException("Illegal Null Argument:xe"); - - xsed = xe; - name= xe.getName(); - namespace = xe.getNamespace(); - XSTypeDefinition xt = xe.getTypeDefinition(); - if(xt instanceof JBossXSTypeDefinition == false - && xt instanceof XSComplexTypeDefinition) - { - xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); - } - else - if(xt instanceof JBossXSTypeDefinition == false) - { - xstype = new JBossXSTypeDefinition(xt); - } - this.annotation = xe.getAnnotation(); + if (xe == null) + throw new IllegalArgumentException("Illegal Null Argument:xe"); + + xsed = xe; + name = xe.getName(); + namespace = xe.getNamespace(); + XSTypeDefinition xt = xe.getTypeDefinition(); + if (xt instanceof JBossXSTypeDefinition == false && xt instanceof XSComplexTypeDefinition) + { + xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); + } + else if (xt instanceof JBossXSTypeDefinition == false) + { + xstype = new JBossXSTypeDefinition(xt); + } + this.annotation = xe.getAnnotation(); } public XSElementDeclaration getXSElementDeclaration() { return xsed; } - + /** * One of XSConstants.SCOPE_GLOBAL, XSConstants.SCOPE_LOCAL * or XSConstants.SCOPE_ABSENT @@ -112,12 +109,11 @@ return this.xstype; } - public void setTypeDefinition(XSTypeDefinition xst ) + public void setTypeDefinition(XSTypeDefinition xst) { - if(xst instanceof JBossXSTypeDefinition) - this.xstype = (JBossXSTypeDefinition)xst ; - else - if(xst instanceof XSComplexTypeDefinition) + if (xst instanceof JBossXSTypeDefinition) + this.xstype = (JBossXSTypeDefinition)xst; + else if (xst instanceof XSComplexTypeDefinition) this.xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xst); } @@ -141,7 +137,7 @@ return this.enclosingCTDefinition; } - public void setEnclosingCTDefinition( XSComplexTypeDefinition enclosingCTDefinition) + public void setEnclosingCTDefinition(XSComplexTypeDefinition enclosingCTDefinition) { this.enclosingCTDefinition = enclosingCTDefinition; } @@ -154,7 +150,7 @@ public void setTargetNamespace(String targetNamespace) { this.targetNamespace = targetNamespace; - this.setNamespace( targetNamespace ); + this.setNamespace(targetNamespace); } public short getConstraintType() @@ -231,7 +227,7 @@ { return this.annotation; } - + /** * Get the type */ @@ -240,4 +236,9 @@ { return XSConstants.ELEMENT_DECLARATION; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 13:03:10 UTC (rev 2398) +++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 13:04:30 UTC (rev 2399) @@ -54,6 +54,7 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; @@ -742,4 +743,9 @@ return anonymousTypeMap; } } + + public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0) + { + throw new NotImplementedException(); + } } Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java =================================================================== --- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 13:03:10 UTC (rev 2398) +++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 13:04:30 UTC (rev 2399) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import java.util.Iterator; @@ -28,14 +28,14 @@ import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSModelGroup; import org.apache.xerces.xs.XSObjectList; +import org.jboss.util.NotImplementedException; /** * Implements a ModelGroup of the Xerces Schema API * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSModelGroup extends JBossXSObject - implements XSModelGroup +public class JBossXSModelGroup extends JBossXSObject implements XSModelGroup { private JBossXSObjectList xsparts = new JBossXSObjectList();; protected short compositor = 0; @@ -73,21 +73,21 @@ Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next()); + xsparts.addItem((JBossXSParticle)iter.next()); } } public void setParticles(List p, boolean shouldSort) { xsparts = new JBossXSObjectList(); - if(shouldSort) + if (shouldSort) setParticles(p); else { Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next(), false); + xsparts.addItem((JBossXSParticle)iter.next(), false); } } @@ -106,4 +106,9 @@ { return XSConstants.MODEL_GROUP; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java =================================================================== --- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 13:03:10 UTC (rev 2398) +++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 13:04:30 UTC (rev 2399) @@ -1,36 +1,37 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.XSConstants; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSTerm; +import org.jboss.util.NotImplementedException; /** * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSParticle - extends JBossXSObject implements XSParticle, Comparable +public class JBossXSParticle extends JBossXSObject implements XSParticle, Comparable { protected int minOccurs = 0; protected int maxOccurs = 0; @@ -111,22 +112,27 @@ public int compareTo(Object o) { int c = -1; - if(o instanceof JBossXSParticle) + if (o instanceof JBossXSParticle) { JBossXSParticle w = (JBossXSParticle)o; String oname = w.getTerm().getName(); - String termName = term.getName() ; - if( termName != null ) - c = termName.compareTo(oname); + String termName = term.getName(); + if (termName != null) + c = termName.compareTo(oname); //In the case of doclit, need to be careful about String_1,SimpleType_2 - if( termName != null) + if (termName != null) { - char num1 = termName.charAt(termName.length()-1); - char num2 = oname.charAt(oname.length()-1); - if(Character.isDigit(num1) && Character.isDigit(num2)) - c = (""+num1).compareTo((""+num2)); + char num1 = termName.charAt(termName.length() - 1); + char num2 = oname.charAt(oname.length() - 1); + if (Character.isDigit(num1) && Character.isDigit(num2)) + c = ("" + num1).compareTo(("" + num2)); } } return c; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } }

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2398 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 08:03:10 -0500 (Sun, 18 Feb 2007) New Revision: 2398 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java Log: Update to xerces-2.9.0 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 12:54:28 UTC (rev 2397) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 13:03:10 UTC (rev 2398) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.ShortList; @@ -28,23 +28,22 @@ import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSException; import org.apache.xerces.xs.XSNamedMap; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; - +import org.jboss.util.NotImplementedException; /** * Represents an XS Element Declaration * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since May 3, 2005 */ -public class JBossXSElementDeclaration - extends JBossXSObject - implements XSElementDeclaration +public class JBossXSElementDeclaration extends JBossXSObject implements XSElementDeclaration { protected String targetNamespace = null; protected JBossXSTypeDefinition xstype = null; protected boolean nillable = false; private XSElementDeclaration xsed; - + /** * Sole Annotation object */ @@ -74,31 +73,29 @@ */ public JBossXSElementDeclaration(XSElementDeclaration xe) { - if(xe == null) - throw new IllegalArgumentException("Illegal Null Argument:xe"); - - xsed = xe; - name= xe.getName(); - namespace = xe.getNamespace(); - XSTypeDefinition xt = xe.getTypeDefinition(); - if(xt instanceof JBossXSTypeDefinition == false - && xt instanceof XSComplexTypeDefinition) - { - xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); - } - else - if(xt instanceof JBossXSTypeDefinition == false) - { - xstype = new JBossXSTypeDefinition(xt); - } - this.annotation = xe.getAnnotation(); + if (xe == null) + throw new IllegalArgumentException("Illegal Null Argument:xe"); + + xsed = xe; + name = xe.getName(); + namespace = xe.getNamespace(); + XSTypeDefinition xt = xe.getTypeDefinition(); + if (xt instanceof JBossXSTypeDefinition == false && xt instanceof XSComplexTypeDefinition) + { + xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); + } + else if (xt instanceof JBossXSTypeDefinition == false) + { + xstype = new JBossXSTypeDefinition(xt); + } + this.annotation = xe.getAnnotation(); } public XSElementDeclaration getXSElementDeclaration() { return xsed; } - + /** * One of XSConstants.SCOPE_GLOBAL, XSConstants.SCOPE_LOCAL * or XSConstants.SCOPE_ABSENT @@ -112,12 +109,11 @@ return this.xstype; } - public void setTypeDefinition(XSTypeDefinition xst ) + public void setTypeDefinition(XSTypeDefinition xst) { - if(xst instanceof JBossXSTypeDefinition) - this.xstype = (JBossXSTypeDefinition)xst ; - else - if(xst instanceof XSComplexTypeDefinition) + if (xst instanceof JBossXSTypeDefinition) + this.xstype = (JBossXSTypeDefinition)xst; + else if (xst instanceof XSComplexTypeDefinition) this.xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xst); } @@ -141,7 +137,7 @@ return this.enclosingCTDefinition; } - public void setEnclosingCTDefinition( XSComplexTypeDefinition enclosingCTDefinition) + public void setEnclosingCTDefinition(XSComplexTypeDefinition enclosingCTDefinition) { this.enclosingCTDefinition = enclosingCTDefinition; } @@ -154,7 +150,7 @@ public void setTargetNamespace(String targetNamespace) { this.targetNamespace = targetNamespace; - this.setNamespace( targetNamespace ); + this.setNamespace(targetNamespace); } public short getConstraintType() @@ -231,7 +227,7 @@ { return this.annotation; } - + /** * Get the type */ @@ -240,4 +236,9 @@ { return XSConstants.ELEMENT_DECLARATION; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 12:54:28 UTC (rev 2397) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 13:03:10 UTC (rev 2398) @@ -54,6 +54,7 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; @@ -742,4 +743,9 @@ return anonymousTypeMap; } } + + public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0) + { + throw new NotImplementedException(); + } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 12:54:28 UTC (rev 2397) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 13:03:10 UTC (rev 2398) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import java.util.Iterator; @@ -28,14 +28,14 @@ import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSModelGroup; import org.apache.xerces.xs.XSObjectList; +import org.jboss.util.NotImplementedException; /** * Implements a ModelGroup of the Xerces Schema API * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSModelGroup extends JBossXSObject - implements XSModelGroup +public class JBossXSModelGroup extends JBossXSObject implements XSModelGroup { private JBossXSObjectList xsparts = new JBossXSObjectList();; protected short compositor = 0; @@ -73,21 +73,21 @@ Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next()); + xsparts.addItem((JBossXSParticle)iter.next()); } } public void setParticles(List p, boolean shouldSort) { xsparts = new JBossXSObjectList(); - if(shouldSort) + if (shouldSort) setParticles(p); else { Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next(), false); + xsparts.addItem((JBossXSParticle)iter.next(), false); } } @@ -106,4 +106,9 @@ { return XSConstants.MODEL_GROUP; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 12:54:28 UTC (rev 2397) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 13:03:10 UTC (rev 2398) @@ -1,36 +1,37 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.XSConstants; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSTerm; +import org.jboss.util.NotImplementedException; /** * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSParticle - extends JBossXSObject implements XSParticle, Comparable +public class JBossXSParticle extends JBossXSObject implements XSParticle, Comparable { protected int minOccurs = 0; protected int maxOccurs = 0; @@ -111,22 +112,27 @@ public int compareTo(Object o) { int c = -1; - if(o instanceof JBossXSParticle) + if (o instanceof JBossXSParticle) { JBossXSParticle w = (JBossXSParticle)o; String oname = w.getTerm().getName(); - String termName = term.getName() ; - if( termName != null ) - c = termName.compareTo(oname); + String termName = term.getName(); + if (termName != null) + c = termName.compareTo(oname); //In the case of doclit, need to be careful about String_1,SimpleType_2 - if( termName != null) + if (termName != null) { - char num1 = termName.charAt(termName.length()-1); - char num2 = oname.charAt(oname.length()-1); - if(Character.isDigit(num1) && Character.isDigit(num2)) - c = (""+num1).compareTo((""+num2)); + char num1 = termName.charAt(termName.length() - 1); + char num2 = oname.charAt(oname.length() - 1); + if (Character.isDigit(num1) && Character.isDigit(num2)) + c = ("" + num1).compareTo(("" + num2)); } } return c; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } }

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2397 - in trunk: build/ant-import and 32 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 07:54:28 -0500 (Sun, 18 Feb 2007) New Revision: 2397 Added: trunk/build/etc/jbossws-component-info14.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml Removed: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/etc/jbossws-component-info.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/version.properties trunk/integration-jboss40/build.xml trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss42/build.xml trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml trunk/jbossws-core/.classpath trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.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/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java Log: svn merge -r2386:2396 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 Add [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI Update to xerces-2.9.0 Include wsdl4j in sar Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant-import/build-release.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -44,8 +44,12 @@  <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> <mkdir dir="${jbossws.repository.dir}/lib"/> + <delete> + <fileset dir="${jbossws.repository.dir}/lib"/> + </delete> <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -68,9 +72,12 @@ </filterset> </copy> -  <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> <mkdir dir="${jbossws14.repository.dir}/lib"/> + <delete> + <fileset dir="${jbossws14.repository.dir}/lib"/> + </delete> <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -79,14 +86,14 @@ <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws40-jdk14.sar"/> <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> </fileset> </copy> - <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info14.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - --> </target> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant-import/build-thirdparty.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -38,6 +38,7 @@ <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> +  <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/ant.properties.example 2007-02-18 12:54:28 UTC (rev 2397) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/etc/jbossws-component-info.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -9,13 +9,8 @@ <artifact id="jboss-saaj.jar"/> <artifact id="jbossws40.sar"/> - <artifact id="jbossws-jboss40-integration.jar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws-jboss42-integration.jar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws-jboss50-integration.jar"/> <artifact id="jbossws50-deployer.zip"/> <import componentref="apache-xmlsec"> @@ -35,6 +30,7 @@ <compatible version="@jboss-microcontainer@"/> </import> <import componentref="jboss/remoting"> + <compatible version="1.4.3.GA"/> <compatible version="2.2.0.Alpha2"/> <compatible version="@jboss-remoting@"/> </import> @@ -42,13 +38,8 @@ <compatible version="@sun-jaxb@"/> </import> -  <export> + <include input="jbossws-core.jar"/> <include input="jboss-jaxrpc.jar"/> <include input="jboss-jaxws.jar"/> <include input="jboss-saaj.jar"/> Copied: trunk/build/etc/jbossws-component-info14.xml (from rev 2396, branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml) =================================================================== --- trunk/build/etc/jbossws-component-info14.xml (rev 0) +++ trunk/build/etc/jbossws-component-info14.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,45 @@ +<project name="jboss/jbossws-component-info"> + + <component id="jboss/jbossws14" licenseType="lgpl" version="@repository.id@" + description="JBossWS an implementation of J2EE Web Services - Retrotranslated"> + + <artifact id="jbossws14-client.jar"/> + <artifact id="jboss-jaxws14.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-saaj.jar"/> + + <artifact id="jbossws40-jdk14.sar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + </import> + <import componentref="jboss/jbossretro"> + <compatible version="@jboss-jbossretro@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="1.4.3.GA"/> + <compatible version="@jboss-remoting@"/> + </import> + + <export> + <include input="jbossws14-client.jar"/> + <include input="jboss-jaxws14.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -16,7 +16,7 @@ <table> <tr><th align=left>@hudson.jboss50.build@</th><td>-r(a)hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr> - <tr><th align=left>@hudson.jboss42.build@-ejb3</th><td>-r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> + <tr><th align=left>@hudson.jboss42.build@</th><td>-r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> <tr><th align=left>@hudson.jboss40.build@-ejb3</th><td>-r(a)hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr> <tr><th align=left>jboss-4.0.5.GA-ejb3</th><td>https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA</td></tr> <tr><th align=left>apache-tomcat-@apache-tomcat@</th></tr> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat ENVIRONMENT="-Djbossws.integration.target=tomcat -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/build/version.properties 2007-02-18 12:54:28 UTC (rev 2397) @@ -16,7 +16,7 @@ # thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss -javassist=3.4.GA +javassist=3.5.0.CR1 jboss-jbossxb=1.0.0.CR9 jboss-microcontainer=1.0.2 jboss-remoting=2.0.0.GA @@ -29,7 +29,7 @@ apache-logging=1.0.5.GA-jboss apache-tomcat=5.5.20 apache-xalan=j_2.7.0 -apache-xerces=2.7.1 +apache-xerces=2.9.0 dom4j=1.6.1 gnu-getopt=1.0.10 hibernate=3.2.1.GA Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss40/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -175,9 +175,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> @@ -267,14 +266,13 @@ <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> <include name="jbossws14-core.jar"/> + <include name="jboss-jaxws14.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss40.resources.dir}"> Modified: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -25,7 +25,7 @@  + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss42/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -131,9 +131,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> Modified: trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -25,7 +25,7 @@  + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss50/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -103,9 +103,8 @@ <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> - <include name="sjsxp.jar"/> <include name="stax-api.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> + <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> Modified: trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -23,7 +23,7 @@  + If multiple connectors are found the port of the first connector is used. <property name="webServiceSecurePort">8443</property> <property name="webServicePort">8080</property> --> Modified: trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -18,15 +18,9 @@ --> <property name="webServiceHost">localhost</property> <property name="alwaysModifySOAPAddress">true</property> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> -  - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> </bean> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/.classpath 2007-02-18 12:54:28 UTC (rev 2397) @@ -15,7 +15,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-src.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -66,7 +66,7 @@ inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled()); if (inputSource == null) - if(log.isDebugEnabled()) log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); return inputSource; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.ShortList; @@ -28,23 +28,22 @@ import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSException; import org.apache.xerces.xs.XSNamedMap; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSTypeDefinition; - +import org.jboss.util.NotImplementedException; /** * Represents an XS Element Declaration * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since May 3, 2005 */ -public class JBossXSElementDeclaration - extends JBossXSObject - implements XSElementDeclaration +public class JBossXSElementDeclaration extends JBossXSObject implements XSElementDeclaration { protected String targetNamespace = null; protected JBossXSTypeDefinition xstype = null; protected boolean nillable = false; private XSElementDeclaration xsed; - + /** * Sole Annotation object */ @@ -74,31 +73,29 @@ */ public JBossXSElementDeclaration(XSElementDeclaration xe) { - if(xe == null) - throw new IllegalArgumentException("Illegal Null Argument:xe"); - - xsed = xe; - name= xe.getName(); - namespace = xe.getNamespace(); - XSTypeDefinition xt = xe.getTypeDefinition(); - if(xt instanceof JBossXSTypeDefinition == false - && xt instanceof XSComplexTypeDefinition) - { - xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); - } - else - if(xt instanceof JBossXSTypeDefinition == false) - { - xstype = new JBossXSTypeDefinition(xt); - } - this.annotation = xe.getAnnotation(); + if (xe == null) + throw new IllegalArgumentException("Illegal Null Argument:xe"); + + xsed = xe; + name = xe.getName(); + namespace = xe.getNamespace(); + XSTypeDefinition xt = xe.getTypeDefinition(); + if (xt instanceof JBossXSTypeDefinition == false && xt instanceof XSComplexTypeDefinition) + { + xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt); + } + else if (xt instanceof JBossXSTypeDefinition == false) + { + xstype = new JBossXSTypeDefinition(xt); + } + this.annotation = xe.getAnnotation(); } public XSElementDeclaration getXSElementDeclaration() { return xsed; } - + /** * One of XSConstants.SCOPE_GLOBAL, XSConstants.SCOPE_LOCAL * or XSConstants.SCOPE_ABSENT @@ -112,12 +109,11 @@ return this.xstype; } - public void setTypeDefinition(XSTypeDefinition xst ) + public void setTypeDefinition(XSTypeDefinition xst) { - if(xst instanceof JBossXSTypeDefinition) - this.xstype = (JBossXSTypeDefinition)xst ; - else - if(xst instanceof XSComplexTypeDefinition) + if (xst instanceof JBossXSTypeDefinition) + this.xstype = (JBossXSTypeDefinition)xst; + else if (xst instanceof XSComplexTypeDefinition) this.xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xst); } @@ -141,7 +137,7 @@ return this.enclosingCTDefinition; } - public void setEnclosingCTDefinition( XSComplexTypeDefinition enclosingCTDefinition) + public void setEnclosingCTDefinition(XSComplexTypeDefinition enclosingCTDefinition) { this.enclosingCTDefinition = enclosingCTDefinition; } @@ -154,7 +150,7 @@ public void setTargetNamespace(String targetNamespace) { this.targetNamespace = targetNamespace; - this.setNamespace( targetNamespace ); + this.setNamespace(targetNamespace); } public short getConstraintType() @@ -231,7 +227,7 @@ { return this.annotation; } - + /** * Get the type */ @@ -240,4 +236,9 @@ { return XSConstants.ELEMENT_DECLARATION; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; // $Id$ @@ -64,11 +64,6 @@ /** * Resolves an external parsed entity. If the entity cannot be * resolved, this method should return null. - * - * @param resourceIdentifier description of the resource to be resolved - * @throws XNIException Thrown on general error. - * @throws IOException Thrown if resolved entity stream cannot be - * opened or some other i/o error occurs. */ public XMLInputSource resolveEntity(XMLResourceIdentifier resId) throws XNIException, IOException { @@ -86,13 +81,13 @@ { XMLInputSource source = getXMLInputSource(inputSource, resId); return source; - } + } } catch (Exception ex) { log.trace(ex); - } - + } + try { String expandedSysId = resId.getExpandedSystemId(); @@ -137,8 +132,7 @@ } // Delegate to JBoss Entity Resolver - XMLInputSource source = getXMLInputSource( - delegate.resolveEntity(null, namespaceURI), resId); + XMLInputSource source = getXMLInputSource(delegate.resolveEntity(null, namespaceURI), resId); if (source != null) return source; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -54,6 +54,7 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; @@ -742,4 +743,9 @@ return anonymousTypeMap; } } + + public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0) + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import java.util.Iterator; @@ -28,14 +28,14 @@ import org.apache.xerces.xs.XSConstants; import org.apache.xerces.xs.XSModelGroup; import org.apache.xerces.xs.XSObjectList; +import org.jboss.util.NotImplementedException; /** * Implements a ModelGroup of the Xerces Schema API * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSModelGroup extends JBossXSObject - implements XSModelGroup +public class JBossXSModelGroup extends JBossXSObject implements XSModelGroup { private JBossXSObjectList xsparts = new JBossXSObjectList();; protected short compositor = 0; @@ -73,21 +73,21 @@ Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next()); + xsparts.addItem((JBossXSParticle)iter.next()); } } public void setParticles(List p, boolean shouldSort) { xsparts = new JBossXSObjectList(); - if(shouldSort) + if (shouldSort) setParticles(p); else { Iterator iter = p.iterator(); while (iter.hasNext()) { - xsparts.addItem((JBossXSParticle)iter.next(), false); + xsparts.addItem((JBossXSParticle)iter.next(), false); } } @@ -106,4 +106,9 @@ { return XSConstants.MODEL_GROUP; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,36 +1,37 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.metadata.wsdl.xmlschema; import org.apache.xerces.xs.XSConstants; +import org.apache.xerces.xs.XSObjectList; import org.apache.xerces.xs.XSParticle; import org.apache.xerces.xs.XSTerm; +import org.jboss.util.NotImplementedException; /** * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Apr 21, 2005 */ -public class JBossXSParticle - extends JBossXSObject implements XSParticle, Comparable +public class JBossXSParticle extends JBossXSObject implements XSParticle, Comparable { protected int minOccurs = 0; protected int maxOccurs = 0; @@ -111,22 +112,27 @@ public int compareTo(Object o) { int c = -1; - if(o instanceof JBossXSParticle) + if (o instanceof JBossXSParticle) { JBossXSParticle w = (JBossXSParticle)o; String oname = w.getTerm().getName(); - String termName = term.getName() ; - if( termName != null ) - c = termName.compareTo(oname); + String termName = term.getName(); + if (termName != null) + c = termName.compareTo(oname); //In the case of doclit, need to be careful about String_1,SimpleType_2 - if( termName != null) + if (termName != null) { - char num1 = termName.charAt(termName.length()-1); - char num2 = oname.charAt(oname.length()-1); - if(Character.isDigit(num1) && Character.isDigit(num2)) - c = (""+num1).compareTo((""+num2)); + char num1 = termName.charAt(termName.length() - 1); + char num2 = oname.charAt(oname.length() - 1); + if (Character.isDigit(num1) && Character.isDigit(num2)) + c = ("" + num1).compareTo(("" + num2)); } } return c; } + + public XSObjectList getAnnotations() + { + throw new NotImplementedException(); + } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -88,7 +88,8 @@ EntityResolver entityResolver = new JBossWSEntityResolver(); // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + // ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition wsdlDefinition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); return wsdlDefinition; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -47,8 +47,6 @@ import org.w3c.dom.Element; import org.xml.sax.EntityResolver; -import com.ibm.wsdl.xml.WSDLReaderImpl; - /** * A factory that creates a <code>WSDLDefinitions</code> object from an URL. * @@ -126,7 +124,8 @@ } // Set EntityResolver in patched version of wsdl4j-1.5.2jboss - ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); + // [TODO] show the usecase that needs this + //((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver); Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation)); wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLLocatorImpl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -157,4 +157,8 @@ { return latestImportURI; } + + public void close() + { + } } Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -188,6 +188,15 @@ </fileset> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Deleted: trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml =================================================================== --- trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/ant-import/jaxws-tools-delegate.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project name="TOOLS-Delegate"> - <macrodef name="call-wsconsume"> - - <attribute name="sourceDir"/> - <attribute name="destDir"/> - <attribute name="wsdlLocation"/> - <attribute name="verbose" default="false"/> - <attribute name="package"/> - - <sequential> - - <echo>-----------------------------------------------</echo> - <echo>Invoking wsimport </echo> - <echo>sourceDir: @{sourceDir}</echo> - <echo>wsdlLocation: @{wsdlLocation}</echo> - <echo>-----------------------------------------------</echo> - - <mkdir dir="@{sourceDir}"/> - <mkdir dir="@{destDir}"/> - - - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath> - <pathelement location="${core.output.dir}/lib/jbossws-client.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-jaxws.jar"/> - <pathelement location="${core.output.dir}/lib/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - </classpath> - </taskdef> - <wsconsume - keep="true" - sourcedestdir="@{sourceDir}" - destdir="@{destDir}" - wsdl="@{wsdlLocation}" - package="@{package}" - verbose="@{verbose}"> - </wsconsume> - - </sequential> - </macrodef> -</project> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/build.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -17,8 +17,9 @@ <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - + <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> @@ -252,6 +253,10 @@ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> @@ -275,7 +280,7 @@ outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> </target> - +  @@ -309,7 +314,7 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" /> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> @@ -358,9 +363,9 @@    - + <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> - + <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529 (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,29 +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.jaxws.jbws1529; -import javax.jws.WebService; - -@WebService (targetNamespace="http://sei-namespace") -public interface JBWS1529 -{ - public String echo(String message) throws UserException; -} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; +import javax.jws.WebService; + +@WebService (targetNamespace="http://sei-namespace") +public interface JBWS1529 +{ + public String echo(String message) throws UserException; +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,38 +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.jaxws.jbws1529; - -import javax.jws.WebService; - -// An endpoint implementation that does not define a target namespace -// does NOT inherit the namespace from the referrenced SEI -@WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529", name="JBWS1529") -public class JBWS1529Impl implements JBWS1529 -{ - public String echo(String message) throws UserException - { - if ("dofault".equals(message)) - throw new UserException(); - - return message; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import javax.jws.WebService; + +// An endpoint implementation that does not define a target namespace +// does NOT inherit the namespace from the referrenced SEI +@WebService(endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529", name="JBWS1529") +public class JBWS1529Impl implements JBWS1529 +{ + public String echo(String message) throws UserException + { + if ("dofault".equals(message)) + throw new UserException(); + + return message; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,83 +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.jaxws.jbws1529; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * wsdlReader fails with faults defined on jaxws SEI - * - * http://jira.jboss.org/jira/browse/JBWS-1529 - * - * @author Thomas.Diesler(a)jboss.com - */ -public class JBWS1529TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; - private JBWS1529 proxy; - -/* - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1529Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1529)service.getPort(JBWS1529.class); - } -*/ - public void testWSDLReader() throws Exception - { - File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); - assertNotNull(wsdl); - } - - public void testEcho() throws Exception - { - System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); - //String retStr = proxy.echo("hi there"); - //assertEquals("hi there", retStr); - } -} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * wsdlReader fails with faults defined on jaxws SEI + * + * http://jira.jboss.org/jira/browse/JBWS-1529 + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBWS1529TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; + private JBWS1529 proxy; + +/* + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1529Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1529)service.getPort(JBWS1529.class); + } +*/ + public void testWSDLReader() throws Exception + { + File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); + assertTrue(wsdlFile.exists()); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); + assertNotNull(wsdl); + } + + public void testEcho() throws Exception + { + System.out.println("FIXME: [JBWS-1529] wsdlReader fails with faults defined on jaxws SEI"); + //String retStr = proxy.echo("hi there"); + //assertEquals("hi there", retStr); + } +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,26 +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.jaxws.jbws1529; - -public class UserException extends Exception -{ -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1529; + +public class UserException extends Exception +{ +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -37,6 +37,15 @@ import org.jboss.test.ws.JBossWSTestSetup; /** + * Test service endpoint capability to process inlined and optimized + * requests transparently. Both client and service endpoint do have handlers in place. + * This means that an additional transition to a conceptually inlined message (handler view) + * will happen as well. + * + * <ul> + * <li>Client and service endpoint have MTOM enabled (roundtrip) + * <li>Client send inlined requests (MTOM disabled), service answers with an optimized response. + * </ul> * @author Heiko Braun <heiko.braun(a)jboss.com> * @since 05.12.2006 */ Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-18 12:54:28 UTC (rev 2397) @@ -33,6 +33,14 @@ import org.jboss.test.ws.JBossWSTestSetup; /** + * Test service endpoint capability to process inlined and optimized + * requests transparently. + * <ul> + * <li>Client and service endpoint have MTOM enabled (roundtrip) + * <li>Client send inlined requests (MTOM disabled), service answers with an optimized response. + * </ul> + * + * @see XOPBase * @author Heiko Braun <heiko.braun(a)jboss.com> * @since 05.12.2006 */ Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529 (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529) Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF) Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='JBWS1529Service' targetNamespace='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <import location='JBWS1529_PortType.wsdl' namespace='http://sei-namespace'/> - <service name='JBWS1529Service'> - <port binding='ns1:JBWS1529Binding' name='JBWS1529Port'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <import location='JBWS1529_PortType.wsdl' namespace='http://sei-namespace'/> + <service name='JBWS1529Service'> + <port binding='ns1:JBWS1529Binding' name='JBWS1529Port'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='JBWS1529Service' targetNamespace='http://sei-namespace' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://sei-namespace' version='1.0' xmlns:tns='http://sei-namespace' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='UserException' type='tns:UserException'/> - <xs:element name='echo' type='tns:echo'/> - <xs:element name='echoResponse' type='tns:echoResponse'/> - <xs:complexType name='echo'> - <xs:sequence> - <xs:element minOccurs='0' name='arg0' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='UserException'> - <xs:sequence> - <xs:element minOccurs='0' name='message' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='JBWS1529_echo'> - <part element='ns1:echo' name='echo'/> - </message> - <message name='JBWS1529_echoResponse'> - <part element='ns1:echoResponse' name='echoResponse'/> - </message> - <message name='UserException'> - <part element='ns1:UserException' name='UserException'/> - </message> - <portType name='JBWS1529'> - <operation name='echo' parameterOrder='echo'> - <input message='ns1:JBWS1529_echo'/> - <output message='ns1:JBWS1529_echoResponse'/> -  - <fault message='ns1:UserException' name='UserException'/> - </operation> - </portType> - <binding name='JBWS1529Binding' type='ns1:JBWS1529'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - <fault name='UserException'> - <soap:fault name='UserException' use='literal'/> - </fault> - </operation> - </binding> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529_PortType.wsdl 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='JBWS1529Service' targetNamespace='http://sei-namespace' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://sei-namespace' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1529.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://sei-namespace' version='1.0' xmlns:tns='http://sei-namespace' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='UserException' type='tns:UserException'/> + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='UserException'> + <xs:sequence> + <xs:element minOccurs='0' name='message' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='JBWS1529_echo'> + <part element='ns1:echo' name='echo'/> + </message> + <message name='JBWS1529_echoResponse'> + <part element='ns1:echoResponse' name='echoResponse'/> + </message> + <message name='UserException'> + <part element='ns1:UserException' name='UserException'/> + </message> + <portType name='JBWS1529'> + <operation name='echo' parameterOrder='echo'> + <input message='ns1:JBWS1529_echo'/> + <output message='ns1:JBWS1529_echoResponse'/> +  + <fault message='ns1:UserException' name='UserException'/> + </operation> + </portType> + <binding name='JBWS1529Binding' type='ns1:JBWS1529'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + <fault name='UserException'> + <soap:fault name='UserException' use='literal'/> + </fault> + </operation> + </binding> +</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:14:17 UTC (rev 2396) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -1,18 +0,0 @@ -<?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.jbws1529.JBWS1529Impl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> Copied: trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml (from rev 2396, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/jbws1529/WEB-INF/web.xml 2007-02-18 12:54:28 UTC (rev 2397) @@ -0,0 +1,18 @@ +<?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.jbws1529.JBWS1529Impl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app>

17 years, 3 months

1
0
0 / 0

JBossWS SVN: r2396 - branches/jbossws-1.2.0/build.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-18 07:14:17 -0500 (Sun, 18 Feb 2007) New Revision: 2396 Modified: branches/jbossws-1.2.0/build/version.properties Log: Set version to 1.2.0.GA Modified: branches/jbossws-1.2.0/build/version.properties =================================================================== --- branches/jbossws-1.2.0/build/version.properties 2007-02-18 11:59:55 UTC (rev 2395) +++ branches/jbossws-1.2.0/build/version.properties 2007-02-18 12:14:17 UTC (rev 2396) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=1.2.0.CR3 -repository.id=1.2.0.CR3 +version.id=1.2.0.GA +repository.id=1.2.0.GA implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws

17 years, 3 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 February 2007