[jboss-cvs] JBossAS SVN: r69680 - in branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3: src/resources/test/ear and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 6 20:22:00 EST 2008
Author: bdecoste
Date: 2008-02-06 20:22:00 -0500 (Wed, 06 Feb 2008)
New Revision: 69680
Added:
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/resources/test/ear/eartest-mq-service.xml
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/QueueTestMDB.java
Modified:
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java
branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
Log:
[JBPAPP-550] merged from JBPAPP_4_2_0_CP
Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/build-test.xml 2008-02-07 00:50:43 UTC (rev 69679)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/build-test.xml 2008-02-07 01:22:00 UTC (rev 69680)
@@ -620,6 +620,7 @@
<jar jarfile="${build.lib}/ear-session.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/ear/Facade*.class"/>
+ <include name="org/jboss/ejb3/test/ear/Queue*.class"/>
</fileset>
<fileset dir="${resources}/test/ear/ejbref">
<include name="META-INF/persistence.xml"/>
@@ -649,7 +650,12 @@
<include name="earpu.jar"/>
</zipfileset>
</ear>
-
+
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/ear">
+ <include name="*-service.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="dependency"
Added: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/resources/test/ear/eartest-mq-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/resources/test/ear/eartest-mq-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/resources/test/ear/eartest-mq-service.xml 2008-02-07 01:22:00 UTC (rev 69680)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=eartest">
+ <attribute name="JNDIName">queue/eartest</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java 2008-02-07 00:50:43 UTC (rev 69679)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/Facade.java 2008-02-07 01:22:00 UTC (rev 69680)
@@ -35,4 +35,6 @@
void testEarLib();
void testReferencedEntity();
+
+ boolean receivedMessage();
}
Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java 2008-02-07 00:50:43 UTC (rev 69679)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/FacadeBean.java 2008-02-07 01:22:00 UTC (rev 69680)
@@ -34,6 +34,8 @@
@Stateless
public class FacadeBean implements Facade
{
+ public static boolean receivedMessage = false;
+
@PersistenceContext(unitName="earlib")
EntityManager earlib;
@@ -51,4 +53,9 @@
ReferencedEntity ref = new ReferencedEntity();
ejbref.persist(ref);
}
+
+ public boolean receivedMessage()
+ {
+ return receivedMessage;
+ }
}
Added: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/QueueTestMDB.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/QueueTestMDB.java (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/QueueTestMDB.java 2008-02-07 01:22:00 UTC (rev 69680)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.ejb3.test.ear;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ */
+ at MessageDriven(name="QueueMDB", messageListenerInterface=MessageListener.class,
+ activationConfig =
+ {
+ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName="destination", propertyValue="queue/eartest")
+ })
+ at PoolClass(value=org.jboss.ejb3.StrictMaxPool.class, maxSize=1, timeout=10000)
+public class QueueTestMDB
+implements MessageListener
+{
+ private static final Logger log = Logger.getLogger(QueueTestMDB.class);
+
+ public void onMessage(Message message)
+ {
+ System.out.println("+++ QueueTestMDB onMessage ");
+
+ FacadeBean.receivedMessage = true;
+ }
+}
Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java 2008-02-07 00:50:43 UTC (rev 69679)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-550/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java 2008-02-07 01:22:00 UTC (rev 69680)
@@ -21,6 +21,15 @@
*/
package org.jboss.ejb3.test.ear.unit;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.TextMessage;
+
+import javax.naming.InitialContext;
+
import org.jboss.test.JBossTestCase;
import org.jboss.ejb3.test.factory.Session1;
import org.jboss.ejb3.test.factory.Session2;
@@ -43,7 +52,6 @@
public class EarUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
@@ -67,9 +75,30 @@
facade.testReferencedEntity();
}
+ public void testMessage() throws Exception
+ {
+ InitialContext jndiContext = new InitialContext();
+ Queue queue = (Queue) getInitialContext().lookup("queue/eartest");
+ QueueConnectionFactory factory = (QueueConnectionFactory)jndiContext.lookup("ConnectionFactory");
+ QueueConnection connection = factory.createQueueConnection();
+ QueueSession session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ QueueSender sender = session.createSender(queue);
+ TextMessage msg = session.createTextMessage("Hello World");
+
+ sender.send(msg);
+ session.close();
+ connection.close();
+
+ Thread.sleep(2000);
+
+ Facade facade = (Facade)getInitialContext().lookup("ear-test/FacadeBean/remote");
+ assertTrue(facade.receivedMessage());
+ }
+
public static Test suite() throws Exception
{
- return getDeploySetup(EarUnitTestCase.class, "ear-test.ear");
+ return getDeploySetup(EarUnitTestCase.class, "eartest-mq-service.xml, ear-test.ear");
}
+
}
More information about the jboss-cvs-commits
mailing list