[jboss-svn-commits] JBL Code SVN: r37206 - in labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration: src/main/java/org/jboss/narayana/quickstarts/mdb and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 1 13:07:06 EDT 2011
Author: tomjenkinson
Date: 2011-07-01 13:07:06 -0400 (Fri, 01 Jul 2011)
New Revision: 37206
Modified:
labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/mdb/SimpleMDB.java
labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java
labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/test/java/TestBusinessLogic.java
Log:
JBTM-854 update to test the EJB rather than the servlet
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml 2011-07-01 15:42:39 UTC (rev 37205)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/pom.xml 2011-07-01 17:07:06 UTC (rev 37206)
@@ -50,6 +50,19 @@
<type>pom</type>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- We will provide some tests to check the quickstart deploys ok -->
<dependency>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/mdb/SimpleMDB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/mdb/SimpleMDB.java 2011-07-01 15:42:39 UTC (rev 37205)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/mdb/SimpleMDB.java 2011-07-01 17:07:06 UTC (rev 37206)
@@ -12,32 +12,28 @@
*/
package org.jboss.narayana.quickstarts.mdb;
-//import javax.ejb.ActivationConfigProperty;
-//import javax.ejb.MessageDriven;
-//import javax.jms.JMSException;
-//import javax.jms.Message;
-//import javax.jms.MessageListener;
-//import javax.jms.TextMessage;
-//
-//import org.jboss.ejb3.annotation.ResourceAdapter;
-//
-//@MessageDriven(name = "MDB_BMTExample", activationConfig = {
-// @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
-// @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") })
-//@ResourceAdapter("jms-ra.rar")
-//public class SimpleMDB implements MessageListener {
-// public void onMessage(final Message message) {
-// TextMessage textMessage = (TextMessage) message;
-// try {
-// String text = textMessage.getText();
-// System.out.println("message " + text + " received");
-// } catch (JMSException e) {
-// System.err.println("Something went wrong");
-// e.printStackTrace();
-// }
-// }
-//}
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
-public class SimpleMDB {
+import org.jboss.ejb3.annotation.ResourceAdapter;
+ at MessageDriven(name = "MDB_BMTExample", activationConfig = {
+ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") })
+ at ResourceAdapter("jms-ra.rar")
+public class SimpleMDB implements MessageListener {
+ public void onMessage(final Message message) {
+ TextMessage textMessage = (TextMessage) message;
+ try {
+ String text = textMessage.getText();
+ System.out.println("message " + text + " received");
+ } catch (JMSException e) {
+ System.err.println("Something went wrong");
+ e.printStackTrace();
+ }
+ }
}
\ No newline at end of file
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java 2011-07-01 15:42:39 UTC (rev 37205)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/main/java/org/jboss/narayana/quickstarts/servlet/SimpleServlet.java 2011-07-01 17:07:06 UTC (rev 37206)
@@ -25,7 +25,6 @@
import javax.ejb.EJB;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
@@ -41,14 +40,6 @@
@EJB(lookup = "java:module/SimpleEJBImpl")
private SimpleEJB simpleEJB;
- public SimpleServlet() throws NamingException {
- if (simpleEJB == null) {
- simpleEJB = (SimpleEJB) new InitialContext()
- .lookup("java:module/SimpleEJBImpl");
- System.out.println("needed to look up EJB - arq only");
- }
- }
-
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/test/java/TestBusinessLogic.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/test/java/TestBusinessLogic.java 2011-07-01 15:42:39 UTC (rev 37205)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/integration/src/test/java/TestBusinessLogic.java 2011-07-01 17:07:06 UTC (rev 37206)
@@ -18,7 +18,17 @@
* (C) 2011,
* @author JBoss, by Red Hat.
*/
+import static org.junit.Assert.assertTrue;
+
+import javax.ejb.EJB;
+import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -46,11 +56,33 @@
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
+ @EJB(lookup = "java:module/SimpleEJBImpl")
+ private SimpleEJB simpleEJB;
+
@Test
- public void checkThatDoubleCallIncreasesListSize() throws NamingException {
- SimpleServlet simpleServlet = new SimpleServlet();
- simpleServlet.createCustomer("tom1");
- simpleServlet.createCustomer("tom2");
+ public void checkThatDoubleCallIncreasesListSize() throws NamingException,
+ NotSupportedException, SystemException, SecurityException,
+ IllegalStateException, RollbackException, HeuristicMixedException,
+ HeuristicRollbackException {
+ UserTransaction tx = (UserTransaction) new InitialContext()
+ .lookup("java:comp/UserTransaction");
+ tx.begin();
+ simpleEJB.createCustomer("tom");
+ tx.commit();
+
+ String firstList = simpleEJB.listIds();
+
+ tx = (UserTransaction) new InitialContext()
+ .lookup("java:comp/UserTransaction");
+ tx.begin();
+ simpleEJB.createCustomer("tom");
+ tx.commit();
+
+ String secondList = simpleEJB.listIds();
+
+ System.out.println(firstList);
+ System.out.println(secondList);
+
+ assertTrue(firstList.length() < secondList.length());
}
-
}
More information about the jboss-svn-commits
mailing list