From 1559af278baf7ecbe526aa178b950557e9696fc4 Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Tue, 28 May 2013 13:01:29 +0200
Subject: [PATCH] fixed configuration problems ...

---
 ch.psi.fda/pom.xml                            |  2 +-
 .../aq/AcquisitionEngineConfiguration.java    | 81 ++++++++++++++++---
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index 8d5472f..578ac8a 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
 	<artifactId>fda</artifactId>
-	<version>1.1.36-SNAPSHOT</version>
+	<version>1.1.37-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java
index 0216dc3..38dcb3c 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/AcquisitionEngineConfiguration.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -36,6 +37,8 @@ import ch.psi.fda.install.ApplicationConfigurator;
  */
 public class AcquisitionEngineConfiguration {
 	
+	
+	private static final Logger logger = Logger.getLogger(AcquisitionEngineConfiguration.class.getName());
 	private static final AcquisitionEngineConfiguration instance = new AcquisitionEngineConfiguration();
 	
 	private String otfChannelPrefix;
@@ -89,19 +92,20 @@ public class AcquisitionEngineConfiguration {
 	private void loadConfiguration() {
 		String config = System.getProperty(ApplicationConfigurator.FDA_CONFIG_FILE_ARGUMENT);
 		
-		if(config == null){
-			throw new RuntimeException("No configuration file specified via -D"+ApplicationConfigurator.FDA_CONFIG_FILE_ARGUMENT+"=...");
-		}
-		
 		Properties properties = new Properties();
-		try {
-			properties.load(new FileReader(config));
-		} catch (FileNotFoundException e) {
-			throw new RuntimeException("Configuration file "+config+" not found", e);
-		} catch (IOException e) {
-			throw new RuntimeException("Cannot read configuration file "+config, e);
-		}
 		
+		if(config != null){
+			try {
+				properties.load(new FileReader(config));
+			} catch (FileNotFoundException e) {
+				throw new RuntimeException("Configuration file "+config+" not found", e);
+			} catch (IOException e) {
+				throw new RuntimeException("Cannot read configuration file "+config, e);
+			}
+		}
+		else{
+			logger.warning("No configfile specified !");
+		}
 		
 		// The defaults are set here
 		otfChannelPrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".otf.channelPrefix", "");
@@ -115,7 +119,12 @@ public class AcquisitionEngineConfiguration {
 		
 		// Workaround
 //		dataBaseDirectory = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".data.baseDirectory", ".");
-		dataBaseDirectory = System.getProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT)+"/data";
+		if(System.getProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT)!=null){
+			dataBaseDirectory = System.getProperty(ApplicationConfigurator.FDA_HOME_ARGUMENT)+"/data";
+		}
+		else{
+			dataBaseDirectory = "./data";
+		}
 		
 		dataFilePrefix = properties.getProperty(AcquisitionEngineConfiguration.class.getPackage().getName()+".data.filePrefix","");
 		
@@ -238,5 +247,53 @@ public class AcquisitionEngineConfiguration {
         }
 		return newString;
 	}
+
+	public void setOtfChannelPrefix(String otfChannelPrefix) {
+		this.otfChannelPrefix = otfChannelPrefix;
+	}
+
+	public void setOtfNfsServer(String otfNfsServer) {
+		this.otfNfsServer = otfNfsServer;
+	}
+
+	public void setOtfNfsShare(String otfNfsShare) {
+		this.otfNfsShare = otfNfsShare;
+	}
+
+	public void setOtfSmbShare(String otfSmbShare) {
+		this.otfSmbShare = otfSmbShare;
+	}
+
+	public void setOtfScalerPrefix(String otfScalerPrefix) {
+		this.otfScalerPrefix = otfScalerPrefix;
+	}
+
+	public void setOtfUseCrlogic(boolean otfUseCrlogic) {
+		this.otfUseCrlogic = otfUseCrlogic;
+	}
+
+	public void setOtfCrlogicPrefix(String otfCrlogicPrefix) {
+		this.otfCrlogicPrefix = otfCrlogicPrefix;
+	}
+
+	public void setOtfCrlogicKeepTmpFiles(boolean otfCrlogicKeepTmpFiles) {
+		this.otfCrlogicKeepTmpFiles = otfCrlogicKeepTmpFiles;
+	}
+
+	public void setDataBaseDirectory(String dataBaseDirectory) {
+		this.dataBaseDirectory = dataBaseDirectory;
+	}
+
+	public void setDataFilePrefix(String dataFilePrefix) {
+		this.dataFilePrefix = dataFilePrefix;
+	}
+
+	public void setActorMoveTimeout(Long actorMoveTimeout) {
+		this.actorMoveTimeout = actorMoveTimeout;
+	}
+
+	public void setSmptServer(String smptServer) {
+		this.smptServer = smptServer;
+	}
 	
 }