JBossWS SVN: r4348 - legacy/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 13:21:21 -0400 (Mon, 13 Aug 2007)
New Revision: 4348
Removed:
legacy/branches/dlofthouse/ASPATCH-260/
Log:
Branch no longer required.
17 years, 4 months
- 1
- 0
JBossWS SVN: r4347 - in legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 13:18:45 -0400 (Mon, 13 Aug 2007)
New Revision: 4347
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
[ASPATCH-206] / [JBPAPP-257] JBossWS - Incorrect handling of charsets when the default charset is not UTF-8.
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 17:06:55 UTC (rev 4346)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 17:18:45 UTC (rev 4347)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamResult;
@@ -51,7 +52,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
}
catch (IOException e)
{
@@ -64,7 +65,7 @@
{
return null;
}
-
+
@Override
public OutputStream getOutputStream()
{
@@ -82,9 +83,19 @@
{
throw new UnsupportedOperationException();
}
-
+
public String toString()
{
- return baos.toString();
+ String result = null;
+ try
+ {
+ result = baos.toString("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return result;
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-13 17:06:55 UTC (rev 4346)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-13 17:18:45 UTC (rev 4347)
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -112,7 +113,16 @@
{
String retStr = null;
if (bytes != null)
- retStr = new String(bytes);
+ {
+ try
+ {
+ retStr = new String(bytes, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 17:06:55 UTC (rev 4346)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 17:18:45 UTC (rev 4347)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-13 17:06:55 UTC (rev 4346)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-13 17:18:45 UTC (rev 4347)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream());
+ reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
}
char[] cbuf = new char[1024];
17 years, 4 months
- 1
- 0
JBossWS SVN: r4346 - in stack/native/branches/native-2.0: src/test/java/org/jboss/test/ws/jaxrpc/marshall and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 13:06:55 -0400 (Mon, 13 Aug 2007)
New Revision: 4346
Modified:
stack/native/branches/native-2.0/ant-import/build-thirdparty.xml
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
Log:
[JBWS-1617] JAXRPC doc/literal trims empty string. Temporarily using jbossxb snapshot
Modified: stack/native/branches/native-2.0/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/build-thirdparty.xml 2007-08-13 16:39:50 UTC (rev 4345)
+++ stack/native/branches/native-2.0/ant-import/build-thirdparty.xml 2007-08-13 17:06:55 UTC (rev 4346)
@@ -127,9 +127,12 @@
<unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
<unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
- <get src="http://snapshots.jboss.org/maven2/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossx..." dest="${thirdparty.dir}/jbossxb-2.0.0-20070620.094346-1.jar" usetimestamp="true" verbose="true"/>
- <get src="http://snapshots.jboss.org/maven2/jboss/jbossxb/jbossxb/1.0.0-SNAPSHOT/jb..." dest="${thirdparty.dir}/jbossxb-1.0.0-20070620.100638-1.jar" usetimestamp="true" verbose="true"/>
-
+ <!--
+ [JBWS-1617] JAXRPC doc/literal trims empty string
+ -->
+ <get src="http://snapshots.jboss.org/maven2/org/jboss/jbossxb/1.0.0-SNAPSHOT/jbossx..." dest="${thirdparty.dir}/jbossxb-1.0.0-snapshot.jar" usetimestamp="true" verbose="true"/>
+ <copy tofile="${thirdparty.dir}/jboss-xml-binding.jar" file="${thirdparty.dir}/jbossxb-1.0.0-snapshot.jar"/>
+
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-13 16:39:50 UTC (rev 4345)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-13 17:06:55 UTC (rev 4346)
@@ -608,10 +608,15 @@
String out = stringTest(in);
assertEquals(in, out);
- System.out.println("FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string");
- //in = " ";
- //out = stringTest(in);
- //assertEquals(in, out);
+ if (isTargetJBoss50())
+ {
+ System.out.println("FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string");
+ return;
+ }
+
+ in = " ";
+ out = stringTest(in);
+ assertEquals(in, out);
}
public void testStringSpecialChars() throws Exception
17 years, 4 months
- 1
- 0
JBossWS SVN: r4345 - in stack/native/branches/native-2.0: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 12:39:50 -0400 (Mon, 13 Aug 2007)
New Revision: 4345
Modified:
stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml
stack/native/branches/native-2.0/ant.properties.example
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
Log:
[JBWS-1738] Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew. Cannot reproduce
Modified: stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml 2007-08-13 16:38:09 UTC (rev 4344)
+++ stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml 2007-08-13 16:39:50 UTC (rev 4345)
@@ -141,12 +141,13 @@
</fileset>
<fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss42.jar"/>
- <include name="policy.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<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"/>
<include name="wsdl4j.jar"/>
@@ -154,6 +155,11 @@
</copy>
<!-- SERVER JARS -->
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ </copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jbossws-jboss42.jar"/>
@@ -232,12 +238,6 @@
<unzip dest="${jboss40.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
- <copy todir="${jboss40.home}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- </copy>
-
<!-- CLIENT JARS -->
<copy todir="${jboss40.home}/client" overwrite="true">
<fileset dir="@{stacklibs}">
@@ -264,6 +264,12 @@
</copy>
<!-- SERVER JARS -->
+ <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"/>
@@ -274,7 +280,6 @@
<include name="jbossws-jboss40.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
-
</copy>
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
Modified: stack/native/branches/native-2.0/ant.properties.example
===================================================================
--- stack/native/branches/native-2.0/ant.properties.example 2007-08-13 16:38:09 UTC (rev 4344)
+++ stack/native/branches/native-2.0/ant.properties.example 2007-08-13 16:39:50 UTC (rev 4345)
@@ -3,15 +3,12 @@
#
# $Id$
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
-# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
+# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
# The JBoss server instance
@@ -33,6 +30,9 @@
# Force thirdparty HTTP get
#force.thirdparty.get=true
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
# Java Compiler options
javac.debug=yes
javac.deprecation=yes
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-13 16:38:09 UTC (rev 4344)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-13 16:39:50 UTC (rev 4345)
@@ -29,8 +29,6 @@
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-
-
/**
* Polymorphism in return types
*
@@ -58,26 +56,23 @@
endpoint = (ServiceFacadeEndpoint)service.getPort(ServiceFacadeEndpoint.class);
}
-
}
public void testAssetCreate() throws Exception
{
- System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew");
-// Event event = new AssetCreate("AssetCreate", 1, "templ");
-// AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event);
-// assertEquals("AssetCreate", retObj.getId());
+ Event event = new AssetCreate("AssetCreate", 1, "templ");
+ AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event);
+ assertEquals("AssetCreate", retObj.getId());
}
public void testAssetRead() throws Exception
{
- System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew");
-// Event event = new AssetRead("AssetRead");
-// AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event);
-// assertEquals("AssetRead", retObj.getId());
-// assertEquals("body", retObj.getBody());
+ Event event = new AssetRead("AssetRead");
+ AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event);
+ assertEquals("AssetRead", retObj.getId());
+ assertEquals("body", retObj.getBody());
}
-
+
public void testEvent() throws Exception
{
try
17 years, 4 months
- 1
- 0
JBossWS SVN: r4344 - legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 12:38:09 -0400 (Mon, 13 Aug 2007)
New Revision: 4344
Modified:
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
Log:
Set another encoding
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 16:17:24 UTC (rev 4343)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 16:38:09 UTC (rev 4344)
@@ -52,7 +52,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
}
catch (IOException e)
{
17 years, 4 months
- 1
- 0
JBossWS SVN: r4343 - stack/native/branches/native-2.0/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 12:17:24 -0400 (Mon, 13 Aug 2007)
New Revision: 4343
Modified:
stack/native/branches/native-2.0/ant-import/build-bin-dist.xml
Log:
Include jbossxb in bin distro
Modified: stack/native/branches/native-2.0/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/build-bin-dist.xml 2007-08-13 15:47:05 UTC (rev 4342)
+++ stack/native/branches/native-2.0/ant-import/build-bin-dist.xml 2007-08-13 16:17:24 UTC (rev 4343)
@@ -92,6 +92,10 @@
<include name="jbossws-framework.jar"/>
<include name="jbossws-framework-scripts.zip"/>
<include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-jboss50-deployer.zip"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss40.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxrpc.jar"/>
@@ -108,18 +112,15 @@
<include name="jbossws-native50.sar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws-jboss50-deployer.zip"/>
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss40.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
<include name="getopt.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<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"/>
<include name="stax-ex.jar"/>
<include name="streambuffer.jar"/>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4342 - in legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 11:47:05 -0400 (Mon, 13 Aug 2007)
New Revision: 4342
Modified:
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
Set encoding in a few locations.
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 15:40:40 UTC (rev 4341)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-08-13 15:47:05 UTC (rev 4342)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamResult;
@@ -64,7 +65,7 @@
{
return null;
}
-
+
@Override
public OutputStream getOutputStream()
{
@@ -82,9 +83,19 @@
{
throw new UnsupportedOperationException();
}
-
+
public String toString()
{
- return baos.toString();
+ String result = null;
+ try
+ {
+ result = baos.toString("UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return result;
}
}
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-13 15:40:40 UTC (rev 4341)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-13 15:47:05 UTC (rev 4342)
@@ -30,6 +30,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -112,7 +113,16 @@
{
String retStr = null;
if (bytes != null)
- retStr = new String(bytes);
+ {
+ try
+ {
+ retStr = new String(bytes, "UTF-8");
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:40:40 UTC (rev 4341)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:47:05 UTC (rev 4342)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-13 15:40:40 UTC (rev 4341)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-13 15:47:05 UTC (rev 4342)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream());
+ reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
}
char[] cbuf = new char[1024];
17 years, 4 months
- 1
- 0
JBossWS SVN: r4341 - legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 11:40:40 -0400 (Mon, 13 Aug 2007)
New Revision: 4341
Modified:
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
Log:
Rollback
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:24:16 UTC (rev 4340)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:40:40 UTC (rev 4341)
@@ -24,7 +24,6 @@
// $Id$
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -98,7 +97,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray(),"UTF-8");
+ xmlFragment = new String(baos.toByteArray());
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -110,10 +109,6 @@
{
WSException.rethrow(e);
}
- catch (UnsupportedEncodingException e)
- {
- WSException.rethrow(e);
- }
return xmlFragment;
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4340 - in stack/native/branches/native-2.0/src: main/java/org/jboss/ws/core/server and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-13 11:24:16 -0400 (Mon, 13 Aug 2007)
New Revision: 4340
Modified:
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
Log:
Restore revisited SPI factory caching
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -29,7 +29,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,16 +45,18 @@
*/
public abstract class CommonSOAP11Binding extends CommonSOAPBinding
{
+ private MessageFactoryImpl msgFactory;
+
public CommonSOAP11Binding()
{
+ msgFactory = new MessageFactoryImpl();
+ msgFactory.setEnvNamespace(Constants.NS_SOAP11_ENV);
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP11_ENV);
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)factory.createMessage();
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgFactory.createMessage();
Use encStyle = opMetaData.getEndpointMetaData().getEncodingStyle();
if (Use.ENCODED.equals(encStyle))
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -26,12 +26,9 @@
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.MessageFactoryImpl;
@@ -46,17 +43,18 @@
*/
public abstract class CommonSOAP12Binding extends CommonSOAPBinding
{
-
+ private MessageFactoryImpl msgFactory;
+
public CommonSOAP12Binding()
{
+ msgFactory = new MessageFactoryImpl();
+ msgFactory.setEnvNamespace(Constants.NS_SOAP12_ENV);
}
/** Create the SOAP-1.1 message */
protected MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException
{
- MessageFactoryImpl factory = new MessageFactoryImpl();
- factory.setEnvNamespace(Constants.NS_SOAP12_ENV);
- return (MessageAbstraction)factory.createMessage();
+ return (MessageAbstraction)msgFactory.createMessage();
}
protected abstract Set<String> getRoles();
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -23,9 +23,31 @@
// $Id$
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.http.HTTPBinding;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.*;
+import org.jboss.ws.core.CommonBinding;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPBinding;
+import org.jboss.ws.core.CommonSOAPFaultException;
+import org.jboss.ws.core.DirectionHolder;
+import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.DirectionHolder.Direction;
import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC;
@@ -45,25 +67,15 @@
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.http.HTTPBinding;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
/** An implementation handles invocations on the endpoint
*
* @author Thomas.Diesler(a)jboss.org
@@ -78,6 +90,14 @@
protected CommonBindingProvider bindingProvider;
protected ServerHandlerDelegate delegate;
+ private WebServiceContextFactory contextFactory;
+
+ public ServiceEndpointInvoker()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ contextFactory = spiProvider.getSPI(WebServiceContextFactory.class);
+ }
+
/** Initialize the service endpoint */
public void init(Endpoint endpoint)
{
@@ -275,22 +295,15 @@
{
if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE)
{
- WebServiceContext wsContext;
if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(
- InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext
- );
+ WebServiceContext wsContext = contextFactory.newWebServiceContext(InvocationType.JAXWS_JSE, (SOAPMessageContextJAXWS)msgContext);
+ invContext.addAttachment(WebServiceContext.class, wsContext);
}
else
{
- // TODO: This is an ESB case, they require a custom MessageContext
- // that works independed of MessageContext.SERVLET_REQUEST
- throw new IllegalArgumentException("JBOSS-ESB? The current WebServiceContext impl. relies on HTTP.ServletRequest"+
- "You should provide a custom spi.invocation.InvocationHandlerFactory");
+ log.warn("Cannot provide WebServiceContext, since the current MessageContext does not provide a ServletRequest");
}
- invContext.addAttachment(WebServiceContext.class, wsContext);
}
invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext);
}
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -67,20 +67,26 @@
// Used if the style is dynamic
private boolean dynamic;
+ private EnvelopeBuilder envelopeBuilder;
+
public MessageFactoryImpl()
{
envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
+ envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
}
public MessageFactoryImpl(String protocol) throws SOAPException
{
+ envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
+
if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol) || SOAPConstants.DEFAULT_SOAP_PROTOCOL.equals(protocol))
envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
else if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol))
envNamespace = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE;
else if (SOAPConstants.DYNAMIC_SOAP_PROTOCOL.equals(protocol))
dynamic = true;
- else throw new SOAPException("Unknown protocol: " + protocol);
+ else
+ throw new SOAPException("Unknown protocol: " + protocol);
}
/**
@@ -249,11 +255,11 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = (EnvelopeBuilder) ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName());
- envBuilder.setStyle(getStyle());
+ envelopeBuilder.setStyle(getStyle());
+
// Build the payload
- envBuilder.build(soapMessage, inputStream, ignoreParseError);
+ envelopeBuilder.build(soapMessage, inputStream, ignoreParseError);
}
return soapMessage;
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -26,28 +26,32 @@
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.Token;
import org.jboss.ws.extensions.security.element.UsernameToken;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
import org.w3c.dom.Document;
public class ReceiveUsernameOperation implements TokenOperation
{
private SecurityHeader header;
private SecurityStore store;
+
+ private SecurityAdaptorFactory secAdapterfactory;
public ReceiveUsernameOperation(SecurityHeader header, SecurityStore store)
{
this.header = header;
this.store = store;
+
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
}
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+ SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -104,8 +104,14 @@
// provide logging
private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
+ private ServerConfig serverConfig;
+ private MessageFactoryImpl msgFactory;
+
RequestHandlerImpl()
{
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ msgFactory = new MessageFactoryImpl();
}
public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
@@ -376,7 +382,7 @@
}
else
{
- MessageFactoryImpl msgFactory = new MessageFactoryImpl();
+
msgFactory.setServiceMode(sepMetaData.getServiceMode());
msgFactory.setStyle(sepMetaData.getStyle());
@@ -526,10 +532,8 @@
if (reqURL.getPort() != -1)
wsdlHost += ":" + reqURL.getPort();
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
- wsdlHost = config.getWebServiceHost();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
+ wsdlHost = serverConfig.getWebServiceHost();
log.debug("WSDL request, using host: " + wsdlHost);
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-13 15:24:16 UTC (rev 4340)
@@ -71,11 +71,16 @@
private ArchiveDeployment dep;
// The expected wsdl location in the deployment
private String expLocation;
+ // The server config
+ private ServerConfig serverConfig;
public WSDLFilePublisher(ArchiveDeployment dep)
{
this.dep = dep;
-
+
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+
if (dep.getType().toString().endsWith("JSE"))
{
expLocation = "WEB-INF/wsdl/";
@@ -241,9 +246,8 @@
public void unpublishWsdlFiles() throws IOException
{
String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
+
+ File serviceDir = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
deleteWsdlPublishDirectory(serviceDir);
}
@@ -296,9 +300,7 @@
File locationFile = null;
if (predefinedLocation == false)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
+ locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName);
}
else
{
Modified: stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-13 15:21:30 UTC (rev 4339)
+++ stack/native/branches/native-2.0/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-13 15:24:16 UTC (rev 4340)
@@ -1,7 +1,7 @@
<jmeterTestPlan version="1.2" properties="1.8">
<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">
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
<collectionProp name="Arguments.arguments">
<elementProp name="host" elementType="Argument">
<stringProp name="Argument.metadata">=</stringProp>
@@ -21,7 +21,7 @@
<stringProp name="TestPlan.comments"></stringProp>
</TestPlan>
<hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_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>
@@ -46,7 +46,6 @@
<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>
@@ -56,6 +55,7 @@
</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,7 +65,6 @@
<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>
@@ -75,6 +74,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -95,8 +95,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -156,7 +156,6 @@
<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>
@@ -166,6 +165,7 @@
</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,7 +175,6 @@
<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>
@@ -185,6 +184,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -205,8 +205,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -259,7 +259,6 @@
<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>
@@ -272,6 +271,7 @@
</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,7 +281,6 @@
<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>
@@ -294,6 +293,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -314,8 +314,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -368,7 +368,6 @@
<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>
@@ -381,6 +380,7 @@
</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,7 +390,6 @@
<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>
@@ -403,6 +402,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -423,8 +423,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -477,7 +477,6 @@
<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>
@@ -490,6 +489,7 @@
</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,7 +499,6 @@
<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>
@@ -512,6 +511,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -532,8 +532,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -568,7 +568,7 @@
</ResultCollector>
<hashTree/>
</hashTree>
- <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Model1_JAXRPC" enabled="true">
+ <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>
@@ -593,7 +593,6 @@
<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>
@@ -603,6 +602,7 @@
</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,7 +612,6 @@
<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>
@@ -622,6 +621,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -642,8 +642,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -703,7 +703,6 @@
<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>
@@ -713,6 +712,7 @@
</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,7 +722,6 @@
<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>
@@ -732,6 +731,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -752,8 +752,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -806,7 +806,6 @@
<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>
@@ -819,6 +818,7 @@
</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,7 +828,6 @@
<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>
@@ -841,6 +840,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -861,8 +861,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -915,7 +915,6 @@
<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>
@@ -928,6 +927,7 @@
</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,7 +937,6 @@
<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>
@@ -950,6 +949,7 @@
</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>
+ <intProp name="Assertion.test_type">2</intProp>
<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">
@@ -970,8 +970,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1024,7 +1024,6 @@
<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>
@@ -1037,6 +1036,7 @@
</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,7 +1046,6 @@
<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>
@@ -1059,6 +1058,7 @@
</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 +1070,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1079,8 +1079,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1140,7 +1140,6 @@
<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>
@@ -1150,6 +1149,7 @@
</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,7 +1159,6 @@
<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>
@@ -1169,6 +1168,7 @@
</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 +1180,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1189,8 +1189,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1250,7 +1250,6 @@
<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>
@@ -1260,6 +1259,7 @@
</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,7 +1269,6 @@
<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>
@@ -1279,6 +1278,7 @@
</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 +1290,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1299,8 +1299,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -1353,7 +1353,6 @@
<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>
@@ -1366,6 +1365,7 @@
</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,7 +1375,6 @@
<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>
@@ -1388,6 +1387,7 @@
</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 +1399,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1408,8 +1408,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1462,7 +1462,6 @@
<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>
@@ -1475,6 +1474,7 @@
</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,7 +1484,6 @@
<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>
@@ -1497,6 +1496,7 @@
</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 +1508,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true">
@@ -1517,8 +1517,8 @@
<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>
- <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false">
@@ -1581,7 +1581,7 @@
</value>
<name>saveConfig</name>
</objProp>
- <stringProp name="filename">/tmp/test.csv</stringProp>
+ <stringProp name="filename">/tmp/model4.csv</stringProp>
<boolProp name="ResultCollector.error_logging">false</boolProp>
</ResultCollector>
<hashTree/>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4339 - legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-13 11:21:30 -0400 (Mon, 13 Aug 2007)
New Revision: 4339
Modified:
legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
Log:
Set the encoding.
Modified: legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:06:55 UTC (rev 4338)
+++ legacy/branches/dlofthouse/ASPATCH-260/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-08-13 15:21:30 UTC (rev 4339)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -97,7 +98,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(),"UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -109,6 +110,10 @@
{
WSException.rethrow(e);
}
+ catch (UnsupportedEncodingException e)
+ {
+ WSException.rethrow(e);
+ }
return xmlFragment;
}
17 years, 4 months
- 1
- 0