[jboss-svn-commits] JBossWS SVN: r763 - in trunk/src: main/java/org/jboss/ws/binding main/java/org/jboss/ws/deployment main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/soap main/java/org/jboss/ws/tools/metadata test/ant test/java/org/jboss/test/ws test/java/org/jboss/test/ws/jbws1125 test/resources test/resources/jbws1125 test/resources/jbws1125/META-INF test/resources/jbws1125/WEB-INF test/resources/jbws1125/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 16 11:07:39 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-16 11:07:02 -0400 (Wed, 16 Aug 2006)
New Revision: 763
Added:
trunk/src/test/java/org/jboss/test/ws/jbws1125/
trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
trunk/src/test/resources/jbws1125/
trunk/src/test/resources/jbws1125/META-INF/
trunk/src/test/resources/jbws1125/META-INF/application-client.xml
trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1125/WEB-INF/
trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1125/WEB-INF/web.xml
trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1125/WEB-INF/wsdl/
trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jbws1125/wstools-config.xml
Removed:
trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
trunk/src/test/resources/jbws1125/META-INF/
trunk/src/test/resources/jbws1125/META-INF/application-client.xml
trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1125/WEB-INF/
trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1125/WEB-INF/web.xml
trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1125/WEB-INF/wsdl/
trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jbws1125/wstools-config.xml
Modified:
trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
trunk/src/test/ant/build-jars.xml
Log:
[JBWS-1125] Support doc/lit with empty soap body elements
Modified: trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -244,7 +244,7 @@
public void initInputParams(Object[] inputParams)
{
List<ParameterMetaData> paramMetaDataList = opMetaData.getParameters();
- if (opMetaData.isDocumentWrapped())
+ if (opMetaData.isDocumentWrapped() && paramMetaDataList.size() != 0)
{
Object value = ParameterWrapping.wrapRequestParameters(opMetaData, inputParams);
ParameterMetaData paramMetaData = paramMetaDataList.get(0);
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -509,15 +509,6 @@
}
// Try the filename as File
- try
- {
- fileURL = new URL(filename);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
if (fileURL == null)
{
try
Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -66,12 +66,6 @@
if (opMetaData.getStyle() != Style.DOCUMENT)
throw new WSException("Unexpected style: " + opMetaData.getStyle());
- if (opMetaData.getNonHeaderParameters().size() != 1)
- throw new WSException("Unexpected number of input parameters: " + opMetaData.getParameters().size());
-
- if (opMetaData.getReturnParameter() == null && opMetaData.isOneWayOperation() == false)
- throw new WSException("Unexpected null return parameter");
-
if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED)
throw new WSException("Unexpected parameter style: " + opMetaData.getParameterStyle());
}
@@ -80,6 +74,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return true;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -132,6 +133,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return true;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
Class resStructType = paramMetaData.getJavaType();
@@ -170,6 +178,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getParameters().size() == 0)
+ {
+ log.debug("Detected document/literal/wrapped with no parameter part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getParameters().get(0);
List<String> varNames = paramMetaData.getWrappedVariables();
Class reqStructType = paramMetaData.getJavaType();
@@ -277,6 +292,13 @@
{
assertOperationMetaData(opMetaData);
+ // [JBWS-1125] Support empty soap body elements
+ if (opMetaData.getReturnParameter() == null)
+ {
+ log.debug("Detected document/literal/wrapped with no return part");
+ return null;
+ }
+
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
List<String> varNames = paramMetaData.getWrappedVariables();
Class resStructType = paramMetaData.getJavaType();
Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/main/java/org/jboss/ws/soap/SOAPMessageDispatcher.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.common.SOAPMessageContextBase;
+import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -87,15 +88,31 @@
Iterator bodyChildren = soapBody.getChildElements();
if (bodyChildren.hasNext() == false)
- throw new SOAPException("SOAPBody has no child element");
+ {
+ if (epMetaData.getStyle() == Style.RPC)
+ throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
+
+ // [JBWS-1125] Support empty soap body elements
+ for (OperationMetaData opAux : epMetaData.getOperations())
+ {
+ if (opAux.getParameters().size() == 0)
+ {
+ log.debug ("Dispatching empty SOAP body");
+ opMetaData = opAux;
+ break;
+ }
+ }
+ }
+ else
+ {
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
+ if (bodyChildren.hasNext())
+ throw new SOAPException("SOAPBody has more than on child element");
- SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next();
- if (bodyChildren.hasNext())
- throw new SOAPException("SOAPBody has more than on child element");
-
- Name soapName = soapBodyElement.getElementName();
- QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
- opMetaData = epMetaData.getOperation(xmlElementName);
+ Name soapName = soapBodyElement.getElementName();
+ QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName());
+ opMetaData = epMetaData.getOperation(xmlElementName);
+ }
}
// Dispatch to a generic operation that takes an org.w3c.dom.Element
@@ -105,8 +122,8 @@
{
if (opAux.isMessageEndpoint())
{
+ log.debug("Use generic message style dispatch");
opMetaData = opAux;
- log.debug("Use generic message style dispatch");
break;
}
}
Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.tools.metadata;
-// $Id: $
+// $Id$
import java.rmi.Remote;
import java.util.List;
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.Style;
import org.jboss.ws.metadata.ServiceMetaData;
Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml 2006-08-16 14:58:33 UTC (rev 762)
+++ trunk/src/test/ant/build-jars.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -225,136 +225,7 @@
<include name="jboss-client.xml"/>
</metainf>
</jar>
-
- <!-- jbossws-jbws1010 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
- <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <!-- jbossws-jbws1011 -->
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
- <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jbosscmp-jdbc.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/TestService.wsdl"/>
- </metainf>
- </jar>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1107 -->
- <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jbossws-jbws1121 -->
- <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
- </classes>
- <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- <include name="jboss-wsse-server.xml"/>
- </webinf>
- <webinf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </webinf>
- </war>
- <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jboss-wsse-client.xml"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/*"/>
- </metainf>
- <metainf dir="${build.test.dir}/resources/jbws1121">
- <include name="wsse.keystore"/>
- <include name="wsse.truststore"/>
- </metainf>
- </jar>
- <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
- appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
- <fileset dir="${build.test.dir}/libs">
- <include name="jbossws-jbws1121-client.jar"/>
- <include name="jbossws-jbws1121.war"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </ear>
-
<!-- jbossws-jaxws-binding -->
<war warfile="${build.test.dir}/libs/jbossws-jaxws-binding.war" webxml="${build.test.dir}/resources/jaxws/binding/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -731,6 +602,214 @@
</webinf>
</war>
+ <!-- jbossws-jbws1010 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1010.war" webxml="${build.test.dir}/resources/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1010-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1010/InheritenceChildInterface.class"/>
+ <include name="org/jboss/test/ws/jbws1010/InheritenceParentInterface.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1010/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1010/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1011 -->
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jbosscmp-jdbc.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/TestService.wsdl"/>
+ </metainf>
+ </jar>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1107 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1107.war" webxml="${build.test.dir}/resources/jbws1107/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1107/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1107-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1107/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1107/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1107/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1121 -->
+ <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
+ appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.test.dir}/libs">
+ <include name="jbossws-jbws1121-client.jar"/>
+ <include name="jbossws-jbws1121.war"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+
+ <!-- jbossws-jbws1124one -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124one"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124one.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <!-- jbossws-jbws1124two -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${test.resources.dir}">
+ <include name="jbws1124/META-INF/jboss-client.xml"/>
+ <include name="jbws1124/WEB-INF/test-resource.txt"/>
+ <include name="jbws1124/WEB-INF/jboss-web.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbws1124.domain" value="jbws1124two"/>
+ </filterset>
+ </copy>
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1124two.war" webxml="${build.test.dir}/resources/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1124/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1124/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="test-resource.txt"/>
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
+ <!-- jbossws-jbws1125 -->
+ <war warfile="${build.test.dir}/libs/jbossws-jbws1125.war" webxml="${build.test.dir}/resources/jbws1125/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1125-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1125/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jbws1125/*ResponseStruct.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1125/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1125/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jsr181-complex -->
<war warfile="${build.test.dir}/libs/jbossws-jsr181-complex.war" webxml="${build.test.dir}/resources/jsr181/complex/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125 (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,94 +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.test.ws.jbws1125;
-
-// $Id: $
-
-import java.io.ByteArrayInputStream;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * Support empty soap body elements
- *
- * http://jira.jboss.org/jira/browse/JBWS-1125
- *
- * @author Thomas.Diesler at jboss.com
- * @since 16-August-2006
- */
-public class JBWS1125TestCase extends JBossWSTest
-{
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1125TestCase.class, "jbossws-jbws1125.war, jbossws-jbws1125-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 testClientAccess() throws Exception
- {
- String retObj = port.noParamPart();
- assertEquals("noParamPart", retObj);
-
- port.noReturnPart("hello");
- }
-
- public void _testMessageAccess() throws Exception
- {
- String reqEnv =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Body/>" +
- "</env:Envelope>";
-
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
-
- SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
- SOAPConnection con = conFactory.createConnection();
- SOAPMessage resMessage = con.call(soapMessage, "http://" + getServerHost() + ":8080/jbossws-jbws1125");
- SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
- assertEquals("noParamPartResponse", soapElement.getElementName().getLocalName());
-
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/JBWS1125TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,32 +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.test.ws.jbws1125;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface TestEndpoint extends Remote
-{
- public String noParamPart() throws RemoteException;
-
- public void noReturnPart(String param) throws RemoteException;
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,41 +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.test.ws.jbws1125;
-
-import org.jboss.logging.Logger;
-
-public class TestEndpointImpl implements TestEndpoint
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- public String noParamPart()
- {
- log.info("noParamPart");
- return "noParamPart";
- }
-
- public void noReturnPart(String param)
- {
- log.info("noReturnPart: " + param);
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpointImpl.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noParamPart_RequestStruct
-{
-public TestEndpoint_noParamPart_RequestStruct(){
-}
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_RequestStruct.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noParamPart_ResponseStruct
-{
-
-protected java.lang.String result;
-public TestEndpoint_noParamPart_ResponseStruct(){}
-
-public TestEndpoint_noParamPart_ResponseStruct(java.lang.String result){
-this.result=result;
-}
-public java.lang.String getResult() { return result ;}
-
-public void setResult(java.lang.String result){ this.result=result; }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noParamPart_ResponseStruct.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noReturnPart_RequestStruct
-{
-
-protected java.lang.String string_1;
-public TestEndpoint_noReturnPart_RequestStruct(){}
-
-public TestEndpoint_noReturnPart_RequestStruct(java.lang.String string_1){
-this.string_1=string_1;
-}
-public java.lang.String getString_1() { return string_1 ;}
-
-public void setString_1(java.lang.String string_1){ this.string_1=string_1; }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_RequestStruct.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,18 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 16 14:41:18 CEST 2006
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1125;
-
-
-public class TestEndpoint_noReturnPart_ResponseStruct
-{
-public TestEndpoint_noReturnPart_ResponseStruct(){
-}
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java (from rev 755, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1125/TestEndpoint_noReturnPart_ResponseStruct.java)
Copied: trunk/src/test/resources/jbws1125 (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125)
Copied: trunk/src/test/resources/jbws1125/META-INF (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/META-INF)
Deleted: trunk/src/test/resources/jbws1125/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/META-INF/application-client.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,21 +0,0 @@
-<?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>HelloService</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.jbws1125.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jbws1125/META-INF/application-client.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,15 +0,0 @@
-<?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/jbossws-jbws1125?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jbws1125/META-INF/jboss-client.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jbws1125/WEB-INF (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF)
Deleted: trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,71 +0,0 @@
-<?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.jbws1125</package-type>
- <namespaceURI>http://jbws1125.ws.test.jboss.org/jaws/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noParamPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noParamPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPart</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>string_1</java-variable-name>
- <xml-element-name>String_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1125.TestEndpoint_noReturnPart_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://jbws1125.ws.test.jboss.org/jaws/types'>typeNS:noReturnPartResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1125.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://jbws1125.ws.test.jboss.org/jaws'>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.jbws1125.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://jbws1125.ws.test.jboss.org/jaws'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://jbws1125.ws.test.jboss.org/jaws'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>noParamPart</java-method-name>
- <wsdl-operation>noParamPart</wsdl-operation>
- <wrapped-element/>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noParamPartResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>noReturnPart</java-method-name>
- <wsdl-operation>noReturnPart</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://jbws1125.ws.test.jboss.org/jaws'>wsdlMsgNS:TestEndpoint_noReturnPart</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/src/test/resources/jbws1125/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/WEB-INF/web.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,19 +0,0 @@
-<?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.jbws1125.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/src/test/resources/jbws1125/WEB-INF/web.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://jbws1125.ws.test.jboss.org/jaws' 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>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1125.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1125/WEB-INF/webservices.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jbws1125/WEB-INF/wsdl (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://jbws1125.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws1125.ws.test.jboss.org/jaws/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='noParamPart'>
- <sequence/>
- </complexType>
- <complexType name='noParamPartResponse'>
- <sequence>
- <element name='result' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPart'>
- <sequence>
- <element name='String_1' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='noReturnPartResponse'>
- <sequence/>
- </complexType>
- <element name='noParamPart' type='tns:noParamPart'/>
- <element name='noParamPartResponse' type='tns:noParamPartResponse'/>
- <element name='noReturnPart' type='tns:noReturnPart'/>
- <element name='noReturnPartResponse' type='tns:noReturnPartResponse'/>
- </schema>
- </types>
-
- <!--
- BP-1.0 5.3.1 Bindings and Parts
- Use of wsdl:message elements with zero parts is permitted in Document styles to permit operations
- that can send or receive messages with empty soap:Bodys.
- -->
- <message name='TestEndpoint_noParamPart'>
- <!-- part element='ns1:noParamPart' name='parameters'/ -->
- </message>
- <message name='TestEndpoint_noParamPartResponse'>
- <part element='ns1:noParamPartResponse' name='result'/>
- </message>
-
- <message name='TestEndpoint_noReturnPart'>
- <part element='ns1:noReturnPart' name='parameters'/>
- </message>
- <message name='TestEndpoint_noReturnPartResponse'>
- <!-- part element='ns1:noReturnPartResponse' name='result'/ -->
- </message>
-
- <portType name='TestEndpoint'>
- <operation name='noParamPart'>
- <input message='tns:TestEndpoint_noParamPart'/>
- <output message='tns:TestEndpoint_noParamPartResponse'/>
- </operation>
- <operation name='noReturnPart'>
- <input message='tns:TestEndpoint_noReturnPart'/>
- <output message='tns:TestEndpoint_noReturnPartResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='noParamPart'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='noReturnPart'>
- <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
Copied: trunk/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jbws1125/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml 2006-08-16 13:53:20 UTC (rev 755)
+++ trunk/src/test/resources/jbws1125/wstools-config.xml 2006-08-16 15:07:02 UTC (rev 763)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/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.jbws1125.TestEndpoint" style="document">
- </service>
- <namespaces target-namespace="http://jbws1125.ws.test.jboss.org/jaws" type-namespace="http://jbws1125.ws.test.jboss.org/jaws/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
-
Copied: trunk/src/test/resources/jbws1125/wstools-config.xml (from rev 755, branches/jbossws-1.0/src/test/resources/jbws1125/wstools-config.xml)
More information about the jboss-svn-commits
mailing list