October 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4748 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-12 05:52:08 -0400 (Fri, 12 Oct 2007) New Revision: 4748 Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml Log: Do not deploy jboss-xml-binding.jar Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2007-10-12 09:25:30 UTC (rev 4747) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-10-12 09:52:08 UTC (rev 4748) @@ -116,7 +116,6 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> <include name="juddi-service.sar"/> <include name="policy.jar"/> <include name="stax-api.jar"/> Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2007-10-12 09:25:30 UTC (rev 4747) +++ stack/native/trunk/ant-import/build-deploy.xml 2007-10-12 09:52:08 UTC (rev 4748) @@ -28,11 +28,6 @@ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss50.home}"/> - -  </target> <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -60,12 +55,6 @@ <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss42.home}"/> - -  - </target> <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-12 09:25:30 UTC (rev 4747) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-10-12 09:52:08 UTC (rev 4748) @@ -146,7 +146,6 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> <include name="policy.jar"/> <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> @@ -155,11 +154,6 @@ </copy>  - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -249,7 +243,6 @@ <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> - <include name="jboss-xml-binding.jar"/> <include name="stax-api.jar"/> <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> @@ -259,12 +252,6 @@ </copy>  - <copy todir="${jboss40.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4747 - in stack/native/trunk/src/main/java/org/jboss/ws/tools: io and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-10-12 05:25:30 -0400 (Fri, 12 Oct 2007) New Revision: 4747 Added: stack/native/trunk/src/main/java/org/jboss/ws/tools/io/ stack/native/trunk/src/main/java/org/jboss/ws/tools/io/NullPrintStream.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/NullPrintStream.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java Log: Refactoring + Optimizing NullPrintStream Added: stack/native/trunk/src/main/java/org/jboss/ws/tools/io/NullPrintStream.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/io/NullPrintStream.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/io/NullPrintStream.java 2007-10-12 09:25:30 UTC (rev 4747) @@ -0,0 +1,224 @@ +/* + * 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.tools.io; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Locale; + +/** + * Print stream singleton that does nothing + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 12, 2007 + */ +public final class NullPrintStream extends PrintStream +{ + + private static final PrintStream instance = new NullPrintStream(); + + public static PrintStream getInstance() + { + return instance; + } + + private NullPrintStream() + { + super(new ByteArrayOutputStream()); + } + + @Override + public PrintStream append(char c) + { + return this; + } + + @Override + public PrintStream append(CharSequence csq, int start, int end) + { + return this; + } + + @Override + public PrintStream append(CharSequence csq) + { + return this; + } + + @Override + public boolean checkError() + { + return false; + } + + @Override + public void close() + { + } + + @Override + public void flush() + { + } + + @Override + public PrintStream format(Locale l, String format, Object... args) + { + return this; + } + + @Override + public PrintStream format(String format, Object... args) + { + return this; + } + + @Override + public void print(boolean b) + { + } + + @Override + public void print(char c) + { + } + + @Override + public void print(char[] s) + { + } + + @Override + public void print(double d) + { + } + + @Override + public void print(float f) + { + } + + @Override + public void print(int i) + { + } + + @Override + public void print(long l) + { + } + + @Override + public void print(Object obj) + { + } + + @Override + public void print(String s) + { + } + + @Override + public PrintStream printf(Locale l, String format, Object... args) + { + return this; + } + + @Override + public PrintStream printf(String format, Object... args) + { + return this; + } + + @Override + public void println() + { + } + + @Override + public void println(boolean x) + { + } + + @Override + public void println(char x) + { + } + + @Override + public void println(char[] x) + { + } + + @Override + public void println(double x) + { + } + + @Override + public void println(float x) + { + } + + @Override + public void println(int x) + { + } + + @Override + public void println(long x) + { + } + + @Override + public void println(Object x) + { + } + + @Override + public void println(String x) + { + } + + @Override + protected void setError() + { + } + + @Override + public void write(byte[] buf, int off, int len) + { + } + + @Override + public void write(int b) + { + } + + @Override + public void write(byte[] b) throws IOException + { + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/tools/io/NullPrintStream.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-10-12 08:43:21 UTC (rev 4746) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-10-12 09:25:30 UTC (rev 4747) @@ -30,6 +30,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.ws.tools.io.NullPrintStream; import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -50,7 +51,7 @@ private File outputDir = new File("output"); private File resourceDir = null; private File sourceDir = null; - private PrintStream messageStream = new NullPrintStream(); + private PrintStream messageStream = NullPrintStream.getInstance(); private void createDirectories(File resourceDir, File sourceDir) { Deleted: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/NullPrintStream.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/NullPrintStream.java 2007-10-12 08:43:21 UTC (rev 4746) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/NullPrintStream.java 2007-10-12 09:25:30 UTC (rev 4747) @@ -1,209 +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.ws.tools.jaxws.impl; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.Locale; - -class NullPrintStream extends PrintStream -{ - NullPrintStream() - { - // Doesn't actually do anything - super(new ByteArrayOutputStream()); - } - - @Override - public PrintStream append(char c) - { - return this; - } - - @Override - public PrintStream append(CharSequence csq, int start, int end) - { - return this; - } - - @Override - public PrintStream append(CharSequence csq) - { - return this; - } - - @Override - public boolean checkError() - { - return false; - } - - @Override - public void close() - { - } - - @Override - public void flush() - { - } - - @Override - public PrintStream format(Locale l, String format, Object... args) - { - return this; - } - - @Override - public PrintStream format(String format, Object... args) - { - return this; - } - - @Override - public void print(boolean b) - { - } - - @Override - public void print(char c) - { - } - - @Override - public void print(char[] s) - { - } - - @Override - public void print(double d) - { - } - - @Override - public void print(float f) - { - } - - @Override - public void print(int i) - { - } - - @Override - public void print(long l) - { - } - - @Override - public void print(Object obj) - { - } - - @Override - public void print(String s) - { - } - - @Override - public PrintStream printf(Locale l, String format, Object... args) - { - return this; - } - - @Override - public PrintStream printf(String format, Object... args) - { - return this; - } - - @Override - public void println() - { - } - - @Override - public void println(boolean x) - { - } - - @Override - public void println(char x) - { - } - - @Override - public void println(char[] x) - { - } - - @Override - public void println(double x) - { - } - - @Override - public void println(float x) - { - } - - @Override - public void println(int x) - { - } - - @Override - public void println(long x) - { - } - - @Override - public void println(Object x) - { - } - - @Override - public void println(String x) - { - } - - @Override - protected void setError() - { - } - - @Override - public void write(byte[] buf, int off, int len) - { - } - - @Override - public void write(int b) - { - } - - @Override - public void write(byte[] b) throws IOException - { - } -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-10-12 08:43:21 UTC (rev 4746) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2007-10-12 09:25:30 UTC (rev 4747) @@ -22,6 +22,8 @@ package org.jboss.ws.tools.jaxws.impl; import com.sun.tools.ws.wscompile.WsimportTool; + +import org.jboss.ws.tools.io.NullPrintStream; import org.jboss.wsf.spi.tools.WSContractConsumer; import java.io.File; @@ -160,7 +162,7 @@ } else { - stream = new NullPrintStream(); + stream = NullPrintStream.getInstance(); } if (!outputDir.exists() && !outputDir.mkdirs())

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4746 - in stack/native: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-12 04:43:21 -0400 (Fri, 12 Oct 2007) New Revision: 4746 Added: stack/native/tags/jbossws-native-2.0.1.SP2/ Removed: stack/native/branches/jbossws-native-2.0.1.SP2/ Log: Release jbossws-2.0.1.SP2 Copied: stack/native/tags/jbossws-native-2.0.1.SP2 (from rev 4745, stack/native/branches/jbossws-native-2.0.1.SP2)

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4745 - in stack/native/branches/jbossws-native-2.0.1.SP2: src/main/java/org/jboss/ws/core and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-12 04:18:30 -0400 (Fri, 12 Oct 2007) New Revision: 4745 Modified: stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-2.0.1.SP2/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java stack/native/branches/jbossws-native-2.0.1.SP2/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx stack/native/branches/jbossws-native-2.0.1.SP2/version.properties Log: [JBWS-1833] ConfigObserver was causing a memory leak Modified: stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-10-12 07:12:52 UTC (rev 4744) +++ stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-10-12 08:18:30 UTC (rev 4745) @@ -40,8 +40,13 @@ /** * Provides access to the protocol binding. - * + * + * NOTE: CommonBindingProvider registers with EndpointMetaData through a observer pattern. + * Which means the meta data model holds a strong reference to the binding provider which can + * easily cause memory problems. Handle with care. + * * @author Thomas.Diesler(a)jboss.com + * @author Heiko.Braun(a)jboss.com * @since 04-Jul-2006 */ public class CommonBindingProvider implements Configurable @@ -55,6 +60,8 @@ { this.epMetaData = epMetaData; initBinding(epMetaData.getBindingId(), epMetaData.getType()); + + this.epMetaData.registerConfigObserver(this); configure(); } Modified: stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-10-12 07:12:52 UTC (rev 4744) +++ stack/native/branches/jbossws-native-2.0.1.SP2/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-10-12 08:18:30 UTC (rev 4745) @@ -24,6 +24,7 @@ // $Id$ import java.lang.reflect.Method; +import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -35,6 +36,7 @@ import java.util.Observable; import java.util.Properties; import java.util.Set; +import java.util.Observer; import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; @@ -614,9 +616,6 @@ if (config == null) initEndpointConfig(); - // register any configurable with the ConfigProvider - configObservable.addObserver(configurable); - // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { @@ -733,11 +732,51 @@ class ConfigObservable extends Observable { + + private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>(); + public void doNotify(Object object) { setChanged(); notifyObservers(object); } + + public synchronized void addObserver(Observer o) + { + observer.add( new WeakReference(o)); + } + + public synchronized void deleteObserver(Observer o) + { + for(WeakReference<Observer> w : observer) + { + Observer tmp = w.get(); + if(tmp.equals(o)) + { + observer.remove(o); + break; + } + + } + } + + public void notifyObservers() + { + notifyObservers(null); + } + + public void notifyObservers(Object arg) + { + if(hasChanged()) + { + for(WeakReference<Observer> w : observer) + { + Observer tmp = w.get(); + tmp.update(this, arg); + + } + } + } } public List<UnifiedPortComponentRefMetaData> getServiceRefContrib() Modified: stack/native/branches/jbossws-native-2.0.1.SP2/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2007-10-12 07:12:52 UTC (rev 4744) +++ stack/native/branches/jbossws-native-2.0.1.SP2/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.java 2007-10-12 08:18:30 UTC (rev 4745) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxrpc.jbws626; +import org.jboss.ws.core.CommonMessageContext; + import java.util.Iterator; import javax.xml.namespace.QName; @@ -83,6 +85,10 @@ wasName = soapElement.getElementName(); assertElementName(expName, wasName); } + + // for testing the CommonBindingProvider memory leak. Not related to this test... + ((CommonMessageContext)msgContext).setModified(true); + } catch (SOAPException ex) { Modified: stack/native/branches/jbossws-native-2.0.1.SP2/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-10-12 07:12:52 UTC (rev 4744) +++ stack/native/branches/jbossws-native-2.0.1.SP2/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-10-12 08:18:30 UTC (rev 4745) @@ -21,7 +21,7 @@ <stringProp name="TestPlan.comments"></stringProp> </TestPlan> <hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -46,6 +46,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -55,7 +56,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -65,6 +65,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -74,7 +75,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -86,8 +86,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -95,8 +95,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -156,6 +156,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -165,7 +166,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -175,6 +175,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -184,7 +185,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -196,8 +196,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -205,8 +205,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -259,6 +259,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -271,7 +272,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -281,6 +281,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -293,7 +294,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -305,8 +305,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -314,8 +314,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -354,10 +354,10 @@ <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> - <stringProp name="ThreadGroup.num_threads">10</stringProp> + <stringProp name="ThreadGroup.num_threads">1</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> + <stringProp name="LoopController.loops">1</stringProp> <boolProp name="LoopController.continue_forever">false</boolProp> </elementProp> <longProp name="ThreadGroup.end_time">1144146988000</longProp> @@ -368,6 +368,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -380,7 +381,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -390,6 +390,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -402,7 +403,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -414,8 +414,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -423,8 +423,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -477,6 +477,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -489,7 +490,6 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -499,6 +499,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -511,7 +512,6 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -523,8 +523,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -532,8 +532,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -593,6 +593,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -602,7 +603,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -612,6 +612,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -621,7 +622,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -633,8 +633,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -642,8 +642,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -703,6 +703,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -712,7 +713,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -722,6 +722,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -731,7 +732,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -743,8 +743,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -752,8 +752,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -806,6 +806,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -818,7 +819,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -828,6 +828,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -840,7 +841,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -852,8 +852,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -861,8 +861,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -915,6 +915,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -927,7 +928,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -937,6 +937,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -949,7 +950,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -961,8 +961,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -970,10 +970,112 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</stringProp> <intProp name="Assertion.test_type">2</intProp> + </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="Mem" 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"> + <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="Sample" enabled="true"> + <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> + <stringProp name="SoapSampler.xml_data_file"></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> + <stringProp name="HTTPSamper.xml_data"><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jbw="http://org.jboss.test.webservice/jbws626"> + <soapenv:Header/> + <soapenv:Body><jbw:echoArray><arrayOfValueObj_1><value><s1>1</s1><s2>2</s2></value></arrayOfValueObj_1></jbw:echoArray></soapenv:Body> +</soapenv:Envelope> +</stringProp> + <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> + <collectionProp name="Arguments.arguments"/> + </elementProp> + <stringProp name="SoapSampler.URL_DATA">http://localhost:8080/jaxrpc-jbws626/DemoBean</stringProp> + </SoapSampler> + <hashTree/> + <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="SoapSampler.SOAP_ACTION"></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/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <SimpleUserType_1> + <f>1.0</f> + 1 + <s>test</s> + </SimpleUserType_1> + </ns1:echoSimpleType> + </env:Body> +</env:Envelope></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> + </collectionProp> + <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> <stringProp name="Assertion.assume_success">false</stringProp> + <intProp name="Assertion.test_type">2</intProp> </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> + <stringProp name="Assertion.assume_success">false</stringProp> + <intProp name="Assertion.test_type">2</intProp> + </ResponseAssertion> + <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> <objProp> <value class="SampleSaveConfiguration"> @@ -1024,6 +1126,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1036,7 +1139,6 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1046,6 +1148,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1058,7 +1161,6 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1070,8 +1172,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1079,8 +1181,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1140,6 +1242,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1149,7 +1252,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1159,6 +1261,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1168,7 +1271,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1180,8 +1282,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1189,8 +1291,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1250,6 +1352,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1259,7 +1362,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1269,6 +1371,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1278,7 +1381,6 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1290,8 +1392,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1299,8 +1401,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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="true"> @@ -1353,6 +1455,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1365,7 +1468,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1375,6 +1477,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1387,7 +1490,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1399,8 +1501,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1408,8 +1510,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1462,6 +1564,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1474,7 +1577,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1484,6 +1586,7 @@ <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="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1496,7 +1599,6 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1508,8 +1610,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <stringProp name="Assertion.assume_success">false</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"> @@ -1517,8 +1619,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <stringProp name="Assertion.assume_success">false</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"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/version.properties 2007-10-12 07:12:52 UTC (rev 4744) +++ stack/native/branches/jbossws-native-2.0.1.SP2/version.properties 2007-10-12 08:18:30 UTC (rev 4745) @@ -35,8 +35,8 @@ jboss-remoting-jboss50=2.2.2.SP1 # JBossAS-4.2 -jboss-jbossxb-jboss42=1.0.0.CR11 -jboss-remoting-jboss42=2.2.1.GA +jboss-jbossxb-jboss42=1.0.0.GA +jboss-remoting-jboss42=2.2.2.SP1 # JBossAS-4.0 jboss-jbossxb-jboss40=1.0.0.CR11

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4744 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-12 03:12:52 -0400 (Fri, 12 Oct 2007) New Revision: 4744 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java Log: [JBWS-1813] context-root in jboss.xml is ignored Disable for AS40 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-10-11 20:57:01 UTC (rev 4743) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-10-12 07:12:52 UTC (rev 4744) @@ -50,7 +50,7 @@ public void testPositive() throws Exception { - if (isTargetJBoss42()) + if (isTargetJBoss42() || isTargetJBoss40()) { System.out.println("FIXME: [JBWS-1813] context-root in jboss.xml is ignored"); return;

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4743 - stack/native/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-10-11 16:57:01 -0400 (Thu, 11 Oct 2007) New Revision: 4743 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt Log: fixing test case Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-11 16:56:35 UTC (rev 4742) +++ stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-11 20:57:01 UTC (rev 4743) @@ -24,6 +24,7 @@ org/jboss/test/ws/jaxws/jbws1799/** org/jboss/test/ws/jaxws/jbws1809/** org/jboss/test/ws/jaxws/jbws1813/** +org/jboss/test/ws/jaxws/jbws1815/** org/jboss/test/ws/jaxws/jbws1840/** org/jboss/test/ws/jaxws/jbws771/** org/jboss/test/ws/jaxws/jbws944/**

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4742 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/jbws1815 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2007-10-11 12:56:35 -0400 (Thu, 11 Oct 2007) New Revision: 4742 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java Log: [JBWS-1815] Solving issue Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-10-11 16:18:51 UTC (rev 4741) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-10-11 16:56:35 UTC (rev 4742) @@ -68,7 +68,7 @@ { if (soapFault == null) throw new IllegalArgumentException("SOAPFault cannot be null"); - + SOAPFaultException faultEx = new SOAPFaultException(soapFault); Detail detail = soapFault.getDetail(); @@ -151,10 +151,20 @@ try { SOAPMessageImpl faultMessage; + Throwable cause = reqEx.getCause(); if (reqEx instanceof SOAPFaultException) { faultMessage = toSOAPMessage((SOAPFaultException)reqEx); } + /* JAX-WS 6.4.1: When an implementation catches an exception thrown by a + * service endpoint implementation and the cause of that exception is an + * instance of the appropriate ProtocolException subclass for the protocol + * in use, an implementation MUST reflect the information contained in the + * ProtocolException subclass within the generated protocol level fault. */ + else if (cause != null && cause instanceof SOAPFaultException) + { + faultMessage = toSOAPMessage((SOAPFaultException)cause); + } else if (reqEx instanceof CommonSOAPFaultException) { faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx); @@ -235,23 +245,8 @@ SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage(); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault; - /* JAX-WS 6.4.1: When an implementation catches an exception thrown by a - * service endpoint implementation and the cause of that exception is an - * instance of the appropriate ProtocolException subclass for the protocol - * in use, an implementation MUST reflect the information contained in the - * ProtocolException subclass within the generated protocol level fault. */ - Throwable cause = ex.getCause(); - if (cause instanceof SOAPFaultException) - { - populateSOAPFault(soapBody, (SOAPFaultException)cause); - soapFault = soapBody.getFault(); - } - else - { - soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); - } + SOAPFault soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); SerializationContext serContext = msgContext.getSerializationContext(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2007-10-11 16:18:51 UTC (rev 4741) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2007-10-11 16:56:35 UTC (rev 4742) @@ -51,8 +51,8 @@ public class JBWS1815TestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1815/ProviderImpl"; - - private String msgString = + + private String msgString = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:my=\"http://www.my-company.it/ws/my-test\">" + " <soapenv:Header/>" + " <soapenv:Body>" + @@ -61,7 +61,7 @@ " </my:performTest>" + " </soapenv:Body>" + "</soapenv:Envelope>"; - + public static Test suite() { return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.ejb3"); @@ -73,29 +73,23 @@ Element wsdl = DOMUtils.parse(wsdlURL.openStream()); assertNotNull(wsdl); } - public void testProviderMessage() throws Exception { - try { - SOAPMessage reqMsg = getRequestMessage(); - URL epURL = new URL(TARGET_ENDPOINT_ADDRESS); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage resMsg = con.call(reqMsg, epURL); - SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - System.out.println("response: " + DOMWriter.printNode(resEnv, false)); - Detail detail = resEnv.getBody().getFault().getDetail(); -// assertNotNull(detail); - SOAPElement exception = (SOAPElement)detail.getDetailEntries().next(); -// assertNotNull(exception); -// assertEquals(exception.getNodeName(),"MyWSException"); - SOAPElement message = (SOAPElement)exception.getChildElements().next(); -// assertNotNull(message); -// assertEquals(message.getNodeName(),"message"); -// assertEquals(message.getValue(),"This is a faked error"); - } catch (Exception e) { - System.out.println("[FIXME] JBWS-1815: Cannot add fault detail"); - } + SOAPMessage reqMsg = getRequestMessage(); + URL epURL = new URL(TARGET_ENDPOINT_ADDRESS); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMsg = con.call(reqMsg, epURL); + SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + Detail detail = resEnv.getBody().getFault().getDetail(); + assertNotNull(detail); + SOAPElement exception = (SOAPElement)detail.getDetailEntries().next(); + assertNotNull(exception); + assertEquals(exception.getNodeName(), "MyWSException"); + SOAPElement message = (SOAPElement)exception.getChildElements().next(); + assertNotNull(message); + assertEquals(message.getNodeName(), "message"); + assertEquals(message.getValue(), "This is a faked error"); } private SOAPMessage getRequestMessage() throws SOAPException, IOException

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4741 - in stack/native/trunk/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-11 12:18:51 -0400 (Thu, 11 Oct 2007) New Revision: 4741 Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java Log: [JBWS-1807] HTTP bindings for Provider Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-10-11 16:12:29 UTC (rev 4740) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-10-11 16:18:51 UTC (rev 4741) @@ -41,6 +41,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; +import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; @@ -177,45 +178,51 @@ // Build endpoint meta data for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - QName portName = wsdlEndpoint.getName(); - QName interfaceQName = wsdlEndpoint.getInterface().getName(); - ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); - epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); - serviceMetaData.addEndpoint(epMetaData); - - // config-name, config-file - if (serviceRefMetaData != null) + QName bindingName = wsdlEndpoint.getBinding(); + WSDLBinding wsdlBinding = wsdlEndpoint.getWsdlService().getWsdlDefinitions().getBinding(bindingName); + String bindingType = wsdlBinding.getType(); + if (Constants.NS_SOAP11.equals(bindingType) || Constants.NS_SOAP12.equals(bindingType)) { - String configName= serviceRefMetaData.getConfigName(); - String configFile = serviceRefMetaData.getConfigFile(); - if (configName != null || configFile != null) - epMetaData.setConfigName(configName, configFile); - } + QName portName = wsdlEndpoint.getName(); + QName interfaceQName = wsdlEndpoint.getInterface().getName(); + ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); + epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); + serviceMetaData.addEndpoint(epMetaData); - // Init the endpoint binding - initEndpointBinding(wsdlEndpoint, epMetaData); + // config-name, config-file + if (serviceRefMetaData != null) + { + String configName= serviceRefMetaData.getConfigName(); + String configFile = serviceRefMetaData.getConfigFile(); + if (configName != null || configFile != null) + epMetaData.setConfigName(configName, configFile); + } - // Init the service encoding style - initEndpointEncodingStyle(epMetaData); + // Init the endpoint binding + initEndpointBinding(wsdlEndpoint, epMetaData); - ServiceEndpointInterfaceMapping seiMapping = null; - if (javaWsdlMapping != null) - { - QName portType = wsdlEndpoint.getInterface().getName(); - seiMapping = javaWsdlMapping.getServiceEndpointInterfaceMappingByPortType(portType); - if (seiMapping != null) + // Init the service encoding style + initEndpointEncodingStyle(epMetaData); + + ServiceEndpointInterfaceMapping seiMapping = null; + if (javaWsdlMapping != null) { - epMetaData.setServiceEndpointInterfaceName(seiMapping.getServiceEndpointInterface()); + QName portType = wsdlEndpoint.getInterface().getName(); + seiMapping = javaWsdlMapping.getServiceEndpointInterfaceMappingByPortType(portType); + if (seiMapping != null) + { + epMetaData.setServiceEndpointInterfaceName(seiMapping.getServiceEndpointInterface()); + } + else + { + log.warn("Cannot obtain the SEI mapping for: " + portType); + } } - else - { - log.warn("Cannot obtain the SEI mapping for: " + portType); - } + + processEndpointMetaDataExtensions(epMetaData, wsdlDefinitions); + setupOperationsFromWSDL(epMetaData, wsdlEndpoint, seiMapping); + setupHandlers(serviceRefMetaData, portName, epMetaData); } - - processEndpointMetaDataExtensions(epMetaData, wsdlDefinitions); - setupOperationsFromWSDL(epMetaData, wsdlEndpoint, seiMapping); - setupHandlers(serviceRefMetaData, portName, epMetaData); } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-10-11 16:12:29 UTC (rev 4740) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-10-11 16:18:51 UTC (rev 4741) @@ -149,23 +149,28 @@ for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) { - QName portName = wsdlEndpoint.getName(); - QName interfaceQName = wsdlEndpoint.getInterface().getName(); - ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXWS); - epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); - serviceMetaData.addEndpoint(epMetaData); + QName bindingName = wsdlEndpoint.getBinding(); + WSDLBinding wsdlBinding = wsdlEndpoint.getWsdlService().getWsdlDefinitions().getBinding(bindingName); + String bindingType = wsdlBinding.getType(); + if (Constants.NS_SOAP11.equals(bindingType) || Constants.NS_SOAP12.equals(bindingType)) + { + QName portName = wsdlEndpoint.getName(); + QName interfaceQName = wsdlEndpoint.getInterface().getName(); + ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXWS); + epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); + serviceMetaData.addEndpoint(epMetaData); - // Init the endpoint binding - initEndpointBinding(wsdlEndpoint, epMetaData); + // Init the endpoint binding + initEndpointBinding(wsdlEndpoint, epMetaData); - // Init the service encoding style - initEndpointEncodingStyle(epMetaData); + // Init the service encoding style + initEndpointEncodingStyle(epMetaData); - setupOperationsFromWSDL(epMetaData, wsdlEndpoint); + setupOperationsFromWSDL(epMetaData, wsdlEndpoint); - // service-ref contributions - bufferServiceRefContributions(epMetaData); - + // service-ref contributions + bufferServiceRefContributions(epMetaData); + } } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-10-11 16:12:29 UTC (rev 4740) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-10-11 16:18:51 UTC (rev 4741) @@ -615,7 +615,7 @@ return locationURL; } - private void processPortType(Definition srcWsdl, PortType srcPortType) throws WSDLException + private void processPortType(Definition srcWsdl, PortType srcPortType, WSDLBinding destBinding) throws WSDLException { log.trace("processPortType: " + srcPortType.getQName()); @@ -640,11 +640,11 @@ destWsdl.addInterface(destInterface); - processPortTypeOperations(srcWsdl, destInterface, srcPortType); + processPortTypeOperations(srcWsdl, destInterface, srcPortType, destBinding); } } - private void processPortTypeOperations(Definition srcWsdl, WSDLInterface destInterface, PortType srcPortType) throws WSDLException + private void processPortTypeOperations(Definition srcWsdl, WSDLInterface destInterface, PortType srcPortType, WSDLBinding destBinding) throws WSDLException { Iterator itOperations = srcPortType.getOperations().iterator(); while (itOperations.hasNext()) @@ -657,17 +657,18 @@ if (srcOperation.getStyle() != null && false == OperationType.NOTIFICATION.equals(srcOperation.getStyle())) { - processOperationInput(srcWsdl, srcOperation, destOperation, srcPortType); + processPortTypeOperationInput(srcWsdl, srcOperation, destOperation, srcPortType, destBinding); } - processOperationOutput(srcWsdl, srcOperation, destOperation, srcPortType); - processOperationFaults(srcOperation, destOperation, destInterface); + processPortTypeOperationOutput(srcWsdl, srcOperation, destOperation, srcPortType, destBinding); + processPortTypeOperationFaults(srcOperation, destOperation, destInterface, destBinding); destInterface.addOperation(destOperation); } } - private void processOperationInput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType) throws WSDLException + private void processPortTypeOperationInput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType, + WSDLBinding destBinding) throws WSDLException { Input srcInput = srcOperation.getInput(); if (srcInput != null) @@ -703,7 +704,7 @@ if (Constants.URI_STYLE_DOCUMENT == destOperation.getStyle()) { WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation); - QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation); + QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation, destBinding); destInput.setElement(elementName); //Lets remember the Message name @@ -722,8 +723,13 @@ // binding will pick it up QName xmlType = srcPart.getTypeName(); if (xmlType != null) + { rpcInput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType))); - else messagePartToElementName(srcMessage, srcPart, destOperation); + } + else + { + messagePartToElementName(srcMessage, srcPart, destOperation, destBinding); + } } } if (Constants.URI_STYLE_RPC == destOperation.getStyle()) @@ -755,7 +761,8 @@ return canBeSkipped; } - private void processOperationOutput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType) throws WSDLException + private void processPortTypeOperationOutput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType, + WSDLBinding destBinding) throws WSDLException { Output srcOutput = srcOperation.getOutput(); if (srcOutput == null) @@ -802,7 +809,7 @@ { WSDLInterfaceOperationOutput destOutput = new WSDLInterfaceOperationOutput(destOperation); - QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation); + QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation, destBinding); destOutput.setElement(elementName); // Lets remember the Message name @@ -822,7 +829,7 @@ QName xmlType = srcPart.getTypeName(); if (xmlType != null) rpcOutput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType))); - else messagePartToElementName(srcMessage, srcPart, destOperation); + else messagePartToElementName(srcMessage, srcPart, destOperation, destBinding); } } @@ -837,7 +844,8 @@ } } - private void processOperationFaults(Operation srcOperation, WSDLInterfaceOperation destOperation, WSDLInterface destInterface) throws WSDLException + private void processPortTypeOperationFaults(Operation srcOperation, WSDLInterfaceOperation destOperation, WSDLInterface destInterface, WSDLBinding destBinding) + throws WSDLException { Map faults = srcOperation.getFaults(); @@ -885,18 +893,23 @@ } /** Translate the message part name into an XML element name. - * @throws WSDLException */ - private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation) throws WSDLException + private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation, WSDLBinding destBinding) throws WSDLException { - QName xmlName; + QName xmlName = null; // R2306 A wsdl:message in a DESCRIPTION MUST NOT specify both type and element attributes on the same wsdl:part if (srcPart.getTypeName() != null && srcPart.getElementName() != null) throw new WSDLException(WSDLException.INVALID_WSDL, "Message parts must not define an element name and type name: " + srcMessage.getQName()); + String bindingType = destBinding.getType(); + if (Constants.NS_HTTP.equals(bindingType)) + { + xmlName = new QName(srcPart.getName()); + } + String style = destOperation.getStyle(); - if (Constants.URI_STYLE_RPC.equals(style)) + if (xmlName == null && Constants.URI_STYLE_RPC.equals(style)) { // R2203 An rpc-literal binding in a DESCRIPTION MUST refer, in its soapbind:body element(s), // only to wsdl:part element(s) that have been defined using the type attribute. @@ -911,7 +924,8 @@ if (xmlName == null) xmlName = new QName(srcPart.getName()); } - else + + if (xmlName == null && Constants.URI_STYLE_DOCUMENT.equals(style)) { // R2204 A document-literal binding in a DESCRIPTION MUST refer, in each of its soapbind:body element(s), // only to wsdl:part element(s) that have been defined using the element attribute @@ -923,6 +937,9 @@ xmlName = srcPart.getElementName(); } + if (xmlName == null) + throw new IllegalStateException("Cannot name for wsdl part: " + srcPart); + xmlName = destWsdl.registerQName(xmlName); String key = srcMessage.getQName() + "->" + srcPart.getName(); messagePartToElementMap.put(key, xmlName); @@ -987,7 +1004,7 @@ return ("rpc".equals(operationStyle)) ? Constants.URI_STYLE_RPC : Constants.URI_STYLE_DOCUMENT; } - private boolean processBinding(Definition srcWsdl, Binding srcBinding) throws WSDLException + private WSDLBinding processBinding(Definition srcWsdl, Binding srcBinding) throws WSDLException { QName srcBindingQName = srcBinding.getQName(); log.trace("processBinding: " + srcBindingQName); @@ -997,7 +1014,6 @@ { PortType srcPortType = getDefinedPortType(srcBinding); - // Get binding type String bindingType = null; List<ExtensibilityElement> extList = srcBinding.getExtensibilityElements(); for (ExtensibilityElement extElement : extList) @@ -1025,7 +1041,6 @@ if (bindingType == null) throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot obtain binding type for: " + srcBindingQName); - // Ignore unknown bindings if (Constants.NS_SOAP11.equals(bindingType) || Constants.NS_SOAP12.equals(bindingType) || Constants.NS_HTTP.equals(bindingType)) { destBinding = new WSDLBinding(destWsdl, srcBindingQName); @@ -1034,11 +1049,9 @@ processUnknownExtensibilityElements(srcBinding, destBinding); destWsdl.addBinding(destBinding); - // mark SWA Parts upfront preProcessSWAParts(srcBinding, srcWsdl); + processPortType(srcWsdl, srcPortType, destBinding); - processPortType(srcWsdl, srcPortType); - String bindingStyle = Style.getDefaultStyle().toString(); for (ExtensibilityElement extElement : extList) { @@ -1058,7 +1071,7 @@ } } - return destBinding != null; + return destBinding; } /** The port might reference a binding which is defined in another wsdl @@ -1076,7 +1089,7 @@ List<Binding> bindings = bindingsByNamespace.get(nsURI); if (bindings == null) throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find bindings for namespace: " + nsURI); - + for (Binding auxBinding : bindings) { if (srcBindingName.equals(auxBinding.getQName())) @@ -1086,7 +1099,7 @@ } } } - + return srcBinding; } @@ -1562,7 +1575,8 @@ destEndpoint.setAddress(getSOAPAddress(srcPort)); processUnknownExtensibilityElements(srcPort, destEndpoint); - if (processBinding(srcWsdl, srcBinding)) + WSDLBinding destBinding = processBinding(srcWsdl, srcBinding); + if (destBinding != null) destService.addEndpoint(destEndpoint); }

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4740 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-11 12:12:29 -0400 (Thu, 11 Oct 2007) New Revision: 4740 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java Log: [JBWS-1813] Disable with fixme Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-10-11 13:00:16 UTC (rev 4739) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2007-10-11 16:12:29 UTC (rev 4740) @@ -32,7 +32,7 @@ import org.jboss.wsf.test.JBossWSTestSetup; /** - * endpoint using @SecurityDomain + * context-root in jboss.xml is ignored * * http://jira.jboss.org/jira/browse/JBWS-1813 * @@ -43,31 +43,23 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; - private static Endpoint port; - public static Test suite() { return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); } - protected void setUp() throws Exception + public void testPositive() throws Exception { - if (port == null) - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); - port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); - } - } - - public void testPositive() - { if (isTargetJBoss42()) { System.out.println("FIXME: [JBWS-1813] context-root in jboss.xml is ignored"); return; } + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); + Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); + String retObj = port.echo("Hello"); assertEquals("Hello", retObj); }

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r4739 - stack/native/branches/jbossws-native-2.0.1.SP2/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-10-11 09:00:16 -0400 (Thu, 11 Oct 2007) New Revision: 4739 Modified: stack/native/branches/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml Log: Remove dependency on jbossws-jboss50 Modified: stack/native/branches/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml 2007-10-11 12:15:07 UTC (rev 4738) +++ stack/native/branches/jbossws-native-2.0.1.SP2/ant-import/macros-deploy-native.xml 2007-10-11 13:00:16 UTC (rev 4739) @@ -111,7 +111,6 @@ <include name="jbossws-integration.jar"/> </fileset> </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential>

16 years, 7 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 October 2007