JBossWS SVN: r1976 - in trunk/jbossws-tests/src/main: resources/jaxrpc/jbws1384/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-01-15 23:03:22 -0500 (Mon, 15 Jan 2007)
New Revision: 1976
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml
Log:
Fix JBWS1384TestCase
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-15 20:34:13 UTC (rev 1975)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-16 04:03:22 UTC (rev 1976)
@@ -40,7 +40,7 @@
/**
* Attachment parts with doclit message
- *
+ *
* http://jira.jboss.org/jira/browse/JBWS-1384
*
* @author Thomas.Diesler(a)jboss.org
@@ -76,15 +76,16 @@
boolean ret = wstools.generate("resources/jaxrpc/jbws1384/wstools-config.xml", "./wstools/jbws1384");
assertTrue("wstools success", ret);
}
-
+
public void testEndpoint() throws Exception
{
+ /*
StubExt stub = (StubExt)port;
AttachmentPart part = stub.createAttachmentPart();
part.setContent("attached-string", "text/plain");
stub.addAttachmentPart(part);
-
- String retStr = port.invokeAttach("user", "pass", "op", "<root/>");
+ */
+ String retStr = port.invokeAttach("user", "pass", "op", "<root/>", "attached-string");
assertEquals("[user=user,pass=pass,op=op,xml=<root/>] attached-string", retStr);
}
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-15 20:34:13 UTC (rev 1975)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-16 04:03:22 UTC (rev 1976)
@@ -36,11 +36,11 @@
private ServletEndpointContext sepCtx;
- public String invokeAttach(String username, String password, String operationName, String inputXML)
+ public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents)
{
String reqMessage = "[user=" + username + ",pass=" + password + ",op=" + operationName + ",xml=" + inputXML + "]";
-
- // Get attached string
+
+ // Verify parameter was actually an attachment
String attachedStr = null;
try
{
@@ -53,6 +53,9 @@
throw new RuntimeException(ex);
}
+ if (attachedStr == null || !attachedStr.equals(attachmentContents))
+ throw new IllegalStateException("Attachment strings do not match");
+
log.info(reqMessage + " " + attachedStr);
return reqMessage + " " + attachedStr;
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-15 20:34:13 UTC (rev 1975)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-16 04:03:22 UTC (rev 1976)
@@ -11,5 +11,5 @@
public interface TransmulatorInterface extends java.rmi.Remote
{
- public java.lang.String invokeAttach(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML) throws java.rmi.RemoteException;
+ public java.lang.String invokeAttach(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML, String attachmentContents) throws java.rmi.RemoteException;
}
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-15 20:34:13 UTC (rev 1975)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-16 04:03:22 UTC (rev 1976)
@@ -89,6 +89,15 @@
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>4</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.webservice/samples2'>wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>attachmentContents</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>java.lang.String</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.webservice/samples2'>wsdlMsgNS:attachResponse</wsdl-message>
@@ -96,4 +105,4 @@
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
</service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
+</java-wsdl-mapping>
18 years
- 1
- 0
JBossWS SVN: r1975 - in trunk: integration-jboss42 and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 15:34:13 -0500 (Mon, 15 Jan 2007)
New Revision: 1975
Modified:
trunk/integration-jboss40/.classpath
trunk/integration-jboss40/build.xml
trunk/integration-jboss42/.classpath
trunk/integration-jboss42/build.xml
trunk/integration-jboss50/.classpath
trunk/integration-jboss50/build.xml
trunk/integration-tomcat/.classpath
trunk/integration-tomcat/build.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
trunk/jbossws-tests/.classpath
Log:
Modified: trunk/integration-jboss40/.classpath
===================================================================
--- trunk/integration-jboss40/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss40/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -17,7 +17,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -28,7 +27,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss40/build.xml 2007-01-15 20:34:13 UTC (rev 1975)
@@ -282,6 +282,7 @@
<copy todir="${jboss40.home}/client" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
@@ -293,6 +294,7 @@
<copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
Modified: trunk/integration-jboss42/.classpath
===================================================================
--- trunk/integration-jboss42/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss42/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -17,7 +17,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -26,12 +25,12 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss42/build.xml 2007-01-15 20:34:13 UTC (rev 1975)
@@ -140,6 +140,7 @@
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
@@ -147,6 +148,7 @@
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss50/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -18,7 +18,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -27,7 +26,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
@@ -36,5 +34,6 @@
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3.jar" sourcepath="/home/tdiesler/svn/jbossas/trunk/ejb3/src/main"/>
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3x.jar"/>
<classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-jboss50/build.xml 2007-01-15 20:34:13 UTC (rev 1975)
@@ -146,6 +146,7 @@
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
@@ -153,6 +154,7 @@
<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
Modified: trunk/integration-tomcat/.classpath
===================================================================
--- trunk/integration-tomcat/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-tomcat/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -16,7 +16,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -27,7 +26,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/integration-tomcat/build.xml 2007-01-15 20:34:13 UTC (rev 1975)
@@ -137,15 +137,30 @@
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="core-jars,tomcat-jars,tomcat-thirdparty-jar" description="Deploy JBossWS to Tomcat">
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
- <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mail.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/endorsed">
+ <fileset dir="${thirdparty.dir}">
+ <include name="serializer.jar"/>
+ <include name="xalan.jar"/>
+ <include name="xercesImpl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.common.dir}/lib" overwrite="true">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="${tomcat.output.lib.dir}">
+ <include name="jbossws-tomcat-integration.jar"/>
+ <include name="jbossws-thirdparty.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="activation.jar"/>
+ <include name="log4j.jar"/>
+ <include name="mail.jar"/>
+ </fileset>
+ </copy>
<copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/jbossws-core/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -15,7 +15,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-src.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-1_5_2.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -26,9 +25,10 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/jbossws-core/src/main/java/javax/xml/ws/Endpoint.java 2007-01-15 20:34:13 UTC (rev 1975)
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
+import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.spi.Provider;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -97,7 +98,15 @@
**/
public static Endpoint create(Object implementor)
{
- return create(null, implementor);
+ if (implementor == null)
+ throw new IllegalArgumentException("Implementor cannot be null");
+
+ String bindingId = SOAPBinding.SOAP11HTTP_BINDING;
+ BindingType anBindingType = implementor.getClass().getAnnotation(BindingType.class);
+ if (anBindingType != null)
+ bindingId = anBindingType.value();
+
+ return create(bindingId, implementor);
}
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-01-15 20:34:13 UTC (rev 1975)
@@ -69,11 +69,13 @@
public EndpointImpl(String bindingId, Object implementor)
{
+ log.debug("new EndpointImpl(bindingId=" + bindingId + ",implementor=" + implementor + ")");
+
+ if (implementor == null)
+ throw new IllegalArgumentException("Implementor cannot be null");
+
this.implementor = implementor;
this.bindingProvider = new BindingProviderImpl(bindingId);
-
- if (implementor == null)
- throw new WebServiceException("Implementor cannot be null");
}
@Override
@@ -98,6 +100,8 @@
@Override
public void publish(String address)
{
+ log.debug("publish: " + address);
+
URI addrURI;
try
{
@@ -133,6 +137,8 @@
@Override
public void publish(Object context)
{
+ log.debug("publish: " + context);
+
if (isDestroyed)
throw new IllegalStateException("Endpoint already destroyed");
@@ -151,6 +157,8 @@
@Override
public void stop()
{
+ log.debug("stop");
+
if (serverContext == null || isPublished == false)
log.error("Endpoint not published");
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-01-15 19:18:45 UTC (rev 1974)
+++ trunk/jbossws-tests/.classpath 2007-01-15 20:34:13 UTC (rev 1975)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/main/java"/>
+ <classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="output/wstools/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
@@ -36,10 +35,10 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
18 years
- 1
- 0
JBossWS SVN: r1974 - in trunk/jbossws-core/src/main/java: org/jboss/ws/core/jaxws/client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 14:18:45 -0500 (Mon, 15 Jan 2007)
New Revision: 1974
Modified:
trunk/jbossws-core/src/main/java/javax/xml/ws/soap/SOAPFaultException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
Log:
[JBCTS-433] - Fix jaxws/api/javax_xml_ws/Dispatch
Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/soap/SOAPFaultException.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/ws/soap/SOAPFaultException.java 2007-01-15 16:57:09 UTC (rev 1973)
+++ trunk/jbossws-core/src/main/java/javax/xml/ws/soap/SOAPFaultException.java 2007-01-15 19:18:45 UTC (rev 1974)
@@ -64,6 +64,16 @@
this.fault = fault;
}
+ public SOAPFaultException(String message)
+ {
+ super(message);
+ }
+
+ public SOAPFaultException(String message, Exception ex)
+ {
+ super(message, ex);
+ }
+
public SOAPFaultException(Exception ex)
{
super(ex);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-01-15 16:57:09 UTC (rev 1973)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-01-15 19:18:45 UTC (rev 1974)
@@ -50,6 +50,7 @@
import javax.xml.ws.Response;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.Service.Mode;
+import javax.xml.ws.soap.SOAPFaultException;
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
@@ -210,6 +211,10 @@
private SOAPMessage getRequestMessage(Object obj)
{
+ // jaxws/api/javax_xml_ws/Dispatch/Client.java#invokeTestJAXBNull
+ if (obj == null)
+ throw new SOAPFaultException("Request object cannot be null");
+
SOAPMessage reqMsg = null;
try
{
18 years
- 1
- 0
JBossWS SVN: r1973 - trunk/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 11:57:09 -0500 (Mon, 15 Jan 2007)
New Revision: 1973
Modified:
trunk/build/ant.properties.example
Log:
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-01-15 16:52:56 UTC (rev 1972)
+++ trunk/build/ant.properties.example 2007-01-15 16:57:09 UTC (rev 1973)
@@ -6,7 +6,7 @@
# Required JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
-#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
jbossws.integration.target=jboss50
18 years
- 1
- 0
JBossWS SVN: r1972 - in trunk: build/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 11:52:56 -0500 (Mon, 15 Jan 2007)
New Revision: 1972
Modified:
trunk/build/ant-import/build-thirdparty.xml
trunk/build/version.properties
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
Log:
Fix jdk1.4 build up to jbws-1458
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-01-15 16:31:58 UTC (rev 1971)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-01-15 16:52:56 UTC (rev 1972)
@@ -53,7 +53,8 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
@@ -68,7 +69,7 @@
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
</target>
@@ -87,13 +88,13 @@
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
<pathelement location="${thirdparty.dir}/xalan.jar"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-01-15 16:31:58 UTC (rev 1971)
+++ trunk/build/version.properties 2007-01-15 16:52:56 UTC (rev 1972)
@@ -17,7 +17,7 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.5.2jboss
javassist=3.4.GA
-jboss-jbossxb=1.0.0.CR8
+jboss-jbossxb=1.0.0.CR7
jboss-microcontainer=snapshot
jboss-remoting=2.0.0.GA
sun-jaxb=2.0.3
@@ -35,13 +35,13 @@
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
jboss-jbossretro=1.0.4.GA
-jboss-security-spi=2.0.0.Beta
+jboss-security=4.0.5.GA
jboss-vfs=2.0.0.snapshot
jbossas-core-libs=4.0.5.GA
jbpm-bpel=1.1.Beta2
junit=3.8.1
oswego-concurrent=1.3.4
-qdox=1.6
+qdox=1.4
stax-api=1.0
sun-jaf=1.1
sun-javamail=1.4
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-15 16:31:58 UTC (rev 1971)
+++ trunk/jbossws-tests/build.xml 2007-01-15 16:52:56 UTC (rev 1972)
@@ -114,13 +114,13 @@
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
- <!-- Define the jbossws.build -->
- <condition property="jbossws.build" value="jbossws14">
+ <!-- Define the jbossws.client.jar -->
+ <condition property="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar">
<not>
<isset property="HAVE_JDK_1.5"/>
</not>
</condition>
- <condition property="jbossws.build" value="jbossws">
+ <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
<isset property="HAVE_JDK_1.5"/>
</condition>
@@ -155,12 +155,14 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="core.classpath"/>
- <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/>
+ <pathelement location="${jbossws.client.jar}"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
<pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
@@ -261,7 +263,9 @@
<target name="generate-sources" depends="compile" description="Generate the deployment resources.">
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${core.output.lib.dir}/jbossws-client.jar"/>
+ <classpath location="${jbossws.client.jar}"/>
+ <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
+ <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
<classpath location="${tests.output.dir}/classes"/>
<classpath location="${tests.output.dir}"/>
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 16:31:58 UTC (rev 1971)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 16:52:56 UTC (rev 1972)
@@ -267,7 +267,7 @@
throw new IllegalStateException("Length of VariableMapping[] do not match");
}
- HashMap<String, VariableMapping> actualMappings = new HashMap<String, VariableMapping>(vm2.length);
+ HashMap actualMappings = new HashMap(vm2.length);
for (int i = 0; i < len1; i++)
{
VariableMapping current = vm2[i];
@@ -280,7 +280,7 @@
for (int i = 0; i < len1; i++)
{
VariableMapping expected = vm1[i];
- VariableMapping actual = actualMappings.get(expected.getJavaVariableName());
+ VariableMapping actual = (VariableMapping)actualMappings.get(expected.getJavaVariableName());
if (actual == null)
throw new IllegalStateException("Variable '" + expected.getJavaVariableName() + "' not found.");
18 years
- 1
- 0
JBossWS SVN: r1971 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/server and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-15 11:31:58 -0500 (Mon, 15 Jan 2007)
New Revision: 1971
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/DispatchException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/EventingUtils.java
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/metadata/EventingEpMetaExt.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl
Log:
Fix JBWS-1388. Thanks to Allessio Soldano for the contribution
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -100,7 +100,15 @@
static final String URI_LITERAL_ENC = "";
/** WSDL 2.0 Encoding Rules */
static final String URI_STYLE_RPC = "http://www.w3.org/2004/03/wsdl/style/rpc";
- static final String URI_STYLE_DOCUMENT = "http://www.w3.org/2004/03/wsdl/style/iri";
+
+ static final String URI_STYLE_DOCUMENT = "http://www.w3.org/2004/03/wsdl/style/iri";
+
+ /** WS-Eventing namespace uri **/
+ static final String URI_WS_EVENTING = "http://schemas.xmlsoap.org/ws/2004/08/eventing";
+
+ /** WS-Addressing namespace uri **/
+ static final String URI_WS_ADDRESSING = "http://www.w3.org/2005/08/addressing";
+
/**Style of WSDL */
static final String RPC_LITERAL = "RPC/Literal";
static final String DOCUMENT_LITERAL = "Document/Literal";
@@ -272,9 +280,10 @@
/** Indicates that an output is a return parameter */
static final String WSDL_PROPERTY_RETURN_PART = "http://www.jboss.org/jbossws/return-part";
- static final QName WSDL_ATTRIBUTE_WSA_ACTION = new QName("http://www.w3.org/2005/08/addressing", "Action");
+ static final QName WSDL_ATTRIBUTE_WSA_ACTION = new QName(URI_WS_ADDRESSING, "Action");
- static final QName WSDL_ATTRIBUTE_WSE_EVENTSOURCE = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventSource");
+ static final QName WSDL_ATTRIBUTE_WSE_EVENTSOURCE = new QName(URI_WS_EVENTING, "EventSource");
+
/** WSDL-2.0 exchange patterns */
static final String WSDL20_PATTERN_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only";
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -111,7 +111,7 @@
Element childElement = (Element)childNode;
String nodeName = childElement.getLocalName();
- // Replace xsd:import location attributes
+ // Replace xsd:import and xsd:include location attributes
if ("import".equals(nodeName) || "include".equals(nodeName))
{
Attr locationAttr = childElement.getAttributeNode("schemaLocation");
@@ -132,7 +132,7 @@
String reqPath = reqURL.getPath();
String completeHost = wsdlHost;
- if (! wsdlHost.startsWith("http://") && wsdlHost.startsWith("https://"))
+ if (! (wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://")) )
{
String reqProtocol = reqURL.getProtocol();
int reqPort = reqURL.getPort();
@@ -141,6 +141,8 @@
}
String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath;
+ locationAttr.setNodeValue(newLocation);
+
log.debug("Mapping import from '" + orgLocation + "' to '" + newLocation + "'");
}
}
@@ -161,7 +163,7 @@
if (reqURL.getProtocol().equals(locProtocol) && reqURL.getPath().equals(locPath))
{
String completeHost = wsdlHost;
- if (!completeHost.startsWith("http://") || !completeHost.startsWith("https://"))
+ if (! (completeHost.startsWith("http://") || completeHost.startsWith("https://")) )
{
int locPort = locURL.getPort();
String hostAndPort = wsdlHost + (locPort > 0 ? ":" + locPort : "");
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/DispatchException.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/DispatchException.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/DispatchException.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.eventing;
+
+
+import org.jboss.ws.WSException;
+
+public class DispatchException extends WSException {
+
+ public DispatchException() {
+ super();
+ }
+
+ public DispatchException(String message) {
+ super(message);
+ }
+}
\ No newline at end of file
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/EventingUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/EventingUtils.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/EventingUtils.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.eventing;
+
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSNamespaceItem;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSStringList;
+import org.jboss.ws.Constants;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Iterator;
+
+/**
+ * @author Heiko.Braun(a)jboss.org
+ * @version $Id$
+ * @since 15.01.2007
+ */
+public class EventingUtils {
+
+ public static String[] extractNotificationSchema(JBossXSModel schemaModel) {
+
+ List<String> list = ((JBossXSStringList)schemaModel.getNamespaces()).toList();
+ List<String> schemas = new LinkedList<String>();
+
+ for (Iterator it = list.iterator(); it.hasNext(); )
+ {
+
+ String ns = (String)it.next();
+
+ if (!Constants.URI_SOAP11_ENC.equalsIgnoreCase(ns) &&
+ !Constants.NS_SCHEMA_XSI.equalsIgnoreCase(ns) &&
+ !Constants.NS_SCHEMA_XSD.equalsIgnoreCase(ns) &&
+ !Constants.URI_WS_EVENTING.equalsIgnoreCase(ns) &&
+ !Constants.URI_WS_ADDRESSING.equalsIgnoreCase(ns))
+ {
+ JBossXSNamespaceItem item = schemaModel.getNamespaceItem(ns);
+ boolean qElem = item.isQualifiedElements();
+ item.setQualifiedElements(true);
+ schemas.add(item.toString());
+ item.setQualifiedElements(qElem);
+ }
+ }
+
+ return schemas.toArray(new String[schemas.size()]);
+ }
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -44,7 +44,7 @@
// See also http://jira.jboss.org/jira/browse/JBWS-770
// create pending incomplete event source
- EventingEndpointDI desc = new EventingEndpointDI(ext.getEventSourceNS(), ext.getNotificationSchema());
+ EventingEndpointDI desc = new EventingEndpointDI(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS());
desc.setEndpointAddress(epMetaData.getEndpointAddress());
desc.setPortName(epMetaData.getPortComponentName());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -1,10 +1,5 @@
package org.jboss.ws.extensions.eventing.deployment;
-import java.io.IOException;
-
-import org.jboss.ws.core.utils.DOMUtils;
-import org.w3c.dom.Element;
-
/**
* Eventsource endpoint deployment info.
*
@@ -16,19 +11,20 @@
/* event source URI */
private String name;
- /* notification schema */
- private Object schema;
-
- private Element schemaElement;
-
private String portName;
// event source endpoint address
private String endpointAddress;
- public EventingEndpointDI(String name, Object schema) {
+ /* notification schema */
+ private String[] schema;
+
+ private String notificationRootElementNS;
+
+ public EventingEndpointDI(String name, String[] schema, String notificationRootElementNS) {
this.name = name;
this.schema = schema;
+ this.notificationRootElementNS = notificationRootElementNS;
}
public String getPortName() {
@@ -43,7 +39,7 @@
return name;
}
- public Object getSchema() {
+ public String[] getSchema() {
return schema;
}
@@ -55,18 +51,12 @@
this.endpointAddress = endpointAddress;
}
- Element getSchemaElement() {
- try
- {
- if(null == this.schemaElement)
- this.schemaElement = DOMUtils.parse((String)getSchema());
- }
- catch (IOException e)
- {
- throw new IllegalArgumentException("Failed to parse notification schema:" +e.getMessage());
- }
+ public String getNotificationRootElementNS() {
+ return notificationRootElementNS;
+ }
- return this.schemaElement;
+ public void setNotificationRootElementNS(String notificationRootElementNS) {
+ this.notificationRootElementNS = notificationRootElementNS;
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/metadata/EventingEpMetaExt.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/metadata/EventingEpMetaExt.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/metadata/EventingEpMetaExt.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -15,8 +15,10 @@
private boolean isEventSource = true;
private String eventSourceNS;
- private Object notificationSchema;
+ private String[] notificationSchema;
+ private String notificationRootElementNS;
+
public EventingEpMetaExt(String extensionNameSpace) {
super(extensionNameSpace);
}
@@ -48,12 +50,20 @@
throw new IllegalArgumentException("Illegal event source URI: " + eventSourceNS);
}
}
-
- public Object getNotificationSchema() {
- return notificationSchema;
+
+ public String[] getNotificationSchema() {
+ return this.notificationSchema;
}
- public void setNotificationSchema(Object notificationSchema) {
+ public void setNotificationSchema(String[] notificationSchema) {
this.notificationSchema = notificationSchema;
}
+
+ public String getNotificationRootElementNS() {
+ return notificationRootElementNS;
+ }
+
+ public void setNotificationRootElementNS(String notificationRootElementNS) {
+ this.notificationRootElementNS = notificationRootElementNS;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -44,22 +44,25 @@
private String name;
private URI nameSpace;
- private String notificationSchema;
private URI managerAddress;
private List<URI> supportedFilter = new ArrayList<URI>();
+ private String[] notificationSchema;
+ private String notificationRootElementNS;
+
public EventSource(String name, URI nameSpace) {
this.name = name;
this.nameSpace = nameSpace;
this.state = State.CREATED;
}
- public EventSource(String name, URI nameSpace, String schema)
+ public EventSource(String name, URI nameSpace, String[] schema, String notificationRootElementNS)
{
this.name = name;
this.nameSpace = nameSpace;
this.notificationSchema = schema;
+ this.notificationRootElementNS = notificationRootElementNS;
this.state = State.CREATED;
}
@@ -97,7 +100,7 @@
return supportedFilter;
}
- public String getNotificationSchema() {
+ public String[] getNotificationSchema() {
return notificationSchema;
}
@@ -113,6 +116,10 @@
return managerAddress;
}
+ public String getNotificationRootElementNS() {
+ return notificationRootElementNS;
+ }
+
public void setManagerAddress(String managerAddress) {
try
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -22,7 +22,7 @@
public EventSource newEventSource(EventingEndpointDI desc) {
URI eventSourceNS = newEventSourceURI(desc.getName());
- EventSource eventSource = new EventSource(desc.getName(), eventSourceNS, (String)desc.getSchema());
+ EventSource eventSource = new EventSource(desc.getName(), eventSourceNS, desc.getSchema(), desc.getNotificationRootElementNS());
eventSource.getSupportedFilterDialects().add(EventingConstants.getDefaultFilterDialect());
return eventSource;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -25,6 +25,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.io.StringReader;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -43,18 +44,27 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
import org.jboss.logging.Logger;
import org.jboss.util.naming.Util;
import org.jboss.ws.WSException;
import org.jboss.ws.core.utils.ObjectNameFactory;
import org.jboss.ws.core.utils.UUIDGenerator;
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.extensions.eventing.EventingConstants;
+import org.jboss.ws.extensions.eventing.DispatchException;
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
import org.jboss.ws.extensions.eventing.element.EndpointReference;
import org.jboss.ws.extensions.eventing.element.ReferenceParameters;
import org.jboss.ws.extensions.eventing.element.NotificationFailure;
import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
+import org.apache.xml.utils.DefaultErrorHandler;
/**
* The SubscriptionManager maintains event sources and subscriptions.<br>
@@ -87,7 +97,7 @@
private static final Logger log = Logger.getLogger(SubscriptionManager.class);
public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=SubscriptionManager,module=eventing");
-
+
/**
* Maps event source namespaces to event source instances.
*/
@@ -124,6 +134,11 @@
*/
private List<NotificationFailure> notificationFailures = new ArrayList<NotificationFailure>();
+ /**
+ * True force validation of every notification message against its schema
+ */
+ private boolean validateNotifications = false;
+
public void create() throws Exception
{
MBeanServer server = getJMXServer();
@@ -147,31 +162,31 @@
public void start() throws Exception
{
log.debug("Start subscription manager");
-
+
// setup thread pool
threadPool = new ThreadPoolExecutor(5, 15, // core/max num threads
- 5000, TimeUnit.MILLISECONDS, // 5 seconds keepalive
- eventQueue);
+ 5000, TimeUnit.MILLISECONDS, // 5 seconds keepalive
+ eventQueue);
// start the subscription watchdog
watchDog = new WatchDog(subscriptionMapping);
watchDog.startup();
}
- public void stop()
+ public void stop()
{
log.debug("Stop subscription manager");
try
{
// remove event dispatcher
Util.unbind(new InitialContext(), EventingConstants.DISPATCHER_JNDI_NAME);
-
+
// stop thread pool
threadPool.shutdown();
-
+
// stop the watchdog
watchDog.shutdown();
-
+
for (URI eventSourceNS : eventSourceMapping.keySet())
{
removeEventSource(eventSourceNS);
@@ -180,7 +195,7 @@
catch (NamingException e)
{
// ignore
- }
+ }
}
private static URI generateSubscriptionID()
@@ -462,6 +477,9 @@
public void dispatch(URI eventSourceNS, Element payload)
{
DispatchJob dispatchJob = new DispatchJob(eventSourceNS, payload, subscriptionMapping);
+ if (validateNotifications && !this.validateMessage(DOMWriter.printNode(payload,false),eventSourceNS)) {
+ throw new DispatchException("Notification message validation failed!");
+ }
threadPool.execute(dispatchJob);
}
@@ -475,6 +493,48 @@
return notificationFailures;
}
+ private boolean validateMessage(String msg, URI eventSourceNS) {
+ try
+ {
+ EventSource es = eventSourceMapping.get(eventSourceNS);
+ log.info(new StringBuffer("Validating message: \n\n").append(msg)
+ .append("\n\nagainst the following schema(s): \n").toString());
+ for (int i=0;i<es.getNotificationSchema().length;i++) {
+ log.info(es.getNotificationSchema()[i]);
+ }
+ Element rootElement = DOMUtils.parse(msg);
+ if (!es.getNotificationRootElementNS().equalsIgnoreCase(rootElement.getNamespaceURI())) {
+ log.error("Root element expected namespace: "+es.getNotificationRootElementNS());
+ return false;
+ }
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(true);
+ factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
+
+ String[] notificationSchemas = es.getNotificationSchema();
+ InputSource[] is = new InputSource[notificationSchemas.length];
+ for (int i=0; i<notificationSchemas.length; i++) {
+ is[i] = new InputSource(new StringReader(notificationSchemas[notificationSchemas.length-1-i]));
+ //is[i] = new InputSource(new StringReader(notificationSchemas[i]));
+ }
+
+ factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", is);
+ DocumentBuilder docBuilder = factory.newDocumentBuilder();
+ DefaultErrorHandler errorHandler = new Validator();
+ docBuilder.setErrorHandler(errorHandler);
+ docBuilder.parse(new InputSource(new StringReader(msg)));
+ log.info("Document validated!");
+ return true;
+ }
+ catch (Exception e) {
+ log.error(e);
+ log.info("Cannot validate and/or parse the document!");
+ return false;
+ }
+
+ }
+
// ----------------------------------------------------------------------
// MBean support
@@ -518,6 +578,25 @@
threadPool.setKeepAliveTime(millies, TimeUnit.MILLISECONDS);
}
+ public boolean isValidateNotifications() {
+ return this.validateNotifications;
+ }
+
+ public void setValidateNotifications(boolean validateNotifications) {
+ this.validateNotifications = validateNotifications;
+ }
+
+ private MBeanServer getJMXServer()
+ {
+ MBeanServer server = null;
+ ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+ if (servers.size() > 0)
+ {
+ server = (MBeanServer)servers.get(0);
+ }
+ return server;
+ }
+
/**
* The watchdog maintains subscription expirations.
*/
@@ -574,14 +653,14 @@
}
- private MBeanServer getJMXServer()
- {
- MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
- {
- server = (MBeanServer)servers.get(0);
+ private class Validator extends DefaultErrorHandler {
+ public void error(SAXParseException exception) throws SAXException {
+ throw new SAXException(exception);
}
- return server;
+ public void fatalError(SAXParseException exception) throws SAXException {
+ throw new SAXException(exception);
+ }
+ public void warning(SAXParseException exception) throws SAXException { }
}
+
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -104,4 +104,8 @@
public void addNotificationFailure(NotificationFailure failure);
public List<NotificationFailure> showNotificationFailures();
+
+ public boolean isValidateNotifications();
+
+ public void setValidateNotifications(boolean validateNotifications);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -48,6 +48,7 @@
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.eventing.EventingConstants;
+import org.jboss.ws.extensions.eventing.EventingUtils;
import org.jboss.ws.extensions.eventing.deployment.EventingEndpoint;
import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner;
@@ -97,7 +98,7 @@
* A meta data builder that is based on webservices.xml.
*
* @author Thomas.Diesler(a)jboss.org
- * @authoer <a href="mailto:jason.greene@jboss.org">Jason T. Greene</a>
+ * @author <a href="mailto:jason.greene@jboss.org">Jason T. Greene</a>
* @since 19-Oct-2005
*/
public abstract class JAXRPCMetaDataBuilder extends MetaDataBuilder
@@ -953,11 +954,31 @@
{
ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String eventSourceNS = wsdlInterface.getQName().getNamespaceURI() + "/" + wsdlInterface.getQName().getLocalPart();
- Object notificationSchema = null; // todo: resolve schema from operation message
+ // extract the schema model
+ JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ String[] notificationSchema = EventingUtils.extractNotificationSchema(schemaModel);
+
+ // extract the root element NS
+ String notificationRootElementNS = null;
+ WSDLInterfaceOperation wsdlInterfaceOperation = wsdlInterface.getOperations()[0];
+ if(wsdlInterfaceOperation.getOutputs().length > 0 )
+ {
+ WSDLInterfaceOperationOutput wsdlInterfaceOperationOutput = wsdlInterfaceOperation.getOutputs()[0];
+ notificationRootElementNS = wsdlInterfaceOperationOutput.getElement().getNamespaceURI();
+ }
+ else
+ {
+ // WSDL operation of an WSDL interface that is marked as an event source
+ // requires to carry an output message.
+ throw new WSException("Unable to resolve eventing root element NS. No operation output found at "+
+ wsdlInterfaceOperation.getQName());
+ }
+
EventingEpMetaExt ext = new EventingEpMetaExt(EventingConstants.NS_EVENTING);
ext.setEventSourceNS(eventSourceNS);
ext.setNotificationSchema(notificationSchema);
+ ext.setNotificationRootElementNS(notificationRootElementNS);
sepMetaData.addExtension(ext);
sepMetaData.setManagedEndpointBean(EventingEndpoint.class.getName());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -35,23 +35,7 @@
import java.util.List;
import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Import;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
+import javax.wsdl.*;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.mime.MIMEContent;
@@ -509,7 +493,12 @@
destOperation.setName(new NCName(srcOperation.getName()));
destOperation.setStyle(getOperationStyle(srcWsdl, srcPortType, srcOperation));
- processOperationInput(srcWsdl, srcOperation, destOperation, srcPortType);
+ if(srcOperation.getStyle()!=null
+ && false == OperationType.NOTIFICATION.equals(srcOperation.getStyle()))
+ {
+ processOperationInput(srcWsdl, srcOperation, destOperation, srcPortType);
+ }
+
processOperationOutput(srcWsdl, srcOperation, destOperation, srcPortType);
processOperationFaults(srcOperation, destOperation, destInterface);
@@ -612,8 +601,11 @@
Message srcMessage = srcOutput.getMessage();
if (srcMessage == null)
- throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find output message on operation " + srcOperation.getName() + " on port type: "
- + srcPortType.getQName());
+ throw new WSDLException(
+ WSDLException.INVALID_WSDL,
+ "Cannot find output message on operation " + srcOperation.getName() +
+ " on port type: "+ srcPortType.getQName()
+ );
log.trace("processOperationOutput: " + srcMessage.getQName());
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wseventing/SubscriptionManagerTestCase.java 2007-01-15 16:31:58 UTC (rev 1971)
@@ -79,7 +79,7 @@
{
try
{
- EventingEndpointDI deploymentInfo = new EventingEndpointDI("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings", null);
+ EventingEndpointDI deploymentInfo = new EventingEndpointDI("http://schemas.xmlsoap.org/ws/2004/08/eventing/Warnings", null, null);
deploymentInfo.setEndpointAddress("http://localhost:8080/jaxrpc-wseventing/manage");
deploymentInfo.setPortName("SubscriptionManagerPort");
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl 2007-01-15 15:25:51 UTC (rev 1970)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/wseventing/WEB-INF/wsdl/wind.wsdl 2007-01-15 16:31:58 UTC (rev 1971)
@@ -2,7 +2,7 @@
<wsdl:definitions
targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing"
- xmlns:tns="http://www.example.org/oceanwatch"
+ xmlns:tns="http://schemas.xmlsoap.org/ws/2004/08/eventing"
xmlns:wse='http://schemas.xmlsoap.org/ws/2004/08/eventing'
xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
xmlns:wsa10='http://www.w3.org/2005/08/addressing'
@@ -12,13 +12,9 @@
<wsdl:types>
<xs:schema targetNamespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'>
+
<xs:include schemaLocation='eventing.xsd'/>
- </xs:schema>
- <xs:schema
- targetNamespace="http://www.example.org/oceanwatch"
- elementFormDefault="qualified"
- blockDefault="#all">
<xs:element name="WindReport">
<xs:complexType>
<xs:sequence>
@@ -34,6 +30,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+
</xs:schema>
</wsdl:types>
@@ -72,7 +69,6 @@
<wsdl:part name='body' element='tns:WindReport'/>
</wsdl:message>
-
<wsdl:portType name='EventSource'>
<wsdl:operation name='SubscribeOp'>
<wsdl:input message='wse:SubscribeMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe'/>
@@ -104,7 +100,7 @@
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="WarningsBinding" type="wse:Warnings">
+ <wsdl:binding name="WarningsBinding" type="tns:Warnings">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="WindOp">
<soap:operation soapAction=""/>
18 years
- 1
- 0
JBossWS SVN: r1970 - in branches/jbossws-1.0.4.GA_JBWS-1454: src/main/java/org/jboss/ws/tools/helpers and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 10:25:51 -0500 (Mon, 15 Jan 2007)
New Revision: 1970
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
Log:
JBWS-1454 WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations.
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:07:36 UTC (rev 1969)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:25:51 UTC (rev 1970)
@@ -34,7 +34,12 @@
WSDL to Java - maps required xsd:double attribute to java.lang.Double
- http://jira.jboss.com/jira/browse/JBWS-1184
+ http://jira.jboss.com/jira/browse/JBWS-1184
+
+ WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times
+ if there are multiple operations.
+
+ http://jira.jboss.com/jira/browse/JBWS-1455
MANUAL INSTALL INSTRUCTIONS:
If you require the Java 1.4 version: -
1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 15:07:36 UTC (rev 1969)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 15:25:51 UTC (rev 1970)
@@ -94,6 +94,7 @@
private String packageName = null;
private Set<String> registeredTypes = new HashSet<String>();
+ private Set<String> registeredExceptions = new HashSet<String>();
private LiteralTypeMapping typeMapping = null;
private String wsdlStyle;
@@ -236,7 +237,7 @@
QName xmlName = wiout.getElement();
QName xmlType = wiout.getXMLType();
boolean primitive = true;
-
+
WSDLProperty wprop = wiout.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME);
QName messageName = new QName(targetNS, wprop.getValue(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS);
@@ -382,10 +383,16 @@
XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true);
- ExceptionMapping exceptionMapping = new ExceptionMapping(jwm);
- exceptionMapping.setExceptionType(getJavaTypeAsString(null, xmlType, false, true));
- exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString()));
- jwm.addExceptionMappings(exceptionMapping);
+ String exceptionType = getJavaTypeAsString(null, xmlType, false, true);
+
+ if (registeredExceptions.contains(exceptionType) == false)
+ {
+ registeredExceptions.add(exceptionType);
+ ExceptionMapping exceptionMapping = new ExceptionMapping(jwm);
+ exceptionMapping.setExceptionType(exceptionType);
+ exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString()));
+ jwm.addExceptionMappings(exceptionMapping);
+ }
}
}//end for
}
@@ -479,7 +486,7 @@
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
-
+
MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, partsMappings.size(), messageName, "IN", xmlName.getLocalPart(),
array, primitive);
partsMappings.add(part);
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455 (from rev 1960, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,64 +0,0 @@
-/*
- * 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.tools.jbws1455;
-
-import java.io.File;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 15 Jan 2007
- */
-public class JBWS1455TestCase extends JBossWSTest
-{
-
- private static final String resourceDir = "resources/tools/jbws1455";
- private static final String toolsDir = "tools/jbws1455";
-
- public void testGenerate() throws Exception
- {
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- compareSource("MyException.java");
- compareSource("TestEndpoint_PortType.java");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String fileName) throws Exception
- {
- File expected = new File(resourceDir + "/" + fileName);
- File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java (from rev 1960, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java)
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 15:07:36 UTC (rev 1969)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 15:25:51 UTC (rev 1970)
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
@@ -77,22 +78,31 @@
{
boolean bool = true;
bool = validatePackageMappings(jw1.getPackageMappings(), jw2.getPackageMappings());
- if (bool)
- bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings());
- else throw new IllegalStateException("Validation of PackageMappings failed");
- if (bool)
- bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings());
- else throw new IllegalStateException("Validation of JavaXmlTypeMappings failed");
+ checkBool(bool, "PackageMappings");
- if (bool)
- bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings());
- else throw new IllegalStateException("Validation of ServiceInterfaceMappings failed");
+ bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings());
+ checkBool(bool, "JavaXmlTypeMappings");
- if (bool == false)
- throw new IllegalStateException("Validation of ServiceEndpointInterfaceMappings failed");
+ bool = validateExceptionMapping(jw1.getExceptionMappings(), jw2.getExceptionMappings());
+ checkBool(bool, "ExceptionMappings");
+
+ bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings());
+ checkBool(bool, "ServiceInterfaceMappings");
+
+ bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings());
+ checkBool(bool, "ServiceEndpointInterfaceMappings");
+
return bool;
}
+ private void checkBool(final boolean bool, final String check)
+ {
+ if (bool == false)
+ {
+ throw new IllegalStateException("Validation of " + check + " failed.");
+ }
+ }
+
//PRIVATE METHODS
private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2)
{
@@ -132,6 +142,22 @@
return true;
}
+ private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType());
+ if (bool)
+ bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope());
+ if (bool)
+ bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName());
+ if (bool)
+ bool = checkQNameEquality(jm1.getAnonymousTypeQName(), jm2.getAnonymousTypeQName());
+ if (bool)
+ bool = validateVariableMappings(jm1.getVariableMappings(), jm2.getVariableMappings());
+
+ return bool;
+ }
+
private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, JavaXmlTypeMapping[] jm2)
{
int len1 = jm1 != null ? jm1.length : 0;
@@ -175,19 +201,59 @@
return true;
}
- private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2)
+ private boolean validateExceptionMapping(ExceptionMapping[] em1, ExceptionMapping[] em2)
{
+ int len1 = em1 != null ? em1.length : 0;
+ int len2 = em2 != null ? em2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of ExceptionMapping[] do not match expected=" + len1 + " actual=" + len2);
+ }
+
+ HashMap actualMappings = new HashMap(len1);
+
+ for (int i = 0; i < len1; i++)
+ {
+ ExceptionMapping current = em2[i];
+ String name = current.getExceptionType();
+ if (actualMappings.containsKey(name))
+ {
+ throw new IllegalStateException("Type '" + name + "' registered more than once.");
+ }
+
+ actualMappings.put(name, current);
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ ExceptionMapping expected = em1[i];
+ ExceptionMapping actual = (ExceptionMapping)actualMappings.get(expected.getExceptionType());
+
+ if (actual == null)
+ {
+ throw new IllegalStateException("Mapping not found for '" + expected.getExceptionType() + "'");
+ }
+
+ if (validateExceptionMapping(expected, actual) == false)
+ {
+ throw new IllegalStateException(expected + " does not match with other side " + actual);
+ }
+ }
+
+ return true;
+ }
+
+ private boolean validateExceptionMapping(ExceptionMapping em1, ExceptionMapping em2)
+ {
boolean bool = true;
- bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType());
+ bool = checkStringEquality(em1.getExceptionType(), em2.getExceptionType());
if (bool)
- bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope());
- if (bool)
- bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName());
- if (bool)
- bool = checkQNameEquality(jm1.getAnonymousTypeQName(), jm2.getAnonymousTypeQName());
- if (bool)
- bool = validateVariableMappings(jm1.getVariableMappings(), jm2.getVariableMappings());
+ bool = checkQNameEquality(em1.getWsdlMessage(), em2.getWsdlMessage());
+ // Parameter order optional so don't enforce.
+ //if (bool)
+ // bool = checkStringArrayEquality(em1.getConstructorParameterOrder(), em2.getConstructorParameterOrder());
+
return bool;
}
@@ -463,6 +529,23 @@
return str1.equals(str2);
}
+ private boolean checkStringArrayEquality(String[] ar1, String[] ar2)
+ {
+ int len1 = ar1 != null ? ar1.length : 0;
+ int len2 = ar2 != null ? ar2.length : 0;
+
+ if (len1 != len2)
+ return false;
+
+ for (int i = 0; i < len1; i++)
+ {
+ if (checkStringEquality(ar1[i], ar2[i]) == false)
+ return false;
+ }
+
+ return true;
+ }
+
private boolean checkQNameEquality(QName q1, QName q2)
{
if (q1 == null && q2 == null)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455 (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1455;
-
-
-public class MyException extends java.lang.Exception {
- private java.lang.String comment;
-
-
- public MyException(java.lang.String comment) {
- super(comment);
- this.comment = comment;
- }
-
- public java.lang.String getComment() {
- return comment;
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/MyException.java (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1455' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1455/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1455' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1455/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1455/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='MyException'>
- <sequence>
- <element name='comment' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <element name='methodOne' type='string'/>
- <element name='methodOneResponse' type='string'/>
- <element name='MyException' type='tns:MyException'/>
- <element name='methodTwo' type='string'/>
- <element name='methodTwoResponse' type='string'/>
- </schema>
- </types>
- <message name='TestEndpoint_methodOne'>
- <part element='ns1:methodOne' name='parameters'/>
- </message>
- <message name='TestEndpoint_methodOneResponse'>
- <part element='ns1:methodOneResponse' name='result'/>
- </message>
- <message name='TestEndpoint_methodTwo'>
- <part element='ns1:methodTwo' name='parameters'/>
- </message>
- <message name='TestEndpoint_methodTwoResponse'>
- <part element='ns1:methodTwoResponse' name='result'/>
- </message>
- <message name='MyException'>
- <part element='ns1:MyException' name='MyException'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='methodOne'>
- <input message='tns:TestEndpoint_methodOne'/>
- <output message='tns:TestEndpoint_methodOneResponse'/>
- </operation>
- <operation name='methodTwo'>
- <input message='tns:TestEndpoint_methodTwo'/>
- <output message='tns:TestEndpoint_methodTwoResponse'/>
- <fault message='tns:MyException' name='MyException'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='methodOne'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='methodTwo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- <fault name='MyException'>
- <soap:fault name='MyException' use='literal'/>
- </fault>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint.wsdl (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,13 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1455;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public java.lang.String methodOne(java.lang.String parameters) throws
- java.rmi.RemoteException;
- public java.lang.String methodTwo(java.lang.String parameters) throws
- org.jboss.test.ws.jbws1455.MyException, java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/TestEndpoint_PortType.java (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1455</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1455</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1455</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1455/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1455.MyException</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1455/types">typeNS:MyException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>comment</java-variable-name>
- <xml-element-name>comment</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <exception-mapping>
- <exception-type>org.jboss.test.ws.jbws1455.MyException</exception-type>
- <wsdl-message xmlns:exMsgNS="http://test.jboss.org/ws/jbws1455">exMsgNS:MyException</wsdl-message>
- <constructor-parameter-order>
- <element-name>comment</element-name>
- </constructor-parameter-order>
- </exception-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1455.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1455">serviceNS:TestEndpoint</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.jbws1455.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1455">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1455">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>methodOne</java-method-name>
- <wsdl-operation>methodOne</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodOne</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodOneResponse</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>methodTwo</java-method-name>
- <wsdl-operation>methodTwo</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodTwo</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodTwoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/jaxrpc-mapping.xml (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml 2007-01-15 11:50:03 UTC (rev 1960)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml 2007-01-15 15:25:51 UTC (rev 1970)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1455/wstools-config.xml (from rev 1960, trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml)
18 years
- 1
- 0
JBossWS SVN: r1969 - in trunk: integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 10:07:36 -0500 (Mon, 15 Jan 2007)
New Revision: 1969
Modified:
trunk/integration-jboss42/.classpath
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java
trunk/integration-jboss50/.classpath
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java
Log:
[JBWS-1443] - getMessageContext Not Implemented\nResolved for jboss50
Modified: trunk/integration-jboss42/.classpath
===================================================================
--- trunk/integration-jboss42/.classpath 2007-01-15 15:03:28 UTC (rev 1968)
+++ trunk/integration-jboss42/.classpath 2007-01-15 15:07:36 UTC (rev 1969)
@@ -21,8 +21,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
@@ -31,7 +29,9 @@
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3/server/default/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-01-15 15:03:28 UTC (rev 1968)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-01-15 15:07:36 UTC (rev 1969)
@@ -27,18 +27,21 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.xml.rpc.soap.SOAPFaultException;
import org.jboss.aop.Dispatcher;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
+import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
+import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInfo;
import org.jboss.ws.core.server.ServiceEndpointInvoker;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.utils.ObjectNameFactory;
/**
@@ -98,20 +101,6 @@
{
log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName());
- /* [FIXME] how to do this for EJB3
-
- // these are provided by the ServerLoginHandler
- Principal principal = SecurityAssociation.getPrincipal();
- Object credential = SecurityAssociation.getCredential();
-
- CommonMessageContext msgContext = MessageContextAssociation.getMessageContext();
-
- Invocation inv = new Invocation(null, method, args, null, principal, credential);
- inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
- inv.setValue(InvocationKey.SOAP_MESSAGE, msgContext.getMessage());
- inv.setType(InvocationType.SERVICE_ENDPOINT);
- */
-
// invoke on the container
try
{
@@ -125,10 +114,26 @@
if (container == null)
throw new WSException("Cannot obtain container from Dispatcher: " + canonicalName);
- Class implClass = container.getBeanClass();
- Method implMethod = getImplMethod(implClass, seiMethod);
+ Class beanClass = container.getBeanClass();
+
+ SOAPMessageContextJAXWS jaxwsMessageContext = null;
+ SOAPMessageContextJAXRPC jaxrpcMessageContext = null;
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext instanceof SOAPMessageContextJAXRPC)
+ {
+ jaxrpcMessageContext = (SOAPMessageContextJAXRPC)msgContext;
+ jaxwsMessageContext = new SOAPMessageContextJAXWS(msgContext);
+ }
+ else if (msgContext instanceof SOAPMessageContextJAXWS)
+ {
+ jaxwsMessageContext = (SOAPMessageContextJAXWS)msgContext;
+ jaxrpcMessageContext = new SOAPMessageContextJAXRPC(msgContext);
+ }
+ Method implMethod = getImplMethod(beanClass, seiMethod);
+ //BeanContextLifecycleCallback callback = new CallbackImpl(jaxrpcMessageContext, jaxwsMessageContext);
Object retObj = container.localInvoke(implMethod, args);
+
epInv.setReturnValue(retObj);
}
catch (Throwable e)
@@ -142,4 +147,5 @@
{
// do nothing
}
+
}
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-01-15 15:03:28 UTC (rev 1968)
+++ trunk/integration-jboss50/.classpath 2007-01-15 15:07:36 UTC (rev 1969)
@@ -2,9 +2,7 @@
<classpath>
<classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3.jar" sourcepath="/home/tdiesler/svn/jbossas/trunk/ejb3/src/main"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
@@ -24,8 +22,6 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
@@ -35,5 +31,10 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3.jar" sourcepath="/home/tdiesler/svn/jbossas/trunk/ejb3/src/main"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3x.jar"/>
+ <classpathentry kind="lib" path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-15 15:03:28 UTC (rev 1968)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-15 15:07:36 UTC (rev 1969)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.integration.jboss50;
// $Id$
@@ -29,7 +29,9 @@
import javax.xml.rpc.soap.SOAPFaultException;
import org.jboss.aop.Dispatcher;
-import org.jboss.ejb3.BaseSessionContext;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.BeanContextLifecycleCallback;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
@@ -60,13 +62,13 @@
public ServiceEndpointInvokerEJB3()
{
}
-
+
/** Initialize the service endpoint */
@Override
- public void initServiceEndpoint(ServiceEndpointInfo seInfo)
+ public void initServiceEndpoint(ServiceEndpointInfo seInfo)
{
super.initServiceEndpoint(seInfo);
-
+
String ejbName = seInfo.getServerEndpointMetaData().getLinkName();
UnifiedDeploymentInfo udi = seInfo.getUnifiedDeploymentInfo();
String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName;
@@ -74,10 +76,10 @@
{
nameStr += ",ear=" + udi.parent.simpleName;
}
-
+
objectName = ObjectNameFactory.create(nameStr.toString());
}
-
+
/** Load the SEI implementation bean if necessary
*/
public Class loadServiceEndpoint(ServiceEndpointInfo seInfo)
@@ -85,7 +87,7 @@
Dispatcher dispatcher = Dispatcher.singleton;
if (dispatcher.getRegistered(objectName.getCanonicalName()) == null)
throw new WSException("Cannot find service endpoint target: " + objectName);
-
+
return null;
}
@@ -110,32 +112,25 @@
Dispatcher dispatcher = Dispatcher.singleton;
StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName());
Class beanClass = container.getBeanClass();
-
- SOAPMessageContextJAXWS jaxwsMessageContext;
- SOAPMessageContextJAXRPC jaxrpcMessageContext;
+
+ SOAPMessageContextJAXWS jaxwsMessageContext = null;
+ SOAPMessageContextJAXRPC jaxrpcMessageContext = null;
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXRPC)
{
jaxrpcMessageContext = (SOAPMessageContextJAXRPC)msgContext;
jaxwsMessageContext = new SOAPMessageContextJAXWS(msgContext);
}
- if (msgContext instanceof SOAPMessageContextJAXWS)
+ else if (msgContext instanceof SOAPMessageContextJAXWS)
{
jaxwsMessageContext = (SOAPMessageContextJAXWS)msgContext;
jaxrpcMessageContext = new SOAPMessageContextJAXRPC(msgContext);
}
-
- // WebServiceContext injection
- // beanInstance = TODO get the bean instance somehow
- // WebServiceContextInjector.injectContext(beanInstance, (SOAPMessageContextJAXWS)msgContext);
-
- // MessageContext injection
- //BaseSessionContext ejbContext = TODO get the bean base context somehow
- //ejbContext.setMessageContext(jaxrpcMessageContext);
Method implMethod = getImplMethod(beanClass, seiMethod);
- Object retObj = container.localInvoke(implMethod, args);
-
+ BeanContextLifecycleCallback callback = new CallbackImpl(jaxrpcMessageContext, jaxwsMessageContext);
+ Object retObj = container.localInvoke(implMethod, args, null, callback);
+
epInv.setReturnValue(retObj);
}
catch (Throwable th)
@@ -149,4 +144,30 @@
{
// do nothing
}
+
+ class CallbackImpl implements BeanContextLifecycleCallback
+ {
+ private SOAPMessageContextJAXWS jaxwsMessageContext;
+ private SOAPMessageContextJAXRPC jaxrpcMessageContext;
+
+ public CallbackImpl(SOAPMessageContextJAXRPC jaxrpcMessageContext, SOAPMessageContextJAXWS jaxwsMessageContext)
+ {
+ this.jaxwsMessageContext = jaxwsMessageContext;
+ this.jaxrpcMessageContext = jaxrpcMessageContext;
+ }
+
+ public void attached(BeanContext ctx)
+ {
+ StatelessBeanContext sbc = (StatelessBeanContext)ctx;
+ sbc.setMessageContextJAXRPC(jaxrpcMessageContext);
+ sbc.setMessageContextJAXWS(jaxwsMessageContext);
+ }
+
+ public void released(BeanContext ctx)
+ {
+ StatelessBeanContext sbc = (StatelessBeanContext)ctx;
+ sbc.setMessageContextJAXRPC(null);
+ sbc.setMessageContextJAXWS(null);
+ }
+ }
}
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java 2007-01-15 15:03:28 UTC (rev 1968)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/ContextEJBTestCase.java 2007-01-15 15:07:36 UTC (rev 1969)
@@ -52,7 +52,6 @@
public void testWSDLAccess() throws MalformedURLException
{
-
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-context?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
@@ -66,7 +65,7 @@
Service service = Service.create(wsdlURL, qname);
EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
- if (true)
+ if (isTargetJBoss50() == false)
{
System.out.println("FIXME: [JBWS-1443] - getMessageContext Not Implemented");
return;
18 years
- 1
- 0
JBossWS SVN: r1968 - in branches/jbossws-1.0.4.GA_JBWS-1454: src/main/java/org/jboss/ws/tools and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 10:03:28 -0500 (Mon, 15 Jan 2007)
New Revision: 1968
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
Log:
JBWS-1454 - WSDL to Java - maps required xsd:double attribute to java.lang.Double.
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 14:49:30 UTC (rev 1967)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:03:28 UTC (rev 1968)
@@ -30,7 +30,11 @@
WSDL To Java - Parameter unwrapping not handling nillable types correctly.
- http://jira.jboss.com/jira/browse/JBWS-1450
+ http://jira.jboss.com/jira/browse/JBWS-1450
+
+ WSDL to Java - maps required xsd:double attribute to java.lang.Double
+
+ http://jira.jboss.com/jira/browse/JBWS-1184
MANUAL INSTALL INSTRUCTIONS:
If you require the Java 1.4 version: -
1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15 14:49:30 UTC (rev 1967)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -410,7 +410,8 @@
XSAttributeDeclaration att = obj.getAttrDeclaration();
XSSimpleTypeDefinition xstype = att.getTypeDefinition();
QName qn = SchemaUtils.handleSimpleType(xstype);
- VAR v = createVAR(qn, att.getName(), pkgname);
+ boolean primitive = obj.getRequired();
+ VAR v = createVAR(qn, att.getName(), pkgname, primitive);
if (vars == null)
vars = new ArrayList();
vars.add(v);
@@ -471,7 +472,7 @@
return vars;
}
- private VAR createVAR(QName qn, String varstr, String pkgname)
+ private VAR createVAR(QName qn, String varstr, String pkgname, boolean primitive)
{
String clname = "";
Class cls = typeMapping.getJavaType(qn);
@@ -479,6 +480,13 @@
if (cls != null)
{
clname = cls.getName();
+ if (primitive)
+ {
+ String primName = utils.getPrimitive(clname);
+ if (primName != null)
+ clname = primName;
+ }
+
}
else
{
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184 (from rev 1957, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,100 +0,0 @@
-/*
- * 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.tools.jbws1184;
-
-import java.io.File;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * JBWS-1184 - Test the use of wrapper jave type for generated source
- * with attributes with use of required or optional.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public class JBWS1184TestCase extends JBossWSTest
-{
-
- /**
- * Test attributes with use set to required.
- *
- * <complexType name='DataObject'>
- * <attribute name='booleanValue' use='required' type='boolean'/>
- * <attribute name='byteValue' use='required' type='byte'/>
- * <attribute name='floatValue' use='required' type='float'/>
- * <attribute name='integerValue' use='required' type='int'/>
- * <attribute name='longValue' use='required' type='long'/>
- * <attribute name='shortValue' use='required' type='short'/>
- * </complexType>
- *
- */
- public void testUseRequired() throws Exception
- {
- generateScenario("A");
- }
-
- /**
- * Test attributes with use set to optional.
- *
- * <complexType name='DataObject'>
- * <attribute name='booleanValue' use='optional' type='boolean'/>
- * <attribute name='byteValue' use='optional' type='byte'/>
- * <attribute name='floatValue' use='optional' type='float'/>
- * <attribute name='integerValue' use='optional' type='int'/>
- * <attribute name='longValue' use='optional' type='long'/>
- * <attribute name='shortValue' use='optional' type='short'/>
- * </complexType>
- *
- */
- public void testUseOptional() throws Exception
- {
- generateScenario("B");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1184/scenario_" + scenario;
- String toolsDir = "tools/jbws1184/scenario_" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- compareSource(resourceDir + "/DataObject.java", toolsDir + "/org/jboss/test/ws/jbws1184/DataObject.java");
- compareSource(resourceDir + "/TestEndpoint_PortType.java", toolsDir + "/org/jboss/test/ws/jbws1184/TestEndpoint_PortType.java");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java (from rev 1957, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184 (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,76 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1184;
-
-
-public class DataObject {
- protected boolean booleanValue;
- protected byte byteValue;
- protected float floatValue;
- protected int integerValue;
- protected long longValue;
- protected short shortValue;
-
- public DataObject() {
- }
-
- public DataObject(boolean booleanValue, byte byteValue, float floatValue, int integerValue, long longValue, short shortValue) {
- this.booleanValue = booleanValue;
- this.byteValue = byteValue;
- this.floatValue = floatValue;
- this.integerValue = integerValue;
- this.longValue = longValue;
- this.shortValue = shortValue;
- }
-
- public boolean isBooleanValue() {
- return booleanValue;
- }
-
- public void setBooleanValue(boolean booleanValue) {
- this.booleanValue = booleanValue;
- }
-
- public byte getByteValue() {
- return byteValue;
- }
-
- public void setByteValue(byte byteValue) {
- this.byteValue = byteValue;
- }
-
- public float getFloatValue() {
- return floatValue;
- }
-
- public void setFloatValue(float floatValue) {
- this.floatValue = floatValue;
- }
-
- public int getIntegerValue() {
- return integerValue;
- }
-
- public void setIntegerValue(int integerValue) {
- this.integerValue = integerValue;
- }
-
- public long getLongValue() {
- return longValue;
- }
-
- public void setLongValue(long longValue) {
- this.longValue = longValue;
- }
-
- public short getShortValue() {
- return shortValue;
- }
-
- public void setShortValue(short shortValue) {
- this.shortValue = shortValue;
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1184' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1184/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1184' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1184/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1184/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='DataObject'>
- <attribute name='booleanValue' use='required' type='boolean'/>
- <attribute name='byteValue' use='required' type='byte'/>
- <attribute name='floatValue' use='required' type='float'/>
- <attribute name='integerValue' use='required' type='int'/>
- <attribute name='longValue' use='required' type='long'/>
- <attribute name='shortValue' use='required' type='short'/>
- </complexType>
- <element name='echoDataObject' type='tns:DataObject'/>
- <element name='echoDataObjectResponse' type='tns:DataObject'/>
- </schema>
- </types>
- <message name='TestEndpoint_echoDataObject'>
- <part element='ns1:echoDataObject' name='echoDataObject'/>
- </message>
- <message name='TestEndpoint_echoDataObjectResponse'>
- <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoDataObject' parameterOrder='echoDataObject'>
- <input message='tns:TestEndpoint_echoDataObject'/>
- <output message='tns:TestEndpoint_echoDataObjectResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoDataObject'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,11 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1184;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1184.DataObject echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1184</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1184</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeNS:DataObject</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>booleanValue</java-variable-name>
- <xml-attribute-name>booleanValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>byteValue</java-variable-name>
- <xml-attribute-name>byteValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>floatValue</java-variable-name>
- <xml-attribute-name>floatValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>integerValue</java-variable-name>
- <xml-attribute-name>integerValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>longValue</java-variable-name>
- <xml-attribute-name>longValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>shortValue</java-variable-name>
- <xml-attribute-name>shortValue</xml-attribute-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceNS:TestEndpoint</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.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoDataObject</java-method-name>
- <wsdl-operation>echoDataObject</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
- <wsdl-message-part-name>echoDataObject</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.jbws1184.DataObject</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObjectResponse</wsdl-message>
- <wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,76 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1184;
-
-
-public class DataObject {
- protected java.lang.Boolean booleanValue;
- protected java.lang.Byte byteValue;
- protected java.lang.Float floatValue;
- protected java.lang.Integer integerValue;
- protected java.lang.Long longValue;
- protected java.lang.Short shortValue;
-
- public DataObject() {
- }
-
- public DataObject(java.lang.Boolean booleanValue, java.lang.Byte byteValue, java.lang.Float floatValue, java.lang.Integer integerValue, java.lang.Long longValue, java.lang.Short shortValue) {
- this.booleanValue = booleanValue;
- this.byteValue = byteValue;
- this.floatValue = floatValue;
- this.integerValue = integerValue;
- this.longValue = longValue;
- this.shortValue = shortValue;
- }
-
- public java.lang.Boolean getBooleanValue() {
- return booleanValue;
- }
-
- public void setBooleanValue(java.lang.Boolean booleanValue) {
- this.booleanValue = booleanValue;
- }
-
- public java.lang.Byte getByteValue() {
- return byteValue;
- }
-
- public void setByteValue(java.lang.Byte byteValue) {
- this.byteValue = byteValue;
- }
-
- public java.lang.Float getFloatValue() {
- return floatValue;
- }
-
- public void setFloatValue(java.lang.Float floatValue) {
- this.floatValue = floatValue;
- }
-
- public java.lang.Integer getIntegerValue() {
- return integerValue;
- }
-
- public void setIntegerValue(java.lang.Integer integerValue) {
- this.integerValue = integerValue;
- }
-
- public java.lang.Long getLongValue() {
- return longValue;
- }
-
- public void setLongValue(java.lang.Long longValue) {
- this.longValue = longValue;
- }
-
- public java.lang.Short getShortValue() {
- return shortValue;
- }
-
- public void setShortValue(java.lang.Short shortValue) {
- this.shortValue = shortValue;
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1184' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1184/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1184' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1184/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1184/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='DataObject'>
- <attribute name='booleanValue' use='optional' type='boolean'/>
- <attribute name='byteValue' use='optional' type='byte'/>
- <attribute name='floatValue' use='optional' type='float'/>
- <attribute name='integerValue' use='optional' type='int'/>
- <attribute name='longValue' use='optional' type='long'/>
- <attribute name='shortValue' use='optional' type='short'/>
- </complexType>
- <element name='echoDataObject' type='tns:DataObject'/>
- <element name='echoDataObjectResponse' type='tns:DataObject'/>
- </schema>
- </types>
- <message name='TestEndpoint_echoDataObject'>
- <part element='ns1:echoDataObject' name='echoDataObject'/>
- </message>
- <message name='TestEndpoint_echoDataObjectResponse'>
- <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoDataObject' parameterOrder='echoDataObject'>
- <input message='tns:TestEndpoint_echoDataObject'/>
- <output message='tns:TestEndpoint_echoDataObjectResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoDataObject'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,11 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1184;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1184.DataObject echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1184</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1184</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeNS:DataObject</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>booleanValue</java-variable-name>
- <xml-attribute-name>booleanValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>byteValue</java-variable-name>
- <xml-attribute-name>byteValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>floatValue</java-variable-name>
- <xml-attribute-name>floatValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>integerValue</java-variable-name>
- <xml-attribute-name>integerValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>longValue</java-variable-name>
- <xml-attribute-name>longValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>shortValue</java-variable-name>
- <xml-attribute-name>shortValue</xml-attribute-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceNS:TestEndpoint</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.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoDataObject</java-method-name>
- <wsdl-operation>echoDataObject</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
- <wsdl-message-part-name>echoDataObject</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.jbws1184.DataObject</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObjectResponse</wsdl-message>
- <wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-13 18:07:01 UTC (rev 1957)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-15 15:03:28 UTC (rev 1968)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml (from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml)
18 years
- 1
- 0
JBossWS SVN: r1967 - in branches/jbossws-1.0.4.GA_JBWS-1454: src/main/java/org/jboss/ws/tools and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 09:49:30 -0500 (Mon, 15 Jan 2007)
New Revision: 1967
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
Log:
JBWS-1454 - Parameter unwrapping not handling nillable types correctly.
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 13:32:12 UTC (rev 1966)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 14:49:30 UTC (rev 1967)
@@ -25,7 +25,12 @@
WSDL to Java - Complex type defined with complexContent only last element is in the generated java class
if base type is empty
- http://jira.jboss.com/jira/browse/JBWS-1441
+ http://jira.jboss.com/jira/browse/JBWS-1441
+
+
+ WSDL To Java - Parameter unwrapping not handling nillable types correctly.
+
+ http://jira.jboss.com/jira/browse/JBWS-1450
MANUAL INSTALL INSTRUCTIONS:
If you require the Java 1.4 version: -
1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-15 13:32:12 UTC (rev 1966)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -357,7 +357,8 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
- generateParameter(buf, null, tempContainingElement, xmlType, xsmodel, type, array, !element.getNillable());
+ boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
+ generateParameter(buf, null, tempContainingElement, xmlType, xsmodel, type, array, primitive);
String paramName;
if (type.getAnonymous())
@@ -561,6 +562,7 @@
QName xmlName = out.getElement();
String containingElement = xmlName.getLocalPart();
String arraySuffix = "";
+ boolean primitive = true;
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
@@ -574,7 +576,9 @@
if (unwrapper.unwrappedElement != null)
{
- xt = unwrapper.unwrappedElement.getTypeDefinition();
+ XSElementDeclaration element = unwrapper.unwrappedElement;
+ xt = element.getTypeDefinition();
+ primitive = unwrapper.primitive;
if (unwrapper.xmlType != null)
xmlType = unwrapper.xmlType;
@@ -585,8 +589,7 @@
arraySuffix = "[]";
}
}
-
- boolean primitive = true;
+
WrappedArray wrappedArray = new WrappedArray(xt);
if (wrappedArray.unwrap())
{
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 13:32:12 UTC (rev 1966)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -235,7 +235,8 @@
{
QName xmlName = wiout.getElement();
QName xmlType = wiout.getXMLType();
-
+ boolean primitive = true;
+
WSDLProperty wprop = wiout.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME);
QName messageName = new QName(targetNS, wprop.getValue(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS);
@@ -253,6 +254,7 @@
{
XSElementDeclaration element = unwrapper.unwrappedElement;
xt = element.getTypeDefinition();
+ primitive = unwrapper.primitive;
partName = element.getName();
containingElement = containingElement + unwrapper.unwrappedElement.getName();
array = unwrapper.array;
@@ -274,7 +276,7 @@
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, true);
+ String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
if (isDocStyle() == false && "void".equals(javaType))
continue;
@@ -476,9 +478,10 @@
}
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
-
+ boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
+
MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, partsMappings.size(), messageName, "IN", xmlName.getLocalPart(),
- array, !element.getNillable());
+ array, primitive);
partsMappings.add(part);
}
}
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-15 13:32:12 UTC (rev 1966)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -48,6 +48,7 @@
public QName xmlType;
public XSElementDeclaration unwrappedElement;
public boolean array = false;
+ public boolean primitive = false;
private boolean wrapped;
public ReturnTypeUnwrapper(WSDLInterfaceOperationOutput[] outputs, JBossXSModel xsmodel, boolean wrapped)
@@ -118,6 +119,7 @@
xmlType = new QName(unwrappedElement.getTypeDefinition().getNamespace(), unwrappedElement.getTypeDefinition().getName());
this.array = array;
+ primitive = !(unwrappedElement.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
}
}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450 (from rev 1949, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,166 +0,0 @@
-/*
- * 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.tools.jbws1450;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 12 Jan 2007
- */
-public class JBWS1450TestCase extends JBossWSTest
-{
-
- /**
- * Test unwrapping with nillable='true'.
- *
- * <complexType name='testBoolean'>
- * <sequence>
- * <element name='Boolean_1' nillable='true' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- * <complexType name='testBooleanResponse'>
- * <sequence>
- * <element name='result' nillable='true' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- */
- public void testScenario_A() throws Exception
- {
- generateScenario("A");
- }
-
- /**
- * Test unwrapping with minOccurs='0' and no maxOccurs.
- *
- * <complexType name='testBoolean'>
- * <sequence>
- * <element name='Boolean_1' minOccurs='0' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- * <complexType name='testBooleanResponse'>
- * <sequence>
- * <element name='result' minOccurs='0' type='boolean'/>
- * </sequence>
- * </complexType>
- */
- public void testScenario_B() throws Exception
- {
- generateScenario("B");
- }
-
- /**
- * Test unwrapping with minOccurs='0' and maxOccurs='1'.
- *
- * <complexType name='testBoolean'>
- * <sequence>
- * <element name='Boolean_1' minOccurs='0' maxOccurs='1' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- * <complexType name='testBooleanResponse'>
- * <sequence>
- * <element name='result' minOccurs='0' maxOccurs='1' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- */
- public void testScenario_C() throws Exception
- {
- generateScenario("C");
- }
-
- /**
- * Test unwrapping with no nillable, no minOccurs and no maxOccurs.
- *
- *
- * <complexType name='testBoolean'>
- * <sequence>
- * <element name='Boolean_1' type='boolean'/>
- * </sequence>
- * </complexType>
- *
- * <complexType name='testBooleanResponse'>
- * <sequence>
- * <element name='result' type='boolean'/>
- * </sequence>
- * </complexType>
- */
- public void testScenario_D() throws Exception
- {
- generateScenario("D");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1450/scenario_" + scenario;
- String toolsDir = "tools/jbws1450/scenario_" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1450/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java (from rev 1949, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450 (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='testBoolean'>
- <sequence>
- <element name='Boolean_1' nillable='true' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testBooleanResponse'>
- <sequence>
- <element name='result' nillable='true' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testByte'>
- <sequence>
- <element name='Byte_1' nillable='true' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testByteResponse'>
- <sequence>
- <element name='result' nillable='true' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testFloat'>
- <sequence>
- <element name='Float_1' nillable='true' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testFloatResponse'>
- <sequence>
- <element name='result' nillable='true' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testInteger'>
- <sequence>
- <element name='Integer_1' nillable='true' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testIntegerResponse'>
- <sequence>
- <element name='result' nillable='true' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testLong'>
- <sequence>
- <element name='Long_1' nillable='true' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testLongResponse'>
- <sequence>
- <element name='result' nillable='true' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testShort'>
- <sequence>
- <element name='Short_1' nillable='true' type='short'/>
- </sequence>
- </complexType>
- <complexType name='testShortResponse'>
- <sequence>
- <element name='result' nillable='true' type='short'/>
- </sequence>
- </complexType>
- <element name='testBoolean' type='tns:testBoolean'/>
- <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
- <element name='testByte' type='tns:testByte'/>
- <element name='testByteResponse' type='tns:testByteResponse'/>
- <element name='testFloat' type='tns:testFloat'/>
- <element name='testFloatResponse' type='tns:testFloatResponse'/>
- <element name='testInteger' type='tns:testInteger'/>
- <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
- <element name='testLong' type='tns:testLong'/>
- <element name='testLongResponse' type='tns:testLongResponse'/>
- <element name='testShort' type='tns:testShort'/>
- <element name='testShortResponse' type='tns:testShortResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_testBoolean'>
- <part element='ns1:testBoolean' name='testBoolean'/>
- </message>
- <message name='TestEndpoint_testBooleanResponse'>
- <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
- </message>
- <message name='TestEndpoint_testByte'>
- <part element='ns1:testByte' name='testByte'/>
- </message>
- <message name='TestEndpoint_testByteResponse'>
- <part element='ns1:testByteResponse' name='testByteResponse'/>
- </message>
- <message name='TestEndpoint_testFloat'>
- <part element='ns1:testFloat' name='testFloat'/>
- </message>
- <message name='TestEndpoint_testFloatResponse'>
- <part element='ns1:testFloatResponse' name='testFloatResponse'/>
- </message>
- <message name='TestEndpoint_testInteger'>
- <part element='ns1:testInteger' name='testInteger'/>
- </message>
- <message name='TestEndpoint_testIntegerResponse'>
- <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
- </message>
- <message name='TestEndpoint_testLong'>
- <part element='ns1:testLong' name='testLong'/>
- </message>
- <message name='TestEndpoint_testLongResponse'>
- <part element='ns1:testLongResponse' name='testLongResponse'/>
- </message>
- <message name='TestEndpoint_testShort'>
- <part element='ns1:testShort' name='testShort'/>
- </message>
- <message name='TestEndpoint_testShortResponse'>
- <part element='ns1:testShortResponse' name='testShortResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='testBoolean' parameterOrder='testBoolean'>
- <input message='tns:TestEndpoint_testBoolean'/>
- <output message='tns:TestEndpoint_testBooleanResponse'/>
- </operation>
- <operation name='testByte' parameterOrder='testByte'>
- <input message='tns:TestEndpoint_testByte'/>
- <output message='tns:TestEndpoint_testByteResponse'/>
- </operation>
- <operation name='testFloat' parameterOrder='testFloat'>
- <input message='tns:TestEndpoint_testFloat'/>
- <output message='tns:TestEndpoint_testFloatResponse'/>
- </operation>
- <operation name='testInteger' parameterOrder='testInteger'>
- <input message='tns:TestEndpoint_testInteger'/>
- <output message='tns:TestEndpoint_testIntegerResponse'/>
- </operation>
- <operation name='testLong' parameterOrder='testLong'>
- <input message='tns:TestEndpoint_testLong'/>
- <output message='tns:TestEndpoint_testLongResponse'/>
- </operation>
- <operation name='testShort' parameterOrder='testShort'>
- <input message='tns:TestEndpoint_testShort'/>
- <output message='tns:TestEndpoint_testShortResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testBoolean'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testByte'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testFloat'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testInteger'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testLong'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testShort'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1450;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
- java.rmi.RemoteException;
- public java.lang.Byte testByte(java.lang.Byte byte_1) throws
- java.rmi.RemoteException;
- public java.lang.Float testFloat(java.lang.Float float_1) throws
- java.rmi.RemoteException;
- public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
- java.rmi.RemoteException;
- public java.lang.Long testLong(java.lang.Long long_1) throws
- java.rmi.RemoteException;
- public java.lang.Short testShort(java.lang.Short short_1) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>long_1</java-variable-name>
- <xml-element-name>Long_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>integer_1</java-variable-name>
- <xml-element-name>Integer_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</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.jbws1450.TestShortResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</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.jbws1450.TestFloatResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</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.jbws1450.TestFloat</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>float_1</java-variable-name>
- <xml-element-name>Float_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>boolean_1</java-variable-name>
- <xml-element-name>Boolean_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</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.jbws1450.TestByte</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>byte_1</java-variable-name>
- <xml-element-name>Byte_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</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.jbws1450.TestIntegerResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</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.jbws1450.TestShort</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>short_1</java-variable-name>
- <xml-element-name>Short_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</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.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>testBoolean</java-method-name>
- <wsdl-operation>testBoolean</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Boolean</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
- <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Boolean</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</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>testByte</java-method-name>
- <wsdl-operation>testByte</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Byte</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
- <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Byte</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</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>testFloat</java-method-name>
- <wsdl-operation>testFloat</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Float</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
- <wsdl-message-part-name>Float_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Float</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</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>testInteger</java-method-name>
- <wsdl-operation>testInteger</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Integer</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
- <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Integer</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</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>testLong</java-method-name>
- <wsdl-operation>testLong</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Long</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
- <wsdl-message-part-name>Long_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Long</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</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>testShort</java-method-name>
- <wsdl-operation>testShort</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Short</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
- <wsdl-message-part-name>Short_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Short</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_A/wstools-config.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='testBoolean'>
- <sequence>
- <element name='Boolean_1' minOccurs='0' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testBooleanResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testByte'>
- <sequence>
- <element name='Byte_1' minOccurs='0' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testByteResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testFloat'>
- <sequence>
- <element name='Float_1' minOccurs='0' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testFloatResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testInteger'>
- <sequence>
- <element name='Integer_1' minOccurs='0' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testIntegerResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testLong'>
- <sequence>
- <element name='Long_1' minOccurs='0' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testLongResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testShort'>
- <sequence>
- <element name='Short_1' minOccurs='0' type='short'/>
- </sequence>
- </complexType>
- <complexType name='testShortResponse'>
- <sequence>
- <element name='result' minOccurs='0' type='short'/>
- </sequence>
- </complexType>
- <element name='testBoolean' type='tns:testBoolean'/>
- <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
- <element name='testByte' type='tns:testByte'/>
- <element name='testByteResponse' type='tns:testByteResponse'/>
- <element name='testFloat' type='tns:testFloat'/>
- <element name='testFloatResponse' type='tns:testFloatResponse'/>
- <element name='testInteger' type='tns:testInteger'/>
- <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
- <element name='testLong' type='tns:testLong'/>
- <element name='testLongResponse' type='tns:testLongResponse'/>
- <element name='testShort' type='tns:testShort'/>
- <element name='testShortResponse' type='tns:testShortResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_testBoolean'>
- <part element='ns1:testBoolean' name='testBoolean'/>
- </message>
- <message name='TestEndpoint_testBooleanResponse'>
- <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
- </message>
- <message name='TestEndpoint_testByte'>
- <part element='ns1:testByte' name='testByte'/>
- </message>
- <message name='TestEndpoint_testByteResponse'>
- <part element='ns1:testByteResponse' name='testByteResponse'/>
- </message>
- <message name='TestEndpoint_testFloat'>
- <part element='ns1:testFloat' name='testFloat'/>
- </message>
- <message name='TestEndpoint_testFloatResponse'>
- <part element='ns1:testFloatResponse' name='testFloatResponse'/>
- </message>
- <message name='TestEndpoint_testInteger'>
- <part element='ns1:testInteger' name='testInteger'/>
- </message>
- <message name='TestEndpoint_testIntegerResponse'>
- <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
- </message>
- <message name='TestEndpoint_testLong'>
- <part element='ns1:testLong' name='testLong'/>
- </message>
- <message name='TestEndpoint_testLongResponse'>
- <part element='ns1:testLongResponse' name='testLongResponse'/>
- </message>
- <message name='TestEndpoint_testShort'>
- <part element='ns1:testShort' name='testShort'/>
- </message>
- <message name='TestEndpoint_testShortResponse'>
- <part element='ns1:testShortResponse' name='testShortResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='testBoolean' parameterOrder='testBoolean'>
- <input message='tns:TestEndpoint_testBoolean'/>
- <output message='tns:TestEndpoint_testBooleanResponse'/>
- </operation>
- <operation name='testByte' parameterOrder='testByte'>
- <input message='tns:TestEndpoint_testByte'/>
- <output message='tns:TestEndpoint_testByteResponse'/>
- </operation>
- <operation name='testFloat' parameterOrder='testFloat'>
- <input message='tns:TestEndpoint_testFloat'/>
- <output message='tns:TestEndpoint_testFloatResponse'/>
- </operation>
- <operation name='testInteger' parameterOrder='testInteger'>
- <input message='tns:TestEndpoint_testInteger'/>
- <output message='tns:TestEndpoint_testIntegerResponse'/>
- </operation>
- <operation name='testLong' parameterOrder='testLong'>
- <input message='tns:TestEndpoint_testLong'/>
- <output message='tns:TestEndpoint_testLongResponse'/>
- </operation>
- <operation name='testShort' parameterOrder='testShort'>
- <input message='tns:TestEndpoint_testShort'/>
- <output message='tns:TestEndpoint_testShortResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testBoolean'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testByte'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testFloat'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testInteger'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testLong'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testShort'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1450;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
- java.rmi.RemoteException;
- public java.lang.Byte testByte(java.lang.Byte byte_1) throws
- java.rmi.RemoteException;
- public java.lang.Float testFloat(java.lang.Float float_1) throws
- java.rmi.RemoteException;
- public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
- java.rmi.RemoteException;
- public java.lang.Long testLong(java.lang.Long long_1) throws
- java.rmi.RemoteException;
- public java.lang.Short testShort(java.lang.Short short_1) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>long_1</java-variable-name>
- <xml-element-name>Long_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>integer_1</java-variable-name>
- <xml-element-name>Integer_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</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.jbws1450.TestShortResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</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.jbws1450.TestFloatResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</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.jbws1450.TestFloat</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>float_1</java-variable-name>
- <xml-element-name>Float_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>boolean_1</java-variable-name>
- <xml-element-name>Boolean_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</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.jbws1450.TestByte</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>byte_1</java-variable-name>
- <xml-element-name>Byte_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</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.jbws1450.TestIntegerResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</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.jbws1450.TestShort</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>short_1</java-variable-name>
- <xml-element-name>Short_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</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.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>testBoolean</java-method-name>
- <wsdl-operation>testBoolean</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Boolean</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
- <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Boolean</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</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>testByte</java-method-name>
- <wsdl-operation>testByte</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Byte</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
- <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Byte</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</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>testFloat</java-method-name>
- <wsdl-operation>testFloat</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Float</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
- <wsdl-message-part-name>Float_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Float</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</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>testInteger</java-method-name>
- <wsdl-operation>testInteger</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Integer</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
- <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Integer</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</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>testLong</java-method-name>
- <wsdl-operation>testLong</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Long</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
- <wsdl-message-part-name>Long_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Long</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</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>testShort</java-method-name>
- <wsdl-operation>testShort</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Short</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
- <wsdl-message-part-name>Short_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Short</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl" parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_B/wstools-config.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='testBoolean'>
- <sequence>
- <element name='Boolean_1' minOccurs='0' maxOccurs='1' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testBooleanResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testByte'>
- <sequence>
- <element name='Byte_1' minOccurs='0' maxOccurs='1' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testByteResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testFloat'>
- <sequence>
- <element name='Float_1' minOccurs='0' maxOccurs='1' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testFloatResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testInteger'>
- <sequence>
- <element name='Integer_1' minOccurs='0' maxOccurs='1' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testIntegerResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testLong'>
- <sequence>
- <element name='Long_1' minOccurs='0' maxOccurs='1' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testLongResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testShort'>
- <sequence>
- <element name='Short_1' minOccurs='0' maxOccurs='1' type='short'/>
- </sequence>
- </complexType>
- <complexType name='testShortResponse'>
- <sequence>
- <element name='result' minOccurs='0' maxOccurs='1' type='short'/>
- </sequence>
- </complexType>
- <element name='testBoolean' type='tns:testBoolean'/>
- <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
- <element name='testByte' type='tns:testByte'/>
- <element name='testByteResponse' type='tns:testByteResponse'/>
- <element name='testFloat' type='tns:testFloat'/>
- <element name='testFloatResponse' type='tns:testFloatResponse'/>
- <element name='testInteger' type='tns:testInteger'/>
- <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
- <element name='testLong' type='tns:testLong'/>
- <element name='testLongResponse' type='tns:testLongResponse'/>
- <element name='testShort' type='tns:testShort'/>
- <element name='testShortResponse' type='tns:testShortResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_testBoolean'>
- <part element='ns1:testBoolean' name='testBoolean'/>
- </message>
- <message name='TestEndpoint_testBooleanResponse'>
- <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
- </message>
- <message name='TestEndpoint_testByte'>
- <part element='ns1:testByte' name='testByte'/>
- </message>
- <message name='TestEndpoint_testByteResponse'>
- <part element='ns1:testByteResponse' name='testByteResponse'/>
- </message>
- <message name='TestEndpoint_testFloat'>
- <part element='ns1:testFloat' name='testFloat'/>
- </message>
- <message name='TestEndpoint_testFloatResponse'>
- <part element='ns1:testFloatResponse' name='testFloatResponse'/>
- </message>
- <message name='TestEndpoint_testInteger'>
- <part element='ns1:testInteger' name='testInteger'/>
- </message>
- <message name='TestEndpoint_testIntegerResponse'>
- <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
- </message>
- <message name='TestEndpoint_testLong'>
- <part element='ns1:testLong' name='testLong'/>
- </message>
- <message name='TestEndpoint_testLongResponse'>
- <part element='ns1:testLongResponse' name='testLongResponse'/>
- </message>
- <message name='TestEndpoint_testShort'>
- <part element='ns1:testShort' name='testShort'/>
- </message>
- <message name='TestEndpoint_testShortResponse'>
- <part element='ns1:testShortResponse' name='testShortResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='testBoolean' parameterOrder='testBoolean'>
- <input message='tns:TestEndpoint_testBoolean'/>
- <output message='tns:TestEndpoint_testBooleanResponse'/>
- </operation>
- <operation name='testByte' parameterOrder='testByte'>
- <input message='tns:TestEndpoint_testByte'/>
- <output message='tns:TestEndpoint_testByteResponse'/>
- </operation>
- <operation name='testFloat' parameterOrder='testFloat'>
- <input message='tns:TestEndpoint_testFloat'/>
- <output message='tns:TestEndpoint_testFloatResponse'/>
- </operation>
- <operation name='testInteger' parameterOrder='testInteger'>
- <input message='tns:TestEndpoint_testInteger'/>
- <output message='tns:TestEndpoint_testIntegerResponse'/>
- </operation>
- <operation name='testLong' parameterOrder='testLong'>
- <input message='tns:TestEndpoint_testLong'/>
- <output message='tns:TestEndpoint_testLongResponse'/>
- </operation>
- <operation name='testShort' parameterOrder='testShort'>
- <input message='tns:TestEndpoint_testShort'/>
- <output message='tns:TestEndpoint_testShortResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testBoolean'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testByte'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testFloat'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testInteger'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testLong'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testShort'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1450;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
- java.rmi.RemoteException;
- public java.lang.Byte testByte(java.lang.Byte byte_1) throws
- java.rmi.RemoteException;
- public java.lang.Float testFloat(java.lang.Float float_1) throws
- java.rmi.RemoteException;
- public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
- java.rmi.RemoteException;
- public java.lang.Long testLong(java.lang.Long long_1) throws
- java.rmi.RemoteException;
- public java.lang.Short testShort(java.lang.Short short_1) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>long_1</java-variable-name>
- <xml-element-name>Long_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>integer_1</java-variable-name>
- <xml-element-name>Integer_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</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.jbws1450.TestShortResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</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.jbws1450.TestFloatResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</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.jbws1450.TestFloat</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>float_1</java-variable-name>
- <xml-element-name>Float_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>boolean_1</java-variable-name>
- <xml-element-name>Boolean_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</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.jbws1450.TestByte</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>byte_1</java-variable-name>
- <xml-element-name>Byte_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</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.jbws1450.TestIntegerResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</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.jbws1450.TestShort</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>short_1</java-variable-name>
- <xml-element-name>Short_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</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.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>testBoolean</java-method-name>
- <wsdl-operation>testBoolean</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Boolean</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
- <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Boolean</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</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>testByte</java-method-name>
- <wsdl-operation>testByte</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Byte</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
- <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Byte</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</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>testFloat</java-method-name>
- <wsdl-operation>testFloat</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Float</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
- <wsdl-message-part-name>Float_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Float</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</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>testInteger</java-method-name>
- <wsdl-operation>testInteger</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Integer</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
- <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Integer</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</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>testLong</java-method-name>
- <wsdl-operation>testLong</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Long</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
- <wsdl-message-part-name>Long_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Long</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</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>testShort</java-method-name>
- <wsdl-operation>testShort</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.Short</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
- <wsdl-message-part-name>Short_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.Short</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl" parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_C/wstools-config.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='testBoolean'>
- <sequence>
- <element name='Boolean_1' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testBooleanResponse'>
- <sequence>
- <element name='result' type='boolean'/>
- </sequence>
- </complexType>
- <complexType name='testByte'>
- <sequence>
- <element name='Byte_1' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testByteResponse'>
- <sequence>
- <element name='result' type='byte'/>
- </sequence>
- </complexType>
- <complexType name='testFloat'>
- <sequence>
- <element name='Float_1' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testFloatResponse'>
- <sequence>
- <element name='result' type='float'/>
- </sequence>
- </complexType>
- <complexType name='testInteger'>
- <sequence>
- <element name='Integer_1' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testIntegerResponse'>
- <sequence>
- <element name='result' type='int'/>
- </sequence>
- </complexType>
- <complexType name='testLong'>
- <sequence>
- <element name='Long_1' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testLongResponse'>
- <sequence>
- <element name='result' type='long'/>
- </sequence>
- </complexType>
- <complexType name='testShort'>
- <sequence>
- <element name='Short_1' type='short'/>
- </sequence>
- </complexType>
- <complexType name='testShortResponse'>
- <sequence>
- <element name='result' type='short'/>
- </sequence>
- </complexType>
- <element name='testBoolean' type='tns:testBoolean'/>
- <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
- <element name='testByte' type='tns:testByte'/>
- <element name='testByteResponse' type='tns:testByteResponse'/>
- <element name='testFloat' type='tns:testFloat'/>
- <element name='testFloatResponse' type='tns:testFloatResponse'/>
- <element name='testInteger' type='tns:testInteger'/>
- <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
- <element name='testLong' type='tns:testLong'/>
- <element name='testLongResponse' type='tns:testLongResponse'/>
- <element name='testShort' type='tns:testShort'/>
- <element name='testShortResponse' type='tns:testShortResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_testBoolean'>
- <part element='ns1:testBoolean' name='testBoolean'/>
- </message>
- <message name='TestEndpoint_testBooleanResponse'>
- <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
- </message>
- <message name='TestEndpoint_testByte'>
- <part element='ns1:testByte' name='testByte'/>
- </message>
- <message name='TestEndpoint_testByteResponse'>
- <part element='ns1:testByteResponse' name='testByteResponse'/>
- </message>
- <message name='TestEndpoint_testFloat'>
- <part element='ns1:testFloat' name='testFloat'/>
- </message>
- <message name='TestEndpoint_testFloatResponse'>
- <part element='ns1:testFloatResponse' name='testFloatResponse'/>
- </message>
- <message name='TestEndpoint_testInteger'>
- <part element='ns1:testInteger' name='testInteger'/>
- </message>
- <message name='TestEndpoint_testIntegerResponse'>
- <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
- </message>
- <message name='TestEndpoint_testLong'>
- <part element='ns1:testLong' name='testLong'/>
- </message>
- <message name='TestEndpoint_testLongResponse'>
- <part element='ns1:testLongResponse' name='testLongResponse'/>
- </message>
- <message name='TestEndpoint_testShort'>
- <part element='ns1:testShort' name='testShort'/>
- </message>
- <message name='TestEndpoint_testShortResponse'>
- <part element='ns1:testShortResponse' name='testShortResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='testBoolean' parameterOrder='testBoolean'>
- <input message='tns:TestEndpoint_testBoolean'/>
- <output message='tns:TestEndpoint_testBooleanResponse'/>
- </operation>
- <operation name='testByte' parameterOrder='testByte'>
- <input message='tns:TestEndpoint_testByte'/>
- <output message='tns:TestEndpoint_testByteResponse'/>
- </operation>
- <operation name='testFloat' parameterOrder='testFloat'>
- <input message='tns:TestEndpoint_testFloat'/>
- <output message='tns:TestEndpoint_testFloatResponse'/>
- </operation>
- <operation name='testInteger' parameterOrder='testInteger'>
- <input message='tns:TestEndpoint_testInteger'/>
- <output message='tns:TestEndpoint_testIntegerResponse'/>
- </operation>
- <operation name='testLong' parameterOrder='testLong'>
- <input message='tns:TestEndpoint_testLong'/>
- <output message='tns:TestEndpoint_testLongResponse'/>
- </operation>
- <operation name='testShort' parameterOrder='testShort'>
- <input message='tns:TestEndpoint_testShort'/>
- <output message='tns:TestEndpoint_testShortResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testBoolean'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testByte'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testFloat'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testInteger'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testLong'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- <operation name='testShort'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpoint'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,21 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1450;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public boolean testBoolean(boolean boolean_1) throws
- java.rmi.RemoteException;
- public byte testByte(byte byte_1) throws
- java.rmi.RemoteException;
- public float testFloat(float float_1) throws
- java.rmi.RemoteException;
- public int testInteger(int integer_1) throws
- java.rmi.RemoteException;
- public long testLong(long long_1) throws
- java.rmi.RemoteException;
- public short testShort(short short_1) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1450</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>long_1</java-variable-name>
- <xml-element-name>Long_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>integer_1</java-variable-name>
- <xml-element-name>Integer_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</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.jbws1450.TestShortResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</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.jbws1450.TestFloatResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</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.jbws1450.TestFloat</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>float_1</java-variable-name>
- <xml-element-name>Float_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>boolean_1</java-variable-name>
- <xml-element-name>Boolean_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</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.jbws1450.TestByte</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>byte_1</java-variable-name>
- <xml-element-name>Byte_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</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.jbws1450.TestIntegerResponse</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</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.jbws1450.TestShort</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>short_1</java-variable-name>
- <xml-element-name>Short_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</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.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>testBoolean</java-method-name>
- <wsdl-operation>testBoolean</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>boolean</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
- <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>boolean</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</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>testByte</java-method-name>
- <wsdl-operation>testByte</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>byte</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
- <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>byte</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</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>testFloat</java-method-name>
- <wsdl-operation>testFloat</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>float</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
- <wsdl-message-part-name>Float_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>float</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</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>testInteger</java-method-name>
- <wsdl-operation>testInteger</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>int</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
- <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>int</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</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>testLong</java-method-name>
- <wsdl-operation>testLong</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>long</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
- <wsdl-message-part-name>Long_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>long</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</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>testShort</java-method-name>
- <wsdl-operation>testShort</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>short</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
- <wsdl-message-part-name>Short_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>short</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-01-15 14:49:30 UTC (rev 1967)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl" parameter-style="wrapped">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1450/scenario_D/wstools-config.xml (from rev 1949, trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml)
18 years
- 1
- 0