JBossWS SVN: r2887 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-19 05:54:14 -0400 (Thu, 19 Apr 2007)
New Revision: 2887
Added:
branches/jbossws-1.2.2/
Log:
Create branch jbossws-1.2.2
Copied: branches/jbossws-1.2.2 (from rev 2886, trunk)
17 years
- 1
- 0
JBossWS SVN: r2886 - branches/jbossws-1.2.0.GA_JBWS-1610/build.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-19 05:39:41 -0400 (Thu, 19 Apr 2007)
New Revision: 2886
Modified:
branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml
Log:
JBWS-1610 - Remove delete JBoss 5
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-17 21:15:37 UTC (rev 2885)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-19 09:39:41 UTC (rev 2886)
@@ -45,7 +45,6 @@
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/>
</target>
17 years
- 1
- 0
JBossWS SVN: r2885 - in branches/jbossws-1.2.0.GA_JBWS-1610: build and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-17 17:15:37 -0400 (Tue, 17 Apr 2007)
New Revision: 2885
Removed:
branches/jbossws-1.2.0.GA_JBWS-1610/integration-jboss50/
Modified:
branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml
branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml
branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml
Log:
JBWS-1610 - Remove JBoss 5.0.x from patch as it breaks the build.
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml 2007-04-17 18:08:35 UTC (rev 2884)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml 2007-04-17 21:15:37 UTC (rev 2885)
@@ -39,7 +39,7 @@
</target>
<!-- Release to jboss.local.repository -->
- <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14"
+ <target name="release-to-repository" depends="core-jars,jboss42-jars,jboss40-jars,jboss40-jars14"
description="Release to jboss.local.repository">
<!-- jbossws -->
@@ -137,7 +137,7 @@
<!-- ================================================================== -->
<!-- Build the bin dist -->
- <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc"
+ <target name="build-bin-dist" depends="core-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc"
description="Build the binary distribution">
<property name="install.etc.dir" value="${build.bin.dist}/install/etc"/>
@@ -213,8 +213,6 @@
</fileset>
</copy>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/>
- <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
<copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/>
<copy todir="${install.jboss40.dir}">
<fileset dir="${jboss40.output.lib.dir}">
@@ -279,7 +277,6 @@
<javadoc destdir="${build.output.dir}/docs/api" author="true" version="true" use="true" windowtitle="JBossWS API">
<packageset dir="${core.java.dir}" defaultexcludes="yes"/>
<packageset dir="${jboss42.java.dir}" defaultexcludes="yes"/>
- <packageset dir="${jboss50.java.dir}" defaultexcludes="yes"/>
<packageset dir="${tomcat.java.dir}" defaultexcludes="yes"/>
<classpath refid="core.classpath"/>
</javadoc>
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml 2007-04-17 18:08:35 UTC (rev 2884)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml 2007-04-17 21:15:37 UTC (rev 2885)
@@ -16,7 +16,7 @@
<!--
| Build the samples
-->
- <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars">
+ <target name="build-samples" description="Builds the samples." depends="core-jars,jboss42-jars,jboss40-jars,tomcat-jars">
<property name="samples.target" value="jbossws-samples-${version.id}"/>
<property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/>
@@ -69,9 +69,6 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss50.output.lib.dir}">
- <include name="jbossws-jboss50-integration.jar"/>
- </fileset>
<fileset dir="${jboss42.output.lib.dir}">
<include name="jbossws-jboss42-integration.jar"/>
</fileset>
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-17 18:08:35 UTC (rev 2884)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-17 21:15:37 UTC (rev 2885)
@@ -20,7 +20,6 @@
<import file="${basedir}/ant-import/build-hudson.xml"/>
<import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
- <import file="${basedir}/../integration-jboss50/build.xml"/>
<import file="${basedir}/../integration-tomcat/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
<import file="${basedir}/../jbossws-tests/build.xml"/>
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml 2007-04-17 18:08:35 UTC (rev 2884)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml 2007-04-17 21:15:37 UTC (rev 2885)
@@ -12,7 +12,6 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <import file="${basedir}/../integration-jboss50/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
<import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-tomcat/build.xml"/>
17 years
- 1
- 0
JBossWS SVN: r2884 - branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-17 14:08:35 -0400 (Tue, 17 Apr 2007)
New Revision: 2884
Modified:
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
Log:
JBWS-1610 - Fixed regression with XOPHandlerTestCase
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-17 17:57:09 UTC (rev 2883)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-17 18:08:35 UTC (rev 2884)
@@ -29,8 +29,10 @@
import javax.xml.soap.SOAPMessage;
+import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
import org.jboss.ws.core.server.MessageContextPropertyHelper;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.xb.binding.NamespaceRegistry;
@@ -43,6 +45,8 @@
*/
public abstract class CommonMessageContext
{
+ private static Logger log = Logger.getLogger(CommonMessageContext.class);
+
// expandToDOM in the SOAPContentElement should not happen during normal operation
// This property should be set the message context when it is ok to do so.
public static String ALLOW_EXPAND_TO_DOM = "org.jboss.ws.allow.expand.dom";
@@ -172,6 +176,13 @@
public boolean isModified()
{
+ // skip changes from XOP handler interactions
+ if (XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage())
+ {
+ log.debug("Disregard changes from XOP/Handler interactions");
+ return false;
+ }
+
return isModified;
}
17 years
- 1
- 0
JBossWS SVN: r2883 - branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-17 13:57:09 -0400 (Tue, 17 Apr 2007)
New Revision: 2883
Modified:
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
Log:
JBWS-1610 - Fixed regression with LogicalHandlerSourceTestCase
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-04-17 17:57:09 UTC (rev 2883)
@@ -33,6 +33,7 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
@@ -84,6 +85,8 @@
SOAPContentElement soapElement = (SOAPContentElement)soapBody.getChildElements().next();
soapElement.setPayload(source);
}
+
+ MessageContextAssociation.peekMessageContext().setModified(true);
}
public Object getPayload(JAXBContext jaxbContext)
@@ -105,6 +108,7 @@
{
SOAPContentElement bodyElement = (SOAPContentElement)it.next();
bodyElement.setObjectValue(payload);
+ MessageContextAssociation.peekMessageContext().setModified(true);
}
}
}
17 years
- 1
- 0
JBossWS SVN: r2882 - in branches/jbossws-1.2.0.GA_JBWS-1610: jbossws-core/src/main/java/javax/xml/soap and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-17 11:32:10 -0400 (Tue, 17 Apr 2007)
New Revision: 2882
Added:
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/DataObject.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/application-client.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/jboss-client.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/web.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/webservices.xml
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/TestService.wsdl
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/wstools-config.xml
Modified:
branches/jbossws-1.2.0.GA_JBWS-1610/build/etc/wstools.sh
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/javax/xml/soap/SOAPEnvelope.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
JBWS-1610 - Fix failures updating the message from a JAX-RPC handler.
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/etc/wstools.sh
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/build/etc/wstools.sh 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/build/etc/wstools.sh 2007-04-17 15:32:10 UTC (rev 2882)
@@ -55,6 +55,7 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/javax/xml/soap/SOAPEnvelope.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/javax/xml/soap/SOAPEnvelope.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/javax/xml/soap/SOAPEnvelope.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -21,29 +21,55 @@
*/
package javax.xml.soap;
-/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object. By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object. The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object. The SOAPBody object is required, and the SOAPHeader object, though optional, is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.
- A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody. The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object sp, which is then used to get the SOAPEnvelope object se.
- SOAPPart sp = message.getSOAPPart();
- SOAPEnvelope se = sp.getEnvelope();
- SOAPHeader sh = se.getHeader();
- SOAPBody sb = se.getBody();
-
- It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one, deleting it, and then adding a new body or header. The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called. For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
- se.getBody().detachNode();
-
- To create a SOAPHeader object to replace the one that was removed, a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object. Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object. The following code fragment retrieves the current header, removes it, and adds a new one. Then it retrieves the current body, removes it, and adds a new one.
- SOAPPart sp = message.getSOAPPart();
- SOAPEnvelope se = sp.getEnvelope();
- se.getHeader().detachNode();
- SOAPHeader sh = se.addHeader();
- se.getBody().detachNode();
- SOAPBody sb = se.addBody();
-
- It is an error to add a SOAPBody or SOAPHeader object if one already exists.
- The SOAPEnvelope interface provides three methods for creating Name objects. One method creates Name objects with a local name, a namespace prefix, and a namesapce URI. The second method creates Name objects with a local name and a namespace prefix, and the third creates Name objects with just a local name. The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
- Name name = se.createName("GetLastTradePrice", "WOMBAT",
- "http://www.wombat.org/trader");
-
+/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object.
+ * By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object.
+ * The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object.<p>
+ * The SOAPBody object is required, and the SOAPHeader object, though optional,
+ * is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.<p>
+ * A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody.
+ * The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object
+ * sp, which is then used to get the SOAPEnvelope object se.<p>
+ *
+ * <code>
+ * SOAPPart sp = message.getSOAPPart();<br>
+ * SOAPEnvelope se = sp.getEnvelope();<br>
+ * SOAPHeader sh = se.getHeader();<br>
+ * SOAPBody sb = se.getBody(); <br>
+ * </code>
+ * <p>
+ * It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one,
+ * deleting it, and then adding a new body or header.
+ * The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called.
+ * For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
+ * <p>
+ * <code>se.getBody().detachNode();</code>
+ * <p>
+ * To create a SOAPHeader object to replace the one that was removed,
+ * a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object.
+ * Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object.
+ * The following code fragment retrieves the current header, removes it, and adds a new one.
+ * Then it retrieves the current body, removes it, and adds a new one.
+ * <p>
+ * <code>
+ * SOAPPart sp = message.getSOAPPart();<br>
+ * SOAPEnvelope se = sp.getEnvelope();<br>
+ * se.getHeader().detachNode(); <br>
+ * SOAPHeader sh = se.addHeader();<br>
+ * se.getBody().detachNode(); <br>
+ * SOAPBody sb = se.addBody();<br>
+ * </code>
+ * <p>
+ * <b>It is an error to add a SOAPBody or SOAPHeader object if one already exists.</b>
+ * The SOAPEnvelope interface provides three methods for creating Name objects.
+ * One method creates Name objects with a local name, a namespace prefix, and a namesapce URI.
+ * The second method creates Name objects with a local name and a namespace prefix,
+ * and the third creates Name objects with just a local name.
+ * <p>
+ * The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
+ * <code>
+ * Name name = se.createName("GetLastTradePrice", "WOMBAT", "http://www.wombat.org/trader");
+ * </code>
+ *
* @author Scott.Stark(a)jboss.org
* @version $Revision$
*/
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -283,12 +283,14 @@
try
{
URL wsaToURL = new URL(wsaTo);
- if(log.isDebugEnabled()) log.debug("Sending request to addressing destination: " + wsaToURL);
+ if (log.isDebugEnabled())
+ log.debug("Sending request to addressing destination: " + wsaToURL);
targetAddress = wsaToURL.toExternalForm();
}
catch (MalformedURLException ex)
{
- if(log.isDebugEnabled()) log.debug("Not a valid URL: " + wsaTo);
+ if (log.isDebugEnabled())
+ log.debug("Not a valid URL: " + wsaTo);
}
}
}
@@ -341,9 +343,10 @@
HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[] {});
// Check if protocol handlers modified the payload
- if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource())
+ if (msgContext.isModified() == true)
{
- if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again");
+ if (log.isDebugEnabled())
+ log.debug("Handler modified body payload, unbind message again");
SOAPMessage resMessage = msgContext.getSOAPMessage();
binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders);
}
@@ -363,7 +366,8 @@
{
for (AttachmentPart part : attachmentParts)
{
- if(log.isDebugEnabled()) log.debug("Adding attachment part: " + part.getContentId());
+ if (log.isDebugEnabled())
+ log.debug("Adding attachment part: " + part.getContentId());
reqMessage.addAttachmentPart(part);
}
}
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -41,12 +41,12 @@
* @author Thomas.Diesler(a)jboss.org
* @since 1-Sep-2006
*/
-public abstract class CommonMessageContext
+public abstract class CommonMessageContext
{
// expandToDOM in the SOAPContentElement should not happen during normal operation
// This property should be set the message context when it is ok to do so.
public static String ALLOW_EXPAND_TO_DOM = "org.jboss.ws.allow.expand.dom";
-
+
// The operation for this message ctx
private EndpointMetaData epMetaData;
// The operation for this message ctx
@@ -56,6 +56,8 @@
// The map of the properties
protected Map<String, Object> props = new HashMap<String, Object>();
+ private boolean isModified;
+
public CommonMessageContext()
{
}
@@ -103,13 +105,13 @@
}
public abstract SerializationContext getSerializationContext();
-
+
/** Gets the namespace registry for this message context */
public NamespaceRegistry getNamespaceRegistry()
{
return getSerializationContext().getNamespaceRegistry();
}
-
+
public Map<String, Object> getProperties()
{
return props;
@@ -134,12 +136,12 @@
public Object getProperty(String name)
{
Object value = props.get(name);
-
+
if (value instanceof MessageContextPropertyHelper)
{
return ((MessageContextPropertyHelper)value).get();
}
-
+
return value;
}
@@ -167,4 +169,26 @@
{
props.put(name, value);
}
+
+ public boolean isModified()
+ {
+ return isModified;
+ }
+
+ /**
+ * Mark a message as 'modified' when the SAAJ model becomes stale.
+ * This may be the case when:
+ * <ul>
+ * <li>the complete message is replaced at MessageContext level
+ * <li>the payload is set on a LogicalMessage
+ * <li>The SAAJ model is changed though the DOM or SAAJ API (handler)
+ * </ul>
+ *
+ * In any of these cases another 'unbind' invocation is required.
+ */
+ public void setModified(boolean modified)
+ {
+ isModified = modified;
+ }
+
}
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -158,7 +158,7 @@
handlersPass = handlersPass && callRequestHandlerChain(seInfo, HandlerType.POST);
// Check if protocol handlers modified the payload
- if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource())
+ if (msgContext.isModified() == true)
{
if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again");
epInv = binding.unbindRequestMessage(opMetaData, reqMessage);
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -79,7 +79,6 @@
// Generic JAXWS payload
private Source payload;
private boolean isDOMValid = true;
- private boolean isModifiedFromSource;
public SOAPBodyImpl(String prefix, String namespace)
{
@@ -91,11 +90,6 @@
return isDOMValid;
}
- public boolean isModifiedFromSource()
- {
- return isModifiedFromSource;
- }
-
public Source getPayload()
{
return payload;
@@ -351,7 +345,6 @@
}
finally
{
- isModifiedFromSource = true;
log.trace("END expandToDOM");
}
}
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -71,8 +71,9 @@
assertEnvelopeNamespace(namespaceURI);
addNamespaceDeclaration(prefix, namespaceURI);
- addHeader();
- addBody();
+ // the Element source might already contain a Header and Body declaration
+ if(null == soapPart.getEnvelope().getHeader()) addHeader();
+ if(null == soapPart.getEnvelope().getBody()) addBody();
}
/** Construct a SOAP envelope for the given SOAP version URI.
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -43,6 +43,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.soap.attachment.MimeConstants;
@@ -131,13 +132,14 @@
String contentId = part.getContentId();
if (contentId.equals(cid))
{
- attachments.remove(part);
- return part;
+ attachments.remove(part);
+ return part;
}
}
return null;
}
+
public AttachmentPart getAttachmentByPartName(String partName)
{
for (AttachmentPart part : attachments)
@@ -260,6 +262,10 @@
saveRequired = false;
}
+
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext != null)
+ msgContext.setModified(true);
}
public boolean saveRequired()
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -28,12 +28,7 @@
import java.util.Iterator;
import java.util.List;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
+import javax.xml.soap.*;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
@@ -153,6 +148,11 @@
return;
}
+ // Start with a fresh soapMessage
+ /*MessageFactory mf = MessageFactory.newInstance();
+ soapMessage = mf.createMessage();
+ soapMessage.getSOAPHeader().detachNode();*/
+
if (source instanceof DOMSource)
{
Element domElement;
@@ -164,7 +164,7 @@
domElement = (Element)node;
else
throw new SOAPException("Unsupported DOMSource node: " + node);
-
+
EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-17 12:04:35 UTC (rev 2881)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -2386,7 +2386,36 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
+ <!-- jaxrpc-jbws1610 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1610.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1610/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/DataObject.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1610/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1610-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1610/DataObject.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1610/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1610/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/DataObject.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/DataObject.java (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/DataObject.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jaxrpc.jbws1610;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 17 Apr 2007
+ */
+public class DataObject
+{
+
+ private String stringA;
+
+ private String stringB;
+
+ public String getStringA()
+ {
+ return stringA;
+ }
+
+ public void setStringA(String stringA)
+ {
+ this.stringA = stringA;
+ }
+
+ public String getStringB()
+ {
+ return stringB;
+ }
+
+ public void setStringB(String stringB)
+ {
+ this.stringB = stringB;
+ }
+
+}
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jaxrpc.jbws1610;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test case for fixes being merged for support patch: -
+ *
+ * http://jira.jboss.com/jira/browse/JBWS-1610
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 17 Apr 2007
+ */
+public class JBWS1610TestCase extends JBossWSTest
+{
+
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1610TestCase.class, "jaxrpc-jbws1610.war, jaxrpc-jbws1610-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testCall() throws Exception
+ {
+ DataObject request = new DataObject();
+ request.setStringA("First String");
+ request.setStringB("Second String");
+
+ DataObject response = port.echo(request);
+
+ assertNotNull(response);
+ assertEquals("String Modifed By Handler", "XXFirst StringXX", response.getStringA());
+ assertEquals("String Modifed By Handler", "XXSecond StringXX", response.getStringB());
+
+ }
+}
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.java (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jaxrpc.jbws1610;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 17 Apr 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public DataObject echo(final DataObject param) throws RemoteException;
+
+}
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.java (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jaxrpc.jbws1610;
+
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 17 Apr 2007
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ /**
+ * @see org.jboss.test.ws.jaxrpc.jbws1610.TestEndpoint#echo(org.jboss.test.ws.jaxrpc.jbws1610.DataObject)
+ */
+ public DataObject echo(final DataObject param) throws RemoteException
+ {
+ return param;
+ }
+
+}
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.java
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.java (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.java 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.jaxrpc.jbws1610;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+import org.jboss.ws.WSException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 17 Apr 2007
+ */
+public class TestHandler extends GenericHandler
+{
+
+ /**
+ * Test handler to wrap all valued with 'XX' either side.
+ */
+ public boolean handleRequest(MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ SOAPPart part = soapMessage.getSOAPPart();
+ SOAPEnvelope evnelope = part.getEnvelope();
+ SOAPBody body = evnelope.getBody();
+
+ MessageFactory msgFact = MessageFactory.newInstance();
+
+ SOAPMessage newMessage = msgFact.createMessage();
+ SOAPPart newPart = newMessage.getSOAPPart();
+ SOAPEnvelope newEnvelope = newPart.getEnvelope();
+ SOAPBody newBody = newEnvelope.getBody();
+
+ SOAPElement lookup = (SOAPElement)body.getChildElements().next();
+
+ Name lookupQN = lookup.getElementName();
+ SOAPElement lookupEl = newBody.addChildElement(lookupQN);
+
+ Iterator it = lookup.getChildElements();
+ while (it.hasNext())
+ {
+ SOAPElement element = (SOAPElement)it.next();
+ Name name = element.getElementName();
+ SOAPElement newElement = lookupEl.addChildElement(name);
+ newElement.setValue("XX" + element.getValue() + "XX");
+ }
+
+ part.setContent(newPart.getContent());
+
+ soapMessage.saveChanges();
+ }
+ catch (Exception e)
+ {
+ throw new WSException("Error in handler", e);
+ }
+
+ return super.handleRequest(msgContext);
+ }
+
+ public QName[] getHeaders()
+ {
+ return null;
+ }
+
+}
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/TestHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/application-client.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/application-client.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>TestEndpoint</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1610.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/jboss-client.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/jboss-client.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1610?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/jaxrpc-mapping.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1610</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1610/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1610.DataObject</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1610/types'>typeNS:DataObject</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>stringA</java-variable-name>
+ <xml-element-name>stringA</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>stringB</java-variable-name>
+ <xml-element-name>stringB</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1610.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1610'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1610.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1610'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1610'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.jbws1610.DataObject</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1610'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>echo</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.jbws1610.DataObject</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1610'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>echoResponse</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/web.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/web.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1610.TestEndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/webservices.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/webservices.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,21 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1610'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1610.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1610.TestHandler</handler-class>
+ </handler>
+
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/TestService.wsdl 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1610' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1610/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1610' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1610/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1610/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='DataObject'>
+ <sequence>
+ <element name='stringA' nillable='true' type='string'/>
+ <element name='stringB' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <element name='echo' type='tns:DataObject'/>
+ <element name='echoResponse' type='tns:DataObject'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo'>
+ <part element='ns1:echo' name='echo'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='ns1:echoResponse' name='echoResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/wstools-config.xml
===================================================================
--- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/wstools-config.xml (rev 0)
+++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/wstools-config.xml 2007-04-17 15:32:10 UTC (rev 2882)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../../output/classes/ -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1610.TestEndpoint" style="document" parameter-style="bare">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1610" type-namespace="http://org.jboss.test.ws/jbws1610/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
+
+<!--
+ Add the following handler to the generated webservices.xml
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1610.TestHandler</handler-class>
+ </handler>
+-->
Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1610/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years
- 1
- 0
JBossWS SVN: r2881 - branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-17 08:04:35 -0400 (Tue, 17 Apr 2007)
New Revision: 2881
Added:
branches/jbossws-1.2.0.GA_JBWS-1610/
Log:
Branch for JBWS-1610
Copied: branches/jbossws-1.2.0.GA_JBWS-1610 (from rev 2880, tags/jbossws-1.2.0.GA)
17 years
- 1
- 0
JBossWS SVN: r2880 - trunk/jbossws-core/src/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-17 07:01:26 -0400 (Tue, 17 Apr 2007)
New Revision: 2880
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java
Log:
Resurect, but comment out fault code handling without namespace
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-04-16 13:40:15 UTC (rev 2879)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-04-17 11:01:26 UTC (rev 2880)
@@ -24,8 +24,10 @@
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
+import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.soap.Detail;
@@ -72,11 +74,29 @@
private SOAPElement faultnode;
private Detail detail;
+ public final static Set<QName> soap11FaultCodes = new HashSet<QName>();
+ static
+ {
+ soap11FaultCodes.add(Constants.SOAP11_FAULT_CODE_CLIENT);
+ soap11FaultCodes.add(Constants.SOAP11_FAULT_CODE_SERVER);
+ soap11FaultCodes.add(Constants.SOAP11_FAULT_CODE_VERSION_MISMATCH);
+ soap11FaultCodes.add(Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND);
+ }
+ public final static Set<QName> soap12FaultCodes = new HashSet<QName>();
+ static
+ {
+ soap12FaultCodes.add(SOAPConstants.SOAP_VERSIONMISMATCH_FAULT);
+ soap12FaultCodes.add(SOAPConstants.SOAP_MUSTUNDERSTAND_FAULT);
+ soap12FaultCodes.add(SOAPConstants.SOAP_DATAENCODINGUNKNOWN_FAULT);
+ soap12FaultCodes.add(SOAPConstants.SOAP_SENDER_FAULT);
+ soap12FaultCodes.add(SOAPConstants.SOAP_RECEIVER_FAULT);
+ }
+
public SOAPFaultImpl() throws SOAPException
{
this(Constants.PREFIX_ENV, Constants.NS_SOAP11_ENV);
}
-
+
public SOAPFaultImpl(String prefix, String namespace) throws SOAPException
{
super(new NameImpl("Fault", prefix, namespace));
@@ -164,11 +184,29 @@
public void setFaultCode(QName faultCode) throws SOAPException
{
- String nsURI = faultCode.getNamespaceURI();
- if (nsURI.length() == 0)
- throw new SOAPException("code must be namespace qualified: " + faultCode);
+ boolean isSOAP11 = Constants.NS_SOAP11_ENV.equals(getNamespaceURI());
+
+ String faultCodeNS = faultCode.getNamespaceURI();
+ if (faultCodeNS.length() == 0)
+ throw new SOAPException("Fault code '" + faultCode + "' must be namespace qualified");
+
+ /* JUDDI uses unqualified fault codes
+ // Fix the namespace for SOAP1.1, if it is not a standard fault code
+ if (isSOAP11 && faultCodeNS.length() == 0)
+ {
+ String localPart = faultCode.getLocalPart();
+ for (QName soap11Fault : soap11FaultCodes)
+ {
+ if (soap11Fault.equals(localPart))
+ throw new SOAPException("Fault code '" + faultCode + "' must be namespace qualified");
+ }
+ QName newFaultCode = new QName("http://unknown-namespace-uri", localPart);
+ log.warn("Fault code '" + faultCode + "' must be namespace qualified, assuming: " + newFaultCode);
+ faultCode = newFaultCode;
+ }
+ */
- if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI()))
+ if (isSOAP11)
{
if (faultcode == null)
{
@@ -180,11 +218,7 @@
}
else
{
- if (!(SOAPConstants.SOAP_DATAENCODINGUNKNOWN_FAULT.equals(faultCode) ||
- SOAPConstants.SOAP_MUSTUNDERSTAND_FAULT.equals(faultCode) ||
- SOAPConstants.SOAP_RECEIVER_FAULT.equals(faultCode) ||
- SOAPConstants.SOAP_SENDER_FAULT.equals(faultCode) ||
- SOAPConstants.SOAP_VERSIONMISMATCH_FAULT.equals(faultCode)))
+ if (soap12FaultCodes.contains(faultCode) == false)
throw new SOAPException(faultCode + " is not a standard SOAP 1.2 Code value");
if (faultcode == null)
@@ -649,8 +683,7 @@
{
if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI()))
findSoap11DetailElement();
- else
- findSoap12DetailElement();
+ else findSoap12DetailElement();
}
return detail;
}
@@ -711,12 +744,9 @@
QName elementName = element.getElementQName();
SOAPFaultElement faultElement;
- if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI()) ?
- Constants.SOAP11_DETAIL.equals(elementName) :
- Constants.SOAP12_DETAIL.equals(elementName))
+ if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI()) ? Constants.SOAP11_DETAIL.equals(elementName) : Constants.SOAP12_DETAIL.equals(elementName))
faultElement = new DetailImpl(element);
- else
- faultElement = new SOAPFaultElementImpl(element);
+ else faultElement = new SOAPFaultElementImpl(element);
log.trace("convertToFaultElement : " + faultElement);
return faultElement;
17 years
- 1
- 0
JBossWS SVN: r2879 - tags/jbossws-1.2.1.GA/build/dist.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-16 09:40:15 -0400 (Mon, 16 Apr 2007)
New Revision: 2879
Modified:
tags/jbossws-1.2.1.GA/build/dist/ReleaseNotes.txt
Log:
Update release notes
Modified: tags/jbossws-1.2.1.GA/build/dist/ReleaseNotes.txt
===================================================================
--- tags/jbossws-1.2.1.GA/build/dist/ReleaseNotes.txt 2007-04-16 12:28:34 UTC (rev 2878)
+++ tags/jbossws-1.2.1.GA/build/dist/ReleaseNotes.txt 2007-04-16 13:40:15 UTC (rev 2879)
@@ -24,6 +24,46 @@
Feature Request
+ * [JBWS-1586] - SOAP encoded arrays with href
+
+Task
+
+ * [JBWS-1576] - Implement jaxws <service-ref> from deployment descriptor
+ * [JBWS-1578] - Redefine order of jaxws handlers
+
+Bug
+
+ * [JBWS-1605] - DOMResult looses namespaces on transform
+ * [JBWS-1581] - EJB client vehicle not sufficiently isolated
+ * [JBWS-1587] - JAXBSerializer does not marshal Date types in client
+ * [JBWS-1589] - JAXRPC endpoint cannot handle xsd:date with timezone
+
+Errata
+
+ FIXME: [JBAS-4210] HTTP request dispatched to the wrong servlet
+ FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface
+ FIXME: [JBWS-269] Support attachments in Web Services Tools
+ FIXME: [JBWS-434] Support sequences of anys
+ FIXME: [JBWS-751] Multiple schema imports with the same namespace
+ FIXME: [JBWS-798] Complete EventingTestCase
+ FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums
+ FIXME: [JBWS-981] Virtual host configuration for EJB endpoints (Enable once JBossAS supports virtual-host element)
+ FIXME: [JBWS-1291] Fix JaxrpcMappingValidator
+ FIXME: [JBWS-1294] Add support for mapping async methods
+ FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations
+ FIXME: [JBWS-1511] MessageFactory does not preserve comments
+ FIXME: [JBWS-1579] @EndpointConfig ignored on SEI
+
+Enjoy,
+The JBossWS Team
+
+Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What's new in jbossws-1.2.0
+---------------------------
+
+Feature Request
+
* [JBWS-1156] - Implement injection of WebServiceRef
* [JBWS-1021] - Implement javax.xml.ws.Endpoint
* [JBWS-1022] - Implement javax.xml.ws.WebServiceContext
@@ -105,17 +145,13 @@
Errata
-------
+
FIXME: [JBWS-1294] Add support for mapping async methods
FIXME: [JBWS-1511] MessageFactory does not preserve comments
FIXME: [JBWS-434] Support sequences of anys in JAXRPC
FIXME: [JBWS-751] Multiple schema imports with the same namespace
-Enjoy,
-The JBossWS Team
-Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
What's new in jbossws-1.0.4
---------------------------
17 years
- 1
- 0
JBossWS SVN: r2878 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxws/spi and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-16 08:28:34 -0400 (Mon, 16 Apr 2007)
New Revision: 2878
Modified:
trunk/build/eclipse/jbossws.userlibraries
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
Log:
Add support for @WebServiceRef with no DD
Modified: trunk/build/eclipse/jbossws.userlibraries
===================================================================
--- trunk/build/eclipse/jbossws.userlibraries 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/build/eclipse/jbossws.userlibraries 2007-04-16 12:28:34 UTC (rev 2878)
@@ -10,13 +10,13 @@
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR2/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/lib/jboss-aop-jdk50.jar"/>
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-16 12:28:34 UTC (rev 2878)
@@ -23,8 +23,11 @@
// $Id$
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Proxy;
import java.net.URL;
+import java.security.CodeSource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -39,6 +42,7 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.Service.Mode;
@@ -107,6 +111,21 @@
usRef = ServiceObjectFactoryJAXWS.getServiceRefAssociation();
UnifiedVirtualFile vfsRoot = (usRef != null ? vfsRoot = usRef.getVfsRoot() : new ResourceLoaderAdapter());
+ // Verify wsdl access if this is not a generic Service
+ if (wsdlURL != null && serviceClass != Service.class)
+ {
+ try
+ {
+ InputStream is = wsdlURL.openStream();
+ is.close();
+ }
+ catch (IOException e)
+ {
+ log.warn("Cannot access wsdlURL: " + wsdlURL);
+ wsdlURL = null;
+ }
+ }
+
if (wsdlURL != null)
{
JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder();
@@ -155,33 +174,26 @@
if (serviceMetaData == null)
throw new WebServiceException("Service meta data not available");
- // com/sun/ts/tests/jaxws/api/javax_xml_ws/Service
- // GetPort1NegTest1WithWsdl_from_wsappclient
+ // com/sun/ts/tests/jaxws/api/javax_xml_ws/Service#GetPort1NegTest1WithWsdl
EndpointMetaData epMetaData = serviceMetaData.getEndpoint(portName);
- if (epMetaData == null)
+ if (serviceMetaData.getEndpoints().size() > 0 && epMetaData == null)
throw new WebServiceException("Cannot get port meta data for: " + portName);
+ // This is the case when the service could not be created from wsdl
+ if (serviceMetaData.getEndpoints().size() == 0)
+ {
+ log.warn("Cannot get port meta data for: " + portName);
+
+ QName portType = getPortTypeName(seiClass);
+ epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, portType, Type.JAXWS);
+ }
+
String seiClassName = seiClass.getName();
epMetaData.setServiceEndpointInterfaceName(seiClassName);
return getPortInternal(epMetaData, seiClass);
}
- private <T> QName getPortTypeName(Class<T> seiClass)
- {
- WebService anWebService = seiClass.getAnnotation(WebService.class);
- String localPart = anWebService.name();
- if (localPart.length() == 0)
- localPart = WSDLUtils.getJustClassName(seiClass);
-
- String nsURI = anWebService.targetNamespace();
- if (nsURI.length() == 0)
- nsURI = WSDLUtils.getTypeNamespace(seiClass);
-
- QName portType = new QName(nsURI, localPart);
- return portType;
- }
-
/**
* The getPort method returns a stub. A service client uses this stub to invoke operations on the target service endpoint.
* The serviceEndpointInterface specifies the service endpoint interface that is supported by the created dynamic proxy or stub instance.
@@ -222,6 +234,24 @@
return getPortInternal(epMetaData, seiClass);
}
+ private <T> QName getPortTypeName(Class<T> seiClass)
+ {
+ if (!seiClass.isAnnotationPresent(WebService.class))
+ throw new IllegalArgumentException("Cannot find @WebService on: " + seiClass.getName());
+
+ WebService anWebService = seiClass.getAnnotation(WebService.class);
+ String localPart = anWebService.name();
+ if (localPart.length() == 0)
+ localPart = WSDLUtils.getJustClassName(seiClass);
+
+ String nsURI = anWebService.targetNamespace();
+ if (nsURI.length() == 0)
+ nsURI = WSDLUtils.getTypeNamespace(seiClass);
+
+ QName portType = new QName(nsURI, localPart);
+ return portType;
+ }
+
private <T> T getPortInternal(EndpointMetaData epMetaData, Class<T> seiClass)
{
QName portName = epMetaData.getPortName();
@@ -349,12 +379,26 @@
private <T> T createProxy(Class<T> seiClass, EndpointMetaData epMetaData) throws WebServiceException
{
+ if (seiClass == null)
+ throw new IllegalArgumentException("SEI class cannot be null");
+
try
{
ExecutorService executor = (ExecutorService)getExecutor();
ClientProxy handler = new ClientProxy(executor, new ClientImpl(epMetaData, handlerResolver));
ClassLoader cl = epMetaData.getClassLoader();
- T proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class }, handler);
+
+ T proxy;
+ try
+ {
+ proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class }, handler);
+ }
+ catch (RuntimeException rte)
+ {
+ URL codeLocation = seiClass.getProtectionDomain().getCodeSource().getLocation();
+ log.error("Cannot create proxy for SEI " + seiClass.getName() + " from: " + codeLocation);
+ throw rte;
+ }
// Configure the stub
configureStub((StubExt)proxy);
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java 2007-04-16 12:28:34 UTC (rev 2878)
@@ -15,7 +15,7 @@
* Generated source version: 2.0
*
*/
-@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl")
+@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl")
public class TestEndpointService
extends Service
{
@@ -27,7 +27,7 @@
static {
URL url = null;
try {
- url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl");
+ url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-04-16 12:28:34 UTC (rev 2878)
@@ -21,10 +21,10 @@
*/
package org.jboss.test.ws.jaxws.samples.webserviceref;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import junit.framework.Test;
@@ -32,8 +32,6 @@
import org.jboss.ejb3.client.ClientLauncher;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -50,12 +48,18 @@
return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-client.jar");
}
- public void testWSDLAccess() throws MalformedURLException
+ public void testGeneratedService() throws Exception
{
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
+ TestEndpointService service = new TestEndpointService();
+ TestEndpoint port = service.getTestEndpointPort();
+
+ // Set the target endpoint address, since the service could not be created from wsdl
+ BindingProvider provider = (BindingProvider)port;
+ provider.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, TARGET_ENDPOINT_ADDRESS);
+
+ String helloWorld = "Hello World!";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
}
public void testDynamicProxy() throws Exception
@@ -74,8 +78,8 @@
{
String helloWorld = "Hello World!";
TestEndpointClientOne.iniCtx = getInitialContext();
-
- new ClientLauncher().launch(TestEndpointClientOne.class.getName(), "jbossws-client", new String[]{helloWorld});
+
+ new ClientLauncher().launch(TestEndpointClientOne.class.getName(), "jbossws-client", new String[] { helloWorld });
assertEquals(helloWorld, TestEndpointClientOne.retStr);
}
}
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-04-16 12:28:34 UTC (rev 2878)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.webserviceref;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.naming.InitialContext;
@@ -32,8 +31,6 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -44,20 +41,12 @@
public class WebServiceRefEJB3TestCase extends JBossWSTest
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref";
-
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-samples-webserviceref.war");
}
- public void testWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
public void testDynamicProxy() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-04-16 10:31:31 UTC (rev 2877)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-04-16 12:28:34 UTC (rev 2878)
@@ -23,7 +23,6 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -33,8 +32,6 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
* Test the JAXWS annotation: javax.xml.ws.WebServiceref
@@ -45,20 +42,12 @@
public class WebServiceRefServletTestCase extends JBossWSTest
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref";
-
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxws-samples-webserviceref.war");
}
- public void testWSDLAccess() throws MalformedURLException
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull(wsdlDefinitions);
- }
-
public void testDynamicProxy() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
17 years
- 1
- 0