[jbossws-commits] JBossWS SVN: r4428 - in stack/native/trunk: ant-import and 15 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Aug 17 14:02:53 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-17 14:02:52 -0400 (Fri, 17 Aug 2007)
New Revision: 4428
Modified:
stack/native/trunk/
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/ant-import/macros-deploy-native.xml
stack/native/trunk/ant.properties.example
stack/native/trunk/build.xml
stack/native/trunk/src/main/distro/Install.txt
stack/native/trunk/src/main/distro/ReleaseNotes.txt
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.java
stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl
stack/native/trunk/version.properties
Log:
svn merge -r4289:4294 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4310:4311 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4322:4326 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4329:4356 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4390:4426 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
Update release targets
[JBWS-1617] JAXRPC doc/literal trims empty string
[JBWS-1766] UsernameToken ignores BindingProvider.USERNAME_PROPERTY
[JBWS-1670] SunRI client does not throw UserException. Do not unwrap InvocationTargetException
check framework svn:externals definition
Include jbossxb in bin distro
Restore revisited SPI factory caching
Add testNamespaceCompletionDefault
overwrite etc files
Property changes on: stack/native/trunk
___________________________________________________________________
Name: svn:ignore
- output-eclipse
output
thirdparty
output*
version.properties.md5
ant.properties
+ output-eclipse
output
thirdparty
output*
version.properties.md5
ant.properties
clipboard.txt
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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"/>
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/ant-import/build-release.xml 2007-08-17 18:02:52 UTC (rev 4428)
@@ -13,8 +13,30 @@
<project>
+ <target name="release" depends="release-to-repository,release-to-portal" description="Release JBossWS">
+ <echo message="*********************************************"/>
+ <echo message="* Released: jbossws-${version.id}"/>
+ <echo message="*"/>
+ <echo message="* Almost there, please do these steps manually"/>
+ <echo message="*"/>
+ <echo message="* - Create SVN tag: jbossws-native-${version.id}"/>
+ <echo message="* - Release the jbossws-${version.id} version in JIRA"/>
+ <echo message="* - Update portal-content/project.xml"/>
+ <echo message="* - Update portal-content/counter.xml"/>
+ <echo message="* - Update news in portal-content/freezone/projectDescription.html"/>
+ <echo message="* - Verify release notes and install instructions"/>
+ <echo message="* - Publish the interop endpoints"/>
+ <echo message="* - Commit the portal-content"/>
+ <echo message="* - Commit the repository jars"/>
+ <echo message="* - Write a sticky post on the user forum"/>
+ <echo message="* - Post a message to jbossws-announce at lists.jboss.org"/>
+ <echo message="* - Post a message to thecore at jboss.org"/>
+ <echo message="*"/>
+ <echo message="*********************************************"/>
+ </target>
+
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jars"
+ <target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
<!-- jboss/jbossws -->
@@ -81,4 +103,74 @@
</copy>
</target>
+ <target name="check-svn-externals" depends="init">
+ <exec dir="${core.dir}/src/test-framework" executable="svn" failonerror="true" output="${core.dir}/output/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${core.dir}/output/svn-info.xml"/>
+ <condition property="framework.externals.ok">
+ <or>
+ <contains string="${info.entry.url}" substring="https://svn.jboss.org/repos/jbossws/framework/tags"/>
+ <equals arg1="${repository.id}" arg2="snapshot"/>
+ </or>
+ </condition>
+ </target>
+ <target name="warn-svn-externals" depends="init" unless="framework.externals.ok">
+ <echo>
+ ***********************************************
+ * External link to framework is not tagged! *
+ * Run: svn pe svn:externals src *
+ ***********************************************
+ </echo>
+ </target>
+
+ <!-- Release to portal content -->
+ <target name="release-to-portal" depends="check-portal-content,build-src-dist,build-bin-dist"
+ description="Release to portal-content" if="jbossws.portal.content.available">
+
+ <property name="portal.freezone" value="${jbossws.portal.content}/freezone"/>
+ <property name="portal.userguide" value="${portal.freezone}/user-guide"/>
+ <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/>
+
+ <!-- Copy downloads -->
+ <copy todir="${portal.downloads}" overwrite="true">
+ <fileset dir="${core.dir}/output">
+ <include name="jbossws-native-src-${version.id}.zip"/>
+ <include name="jbossws-native-${version.id}.zip"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy Release Notes -->
+ <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${core.dir}/output/jbossws-native-${version.id}/docs/ReleaseNotes.txt" overwrite="true"/>
+ <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${core.dir}/output/jbossws-native-${version.id}/docs/Install.txt" overwrite="true"/>
+ </target>
+
+ <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available">
+ <echo message="*********************************************"/>
+ <echo message="* Not available: ${jbossws.portal.content}"/>
+ <echo message="*********************************************"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Build source distributions -->
+ <!-- ================================================================== -->
+
+ <!-- Build the src dist -->
+ <target name="build-src-dist" description="Build the source distribution">
+ <property name="build.src.dist" value="${core.dir}/output/src-dist"/>
+ <delete dir="${build.src.dist}/jbossws-native-src-${version.id}"/>
+ <mkdir dir="${build.src.dist}/jbossws-native-src-${version.id}"/>
+ <copy todir="${build.src.dist}/jbossws-native-src-${version.id}">
+ <fileset dir="${basedir}">
+ <exclude name="**/*.md5"/>
+ <exclude name="**/output*/**"/>
+ <exclude name="**/thirdparty/**"/>
+ <exclude name="mergeinfo.txt"/>
+ </fileset>
+ </copy>
+ <zip destfile="${core.dir}/output/jbossws-native-src-${version.id}.zip" basedir="${build.src.dist}"
+ includes="jbossws-native-src-${version.id}/**"/>
+ </target>
+
</project>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-17 18:02:52 UTC (rev 4428)
@@ -88,8 +88,8 @@
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/>
@@ -97,8 +97,8 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
@@ -117,8 +117,8 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
@@ -127,9 +127,6 @@
<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/jbossxb-2.0.0-20070620.094346-1.jar" 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/jbossxb-1.0.0-20070620.100638-1.jar" dest="${thirdparty.dir}/jbossxb-1.0.0-20070620.100638-1.jar" usetimestamp="true" verbose="true"/>
-
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/ant.properties.example 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/build.xml 2007-08-17 18:02:52 UTC (rev 4428)
@@ -82,7 +82,7 @@
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${core.output.etc.dir}"/>
- <copy todir="${core.output.etc.dir}" filtering="yes">
+ <copy todir="${core.output.etc.dir}" filtering="yes" overwrite="true">
<fileset dir="${core.etc.dir}"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/distro/Install.txt 2007-08-17 18:02:52 UTC (rev 4428)
@@ -7,9 +7,6 @@
Installation instructions
=========================
-This distribution ships with JBoss binaries for JDK1.4 and JDK1.5.
-Please make sure your chose the right distribution that fits your target JDK.
-
In order to install JBossWS the following steps are necessary:
1.) Copy ant.properties.examples to ant.properties
@@ -19,8 +16,6 @@
ant deploy-jboss50
ant deploy-jboss42
ant deploy-jboss40
- ant deploy-jboss40-jdk14
- ant deploy-tomcat
Please consult the wiki for detailed up to date install instructions
http://labs.jboss.com/portal/jbossws/
Modified: stack/native/trunk/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/trunk/src/main/distro/ReleaseNotes.txt 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/distro/ReleaseNotes.txt 2007-08-17 18:02:52 UTC (rev 4428)
@@ -27,6 +27,56 @@
Feature Request
+ * [JBWS-1736] - MTOM property at service-ref level
+
+Bug
+
+ * [JBWS-1453] - WSDL To Java - Invalid name for generated class if complex type name contains a period.
+ * [JBWS-1536] - NPE in WSDL to Java when webservices.xml requested but no global package mapping
+ * [JBWS-1617] - JAXRPC doc/literal trims empty string
+ * [JBWS-1702] - JAXWS type inheritance
+ * [JBWS-1723] - WSDL To Java - Anonymous Types Referenced As Bound Headers Not Handled Correctly
+ * [JBWS-1725] - WSDL-JAVA Derivation of a complex type from a Simple type: bas64Binary is not mapped to byte[]
+ * [JBWS-1732] - WSProvideTask throws IllegalArgumentException
+ * [JBWS-1733] - JAXWS client ignores BindingProvider.SESSION_MAINTAIN_PROPERTY
+ * [JBWS-1747] - org.jboss.wsf.container.jboss42.WebMetaDataAdapter doesn't check if there's a J2eeApplicationMetaData instance set on the DeploymentInfo parent
+ * [JBWS-1749] - JBossWS2.0.0.GA download does not contain updated jboss-xml-binding library
+ * [JBWS-1762] - web.xml modified to web.xml.org - Subsequent runs fail
+ * [JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8
+ * [JBWS-1766] - UsernameToken ignores BindingProvider.USERNAME_PROPERTY
+ * [JBWS-1771] - Post-handler-chain not invoked for "Standard Client" configuration with DII client
+ * [JBWS-1780] - Context servlet throws NPE
+
+
+Task
+
+ * [JBWS-1729] - Create a comprehensive SPI tools test suite
+ * [JBWS-1770] - Fix Endpoint API for jboss-5.0.0.Beta3
+
+Errata
+------
+
+ FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface
+ FIXME: [JBCTS-624] R2753 cannot parse web.xml for jsp vehicle
+ FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations
+ FIXME: [JBWS-1665] incorrect wsdl generation
+ FIXME: [JBWS-1772] WSConsume output is not correctly redirected
+ FIXME: [JBWS-1773] Verify isolated classloading with WSConsume
+ FIXME: [JBWS-1776] Verify isolated classloading with WSProvide
+ FIXME: [JBWS-751] Multiple schema imports with the same namespace
+ FIXME: [JBWS-798] Complete EventingTestCase
+ FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
+
+Enjoy,
+The JBossWS Team
+
+Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What's new in jbossws-2.0.0
+---------------------------
+
+Feature Request
+
* [JBWS-434] - Support sequences of anys in JAXRPC
* [JBWS-1460] - @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations
* [JBWS-1518] - Add support for jdk-1.6
@@ -110,11 +160,6 @@
FIXME: [JBWS-798] Complete EventingTestCase
FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
-Enjoy,
-The JBossWS Team
-
-Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
What's new in JBossWS-1.2.1
---------------------------
Feature Request
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAP12Binding.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -114,6 +114,8 @@
if (Service.class.isAssignableFrom(serviceClass) == false)
throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service");
+
+ log.debug("Loaded Service '" + serviceClass.getName() + "' from: " + serviceClass.getProtectionDomain().getCodeSource());
// Receives either a javax.xml.ws.Service or a dynamic proxy
Object target;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -92,6 +92,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)
{
@@ -206,7 +214,7 @@
// Invoke an instance of the SEI implementation bean
Invocation inv = setupInvocation(endpoint, sepInv, invContext);
InvocationHandler invHandler = endpoint.getInvocationHandler();
-
+
try
{
invHandler.invoke(endpoint, inv);
@@ -299,20 +307,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/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -31,6 +31,7 @@
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
+import javax.xml.ws.BindingProvider;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -252,6 +253,12 @@
{
Object user = ctx.get(Stub.USERNAME_PROPERTY);
Object pass = ctx.get(Stub.PASSWORD_PROPERTY);
+
+ if (user == null && pass == null)
+ {
+ user = ctx.get(BindingProvider.USERNAME_PROPERTY);
+ pass = ctx.get(BindingProvider.PASSWORD_PROPERTY);
+ }
if (user != null && pass != null)
{
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -211,6 +211,8 @@
// Try the filename as Resource
if (fileURL == null)
{
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
fileURL = wsClass.getClassLoader().getResource(filename);
}
@@ -232,6 +234,8 @@
if (fileURL == null)
throw new WSException("Cannot resolve handler file '" + filename + "' on " + wsClass.getName());
+ log.debug("Loading handler chain: " + fileURL);
+
UnifiedHandlerChainsMetaData handlerChainsMetaData = null;
try
{
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -133,6 +133,34 @@
assertEquals(expStr, wasStr);
}
+ /** The envelope defines a default namespace
+ */
+ public void testNamespaceCompletionDefault() throws Exception
+ {
+ String inStr =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns='http://somens'>" +
+ "<env:Body>" +
+ "<rpc>" +
+ "<param1/>" +
+ "<param2/>" +
+ "</rpc>" +
+ "</env:Body>" +
+ "</env:Envelope>";
+
+ Element env = DOMUtils.parse(inStr);
+ Element body = DOMUtils.getFirstChildElement(env);
+ Element rpc = DOMUtils.getFirstChildElement(body);
+
+ String expStr =
+ "<rpc xmlns='http://somens'>" +
+ "<param1/>" +
+ "<param2/>" +
+ "</rpc>";
+
+ String wasStr = DOMWriter.printNode(rpc, false);
+ assertEquals(expStr, wasStr);
+ }
+
/** The element does not contain the required attribute ns declaration.
*/
public void testNamespaceCompletionAttribute() throws Exception
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -608,10 +608,9 @@
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);
+ in = " ";
+ out = stringTest(in);
+ assertEquals(in, out);
}
public void testStringSpecialChars() throws Exception
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -21,36 +21,39 @@
*/
package org.jboss.test.ws.jaxws.jbws1733;
+import javax.annotation.Resource;
import javax.jws.WebService;
-import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
- at WebService(name="JBWS1733", serviceName="JBWS1733Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
+ at WebService(name = "JBWS1733", serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
public class JBWS1733Impl implements JBWS1733
{
-
+
@Resource
private WebServiceContext wsContext;
-
+
public int getCounter()
{
- MessageContext mc = wsContext.getMessageContext();
- HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
- // Get a session property "counter" from context
- if (session == null)
- throw new WebServiceException("No session in WebServiceContext");
- Integer counter = (Integer)session.getAttribute("counter");
- if (counter == null) {
- counter = new Integer(0);
- System.out.println("Starting the Session");
- }
- counter = new Integer(counter.intValue() + 1);
- session.setAttribute("counter", counter);
- return counter;
+ MessageContext mc = wsContext.getMessageContext();
+ HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+
+ // Get a session property "counter" from context
+ if (session == null)
+ throw new WebServiceException("No session in WebServiceContext");
+
+ Integer counter = (Integer)session.getAttribute("counter");
+ if (counter == null)
+ {
+ counter = new Integer(0);
+ System.out.println("Starting the Session");
+ }
+ counter = new Integer(counter.intValue() + 1);
+ session.setAttribute("counter", counter);
+ return counter;
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -24,8 +24,8 @@
import java.net.URL;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import junit.framework.Test;
@@ -47,7 +47,7 @@
{
return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war");
}
-
+
@Override
protected void setUp() throws Exception
{
@@ -59,14 +59,13 @@
Service service = Service.create(wsdlURL, serviceName);
proxy = (JBWS1733)service.getPort(JBWS1733.class);
}
-
- public void testIssue() throws Exception {
- ((BindingProvider)proxy)
- .getRequestContext()
- .put(BindingProvider.SESSION_MAINTAIN_PROPERTY,true);
- for ( int i = 1; i <= 10; i++ ) {
- assertTrue( proxy.getCounter() == i );
+ public void testIssue() throws Exception
+ {
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true);
+ for (int i = 1; i <= 10; i++)
+ {
+ assertTrue(proxy.getCounter() == i);
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -39,53 +39,55 @@
* Test WS-Security for Username Token
*
* @author <a href="mailto:mageshbk at jboss.com">Magesh Kumar B</a>
+ * @author Thomas.Diesler at jboss.com
* @since 15-Aug-2007
- * @version $Revision$
*/
public class SimpleUsernameTestCase extends JBossWSTest
{
- /** Construct the test case with a given name
- */
+ private static UsernameEndpoint port;
- /** Deploy the test */
public static Test suite() throws Exception
{
return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war");
}
- /**
- * Test SOAP Envelope for Username Token
- */
- public void testUsernameToken() throws Exception
+ @Override
+ protected void setUp() throws Exception
{
- UsernameEndpoint username = getPort();
+ if (port == null)
+ {
+ URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
+ URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
- String retObj = username.getUsernameToken();
- System.out.println("FIXME [JBWS-1790]: UsernameToken is no longer present in Header after it is processed");
- //assertTrue(retObj.indexOf("UsernameToken") > 0);
+ Service service = Service.create(wsdlURL, serviceName);
+
+ port = (UsernameEndpoint)service.getPort(UsernameEndpoint.class);
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+ }
}
- private UsernameEndpoint getPort() throws Exception
+ public void testUsernameTokenNegative() throws Exception
{
- URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
- QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
+ try
+ {
+ port.getUsernameToken();
+ fail("Server should respond with [401] - Unauthorized");
+ }
+ catch (Exception ex)
+ {
+ // this should be ok
+ }
+ }
- Service service = Service.create(wsdlURL, serviceName);
-
- UsernameEndpoint port = (UsernameEndpoint)service.getPort(UsernameEndpoint.class);
- ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
- ((StubExt)port).setConfigName("Standard WSSecurity Client");
-
+ public void testUsernameToken() throws Exception
+ {
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
- reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
+ reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
- // If these below parameters are set it appears in the log, but the test fails as another
- // request for the getHeader() returns empty <env:Header></env:Header>
- //reqContext.put("javax.xml.rpc.security.auth.username", "kermit");
- //reqContext.put("javax.xml.rpc.security.auth.password", "thefrog");
- reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-username");
- return port;
+ String retObj = port.getUsernameToken();
+ assertEquals("kermit", retObj);
}
}
\ No newline at end of file
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -21,32 +21,26 @@
*/
package org.jboss.test.ws.jaxws.samples.wssecurity;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
+// $Id$
+import java.security.Principal;
+
import javax.annotation.Resource;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
import javax.xml.ws.WebServiceContext;
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.core.soap.SOAPHeaderImpl;
/**
* The SEI implementation used by the SimpleUsernameTestCase
*
* @author <a href="mailto:mageshbk at jboss.com">Magesh Kumar B</a>
+ * @author Thomas.Diesler at jboss.com
* @since 15-Aug-2007
- * @version $Revision$
*/
@WebService(name = "UsernameEndpoint", serviceName = "UsernameService", targetNamespace = "http://org.jboss.ws/samples/wssecurity")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
@@ -54,32 +48,16 @@
public class UsernameBean
{
private Logger log = Logger.getLogger(UsernameBean.class);
-
+
@Resource
WebServiceContext wsCtx;
@WebMethod
+ @WebResult(partName = "return")
public String getUsernameToken()
{
- String retObj = "<wsse:UsernameToken wsu:Id='token-1-1187274179843-29806874'></wsse:UsernameToken>";
-
- try
- {
- MessageContext jaxwsContext = (MessageContext)wsCtx.getMessageContext();
- SOAPHeader soapHeader = ((SOAPMessageContext)jaxwsContext).getMessage().getSOAPPart().getEnvelope().getHeader();
- StringWriter strw = new StringWriter();
- ((SOAPHeaderImpl)soapHeader).writeElement(strw);
- retObj = strw.toString();
- log.info(retObj);
- }
- catch (SOAPException se)
- {
- log.error(se.getMessage());
- }
- catch (IOException ioe)
- {
- log.error(ioe.getMessage());
- }
- return retObj;
+ Principal principal = wsCtx.getUserPrincipal();
+ log.info("getUsernameToken: " + principal);
+ return principal.toString();
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.java 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.java 2007-08-17 18:02:52 UTC (rev 4428)
@@ -1,12 +1,30 @@
-
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxws.samples.wssecurity;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
/**
* The SEI
@@ -19,11 +37,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface UsernameEndpoint {
- /**
- *
- * @return
- * returns java.lang.String
- */
@WebMethod
@WebResult(partName = "return")
public String getUsernameToken();
Modified: stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx
===================================================================
--- stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-08-17 18:02:52 UTC (rev 4428)
@@ -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/>
Modified: stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/src/test/resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl 2007-08-17 18:02:52 UTC (rev 4428)
@@ -24,7 +24,7 @@
</binding>
<service name='UsernameService'>
<port binding='tns:UsernameEndpointBinding' name='UsernameEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-wssecurity-username'/>
</port>
</service>
</definitions>
\ No newline at end of file
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-08-17 17:05:57 UTC (rev 4427)
+++ stack/native/trunk/version.properties 2007-08-17 18:02:52 UTC (rev 4428)
@@ -17,7 +17,6 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.6.2
jbpm-bpel=1.1.0.Beta5
-jboss-remoting=2.2.0.SP4
stax-api=1.0
sun-jaxb=2.1.4
sun-jaxws=2.1.1
@@ -25,23 +24,23 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-framework=2.0.1.CR1
-jbossws-common=1.0.0.CR1
-jbossws-spi=1.0.0.CR1
-jbossws-jboss40=2.0.1.CR1
-jbossws-jboss42=2.0.1.CR1
-jbossws-jboss50=2.0.1.CR1
+jbossws-spi=1.0.0.GA
+jbossws-common=1.0.0.GA
+jbossws-framework=2.0.1.GA
+jbossws-jboss40=2.0.1.GA
+jbossws-jboss42=2.0.1.GA
+jbossws-jboss50=2.0.1.GA
# JBossAS-5.0
-jboss-jbossxb-jboss50=2.0.0.CR2
+jboss-jbossxb-jboss50=2.0.0.CR4
jboss-remoting-jboss50=2.2.0.SP4
# JBossAS-4.2
-jboss-jbossxb-jboss42=1.0.0.GA
+jboss-jbossxb-jboss42=1.0.0.CR11
jboss-remoting-jboss42=2.2.1.GA
# JBossAS-4.0
-jboss-jbossxb-jboss40=1.0.0.GA
+jboss-jbossxb-jboss40=1.0.0.CR11
jboss-remoting-jboss40=1.4.3.GA
# Thirdparty library versions
@@ -66,7 +65,6 @@
jboss-microcontainer=2.0.0.Beta3
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
-jboss-jbossxb=1.0.0.GA
jbossas-core-libs=4.2.0.GA
junit=3.8.1
oswego-concurrent=1.3.4
More information about the jbossws-commits
mailing list