[jbossws-commits] JBossWS SVN: r3400 - in trunk: build/hudson/hudson-home/jobs and 31 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Jun 3 06:11:53 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-03 06:11:51 -0400 (Sun, 03 Jun 2007)
New Revision: 3400
Added:
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-All/
trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-All/
trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java
trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder
Removed:
trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java
Modified:
trunk/build/ant.properties.example
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java
trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java
Log:
[JBWS-1647] Text Node Preservation For Messages Sent Across The Wire
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/build/ant.properties.example 2007-06-03 10:11:51 UTC (rev 3400)
@@ -52,7 +52,7 @@
# Java Compiler options
javac.debug=yes
-javac.deprecation=yes
+javac.deprecation=no
javac.fail.onerror=yes
javac.verbose=no
Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>AS-Tests-5.0, AS-Tests-4.2, AS-Tests-4.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all AS webservice testsuites agains jbossws- at version.id@</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all JBossWS core tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Distro-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Distro-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all distribution tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-All (from rev 3395, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1)
Deleted: trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
+++ trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector"/>
- <publishers class="vector">
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
- </hudson.tasks.BuildTrigger>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 2 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build the relase matrix target containers.</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml (from rev 3399, trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Integration-All/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run all integration tests</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ <childProjects>AS-Tests-All, Core-Tests-All, Integration-All, Distro-All</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/.classpath 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,5 +36,6 @@
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
+ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/build.xml 2007-06-03 10:11:51 UTC (rev 3400)
@@ -150,7 +150,7 @@
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
- <metainf dir="${core.resources.dir}/jbossws-core.jar"/>
+ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
</jar>
<!-- Build jbossws-client.jar -->
@@ -166,6 +166,7 @@
<fileset dir="${core.etc.dir}">
<include name="log4j.properties"/>
</fileset>
+ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
<metainf dir="${core.resources.dir}/standard-config">
<include name="standard-jaxrpc-client-config.xml"/>
<include name="standard-jaxws-client-config.xml"/>
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/MessageFactory.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -83,7 +83,7 @@
if (factory == null)
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
- factory = saajFactory.newMessageFactory(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
+ factory = saajFactory.newMessageFactory(SOAPConstants.DEFAULT_SOAP_PROTOCOL);
}
if (factory == null)
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConstants.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -30,16 +30,16 @@
*/
public interface SOAPConstants
{
+ /** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.1 specification */
+ String SOAP_1_1_PROTOCOL = "SOAP 1.1 Protocol";
+ /** The media type of the Content-Type MIME header in SOAP 1.2. */
+ String SOAP_1_2_CONTENT_TYPE = "application/soap+xml";
/** The default protocol: SOAP 1.1 for backwards compatibility. */
- String DEFAULT_SOAP_PROTOCOL = "SOAP 1.1 Protocol";
+ String DEFAULT_SOAP_PROTOCOL = SOAP_1_1_PROTOCOL;
/** Used to create MessageFactory instances that create SOAPMessages whose concrete type is based on the Content-Type MIME header passed to the createMessage method. */
String DYNAMIC_SOAP_PROTOCOL = "Dynamic Protocol";
/** The media type of the Content-Type MIME header in SOAP 1.1. */
String SOAP_1_1_CONTENT_TYPE = "text/xml";
- /** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.1 specification */
- String SOAP_1_1_PROTOCOL = "SOAP 1.1 Protocol";
- /** The media type of the Content-Type MIME header in SOAP 1.2. */
- String SOAP_1_2_CONTENT_TYPE = "application/soap+xml";
/** Used to create MessageFactory instances that create SOAPMessages whose behavior supports the SOAP 1.2 specification */
String SOAP_1_2_PROTOCOL = "SOAP 1.2 Protocol";
/** The default namespace prefix for http://www.w3.org/2003/05/soap-envelope */
Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPFactory.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -73,7 +73,7 @@
if (soapFactory == null)
{
SAAJMetaFactory saajFactory = SAAJMetaFactory.getInstance();
- soapFactory = saajFactory.newSOAPFactory(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
+ soapFactory = saajFactory.newSOAPFactory(SOAPConstants.DEFAULT_SOAP_PROTOCOL);
}
if (soapFactory == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -48,8 +48,8 @@
import org.jboss.ws.core.client.EndpointInfo;
import org.jboss.ws.core.client.SOAPRemotingConnection;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAP11Binding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,10 +32,10 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.umdm.OperationMetaData;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -52,8 +52,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
@@ -61,13 +59,16 @@
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPBodyElementDoc;
import org.jboss.ws.core.soap.SOAPBodyElementRpc;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.SOAPElementImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.core.soap.SOAPHeaderElementImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.UnboundHeader;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.utils.MimeUtils;
@@ -544,13 +545,9 @@
msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
SOAPHeader soapHeader = soapEnvelope.getHeader();
- SOAPBody soapBody = soapEnvelope.getBody();
- Iterator bodyChildren = soapBody.getChildElements();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody();
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
- SOAPBodyElement soapBodyElement = null;
- if (bodyChildren.hasNext() != false)
- soapBodyElement = (SOAPBodyElement)bodyChildren.next();
-
// Translate the SOAPFault to an exception and throw it
if (soapBodyElement instanceof SOAPFaultImpl)
throwFaultException((SOAPFaultImpl)soapBodyElement);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -43,6 +43,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.core.jaxrpc;
-
-// $Id$
-
-/** A type-safe enumeration for encoding style.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 14-Oct-2004
- */
-public class Style
-{
- private String style;
-
- public static final Style RPC = new Style("rpc");
- public static final Style DOCUMENT = new Style("document");
-
- private Style(String style)
- {
- this.style = style;
- }
-
- public static Style getDefaultStyle()
- {
- return DOCUMENT;
- }
-
- public static Style valueOf(String style)
- {
- if (RPC.style.equals(style))
- return RPC;
- if (DOCUMENT.style.equals(style))
- return DOCUMENT;
-
- throw new IllegalArgumentException("Unsupported style: " + style);
- }
-
- public String toString()
- {
- return style;
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,74 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.core.jaxrpc;
-
-import org.jboss.ws.Constants;
-
-// $Id$
-
-/** A type-safe enumeration for encoding use.
- *
- * @author Thomas.Diesler at jboss.org
- * @since 16-Oct-2005
- */
-public class Use
-{
- private String use;
-
- public static final Use LITERAL = new Use("literal");
- public static final Use ENCODED = new Use("encoded");
-
- private Use(String use)
- {
- this.use = use;
- }
-
- public static Use getDefaultUse()
- {
- return LITERAL;
- }
-
- public static Use valueOf(String encodingStyle)
- {
- if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle))
- return LITERAL;
- if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle))
- return ENCODED;
-
- throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle);
- }
-
- public String toURI()
- {
- String encURI = null;
- if (this == LITERAL)
- encURI = Constants.URI_LITERAL_ENC;
- else if (this == ENCODED)
- encURI = Constants.URI_SOAP11_ENC;
- return encURI;
- }
-
- public String toString()
- {
- return use;
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -23,10 +23,12 @@
// $Id$
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import javax.xml.ws.handler.Handler;
@@ -93,9 +95,9 @@
SOAPMessage reqMessage = (SOAPMessage)payload;
SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody();
- SOAPContentElement bodyElement = (SOAPContentElement)body.getFirstChild();
+
+ SOAPContentElement bodyElement = (SOAPContentElement)body.getBodyElement();
Source source = bodyElement.getXMLFragment().getSource();
-
if (source == null)
throw new IllegalStateException("Payload cannot be null");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,6 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
@@ -157,8 +156,8 @@
{
if (mode == Mode.PAYLOAD)
{
- SOAPBody soapBody = resMsg.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
+ SOAPElement soapElement = soapBody.getBodyElement();
retObj = new DOMSource(soapElement);
}
if (mode == Mode.MESSAGE)
@@ -171,7 +170,7 @@
else if (jaxbContext != null)
{
SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPElement soapElement = soapBody.getBodyElement();
log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false));
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageContextImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import javax.xml.ws.handler.MessageContext;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
/**
* The LogicalMessageContext interface extends MessageContext to provide access to a the
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,8 +39,13 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.soap.*;
+import org.jboss.ws.core.soap.EnvelopeBuilder;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.ws.integration.FactoryLoader;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
@@ -106,9 +111,10 @@
try
{
soapBody.removeContents();
- EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(style);
Element domBodyElement = DOMUtils.sourceToElement(source);
- builder.buildBodyElementRpc(soapBody, domBodyElement);
+ envBuilder.buildBodyElementRpc(soapBody, domBodyElement);
}
catch (IOException ex)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -25,6 +25,7 @@
import java.lang.reflect.Method;
import java.util.HashMap;
+import java.util.Iterator;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -62,6 +63,7 @@
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -395,10 +397,11 @@
if (opMetaData == null)
{
String faultString;
- SOAPBody soapBody = soapMessage.getSOAPBody();
- if (soapBody.getChildElements().hasNext())
+
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ if (soapBodyElement != null)
{
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
Name soapName = soapBodyElement.getElementName();
faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -25,11 +25,16 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import org.w3c.dom.Element;
+
+
/**
* @author Heiko Braun, <heiko.braun at jboss.com>
* @author Thomas.Diesler at jboss.com
@@ -37,5 +42,17 @@
*/
public interface EnvelopeBuilder
{
+ Style getStyle();
+
+ void setStyle(Style style);
+
SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException;
+
+ SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException;
+
+ SOAPEnvelope build(SOAPMessage soapMessage, Element domEnv) throws SOAPException;
+
+ SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException;
+
+ SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,6 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -42,7 +41,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
@@ -63,14 +61,16 @@
// provide logging
private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class);
- private SOAPFactoryImpl soapFactory;
- private String envNamespace;
- private boolean isSOAP11;
+ private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
private Style style;
- public EnvelopeBuilderDOM(Style style)
+ public Style getStyle()
{
- this.soapFactory = new SOAPFactoryImpl();
+ return style;
+ }
+
+ public void setStyle(Style style)
+ {
this.style = style;
}
@@ -120,10 +120,6 @@
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
SOAPEnvelopeImpl soapEnv = new SOAPEnvelopeImpl(soapPart, soapFactory.createElement(domEnv, false), false);
- // Get the envelope namespace
- envNamespace = soapEnv.getNamespaceURI();
- isSOAP11 = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(envNamespace);
-
DOMUtils.copyAttributes(soapEnv, domEnv);
NodeList envChildNodes = domEnv.getChildNodes();
@@ -305,7 +301,7 @@
XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement));
contentElement.setXMLFragment(xmlFragment);
-
+
return soapBodyElement;
}
@@ -393,21 +389,15 @@
private void appendCommentNode(SOAPElement soapElement, Node child)
{
- if (isSOAP11)
- {
- String nodeValue = child.getNodeValue();
- Document ownerDoc = soapElement.getOwnerDocument();
- Comment comment = ownerDoc.createComment(nodeValue);
- soapElement.appendChild(comment);
- }
+ String nodeValue = child.getNodeValue();
+ Document ownerDoc = soapElement.getOwnerDocument();
+ Comment comment = ownerDoc.createComment(nodeValue);
+ soapElement.appendChild(comment);
}
private void appendTextNode(SOAPElement soapElement, Node child) throws SOAPException
{
- if (isSOAP11)
- {
- String nodeValue = child.getNodeValue();
- soapElement.addTextNode(nodeValue);
- }
+ String nodeValue = child.getNodeValue();
+ soapElement.addTextNode(nodeValue);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,10 +26,12 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
@@ -40,6 +42,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
+import org.jboss.util.NotImplementedException;
import org.w3c.dom.Element;
import com.ctc.wstx.stax.WstxInputFactory;
@@ -469,4 +472,34 @@
return builder.toString();
}
+
+ public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPEnvelope build(SOAPMessage soapMessage, Element domEnv) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPBodyElement buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public SOAPBodyElement buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
+ {
+ throw new NotImplementedException();
+ }
+
+ public Style getStyle()
+ {
+ throw new NotImplementedException();
+ }
+
+ public void setStyle(Style style)
+ {
+ throw new NotImplementedException();
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,7 +26,6 @@
import java.util.Iterator;
import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
@@ -51,9 +50,9 @@
private static Logger log = Logger.getLogger(HRefInlineHandler.class);
private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
- private SOAPBody soapBody;
+ private SOAPBodyImpl soapBody;
- public HRefInlineHandler(SOAPBody soapBody)
+ public HRefInlineHandler(SOAPBodyImpl soapBody)
{
this.soapBody = soapBody;
}
@@ -63,16 +62,21 @@
String bodyStr = DOMWriter.printNode(soapBody, true);
log.debug("Begin processHRefs:\n" + bodyStr);
- SOAPBodyElement bodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
- processElement(bodyElement);
+ SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
+ processElement(soapBodyElement);
+ // Process elements after SOAPBodyElement
Iterator it = soapBody.getChildElements();
while (it.hasNext())
{
- // Remove id elements
- SOAPElement soapElement = (SOAPElement)it.next();
- if ((soapElement instanceof SOAPBodyElement) == false)
- soapBody.removeChild(soapElement);
+ Object next = it.next();
+ if (next instanceof SOAPElement)
+ {
+ // Remove id elements
+ SOAPElement soapElement = (SOAPElement)next;
+ if ((soapElement instanceof SOAPBodyElement) == false)
+ soapBody.removeChild(soapElement);
+ }
}
bodyStr = DOMWriter.printNode(soapBody, true);
@@ -105,11 +109,15 @@
Iterator it = soapBody.getChildElements();
while (it.hasNext())
{
- SOAPElement auxElement = (SOAPElement)it.next();
- if (href.equals("#" + auxElement.getAttribute("id")))
+ Object next = it.next();
+ if (next instanceof SOAPElement)
{
- idElement = (SOAPElement)auxElement;
- break;
+ SOAPElement auxElement = (SOAPElement)next;
+ if (href.equals("#" + auxElement.getAttribute("id")))
+ {
+ idElement = (SOAPElement)auxElement;
+ break;
+ }
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -43,9 +43,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
+import org.jboss.ws.integration.FactoryLoader;
import org.jboss.wsf.spi.utils.IOUtils;
/**
@@ -150,7 +150,7 @@
public SOAPMessage createMessage() throws SOAPException
{
if (dynamic)
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException("Cannot create default message when protocol is dynamic");
SOAPMessageImpl soapMessage = new SOAPMessageImpl();
SOAPPartImpl soapPart = (SOAPPartImpl)soapMessage.getSOAPPart();
@@ -249,7 +249,8 @@
soapMessage.setAttachments(attachments);
// Get the SOAPEnvelope builder
- EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle());
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(getStyle());
// Build the payload
envBuilder.build(soapMessage, inputStream, ignoreParseError);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -182,6 +182,19 @@
return getChildElements(new QName(getNamespaceURI(), "Fault"));
}
+ public SOAPBodyElement getBodyElement()
+ {
+ SOAPBodyElement bodyElement = null;
+ Iterator it = getChildElements();
+ while (bodyElement == null && it.hasNext())
+ {
+ Object next = it.next();
+ if (next instanceof SOAPBodyElement)
+ bodyElement = (SOAPBodyElement)next;
+ }
+ return bodyElement;
+ }
+
public Node appendChild(Node newChild) throws DOMException
{
log.trace("appendChild: " + newChild.getNodeName());
@@ -274,4 +287,5 @@
element.detachNode();
return new SOAPBodyElementDoc(element);
}
+
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -160,8 +160,7 @@
@Override
public Detail createDetail() throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
return SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(envNamespace) ? new DetailImpl() :
new DetailImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
@@ -182,8 +181,7 @@
@Override
public SOAPFault createFault(String reasonText, QName faultCode) throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
SOAPFaultImpl soapFault = new SOAPFaultImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
soapFault.setFaultCode(faultCode);
@@ -194,11 +192,16 @@
@Override
public SOAPFault createFault() throws SOAPException
{
- if (envNamespace == null)
- throw new UnsupportedOperationException("the specified protocol was DYNAMIC_SOAP_PROTOCOL");
+ assertEnvNamespace();
SOAPFaultImpl soapFault = new SOAPFaultImpl(SOAPConstants.SOAP_ENV_PREFIX, envNamespace);
soapFault.setFaultCode(soapFault.getDefaultFaultCode());
return soapFault;
}
+
+ private void assertEnvNamespace()
+ {
+ if (envNamespace == null)
+ throw new UnsupportedOperationException("Envelope namespace not specified, use one of the SOAP protocols");
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,7 +36,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.integration.FactoryLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
@@ -172,7 +172,8 @@
else
throw new SOAPException("Unsupported DOMSource node: " + node);
- EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
else if (source instanceof StreamSource)
@@ -180,7 +181,8 @@
try
{
StreamSource streamSource = (StreamSource)source;
- EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
+ EnvelopeBuilder envBuilder = (EnvelopeBuilder)FactoryLoader.loadFactory(EnvelopeBuilder.class.getName(), null);
+ envBuilder.setStyle(Style.DOCUMENT);
InputStream stream = streamSource.getInputStream();
Reader reader = streamSource.getReader();
if (stream != null)
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java (from rev 3395, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Style.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Style.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,62 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.core.soap;
+
+// $Id$
+
+/** A type-safe enumeration for encoding style.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Oct-2004
+ */
+public class Style
+{
+ private String style;
+
+ public static final Style RPC = new Style("rpc");
+ public static final Style DOCUMENT = new Style("document");
+
+ private Style(String style)
+ {
+ this.style = style;
+ }
+
+ public static Style getDefaultStyle()
+ {
+ return DOCUMENT;
+ }
+
+ public static Style valueOf(String style)
+ {
+ if (RPC.style.equals(style))
+ return RPC;
+ if (DOCUMENT.style.equals(style))
+ return DOCUMENT;
+
+ throw new IllegalArgumentException("Unsupported style: " + style);
+ }
+
+ public String toString()
+ {
+ return style;
+ }
+}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java (from rev 3395, trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/Use.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/Use.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.core.soap;
+
+import org.jboss.ws.Constants;
+
+// $Id$
+
+/** A type-safe enumeration for encoding use.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 16-Oct-2005
+ */
+public class Use
+{
+ private String use;
+
+ public static final Use LITERAL = new Use("literal");
+ public static final Use ENCODED = new Use("encoded");
+
+ private Use(String use)
+ {
+ this.use = use;
+ }
+
+ public static Use getDefaultUse()
+ {
+ return LITERAL;
+ }
+
+ public static Use valueOf(String encodingStyle)
+ {
+ if (Constants.URI_LITERAL_ENC.equals(encodingStyle) || LITERAL.use.equals(encodingStyle))
+ return LITERAL;
+ if (Constants.URI_SOAP11_ENC.equals(encodingStyle) || ENCODED.use.equals(encodingStyle))
+ return ENCODED;
+
+ throw new IllegalArgumentException("Unsupported encoding style: " + encodingStyle);
+ }
+
+ public String toURI()
+ {
+ String encURI = null;
+ if (this == LITERAL)
+ encURI = Constants.URI_LITERAL_ENC;
+ else if (this == ENCODED)
+ encURI = Constants.URI_SOAP11_ENC;
+ return encURI;
+ }
+
+ public String toString()
+ {
+ return use;
+ }
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -44,7 +44,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.eventing.EventingConstants;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,11 +39,11 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.EncodedTypeMapping;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,8 +33,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -58,10 +58,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.core.jaxws.WrapperGenerator;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,8 +37,8 @@
import javax.xml.ws.Service.Mode;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -45,9 +45,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonSOAPBinding;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
@@ -56,6 +54,8 @@
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.jaxws.client.DispatchBinding;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.Configurable;
import org.jboss.ws.metadata.config.ConfigurationProvider;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -35,8 +35,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.Use;
+import org.jboss.ws.core.soap.Style;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.wsf.spi.utils.JavaUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -40,8 +40,8 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
-import org.jboss.ws.core.jaxrpc.Use;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder;
+import org.jboss.ws.core.soap.Use;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -34,7 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,7 +37,7 @@
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -39,7 +39,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -36,7 +36,7 @@
import javax.xml.rpc.holders.Holder;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -73,7 +73,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.Extendable;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,7 +33,7 @@
import org.apache.ws.policy.util.PolicyWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Added: trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder
===================================================================
--- trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder (rev 0)
+++ trunk/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.soap.EnvelopeBuilder 2007-06-03 10:11:51 UTC (rev 3400)
@@ -0,0 +1 @@
+org.jboss.ws.core.soap.EnvelopeBuilderDOM
\ No newline at end of file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.Iterator;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPBody;
@@ -33,12 +34,13 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.Text;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.Style;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
@@ -82,7 +84,10 @@
assertEquals("env:Envelope", env.getNodeName());
assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI());
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next();
+ Iterator it = env.getBody().getChildElements();
+ Text text = (Text)it.next();
+ assertEquals(" ", text.getValue());
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)it.next();
assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI());
}
@@ -186,11 +191,11 @@
public void testPreserveComments() throws Exception
{
String expMsg =
- "<soapenv:Envelope xmlns:ns1='http://somens.org' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <soapenv:Header>" +
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns1='http://somens.org'>" +
+ " <env:Header>" +
" <ns1:header>kermit</ns1:header>" +
- " </soapenv:Header>" +
- " <soapenv:Body>" +
+ " </env:Header>" +
+ " <env:Body>" +
" <!-- pre body element -->" +
" <Hello>" +
" <!-- pre element -->" +
@@ -198,8 +203,8 @@
" <!-- post element -->" +
" </Hello>" +
" <!-- post body element -->" +
- " </soapenv:Body>" +
- "</soapenv:Envelope>";
+ " </env:Body>" +
+ "</env:Envelope>";
// Verify that DOM parse/write do not modify the message
Element expEnv = DOMUtils.parse(expMsg);
@@ -220,8 +225,13 @@
SOAPEnvelope wasEnv = soapMsg.getSOAPPart().getEnvelope();
String wasXML = DOMWriter.printNode(wasEnv, false);
- //System.out.println(expXML);
- //System.out.println(wasXML);
- assertEquals(expXML, wasXML);
+ String wasBody = wasXML.substring(wasXML.indexOf("<env:Body>"));
+ wasBody = wasBody.substring(0, wasBody.indexOf("</env:Body>") + 11);
+
+ String expBody = expXML.substring(expXML.indexOf("<env:Body>"));
+ expBody = expBody.substring(0, expBody.indexOf("</env:Body>") + 11);
+ //System.out.println(expBody);
+ //System.out.println(wasBody);
+ assertEquals(expBody, wasBody);
}
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -107,9 +107,9 @@
{
String xml =
"<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <soap:Body>" +
- " <np:bear name='ted' zoo:species='ursus maritimus' xmlns:np='http://northpole.net' xmlns:zoo='http://zoofan.net'/>" +
- " </soap:Body>" +
+ "<soap:Body>" +
+ "<np:bear name='ted' zoo:species='ursus maritimus' xmlns:np='http://northpole.net' xmlns:zoo='http://zoofan.net'/>" +
+ "</soap:Body>" +
"</soap:Envelope>";
SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes()));
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -23,6 +23,7 @@
import java.io.ByteArrayInputStream;
+import javax.xml.namespace.QName;
import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.Detail;
import javax.xml.soap.DetailEntry;
@@ -49,19 +50,20 @@
*/
public class SOAPFaultTestCase extends JBossWSTest
{
- private String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" +
- " <env:Fault>" +
- " <faultcode>env:Client</faultcode>" +
- " <faultstring>Some fault message</faultstring>" +
- " <faultactor>Some fault actor</faultactor>" +
- " <detail>" +
- " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" +
- " </detail>" +
- " </env:Fault>" +
- " </env:Body>" +
- "</env:Envelope>";
+ private String envStr =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <env:Fault>" +
+ " <faultcode>env:Client</faultcode>" +
+ " <faultstring>Some fault message</faultstring>" +
+ " <faultactor>Some fault actor</faultactor>" +
+ " <detail>" +
+ " <ns1:name xmlns:ns1='http://somens'>Kermit</ns1:name>" +
+ " </detail>" +
+ " </env:Fault>" +
+ " </env:Body>" +
+ "</env:Envelope>";
public void testExceptionToFault() throws Exception
{
@@ -76,7 +78,7 @@
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next();
+ SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Fault")).next();
assertEquals("env:Client", soapFault.getFaultCode());
assertEquals("Some fault message", soapFault.getFaultString());
assertEquals("Some fault actor", soapFault.getFaultActor());
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -28,13 +28,13 @@
import javax.xml.rpc.Service;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import junit.framework.Test;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.w3c.dom.Node;
@@ -184,8 +184,8 @@
mimeHeaders.addHeader("Content-Type", "text/xml; charset=UTF-8");
SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes()));
- SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPElement soapElement = soapBody.getBodyElement();
StringBuffer builder = new StringBuffer();
NodeList nlist = soapElement.getChildNodes();
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -33,7 +33,7 @@
import org.jboss.test.ws.tools.sei.ServiceException;
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.tools.JavaToWSDL;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -37,7 +37,7 @@
import org.jboss.test.ws.tools.validation.WSDL11Validator;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.tools.JavaToWSDL;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -26,7 +26,7 @@
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSToolsConstants;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -31,7 +31,7 @@
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.WSDLToJava;
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -32,7 +32,7 @@
import org.jboss.test.ws.tools.sei.StandardJavaTypes;
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.soap.Style;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.utils.IOUtils;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
Modified: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-03 10:11:51 UTC (rev 3400)
@@ -5,6 +5,10 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/serviceref/**
org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java 2007-06-02 23:12:55 UTC (rev 3399)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.java 2007-06-03 10:11:51 UTC (rev 3400)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxws.samples.provider;
import javax.jws.WebParam;
@@ -27,16 +27,12 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
- at WebService(
- serviceName = "ProviderService",
- portName = "ProviderPort",
- targetNamespace = "http://org.jboss.ws/provider",
- wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
+ at WebService(name = "Provider", serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
@SOAPBinding(parameterStyle = ParameterStyle.BARE)
public class WebServiceEndpoint
{
- @WebResult(name="user")
- public UserType echo(@WebParam(name="user")UserType type)
+ @WebResult(name = "user")
+ public UserType echo(@WebParam(name = "user") UserType type)
{
return type;
}
More information about the jbossws-commits
mailing list