From 87ed988dfeaa7b1467e5c6aa8b245e90e82f5008 Mon Sep 17 00:00:00 2001
From: ebner <simon.ebner@psi.ch>
Date: Thu, 13 Aug 2015 14:44:02 +0200
Subject: [PATCH] updated zmq

---
 ch.psi.fda/pom.xml                                          | 4 ++--
 .../src/main/java/ch/psi/fda/rest/ZMQDataService.java       | 4 ++--
 ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index d367af3..26fd2d8 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -61,9 +61,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.jeromq</groupId>
+			<groupId>org.zeromq</groupId>
 			<artifactId>jeromq</artifactId>
-			<version>0.2.0</version>
+			<version>0.3.4</version>
 		</dependency>
 
 		<dependency>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
index a5982e1..48b2ffb 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
@@ -24,7 +24,7 @@ import java.io.ObjectOutputStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jeromq.ZMQ;
+import org.zeromq.ZMQ;
 
 import ch.psi.fda.messages.Message;
 
@@ -51,7 +51,7 @@ public class ZMQDataService {
 	}
 
 	public void initialize(){
-		context = ZMQ.context();
+		context = ZMQ.context(1);
 //		zmq.ZError.clear(); // Clear error code
 		socket = context.socket(ZMQ.PUB);
 		socket.setHWM(bufferSize);
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
index 5d1ee61..d7a4933 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
-import org.jeromq.ZMQ;
+import org.zeromq.ZMQ;
 
 import com.google.common.eventbus.EventBus;
 
@@ -48,11 +48,11 @@ public class StreamClient {
 	}
 	
 	public void listen(String endpoint) {
-		ZMQ.Context context = ZMQ.context();
+		ZMQ.Context context = ZMQ.context(1);
 //		zmq.ZError.clear(); // Clear error code
 		ZMQ.Socket socket = context.socket(ZMQ.SUB);
 		socket.connect(endpoint);
-		socket.subscribe(""); // SUBSCRIBE !
+		socket.subscribe("".getBytes()); // SUBSCRIBE !
 
 		while (true) {
 			String tid = null;