December 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5326 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1900: jbossws-tests and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-17 03:49:20 -0500 (Mon, 17 Dec 2007) New Revision: 5326 Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/ant-import/build-samples-jaxrpc.xml legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/build.xml Log: [JBWS-1900] Ported JBWS-1937 Document/Literal addressing endpoint fails when retreiving Outbound Action Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-17 06:29:41 UTC (rev 5325) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -517,7 +517,14 @@ else { WSDLProperty messageName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN); - addrExt.setInboundAction(tns + "/" + portTypeName + "/" + messageName); + if (messageName != null) + { + addrExt.setInboundAction(tns + "/" + portTypeName + "/" + messageName.getValue()); + } + else + { + addrExt.setInboundAction(tns + "/" + portTypeName + "/IN"); + } } // outbound action @@ -529,7 +536,14 @@ else { WSDLProperty messageName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT); - addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + messageName); + if (messageName != null) + { + addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + messageName.getValue()); + } + else + { + addrExt.setOutboundAction(tns + "/" + portTypeName + "/OUT"); + } } opMetaData.addExtension(addrExt); Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-17 06:29:41 UTC (rev 5325) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -525,6 +525,55 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello.war" + webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-replyto.war" + webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> + <include name="replyto-jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> + <include name="replyto-jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar>  <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/build.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/build.xml 2007-12-17 06:29:41 UTC (rev 5325) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/build.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -316,11 +316,19 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> + </move>  <copy todir="${tests.output.dir}/resources"> Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,104 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPMessage; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test endpoint using ws-addressing + * + * @author mageshbk(a)jboss.com + * @since 12-Dec-2007 + */ +public class AddressingReplyToTestCase extends JBossWSTest +{ + private static Hello initial; + private static ReplyTo replyto; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class, + "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + + "jaxrpc-samples-wsaddr-hello-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (initial == null) + { + Service replytoService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/ReplyToService"); + replyto = (ReplyTo)replytoService.getPort(ReplyTo.class); + Service initialService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/HelloService"); + initial = (Hello)initialService.getPort(Hello.class); + } + } + + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. + */ + public void testReplyToMessage() throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:sayHelloResponse xmlns:ns1='http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types'>" + + " <result>ReplyTo</result>" + + " </ns1:sayHelloResponse>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto"); + con.call(reqMsg, epURL); + + assertEquals("ReplyTo", replyto.getLastMessage()); + } + + public void testReplyTo() throws Exception + { + String message = initial.sayHello("Addressing TestCase"); + assertNull("Expected null, but was: " + message, message); + + String reply = replyto.getLastMessage(); + assertEquals("Hello Addressing TestCase", reply); + } +} Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,79 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +import java.net.URI; +import java.net.URISyntaxException; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.MessageContext; + +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.EndpointReference; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; + +/** + * A client side handler for the ws-addressing + * + * @author mageshbk(a)jboss.com + * @since 12-Dec-2007 + */ +public class ClientHandler extends AddressingHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(ClientHandler.class); + protected QName[] headers; + + public boolean handleRequest(MessageContext context) + { + log.info("enter handleRequest"); + + try + { + AddressingBuilder builder = SOAPAddressingBuilder.getAddressingBuilder(); + SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); + outProps.setTo(builder.newURI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-hello")); + outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/sayHello")); + EndpointReference rp = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto")); + outProps.setReplyTo(rp); + outProps.setMessageID(builder.newURI("123456")); + context.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps); + } + catch(URISyntaxException e) + { + e.printStackTrace(); + } + log.info("exit handleRequest"); + return true; + } + + public QName[] getHeaders() + { + return headers; + } + +} Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,37 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * JAXRPC WS-Addressing service endpoint interface + * + * @author mageshbk(a)jboss.com + * + * @since 12-Dec-2007 + */ +public interface Hello extends Remote +{ + String sayHello(String str) throws RemoteException; +} \ No newline at end of file Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,43 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +import org.jboss.logging.Logger; + +/** + * JAXRPC WS-Addressing service endpoint + * + * @author mageshbk(a)jboss.com + * + * @since 12-Dec-2007 + */ +public class HelloEndpointJSE implements Hello +{ + // Provide logging + private static Logger log = Logger.getLogger(HelloEndpointJSE.class); + + public String sayHello(String str) + { + log.info("sayHello: " + str); + return "Hello " + str; + } +} Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,39 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * JAXRPC WS-Addressing service endpoint interface + * + * @author mageshbk(a)jboss.com + * + * @since 12-Dec-2007 + */ +public interface ReplyTo extends Remote +{ + void sayHelloResponse(String str) throws RemoteException; + + String getLastMessage() throws RemoteException; +} \ No newline at end of file Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,51 @@ +/* + * 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.jaxrpc.samples.wsaddr.replyto; + +import org.jboss.logging.Logger; + +/** + * JAXRPC WS-Addressing service endpoint + * + * @author mageshbk(a)jboss.com + * + * @since 12-Dec-2007 + */ +public class ReplyToEndpointJSE implements ReplyTo +{ + // Provide logging + private static Logger log = Logger.getLogger(ReplyToEndpointJSE.class); + + private static String lastMessage; + + public void sayHelloResponse(String str) + { + log.info("sayHelloResponse: " + str); + lastMessage = str; + } + + public String getLastMessage() + { + log.info("getLastMessage: " + lastMessage); + return lastMessage; + } +} Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>HelloService</display-name> + + <service-ref> + <service-ref-name>service/HelloService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ClientHandler</handler-class> + </handler> + <handler> + <handler-name>WSAddressingHandler</handler-name> + <handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</handler-class> + </handler> + </service-ref> + + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/ReplyToService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/replyto-jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jaxrpc-addressing-replyto-client</jndi-name> + + <service-ref> + <service-ref-name>service/HelloService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-wsaddr-hello?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-wsaddr-replyto?wsdl</wsdl-override> + </service-ref> +</jboss-client> Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> + + +<jboss-web> + <context-root>/jaxrpc-samples-wsaddr-hello</context-root> +</jboss-web> Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard WSAddressing Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>HelloService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.HelloEndpointJSE</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>HelloService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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="HelloService" style="document" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello"> + <operation name="sayHello" one-way="false" return-xml-name="result"> + <parameter type="java.lang.String" xml-name="String_1"/> + </operation> + </service> + <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="HelloService"/> + </java-wsdl> +</configuration> Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> + + +<jboss-web> + <context-root>/jaxrpc-samples-wsaddr-replyto</context-root> +</jboss-web> Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>ReplyToService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyToEndpointJSE</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ReplyToService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml (rev 0) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml 2007-12-17 08:49:20 UTC (rev 5326) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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="ReplyToService" style="document" parameter-style="wrapped" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo"> + <operation name="sayHelloResponse" one-way="true"> + <parameter type="java.lang.String" xml-name="result"/> + </operation> + <operation name="getLastMessage" one-way="false" return-xml-name="result"/> + </service> + <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/> + <mapping file="replyto-jaxrpc-mapping.xml"/> + <webservices servlet-link="ReplyToService"/> + </java-wsdl> +</configuration> Property changes on: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5325 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-17 01:29:41 -0500 (Mon, 17 Dec 2007) New Revision: 5325 Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java Log: [JBPAPP-493] Fixed test suite to execute test cases in the order expected Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-17 06:28:49 UTC (rev 5324) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-17 06:29:41 UTC (rev 5325) @@ -93,15 +93,12 @@ assertEquals("ReplyTo", replyto.getLastMessage()); } - public void testInital() throws Exception + public void testReplyTo() throws Exception { String message = initial.sayHello("Addressing TestCase"); assertNull("Expected null, but was: " + message, message); - } - public void testReplyTo() throws Exception - { - String message = replyto.getLastMessage(); - assertEquals("Hello Addressing TestCase", message); + String reply = replyto.getLastMessage(); + assertEquals("Hello Addressing TestCase", reply); } }

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5324 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-17 01:28:49 -0500 (Mon, 17 Dec 2007) New Revision: 5324 Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java Log: [JBPAPP-493] Replaced localhost with getServerHost() Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-14 23:17:48 UTC (rev 5323) +++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-17 06:28:49 UTC (rev 5324) @@ -25,7 +25,6 @@ import java.net.URISyntaxException; import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.MessageContext; import javax.xml.ws.addressing.AddressingBuilder; @@ -34,10 +33,8 @@ import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; - - import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; /** * A client side handler for the ws-addressing @@ -45,7 +42,7 @@ * @author mageshbk(a)jboss.com * @since 12-Dec-2007 */ -public class ClientHandler extends GenericHandler +public class ClientHandler extends AddressingHandler { // Provide logging private static Logger log = Logger.getLogger(ClientHandler.class); @@ -59,9 +56,9 @@ { AddressingBuilder builder = SOAPAddressingBuilder.getAddressingBuilder(); SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); - outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-samples-wsaddr-hello")); + outProps.setTo(builder.newURI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-hello")); outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/sayHello")); - EndpointReference rp = builder.newEndpointReference(new URI("http://localhost:8080/jaxrpc-samples-wsaddr-replyto")); + EndpointReference rp = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto")); outProps.setReplyTo(rp); outProps.setMessageID(builder.newURI("123456")); context.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps);

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5323 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-14 18:17:48 -0500 (Fri, 14 Dec 2007) New Revision: 5323 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java Log: [JBWS-1937] Replaced localhost with getServerHost() Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-14 17:58:07 UTC (rev 5322) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-14 23:17:48 UTC (rev 5323) @@ -25,7 +25,6 @@ import java.net.URISyntaxException; import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.MessageContext; import javax.xml.ws.addressing.AddressingBuilder; @@ -34,10 +33,8 @@ import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; - - import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; /** * A client side handler for the ws-addressing @@ -45,7 +42,7 @@ * @author mageshbk(a)jboss.com * @since 12-Dec-2007 */ -public class ClientHandler extends GenericHandler +public class ClientHandler extends AddressingHandler { // Provide logging private static Logger log = Logger.getLogger(ClientHandler.class); @@ -59,9 +56,9 @@ { AddressingBuilder builder = SOAPAddressingBuilder.getAddressingBuilder(); SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties(); - outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-samples-wsaddr-hello")); + outProps.setTo(builder.newURI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-hello")); outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/sayHello")); - EndpointReference rp = builder.newEndpointReference(new URI("http://localhost:8080/jaxrpc-samples-wsaddr-replyto")); + EndpointReference rp = builder.newEndpointReference(new URI("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto")); outProps.setReplyTo(rp); outProps.setMessageID(builder.newURI("123456")); context.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps);

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5322 - in stack/native/trunk/src/main/java/org/jboss: ws/core/soap and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-14 12:58:07 -0500 (Fri, 14 Dec 2007) New Revision: 5322 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java Log: identified and applied other RM related hacks Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-14 16:18:56 UTC (rev 5321) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-14 17:58:07 UTC (rev 5322) @@ -319,11 +319,14 @@ } } - if (payloadParent == null) - throw new SOAPException("Cannot find RPC element in"); - - QName elName = payloadParent.getElementQName(); - elName = namespaceRegistry.registerQName(elName); + if (RMHelper.isRMOperation(opMetaData.getQName()) == false) // RM hack + { + if (payloadParent == null) + throw new SOAPException("Cannot find RPC element in"); + + QName elName = payloadParent.getElementQName(); + elName = namespaceRegistry.registerQName(elName); + } } int numParameters = 0; @@ -362,17 +365,20 @@ } } - // Verify the numer of parameters matches the actual message payload - int numChildElements = 0; - Iterator itElements = payloadParent.getChildElements(); - while (itElements.hasNext()) + if (RMHelper.isRMOperation(opMetaData.getQName()) == false) { - Node node = (Node)itElements.next(); - if (node instanceof SOAPElement) - numChildElements++; + // Verify the numer of parameters matches the actual message payload + int numChildElements = 0; + Iterator itElements = payloadParent.getChildElements(); + while (itElements.hasNext()) + { + Node node = (Node)itElements.next(); + if (node instanceof SOAPElement) + numChildElements++; + } + if (numChildElements != numParameters) + throw new WSException("Invalid number of payload elements: " + numChildElements); } - if (numChildElements != numParameters && (RMHelper.isRMOperation(opMetaData.getQName()) == false)) - throw new WSException("Invalid number of payload elements: " + numChildElements); } // Generic message endpoint Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-12-14 16:18:56 UTC (rev 5321) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-12-14 17:58:07 UTC (rev 5322) @@ -98,7 +98,8 @@ if (soapBodyElement == null) { - if (epMetaData.getStyle() == Style.RPC) + boolean wsrmDisabled = epMetaData.getConfig().getRMMetaData() == null; + if ((epMetaData.getStyle() == Style.RPC) && (wsrmDisabled)) // RM hack throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); // [JBWS-1125] Support empty soap body elements Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 16:18:56 UTC (rev 5321) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 17:58:07 UTC (rev 5322) @@ -115,6 +115,7 @@ rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages); msgContext.remove(RMConstant.RESPONSE_CONTEXT); RMServerSequence sequence = null; + boolean isSequenceAcknowledgementOnly = true; if (RMHelper.isCreateSequence(rmReqProps)) { @@ -122,6 +123,7 @@ sequences.add(sequence); protocolMessages.add(rmConstants.getCreateSequenceResponseQName()); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); + isSequenceAcknowledgementOnly = false; } if (RMHelper.isCloseSequence(rmReqProps)) @@ -139,6 +141,7 @@ protocolMessages.add(rmConstants.getCloseSequenceResponseQName()); protocolMessages.add(rmConstants.getSequenceAcknowledgementQName()); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); + isSequenceAcknowledgementOnly = false; } if (RMHelper.isSequenceAcknowledgement(rmReqProps)) @@ -176,6 +179,7 @@ protocolMessages.add(rmConstants.getTerminateSequenceResponseQName()); protocolMessages.add(rmConstants.getSequenceAcknowledgementQName()); rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence); + isSequenceAcknowledgementOnly = false; } if (RMHelper.isSequence(rmReqProps)) @@ -214,8 +218,11 @@ } rmResponseContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps); } + isSequenceAcknowledgementOnly = false; } + rmResponseContext.put(RMConstant.ONE_WAY_OPERATION, isSequenceAcknowledgementOnly); + return rmResponseContext; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-12-14 16:18:56 UTC (rev 5321) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-12-14 17:58:07 UTC (rev 5322) @@ -37,7 +37,6 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.wsrm.common.RMHelper; -import org.jboss.ws.extensions.wsrm.spi.RMProvider; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-12-14 16:18:56 UTC (rev 5321) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-12-14 17:58:07 UTC (rev 5322) @@ -77,6 +77,7 @@ import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; +import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -303,7 +304,10 @@ } } - if (outStream != null) + Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT); + boolean isWsrmMessage = rmResCtx != null; + boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION); + if ((outStream != null) && (isWsrmOneWay == false)) // RM hack sendResponse(outStream, msgContext, isFault); } catch (Exception ex)

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5321 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2007-12-14 11:18:56 -0500 (Fri, 14 Dec 2007) New Revision: 5321 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java Log: [JBWS-1937] Fixed test suite to execute test cases in the order expected Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-14 15:12:35 UTC (rev 5320) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-14 16:18:56 UTC (rev 5321) @@ -93,15 +93,12 @@ assertEquals("ReplyTo", replyto.getLastMessage()); } - public void testInital() throws Exception + public void testReplyTo() throws Exception { String message = initial.sayHello("Addressing TestCase"); assertNull("Expected null, but was: " + message, message); - } - public void testReplyTo() throws Exception - { - String message = replyto.getLastMessage(); - assertEquals("Hello Addressing TestCase", message); + String reply = replyto.getLastMessage(); + assertEquals("Hello Addressing TestCase", reply); } }

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5320 - in stack/native/trunk/src: test/resources/jaxws/wsrm/WEB-INF and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-14 10:12:35 -0500 (Fri, 14 Dec 2007) New Revision: 5320 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml Log: minor changes Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 14:29:35 UTC (rev 5319) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 15:12:35 UTC (rev 5320) @@ -95,18 +95,20 @@ * Do RM staff before endpoint invocation * @param ep endpoint * @param inv invocation - * @return true if endpoint have to be called too + * @return RM response context to be set after target endpoint invocation */ - private void beforeEndpointInvocation(Endpoint ep, Invocation inv) + private Map<String, Object> prepareResponseContext(Endpoint ep, Invocation inv) { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); AddressingProperties addrProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); if (addrProps == null) - throw new RMException("WS-Addressing properties not found in server request"); + throw new IllegalStateException("WS-Addressing properties not found in server request"); Map<String, Object> rmReqProps = (Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT); + msgContext.remove(RMConstant.REQUEST_CONTEXT); if (rmReqProps == null) - throw new RMException("WS-RM specific data not found in server request"); + throw new IllegalStateException("WS-RM specific data not found in server request"); + List<QName> protocolMessages = new LinkedList<QName>(); Map<String, Object> rmResponseContext = new HashMap<String, Object>(); List<RMServerSequence> sequences = (List<RMServerSequence>)ep.getAttachment(RMServerSequence.class); @@ -210,27 +212,17 @@ catch (URISyntaxException ignore) { } - msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps); + rmResponseContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps); } } - msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); + return rmResponseContext; } - /** - * Do RM staff after endpoint invocation - * @param ep endpoint - * @param inv invocation - */ - private void afterEndpointInvocation(Endpoint ep, Invocation inv) - { - // TODO: implement - } - @Override public final void invoke(Endpoint ep, Invocation inv) throws Exception { - beforeEndpointInvocation(ep, inv); + Map<String, Object> rmResponseContext = prepareResponseContext(ep, inv); if (inv.getJavaMethod() != null) { @@ -242,9 +234,16 @@ logger.debug("RM lifecycle protocol method detected"); } - afterEndpointInvocation(ep, inv); + setupResponseContext(rmResponseContext); } + private void setupResponseContext(Map<String, Object> rmResponseContext) + { + CommonMessageContext msgCtx = MessageContextAssociation.peekMessageContext(); + msgCtx.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext); + msgCtx.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, rmResponseContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND)); + } + public final InvocationHandler getDelegate() { return this.delegate; Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-14 14:29:35 UTC (rev 5319) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-14 15:12:35 UTC (rev 5320) @@ -8,11 +8,6 @@ <endpoint-config> <config-name>Standard WSRM Endpoint</config-name> -  <post-handler-chains> <javaee:handler-chain> <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5319 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm/server and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2007-12-14 09:29:35 -0500 (Fri, 14 Dec 2007) New Revision: 5319 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java Log: refactoring Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -18,15 +18,8 @@ } private static final String PREFIX = "wsrm"; - public static final String TARGET_ADDRESS = PREFIX + ".targetAddress"; - public static final String REMOTING_VERSION = PREFIX + ".remotingVersion"; + public static final String ONE_WAY_OPERATION = PREFIX + ".oneWayOperation"; - public static final String INVOCATION_CONTEXT = PREFIX + ".invocationContext"; - public static final String MARSHALLER = PREFIX + ".marshaller"; - public static final String UNMARSHALLER = PREFIX + ".unmarshaller"; - public static final String SERIALIZATION_CONTEXT = PREFIX + ".serializationContext"; - public static final String REMOTING_INVOCATION_CONTEXT = PREFIX + ".remotingInvocationContext"; - public static final String REMOTING_CONFIGURATION_CONTEXT = PREFIX + ".remotingConfigurationContext"; public static final String REQUEST_CONTEXT = PREFIX + ".requestContext"; public static final String RESPONSE_CONTEXT = PREFIX + ".responseContext"; public static final String SEQUENCE_REFERENCE = PREFIX + ".sequenceReference"; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -32,13 +32,11 @@ import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.addressing.Relationship; -import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.wsrm.RMAddressingConstants; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.api.RMException; Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -0,0 +1,48 @@ +/* + * 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.wsrm.transport; + +/** + * RM transport constants + * + * @author richard.opalka(a)jboss.com + * + * @since Dec 14, 2007 + */ +public class RMChannelConstants +{ + + public static final String TARGET_ADDRESS = "targetAddress"; + public static final String REMOTING_VERSION = "remotingVersion"; + public static final String INVOCATION_CONTEXT = "invocationContext"; + public static final String MARSHALLER = "marshaller"; + public static final String UNMARSHALLER = "unmarshaller"; + public static final String SERIALIZATION_CONTEXT = "serializationContext"; + public static final String REMOTING_INVOCATION_CONTEXT = "remotingInvocationContext"; + public static final String REMOTING_CONFIGURATION_CONTEXT = "remotingConfigurationContext"; + + private RMChannelConstants() + { + // instances not allowed + } + +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelConstants.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,8 +21,6 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.*; - import java.io.IOException; import java.net.URI; import java.util.Map; @@ -58,8 +56,8 @@ { try { - String targetAddress = (String)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT).get(TARGET_ADDRESS); - String version = (String)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT).get(REMOTING_VERSION); + String targetAddress = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.TARGET_ADDRESS); + String version = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.REMOTING_VERSION); if (version.startsWith("1.4")) { @@ -84,7 +82,7 @@ } boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest); - Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(REMOTING_CONFIGURATION_CONTEXT)); + Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT)); client.connect(); client.setMarshaller(RMMarshaller.getInstance()); @@ -92,7 +90,7 @@ if ((false == oneWay) && (null == backPort)) client.setUnMarshaller(RMUnMarshaller.getInstance()); - Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); + Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT); // debug the outgoing request message MessageTrace.traceMessage("Outgoing RM Request Message", rmRequest.getPayload()); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,11 +21,7 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.INVOCATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.MARSHALLER; -import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.SERIALIZATION_CONTEXT; -import static org.jboss.ws.extensions.wsrm.RMConstant.UNMARSHALLER; +import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.*; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -4,7 +4,6 @@ import java.util.HashMap; import org.jboss.remoting.marshal.Marshaller; import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.ws.extensions.wsrm.RMConstant; /** * RM metadata heavily used by this RM transport @@ -27,27 +26,27 @@ if (targetAddress == null) throw new IllegalArgumentException("Target address cannot be null"); - invocationContext.put(RMConstant.TARGET_ADDRESS, targetAddress); - invocationContext.put(RMConstant.REMOTING_VERSION, remotingVersion); - setContext(RMConstant.INVOCATION_CONTEXT, invocationContext); + invocationContext.put(RMChannelConstants.TARGET_ADDRESS, targetAddress); + invocationContext.put(RMChannelConstants.REMOTING_VERSION, remotingVersion); + setContext(RMChannelConstants.INVOCATION_CONTEXT, invocationContext); if (marshaller == null || unmarshaller == null) throw new IllegalArgumentException("Unable to create de/serialization context"); Map<String, Object> serializationContext = new HashMap<String, Object>(); - serializationContext.put(RMConstant.MARSHALLER, marshaller); - serializationContext.put(RMConstant.UNMARSHALLER, unmarshaller); - setContext(RMConstant.SERIALIZATION_CONTEXT, serializationContext); + serializationContext.put(RMChannelConstants.MARSHALLER, marshaller); + serializationContext.put(RMChannelConstants.UNMARSHALLER, unmarshaller); + setContext(RMChannelConstants.SERIALIZATION_CONTEXT, serializationContext); if (remotingInvocationContext == null) throw new IllegalArgumentException("Remoting invocation context cannot be null"); - setContext(RMConstant.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); + setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); if (remotingConfigurationContext == null) throw new IllegalArgumentException("Remoting configuraton context cannot be null"); - setContext(RMConstant.REMOTING_CONFIGURATION_CONTEXT, remotingConfigurationContext); + setContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT, remotingConfigurationContext); } public RMMetadata(Map<String, Object> remotingInvocationContext) @@ -55,7 +54,7 @@ if (remotingInvocationContext == null) throw new IllegalArgumentException("Remoting invocation context cannot be null"); - setContext(RMConstant.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); + setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext); } void setContext(String key, Map<String, Object> ctx) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -21,8 +21,6 @@ */ package org.jboss.ws.extensions.wsrm.transport; -import static org.jboss.ws.extensions.wsrm.RMConstant.REMOTING_INVOCATION_CONTEXT; - import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -123,7 +121,7 @@ endTime = System.currentTimeMillis(); if (result.getResponse() != null) { - Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(REMOTING_INVOCATION_CONTEXT); + Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT); if (remotingCtx != null) { if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE))) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMTransportHelper.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -41,7 +41,7 @@ private static Map<String, Object> getWsrmRequestContext(RMMessage rmRequest) { - Map<String, Object> invocationCtx = (Map<String, Object>)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT); + Map<String, Object> invocationCtx = (Map<String, Object>)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT); return (Map<String, Object>)invocationCtx.get(REQUEST_CONTEXT); } @@ -54,12 +54,10 @@ { RMMetadata meta = rmRequest.getMetadata(); if (meta == null) throw new RuntimeException("Unable to obtain wsrm metadata"); - Map<String, Object> invCtx = meta.getContext(RMConstant.INVOCATION_CONTEXT); + Map<String, Object> invCtx = meta.getContext(RMChannelConstants.INVOCATION_CONTEXT); if (invCtx == null) throw new RuntimeException("Unable to obtain invocation context"); Map<String, Object> wsrmReqCtx = (Map<String, Object>)invCtx.get(RMConstant.REQUEST_CONTEXT); Boolean isOneWay = (Boolean)wsrmReqCtx.get(ONE_WAY_OPERATION); - logger.debug("oneWayMessage == " + (isOneWay == null ? false : isOneWay.booleanValue())); - logger.debug("messages == " + wsrmReqCtx.get(PROTOCOL_MESSAGES)); return isOneWay == null ? false : isOneWay.booleanValue(); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-14 14:04:17 UTC (rev 5318) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-14 14:29:35 UTC (rev 5319) @@ -77,8 +77,7 @@ public void testOneWayMethods() throws Exception { - boolean addressableClient = isClientAddressable(); - RMSequence sequence = ((RMProvider)proxy).createSequence(addressableClient); + RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable()); setAddrProps(proxy, "http://useless/action1", serviceURL); proxy.method1(); setAddrProps(proxy, "http://useless/action2", serviceURL);

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5318 - in stack/cxf/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-14 09:04:17 -0500 (Fri, 14 Dec 2007) New Revision: 5318 Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/ant-import/build-testsuite-jars.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/version.properties Log: Enable ws-rm test case Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2007-12-14 14:03:46 UTC (rev 5317) +++ stack/cxf/trunk/.classpath 2007-12-14 14:04:17 UTC (rev 5318) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test-framework/java"/> + <classpathentry excluding="org/jboss/test/ws/jaxws/smoke/tools/" kind="src" path="src/test-framework/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> @@ -36,5 +36,6 @@ <classpathentry kind="lib" path="thirdparty/cxf-2.0.3-incubator.jar" sourcepath="apache-cxf"/> <classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/> <classpathentry kind="lib" path="tools/ant/lib/junit.jar"/> + <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-14 14:03:46 UTC (rev 5317) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2007-12-14 14:04:17 UTC (rev 5318) @@ -25,12 +25,12 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.class"/> </classes> -  - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/reliable/WEB-INF"> + </classes> +  </war>  Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-14 14:03:46 UTC (rev 5317) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-12-14 14:04:17 UTC (rev 5318) @@ -64,6 +64,7 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-12-14 14:03:46 UTC (rev 5317) +++ stack/cxf/trunk/version.properties 2007-12-14 14:04:17 UTC (rev 5318) @@ -47,6 +47,7 @@ jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta stax-api=1.0 +sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1 sun-servlet=2.5

16 years, 5 months

1
0
0 / 0

JBossWS SVN: r5317 - stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-12-14 09:03:46 -0500 (Fri, 14 Dec 2007) New Revision: 5317 Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml Log: xmlns:wsp="http://www.w3.org/2006/07/ws-policy" Modified: stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml =================================================================== --- stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml 2007-12-14 13:43:46 UTC (rev 5316) +++ stack/cxf/trunk/src/test/resources/jaxws/cxf/reliable/cxf.xml 2007-12-14 14:03:46 UTC (rev 5317) @@ -2,10 +2,10 @@ xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://schemas.xmlsoap.org/ws/2004/09/policy http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> <wsp:Policy/> </wsam:Addressing>

16 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2007