Author: jason.greene(a)jboss.com Date: 2006-11-04 20:13:36 -0500 (Sat, 04 Nov 2006) New Revision: 1379 Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml trunk/src/test/resources/tools/jbws-211/wsdlFixture/OneWay/OneWayService.wsdl Log: Merge fix for JBWS-1331 Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-05 01:00:14 UTC (rev 1378) +++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2006-11-05 01:13:36 UTC (rev 1379) @@ -19,7 +19,7 @@ * 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.jbws_211.tests.OneWay; +package org.jboss.test.ws.tools.jbws_211.tests.OneWay; import org.jboss.test.ws.tools.jbws_211.tests.JBWS211Test; @@ -30,22 +30,22 @@ * @since Sep 24, 2005 */ public class OneWayJava2WSDLTestCase extends JBWS211Test -{ +{ private String base = "OneWay"; - + public String getBase() { return base; } - + @Override protected String getFixMe() { - return "FIXME: [JBWS-1331] JBossWS Tools should generate oneway operations"; + return null; } public String getWSDLName() { return base + "Service.wsdl"; - } + } } Modified: trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml =================================================================== --- trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-05 01:00:14 UTC (rev 1378) +++ trunk/src/test/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2006-11-05 01:13:36 UTC (rev 1379) @@ -1,9 +1,15 @@ -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="OneWayService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" style="rpc"> - <operation name="oneWayOperation" one-way="true"/> - </service> - <namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/> - </java-wsdl> +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="OneWayService" + endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" + style="rpc"> + <operation name="oneWayOperation" one-way="true"> + <parameter type="java.lang.String"/> + </operation> + </service> + <namespaces target-namespace="http://org.jboss.ws" + type-namespace="http://org.jboss.ws/types"/> + </java-wsdl> </configuration> Modified: trunk/src/test/resources/tools/jbws-211/wsdlFixture/OneWay/OneWayService.wsdl =================================================================== --- trunk/src/test/resources/tools/jbws-211/wsdlFixture/OneWay/OneWayService.wsdl 2006-11-05 01:00:14 UTC (rev 1378) +++ trunk/src/test/resources/tools/jbws-211/wsdlFixture/OneWay/OneWayService.wsdl 2006-11-05 01:13:36 UTC (rev 1379) @@ -9,11 +9,9 @@ <message name="TestOneWaySEI_oneWayOperation"> <part name="String_1" type="xsd:string" /> </message> - <!-- Manually remove the output response --> <portType name="TestOneWaySEI"> <operation name="oneWayOperation" parameterOrder="String_1"> <input message="tns:TestOneWaySEI_oneWayOperation" /> - <!-- Manually remove the output message --> </operation> </portType> <binding name="TestOneWaySEIBinding" type="tns:TestOneWaySEI"> @@ -25,10 +23,6 @@ <soap:body use="literal" namespace="http://org.jboss.ws" /> </input> - <output> - <soap:body use="literal" - namespace="http://org.jboss.ws" /> - </output> </operation> </binding> <service name="OneWayService">