Author: thomas.diesler(a)jboss.com Date: 2008-01-09 07:26:52 -0500 (Wed, 09 Jan 2008) New Revision: 5433 Added: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/ stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/ stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB21.java stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB3.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/Organization.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/ stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/ stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml Modified: stack/native/trunk/.classpath stack/native/trunk/ant-import-tests/build-samples-jaxws.xml stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt stack/native/trunk/src/test/resources/test-excludes-jboss405.txt stack/native/trunk/src/test/resources/test-excludes-jboss421.txt stack/native/trunk/src/test/resources/test-excludes-jboss422.txt stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Log: [JBWS-1911] Support the JMS transport with JAX-WS Modified: stack/native/trunk/.classpath =================================================================== --- stack/native/trunk/.classpath 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/.classpath 2008-01-09 12:26:52 UTC (rev 5433) @@ -38,7 +38,7 @@ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/native/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-01-09 12:26:52 UTC (rev 5433) @@ -18,7 +18,23 @@ <mkdir dir="${tests.output.dir}/libs"/> - <!-- jaxws-webserviceref --> + <!-- jaxws-samples-jmstransport --> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jmstransport.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jmstransport.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-samples-jmstransport.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jmstransport/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + + <!-- jaxws-samples-webserviceref --> <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> @@ -107,6 +123,43 @@ </manifest> </jar> + <!-- jaxws-samples-webserviceref-secure --> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + <!-- jaxws-samples-wsaddressing --> <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -130,8 +183,8 @@ <include name="wsdl/ws-addr.xsd"/> </webinf> </war> - - <jar destfile="${tests.output.dir}/libs/jaxws-samples-wseventing-sink.jar"> + + <jar destfile="${tests.output.dir}/libs/jaxws-samples-wseventing-sink.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wseventing/SystemStatus.class"/> @@ -169,21 +222,23 @@ <include name="wsse.truststore"/> </webinf> </war> - - <!-- jaxws-samples-wssecurity-username --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-username.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/web.xml"> + + <!-- jaxws-samples-wssecurity-username --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-username.war" + webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-username/WEB-INF"> - <include name="jboss-web.xml"/> + <include name="jboss-web.xml"/> <include name="jboss-wsse-server.xml"/> </webinf> </war> <!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" + webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/Hello.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.class"/> @@ -197,9 +252,10 @@ <include name="Policy.xml"/> </webinf> </war> - - <!-- jaxws-samples-wssecuritypolicy-encrypt --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecuritypolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> + + <!-- jaxws-samples-wssecuritypolicy-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecuritypolicy-encrypt.war" + webxml="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/> <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.class"/> @@ -209,50 +265,13 @@ <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF"> - <include name="wsdl/**"/> - </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF"> + <include name="wsdl/**"/> + </webinf> </war> - - <!-- jaxws-webserviceref --> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - - <!-- Please add alphabetically --> + <!-- Please add alphabetically --> + </target> </project> Added: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,297 @@ +/* + * 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.core.transport.jms; + +// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.rmi.RemoteException; + +import javax.ejb.EJBException; +import javax.jms.BytesMessage; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.xml.soap.SOAPException; + +import org.jboss.logging.Logger; +import org.jboss.util.NestedRuntimeException; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; + +/** + * The abstract base class for MDBs that want to act as web service endpoints. + * A subclass should only need to implement the service endpoint interface. + * + * @author Thomas.Diesler(a)jboss.org + */ +public abstract class AbstractJMSTransportSupport implements MessageListener +{ + // logging support + protected Logger log = Logger.getLogger(AbstractJMSTransportSupport.class); + + private QueueConnectionFactory conFactory; + + /** + * All messages come in here, if it is a BytesMessage we pass it on for further processing. + */ + public void onMessage(Message message) + { + try + { + String msgStr = null; + if (message instanceof BytesMessage) + { + msgStr = getMessageStr((BytesMessage)message); + } + else if (message instanceof TextMessage) + { + msgStr = ((TextMessage)message).getText(); + } + else + { + log.warn("Invalid message type: " + message); + return; + } + + log.debug("Incomming SOAP message: " + msgStr); + + String fromName = null; + Destination destination = message.getJMSDestination(); + if (destination instanceof Queue) + fromName = "queue/" + ((Queue)destination).getQueueName(); + if (destination instanceof Topic) + fromName = "topic/" + ((Topic)destination).getTopicName(); + + InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes()); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024); + processSOAPMessage(fromName, inputStream, outputStream); + + msgStr = new String(outputStream.toByteArray()); + log.debug("Outgoing SOAP message: " + msgStr); + + if (msgStr.length() > 0) + { + Queue replyQueue = getReplyQueue(message); + if (replyQueue != null) + { + sendResponse(replyQueue, msgStr); + } + else + { + log.warn("No reply queue, ignore response message"); + } + } + else + { + log.debug("SOAP response message is null"); + } + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new EJBException(e); + } + } + + protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + + Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); + + if (endpoint == null) + throw new IllegalStateException("Cannot find endpoint for: " + fromName); + + EndpointAssociation.setEndpoint(endpoint); + try + { + log.debug("dipatchMessage: " + endpoint.getName()); + + // [JBWS-1324]: workaround to prevent message processing before endpoint is started + EndpointState state = endpoint.getState(); + ObjectName name = endpoint.getName(); + long startTime = System.currentTimeMillis(); + log.debug(name + " is in state: " + state); + while (state != EndpointState.STARTED && (System.currentTimeMillis() - startTime < 60000)) + { + try + { + Thread.sleep(1000); + state = endpoint.getState(); + log.debug(name + " is now in state: " + state); + } + catch (InterruptedException e) + { + throw new EJBException(e); + } + } + + RequestHandler reqHandler = endpoint.getRequestHandler(); + + try + { + InvocationContext invContext = new InvocationContext(); + invContext.setTargetBean(this); + + reqHandler.handleRequest(endpoint, inputStream, outStream, invContext); + } + catch (Exception ex) + { + throw new RemoteException("Cannot process SOAP request", ex); + } + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + // The destination jndiName is encoded in the service object name under key 'jms' + private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName) + { + Endpoint endpoint = null; + for (ObjectName oname : epRegistry.getEndpoints()) + { + Endpoint aux = epRegistry.getEndpoint(oname); + String jmsProp = aux.getName().getKeyProperty("jms"); + if (jmsProp != null && jmsProp.equals(fromName)) + { + endpoint = aux; + break; + } + } + return endpoint; + } + + private String getMessageStr(BytesMessage message) throws Exception + { + byte[] buffer = new byte[8 * 1024]; + ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length); + int read = message.readBytes(buffer); + while (read != -1) + { + out.write(buffer, 0, read); + read = message.readBytes(buffer); + } + + byte[] msgBytes = out.toByteArray(); + return new String(msgBytes); + } + + /** + * Get the reply queue. + */ + protected Queue getReplyQueue(Message message) throws JMSException + { + Queue replyQueue = (Queue)message.getJMSReplyTo(); + return replyQueue; + } + + /** + * Respond to the call by sending a message to the reply queue + */ + protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException + { + QueueConnection qc = getQueueFactory().createQueueConnection(); + QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueSender sender = null; + try + { + sender = session.createSender(replyQueue); + TextMessage responseMessage = session.createTextMessage(msgStr); + sender.send(responseMessage); + log.info("Sent response"); + } + finally + { + try + { + sender.close(); + } + catch (JMSException ignored) + { + } + try + { + session.close(); + } + catch (JMSException ignored) + { + } + try + { + qc.close(); + } + catch (JMSException ignored) + { + } + } + } + + private QueueConnectionFactory getQueueFactory() + { + if (conFactory == null) + { + try + { + InitialContext ctx = new InitialContext(); + conFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory"); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new NestedRuntimeException(e); + } + } + return conFactory; + } +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB21.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB21.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB21.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -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.ws.core.transport.jms; + +// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import javax.ejb.EJBException; +import javax.ejb.MessageDrivenBean; +import javax.ejb.MessageDrivenContext; + +public abstract class JMSTransportSupportEJB21 extends AbstractJMSTransportSupport implements MessageDrivenBean +{ + public void ejbCreate() + { + } + + public void ejbRemove() throws EJBException + { + } + + public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException + { + } +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB3.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB3.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB3.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,28 @@ +/* + * 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.core.transport.jms; + +// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +public abstract class JMSTransportSupportEJB3 extends AbstractJMSTransportSupport +{ +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/core/transport/jms/JMSTransportSupportEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -23,8 +23,38 @@ // $Id$ -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.TypeReference; +import java.io.File; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.net.MalformedURLException; +import java.net.URL; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.jws.HandlerChain; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPMessageHandlers; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.bind.annotation.XmlType; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.BindingType; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; +import javax.xml.ws.WebFault; +import javax.xml.ws.addressing.Action; +import javax.xml.ws.addressing.AddressingProperties; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -57,46 +87,18 @@ import org.jboss.ws.metadata.wsdl.WSDLMIMEPart; import org.jboss.wsf.common.JavaUtils; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import javax.jws.HandlerChain; -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.jws.soap.SOAPMessageHandlers; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.BindingType; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; -import javax.xml.ws.WebFault; -import javax.xml.ws.addressing.Action; -import javax.xml.ws.addressing.AddressingProperties; -import java.io.File; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.net.MalformedURLException; -import java.net.URL; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import com.sun.xml.bind.api.JAXBRIContext; +import com.sun.xml.bind.api.TypeReference; /** * Abstract class that represents a JAX-WS metadata builder. @@ -237,7 +239,7 @@ throw new WSException("Cannot resolve handler file '" + filename + "' on " + wsClass.getName()); log.debug("Loading handler chain: " + fileURL); - + UnifiedHandlerChainsMetaData handlerChainsMetaData = null; try { @@ -379,7 +381,7 @@ return wrapperParameter; } - + private ParameterMetaData createResponseWrapper(OperationMetaData operation, Method method) { QName operationQName = operation.getQName(); @@ -805,7 +807,8 @@ { if (AttachmentScanResult.Type.SWA_REF == asr.getType()) wrappedParameter.setSwaRef(true); - else wrappedParameter.setXOP(true); + else + wrappedParameter.setXOP(true); } } @@ -822,7 +825,8 @@ { if (AttachmentScanResult.Type.SWA_REF == asr.getType()) parameter.setSwaRef(true); - else parameter.setXOP(true); + else + parameter.setXOP(true); } } @@ -907,7 +911,8 @@ // Use the dynamic generator by default. Otherwise reset the last if (wrapperGenerator == null) wrapperGenerator = new DynamicWrapperGenerator(loader); - else wrapperGenerator.reset(loader); + else + wrapperGenerator.reset(loader); } protected void resetMetaDataBuilder(ClassLoader loader) @@ -928,22 +933,16 @@ JAXBContextFactory factory = JAXBContextFactory.newInstance(); - // JAXBIntros may mofiy the WSDL being generated // only true for server side invocation, tooling (WSProvide) doesnt support this BindingCustomization bindingCustomization = null; - if(epMetaData instanceof ServerEndpointMetaData) + if (epMetaData instanceof ServerEndpointMetaData) { Endpoint endpoint = ((ServerEndpointMetaData)epMetaData).getEndpoint(); - bindingCustomization = endpoint!=null ? endpoint.getAttachment(BindingCustomization.class) : null; + bindingCustomization = endpoint != null ? endpoint.getAttachment(BindingCustomization.class) : null; } - jaxbCtx = factory.createContext( - javaTypes.toArray(new Class[0]), - typeRefs, - targetNS, - false, bindingCustomization - ); + jaxbCtx = factory.createContext(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false, bindingCustomization); } catch (WSException ex) { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -11,7 +11,7 @@ import java.rmi.RemoteException; import org.jboss.logging.Logger; -import org.jboss.wsf.common.transport.jms.JMSTransportSupport; +import org.jboss.ws.core.transport.jms.JMSTransportSupportEJB21; /** * An example of a MDB acting as a web service endpoint. @@ -19,7 +19,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 02-Oct-2004 */ -public class OrganizationJMSEndpoint extends JMSTransportSupport +public class OrganizationJMSEndpoint extends JMSTransportSupportEJB21 { // provide logging private static final Logger log = Logger.getLogger(OrganizationJMSEndpoint.class); Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,129 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.jaxws.samples.jmstransport; + +// $Id$ + +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueReceiver; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.naming.InitialContext; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.common.DOMUtils; + +import junit.framework.Test; + + +/** + * A web service client that connects to a MDB endpoint. + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2004 + */ +public class JMSTransportTestCase extends JBossWSTest +{ + private static boolean waitForResponse; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar"); + } + + /** + * Send the message to the specified queue + */ + public void testSOAPMessageToEndpointQueue() throws Exception + { + if (isTargetJBoss50()) + { + System.out.println("FIXME [JBWS-1312] Fix JMS transport in trunk"); + return; + } + + String reqMessage = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + "<env:Body>" + + "<ns1:getContactInfo xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + + "<arg0>mafia</arg0>" + + "</ns1:getContactInfo>" + + "</env:Body>" + + "</env:Envelope>"; + + String resMessage = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + "<env:Header/>" + + "<env:Body>" + + "<ns1:getContactInfoResponse xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + + "<return>The 'mafia' boss is currently out of office, please call again.</return>" + + "</ns1:getContactInfoResponse>" + + "</env:Body>" + + "</env:Envelope>"; + + InitialContext context = new InitialContext(); + QueueConnectionFactory connectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory"); + Queue reqQueue = (Queue)context.lookup("queue/RequestQueue"); + Queue resQueue = (Queue)context.lookup("queue/ResponseQueue"); + + QueueConnection con = connectionFactory.createQueueConnection(); + QueueSession session = con.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueReceiver receiver = session.createReceiver(resQueue); + ResponseListener responseListener = new ResponseListener(); + receiver.setMessageListener(responseListener); + con.start(); + + TextMessage message = session.createTextMessage(reqMessage); + message.setJMSReplyTo(resQueue); + + waitForResponse = true; + + QueueSender sender = session.createSender(reqQueue); + sender.send(message); + sender.close(); + + int timeout = 5000; + while (waitForResponse && timeout > 0) + { + Thread.sleep(100); + timeout -= 100; + } + + assertNotNull("Expected response message", responseListener.resMessage); + assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); + + con.stop(); + session.close(); + con.close(); + } + + public static class ResponseListener implements MessageListener + { + public String resMessage; + + public void onMessage(Message msg) + { + TextMessage textMessage = (TextMessage)msg; + try + { + resMessage = textMessage.getText(); + waitForResponse = false; + } + catch (Throwable t) + { + t.printStackTrace(); + } + } + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/Organization.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/Organization.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/Organization.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,34 @@ +/* + * 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.jmstransport; + +import java.rmi.Remote; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Organization extends Remote +{ + String getContactInfo(String organization); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/Organization.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,45 @@ +/* + * JBoss, the OpenSource J2EE webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.test.ws.jaxws.samples.jmstransport; + +// $Id$ + +import java.rmi.RemoteException; + +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.transport.jms.JMSTransportSupportEJB3; + +/** + * An example of a MDB acting as a web service endpoint. + * + * @author Thomas.Diesler(a)jboss.org + * @since 09-Jan-2008 + */ +@WebService (targetNamespace = "http://org.jboss.ws/samples/jmstransport") +@SOAPBinding(style = SOAPBinding.Style.RPC) + +@MessageDriven(activationConfig = { + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/RequestQueue") }) +public class OrganizationJMSEndpoint extends JMSTransportSupportEJB3 +{ + // provide logging + private static final Logger log = Logger.getLogger(OrganizationJMSEndpoint.class); + + @WebMethod + public String getContactInfo(String organization) throws RemoteException + { + log.info("getContactInfo: " + organization); + return "The '" + organization + "' boss is currently out of office, please call again."; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml 2008-01-09 12:26:52 UTC (rev 5433) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<server> + <mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.mq.destination:service=Queue,name=ResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server> Property changes on: stack/native/trunk/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-09 12:26:52 UTC (rev 5433) @@ -31,11 +31,12 @@ org/jboss/test/ws/jaxws/handlerlifecycle/** org/jboss/test/ws/jaxws/samples/context/** org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/samples/serviceref/*EJB* org/jboss/test/ws/jaxws/samples/webservice/*EJB3* +org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/samples/wsaddressing/** org/jboss/test/ws/jaxws/samples/wseventing/** org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean* Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.txt 2008-01-09 12:26:52 UTC (rev 5433) @@ -10,11 +10,14 @@ org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/webserviceref/** +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* +# [JBWS-1911] Support the JMS transport with JAX-WS +org/jboss/test/ws/jaxws/samples/jmstransport/** # [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail # This requires changes to the AS web meta data (servlet init params), whic is not possible for 4.0.5 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/resources/test-excludes-jboss421.txt 2008-01-09 12:26:52 UTC (rev 5433) @@ -6,9 +6,12 @@ org/jboss/test/ws/jaxws/jbws1762/** org/jboss/test/ws/jaxrpc/jbws1762/** +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* +# [JBWS-1911] Support the JMS transport with JAX-WS +org/jboss/test/ws/jaxws/samples/jmstransport/** Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-01-09 12:26:52 UTC (rev 5433) @@ -9,5 +9,8 @@ # [JBWS-1797] Setting .NET friendly Endpoint in web.xml org/jboss/test/ws/jaxws/jbws1797/** +# [JBWS-1911] Support the JMS transport with JAX-WS +org/jboss/test/ws/jaxws/samples/jmstransport/** + # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-01-09 11:39:53 UTC (rev 5432) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-01-09 12:26:52 UTC (rev 5433) @@ -15,3 +15,7 @@ # [JBAS-5055] Failed to load users/passwords/role files org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.* org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.* + +# [JBWS-1911] Support the JMS transport with JAX-WS +org/jboss/test/ws/jaxws/samples/jmstransport/** +