Added EJB MDB to JMS support.

sandbox/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java

@@ -28,12 +28,12 @@ import org.springframework.ws.transport.support.SimpleWebServiceMessageReceiverO
  * Convenience base class for JMS server-side transport objects. Contains a {@link WebServiceMessageReceiver}, and has
  * methods for handling incoming JMS <code>Message</code> requests.
  * <p/>
- * This class can be used as a base for a EJB MessageDrivenBean, or using Spring-2.0's MessageDriven POJO's.
+ * Used by {@link WebServiceMessageListener} and {@link WebServiceMessageBean}.
  *
  * @author Arjen Poutsma
  * @see #handleMessage(javax.jms.Message,javax.jms.Session)
  */
-public abstract class JmsWebServiceMessageReceiverObjectSupport extends SimpleWebServiceMessageReceiverObjectSupport {
+public class JmsMessageReceiver extends SimpleWebServiceMessageReceiverObjectSupport {
 
     /**
      * Handles an incoming <code>Message</code>s. Uses the given <code>Session</code> to create a response request.

sandbox/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageBean.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright 2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.transport.jms;
+
+import javax.ejb.EJBException;
+import javax.ejb.MessageDrivenBean;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.naming.NamingException;
+
+import org.springframework.ejb.support.AbstractJmsMessageDrivenBean;
+import org.springframework.jms.support.JmsUtils;
+import org.springframework.jndi.JndiLookupFailureException;
+import org.springframework.ws.WebServiceMessageFactory;
+import org.springframework.ws.transport.WebServiceMessageReceiver;
+
+/**
+ * EJB {@link MessageDrivenBean} that can be used to handleMessage incoming JMS messages.
+ * <p/>
+ * By default, this MDB performs does a bean lookup on the bean factory provided by {@link #getBeanFactory()} the super
+ * class.
+ *
+ * @author Arjen Poutsma
+ * @see #createConnection()
+ * @see #createMessageFactory()
+ * @see #createMessageReceiver()
+ */
+public class WebServiceMessageBean extends AbstractJmsMessageDrivenBean {
+
+    /** Well-known name for the {@link ConnectionFactory} object in the bean factory for this bean. */
+    public static final String CONNECTION_FACTORY_BEAN_NAME = "connectionFactory";
+
+    /** Well-known name for the {@link WebServiceMessageFactory} bean in the bean factory for this bean. */
+    public static final String MESSAGE_FACTORY_BEAN_NAME = "messageFactory";
+
+    /** Well-known name for the {@link WebServiceMessageReceiver} object in the bean factory for this bean. */
+    public static final String MESSAGE_RECEIVER_BEAN_NAME = "messageReceiver";
+
+    private JmsMessageReceiver delegate;
+
+    private Connection connection;
+
+    /** Delegates to {@link JmsMessageReceiver#handleMessage(Message,Session)}. */
+    public void onMessage(Message message) {
+        Session session = null;
+        try {
+            session = createSession(connection);
+            delegate.handleMessage(message, session);
+        }
+        catch (JmsTransportException ex) {
+            throw JmsUtils.convertJmsAccessException(ex.getJmsException());
+        }
+        catch (JMSException ex) {
+            throw JmsUtils.convertJmsAccessException(ex);
+        }
+        catch (Exception ex) {
+            throw new EJBException(ex);
+        }
+        finally {
+            JmsUtils.closeSession(session);
+        }
+    }
+
+    /**
+     * Creates a new {@link Connection}, {@link WebServiceMessageFactory}, and {@link WebServiceMessageReceiver}.
+     *
+     * @see #createConnection()
+     * @see #createMessageFactory()
+     * @see #createMessageReceiver()
+     */
+    protected void onEjbCreate() {
+        try {
+            connection = createConnection();
+            delegate = new JmsMessageReceiver();
+            delegate.setMessageFactory(createMessageFactory());
+            delegate.setMessageReceiver(createMessageReceiver());
+        }
+        catch (NamingException ex) {
+            throw new JndiLookupFailureException("Could not create connection", ex);
+        }
+        catch (JMSException ex) {
+            throw JmsUtils.convertJmsAccessException(ex);
+        }
+        catch (Exception ex) {
+            throw new EJBException(ex);
+        }
+    }
+
+    /** Closes the connection. */
+    protected void onEjbRemove() {
+        JmsUtils.closeConnection(connection);
+    }
+
+    /** Creates a connection factory. Default implemantion does a bean lookup for {@link #CONNECTION_FACTORY_BEAN_NAME}. */
+    protected Connection createConnection() throws Exception {
+        ConnectionFactory connectionFactory =
+                (ConnectionFactory) getBeanFactory().getBean(CONNECTION_FACTORY_BEAN_NAME, ConnectionFactory.class);
+        return connectionFactory.createConnection();
+    }
+
+    /** Creates a message factory. Default implemantion does a bean lookup for {@link #MESSAGE_FACTORY_BEAN_NAME}. */
+    protected WebServiceMessageFactory createMessageFactory() {
+        return (WebServiceMessageFactory) getBeanFactory()
+                .getBean(MESSAGE_FACTORY_BEAN_NAME, WebServiceMessageFactory.class);
+    }
+
+    /** Creates a connection factory. Default implemantion does a bean lookup for {@link #MESSAGE_RECEIVER_BEAN_NAME}. */
+    protected WebServiceMessageReceiver createMessageReceiver() {
+        return (WebServiceMessageReceiver) getBeanFactory()
+                .getBean(MESSAGE_RECEIVER_BEAN_NAME, WebServiceMessageReceiver.class);
+    }
+
+    /**
+     * Creates a session. Default implemantion creates a non-transactional, {@link Session#AUTO_ACKNOWLEDGE auto
+     * acknowledged} session.
+     *
+     * @see Connection#createSession(boolean,int)
+     */
+    protected Session createSession(Connection connection) throws JMSException {
+        return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+}

sandbox/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java

@@ -37,8 +37,7 @@ import org.springframework.ws.transport.WebServiceMessageReceiver;
  * @see #setMessageFactory(org.springframework.ws.WebServiceMessageFactory)
  * @see #setMessageReceiver(org.springframework.ws.transport.WebServiceMessageReceiver)
  */
-public class WebServiceMessageListener extends JmsWebServiceMessageReceiverObjectSupport
-        implements SessionAwareMessageListener {
+public class WebServiceMessageListener extends JmsMessageReceiver implements SessionAwareMessageListener {
 
     public void onMessage(Message message, Session session) throws JMSException {
         try {