1 files changed, 9 insertions, 32 deletions

diff --git a/calamus-engine/src/main/java/io/trygvis/engine/MqClient.java b/calamus-engine/src/main/java/io/trygvis/engine/MqClient.java
index b609c9f..91eec37 100644
--- a/calamus-engine/src/main/java/io/trygvis/engine/MqClient.java
+++ b/calamus-engine/src/main/java/io/trygvis/engine/MqClient.java
@@ -6,23 +6,24 @@ import org.kie.internal.runtime.StatefulKnowledgeSession;
 import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.jms.MapMessage;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Properties;
 
+import static java.lang.Integer.parseInt;
 import static javax.jms.Session.AUTO_ACKNOWLEDGE;
 
 public class MqClient implements AutoCloseable {
 
     private Connection connection;
-//    private final ActiveMQConnectionFactory connectionFactory;
-//    private final StatefulKnowledgeSession jbpm;
 
-    public MqClient(final StatefulKnowledgeSession jbpm, String brukerUrl) {
-//        this.jbpm = jbpm;
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brukerUrl);
+    public MqClient(String brokerUrl, String queueName, MessageListener messageListener) {
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUrl);
 
         try {
             connection = connectionFactory.createConnection();
@@ -30,34 +31,10 @@ public class MqClient implements AutoCloseable {
 
             Session session = connection.createSession(false, AUTO_ACKNOWLEDGE);
 
-            Destination destination = session.createQueue("jenkins.build-result");
+            Destination destination = session.createQueue(queueName);
 
             MessageConsumer consumer = session.createConsumer(destination);
-            consumer.setMessageListener(new MessageListener() {
-                @Override
-                public void onMessage(Message message) {
-                    if (!(message instanceof MapMessage)) {
-                        return;
-                    }
-
-                    MapMessage m = (MapMessage) message;
-
-                    try {
-                        String jobName = m.getString("jobName");
-                        int buildNumber = m.getInt("buildNumber");
-                        String result = m.getString("result");
-
-/*
-                        String type;
-                        Object event;
-                        long processInstanceId;
-                        jbpm.signalEvent(type, event, processInstanceId);
-*/
-                    } catch (JMSException e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
+            consumer.setMessageListener(messageListener);
         } catch (JMSException e) {
             e.printStackTrace();
         }