[THORN-2470] update the AMQ booster to use the ejb-mdb fraction

thorntail-examples · Sep 24, 2019 · 745c545 · 745c545
1 parent 02fe43b
commit 745c545
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 target/
 audit.log
-/README.html
 .idea
diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.thorntail</groupId>
-      <artifactId>ejb</artifactId>
+      <artifactId>ejb-mdb</artifactId>
     </dependency>
     <dependency>
       <groupId>io.thorntail</groupId>
@@ -57,12 +57,6 @@
       <version>${version.amqphub-jca}</version>
       <type>rar</type>
     </dependency>
-
-    <!-- I don't think I should need this, but I do -->
-    <dependency>
-      <groupId>io.thorntail</groupId>
-      <artifactId>messaging</artifactId>
-    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/frontend/src/main/java/io/thorntail/example/FrontendResource.java b/frontend/src/main/java/io/thorntail/example/FrontendResource.java
@@ -3,7 +3,6 @@
 import org.jboss.logging.Logger;
 
 import javax.inject.Inject;
-import javax.jms.JMSConnectionFactory;
 import javax.jms.JMSContext;
 import javax.jms.JMSException;
 import javax.jms.Queue;
@@ -26,7 +25,6 @@ public class FrontendResource {
     private GlobalData globalData;
 
     @Inject
-    @JMSConnectionFactory("java:global/jms/default")
     private JMSContext jmsContext;
 
     @POST

diff --git a/frontend/src/main/resources/project-defaults.yml b/frontend/src/main/resources/project-defaults.yml
@@ -23,3 +23,5 @@ thorntail:
     default-resource-adapter-name: default
   ee:
     annotation-property-replacement: true
+    default-bindings-service:
+      jms-connection-factory: java:global/jms/default
diff --git a/worker/pom.xml b/worker/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.thorntail</groupId>
-      <artifactId>ejb</artifactId>
+      <artifactId>ejb-mdb</artifactId>
     </dependency>
     <dependency>
       <groupId>io.thorntail</groupId>
@@ -53,15 +53,8 @@
       <version>${version.amqphub-jca}</version>
       <type>rar</type>
     </dependency>
-
-    <!-- I don't think I should need this, but I do -->
-    <dependency>
-      <groupId>io.thorntail</groupId>
-      <artifactId>messaging</artifactId>
-    </dependency>
   </dependencies>
 
-
   <profiles>
     <profile>
       <id>openshift</id>

diff --git a/worker/src/main/java/io/thorntail/example/RequestListener.java b/worker/src/main/java/io/thorntail/example/RequestListener.java
@@ -25,7 +25,6 @@
 import javax.ejb.TransactionAttributeType;
 import javax.inject.Inject;
 import javax.jms.Destination;
-import javax.jms.JMSConnectionFactory;
 import javax.jms.JMSContext;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -47,7 +46,6 @@ public class RequestListener implements MessageListener {
     private GlobalData globalData;
 
     @Inject
-    @JMSConnectionFactory("java:global/jms/default")
     private JMSContext jmsContext;
 
     @Override

diff --git a/worker/src/main/java/io/thorntail/example/UpdatesSender.java b/worker/src/main/java/io/thorntail/example/UpdatesSender.java
@@ -24,7 +24,6 @@
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.inject.Inject;
-import javax.jms.JMSConnectionFactory;
 import javax.jms.JMSContext;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -39,7 +38,6 @@ public class UpdatesSender {
     private GlobalData globalData;
 
     @Inject
-    @JMSConnectionFactory("java:global/jms/default")
     private JMSContext jmsContext;
 
     @Schedule(second = "*/5", minute = "*", hour = "*", persistent = false)

diff --git a/worker/src/main/resources/project-defaults.yml b/worker/src/main/resources/project-defaults.yml
@@ -23,3 +23,5 @@ thorntail:
     default-resource-adapter-name: default
   ee:
     annotation-property-replacement: true
+    default-bindings-service:
+      jms-connection-factory: java:global/jms/default