Author: thomas.diesler(a)jboss.com
Date: 2007-05-29 12:28:58 -0400 (Tue, 29 May 2007)
New Revision: 3291
Modified:
trunk/build/build.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/build.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/xfire/build.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java
Log:
Enable SunRI jaxws/asynchronous
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/build/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -153,13 +153,17 @@
</target>
<target name="most" description="Builds almost everything."
depends="prepare">
+ <ant antfile="${core.dir}/build.xml" target="most"
inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="most"
inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="most"
inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="most"
inheritall="false"/>
- <ant antfile="${core.dir}/build.xml" target="tests-main"
inheritall="false"/>
</target>
- <target name="all" description="Create a distribution zip file"
depends="most"> <!--build-bin-dist,build-src-dist -->
+ <target name="all" description="Create a distribution zip file"
depends="prepare">
+ <ant antfile="${core.dir}/build.xml" target="all"
inheritall="false"/>
+ <ant antfile="${int.native.dir}/build.xml" target="all"
inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml" target="all"
inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="all"
inheritall="false"/>
</target>
</project>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-29 15:16:17 UTC (rev
3290)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-29 16:28:58 UTC (rev
3291)
@@ -21,7 +21,6 @@
<!-- Deploy jbossws to jboss50 -->
<target name="deploy-jboss50"
depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to
jboss50">
- <ant antfile="${int.jboss50.dir}/build.xml" target="jars"
inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
@@ -58,7 +57,8 @@
<!-- Deploy jbossws to jboss42 -->
<target name="deploy-jboss42"
depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to
jboss42">
- <ant antfile="${int.jboss42.dir}/build.xml" target="jars"
inheritall="false"/>
+ <ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/native/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -40,7 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${core.dir}/build.xml" target="main"
inheritall="false"/>
+ <ant antfile="${core.dir}/build.xml" target="jars"
inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -229,9 +229,8 @@
<target name="main" description="Executes the default target
(most)." depends="most"/>
- <target name="most" description="Builds almost everything."
depends="jars"/>
+ <target name="most" description="Builds almost everything."
depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file"
depends="most">
- </target>
+ <target name="all" description="Create a distribution zip file"
depends="most,binary-dist"/>
</project>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/sunri/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -244,9 +244,8 @@
<target name="main" description="Executes the default target
(most)." depends="most"/>
- <target name="most" description="Builds almost everything."
depends="jars"/>
+ <target name="most" description="Builds almost everything."
depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file"
depends="most,tests-main">
- </target>
+ <target name="all" description="Create a distribution zip file"
depends="most,binary-dist"/>
</project>
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-29 15:16:17
UTC (rev 3290)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-29 16:28:58
UTC (rev 3291)
@@ -2,7 +2,6 @@
# $Id$
#
-org/jboss/test/ws/jaxws/samples/asynchronous/**
org/jboss/test/ws/jaxws/samples/context/**
org/jboss/test/ws/jaxws/samples/exception/**
org/jboss/test/ws/jaxws/samples/handlerchain/**
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/integration/xfire/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -239,9 +239,8 @@
<target name="main" description="Executes the default target
(most)." depends="most"/>
- <target name="most" description="Builds almost everything."
depends="jars"/>
+ <target name="most" description="Builds almost everything."
depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file"
depends="most,tests-main">
- </target>
+ <target name="all" description="Create a distribution zip file"
depends="most,binary-dist"/>
</project>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-29 15:16:17 UTC (rev 3290)
+++ trunk/jbossws-core/build.xml 2007-05-29 16:28:58 UTC (rev 3291)
@@ -237,9 +237,9 @@
<target name="main" description="Executes the default target
(most)." depends="most"/>
- <target name="most" description="Builds almost everything."
depends="jars"/>
+ <target name="most" description="Builds almost everything."
depends="jars,tests-jars"/>
- <target name="all" description="Create a distribution zip file"
depends="most,tests-jars">
+ <target name="all" description="Create a distribution zip file"
depends="most">
</target>
</project>
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-29
15:16:17 UTC (rev 3290)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-29
16:28:58 UTC (rev 3291)
@@ -293,7 +293,7 @@
String serviceName = anWebService.serviceName();
if (serviceName.length() == 0)
- serviceName = name + "Service";
+ serviceName = WSDLUtils.getJustClassName(sepClass) + "Service";
String serviceNS = anWebService.targetNamespace();
if (serviceNS.length() == 0)
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-29
15:16:17 UTC (rev 3290)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-29
16:28:58 UTC (rev 3291)
@@ -72,23 +72,6 @@
assertEquals("Async", retStr);
}
- public void testInvokeAsyncReentrant() throws Exception
- {
- System.out.println("FIXME: [JBWS-1294] Add support for mapping async
methods");
- if (true) return;
-
- TestEndpoint port = createProxy();
- Response response = port.echoAsync("Async");
-
- // do something in between
- String retStr = port.echo("Sync");
- assertEquals("Sync", retStr);
-
- // access future
- retStr = (String) response.get();
- assertEquals("Async", retStr);
- }
-
public void testInvokeAsyncHandler() throws Exception
{
AsyncHandler<String> handler = new AsyncHandler<String>()
@@ -121,7 +104,7 @@
private TestEndpoint createProxy() throws MalformedURLException
{
URL wsdlURL = new URL("http://" + getServerHost() +
":8080/jaxws-samples-asynchronous?wsdl");
- QName serviceName = new QName(targetNS, "TestEndpointService");
+ QName serviceName = new QName(targetNS, "TestEndpointBeanService");
Service service = Service.create(wsdlURL, serviceName);
return (TestEndpoint)service.getPort(TestEndpoint.class);
}
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-05-29
15:16:17 UTC (rev 3290)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-05-29
16:28:58 UTC (rev 3291)
@@ -1,3 +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.
+ */
package org.jboss.test.ws.jaxws.samples.asynchronous;
import java.util.concurrent.Future;
@@ -11,28 +32,17 @@
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
-/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0_01-b59-fcs
- * Generated source version: 2.0
- *
- */
@WebService(name = "TestEndpoint", targetNamespace =
"http://org.jboss.ws/jaxws/asynchronous")
@SOAPBinding(style = Style.RPC)
public interface TestEndpoint
{
@WebMethod(operationName = "echo")
- public Response<String> echoAsync(@WebParam(name = "String_1",
partName = "String_1")
- String string1);
+ public Response<String> echoAsync(@WebParam(name = "String_1") String
string1);
@WebMethod(operationName = "echo")
- public Future<?> echoAsync(@WebParam(name = "String_1", partName =
"String_1")
- String string1, @WebParam(name = "asyncHandler", partName =
"asyncHandler")
- AsyncHandler<String> asyncHandler);
+ public Future<?> echoAsync(@WebParam(name = "String_1") String
string1, @WebParam(name = "asyncHandler") AsyncHandler<String>
asyncHandler);
@WebMethod
- @WebResult(name = "result", partName = "result")
- public String echo(@WebParam(name = "String_1", partName =
"String_1")
- String string1);
-
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String string1);
}
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-05-29
15:16:17 UTC (rev 3290)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-05-29
16:28:58 UTC (rev 3291)
@@ -23,16 +23,24 @@
// $Id$
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
import org.jboss.logging.Logger;
-@WebService(name = "TestEndpoint", targetNamespace =
"http://org.jboss.ws/jaxws/asynchronous", endpointInterface =
"org.jboss.test.ws.jaxws.samples.asynchronous.TestEndpoint")
+@WebService(name = "TestEndpoint", targetNamespace =
"http://org.jboss.ws/jaxws/asynchronous")
+@SOAPBinding(style = Style.RPC)
public class TestEndpointBean
{
private static Logger log = Logger.getLogger(TestEndpointBean.class);
- public String echo(String msg)
+ @WebMethod
+ @WebResult(name = "result")
+ public String echo(@WebParam(name = "String_1") String msg)
{
log.info("echo: " + msg);
return msg;