From da0e0eab79a2a1ac5655b6fed519ae7d1bf8aaa7 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Wed, 22 Jan 2014 13:38:35 +0100
Subject: [PATCH] Updated to latest fdaq

---
 ch.psi.fda/pom.xml                                       | 2 +-
 ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqEngine.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index 3ad0d83..b07b78c 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>ch.psi.fda.fdaq</artifactId>
-			<version>1.0.4</version>
+			<version>1.0.5</version>
 		</dependency>
 	
 		<dependency>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqEngine.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqEngine.java
index 7c65ca9..2260766 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqEngine.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaqEngine.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Executors;
 
 import javax.inject.Inject;
 
+import ch.psi.fda.fdaq.FdaqConfiguration;
 import ch.psi.fda.fdaq.FdaqService;
 import ch.psi.fda.rest.model.FdaqRequest;
 import ch.psi.fda.serializer.SerializerTXT;
@@ -57,7 +58,7 @@ public class FdaqEngine {
 		}
 		
 		bus = new AsyncEventBus(Executors.newSingleThreadExecutor());
-		fdaq = new FdaqService(bus);
+		fdaq = new FdaqService(bus, new FdaqConfiguration());
 
 		SerializerTXT serializer = new SerializerTXT(new File(request.getFilename()));
 		serializer.setShowDimensionHeader(false);