use enum in annotation, more preference keys

src/main/java/org/aktin/Preference.java

@@ -7,6 +7,8 @@ import java.lang.annotation.Target;
 
 import javax.inject.Qualifier;
 
+import org.aktin.dwh.PreferenceKey;
+
 /**
  * AKTIN preference. Can be used to inject preference values into any class.
  * The preferences can not be changed during runtime.
@@ -22,5 +24,5 @@ import javax.inject.Qualifier;
 public @interface Preference {
 	// no default meaning a value is mandatory
 	//@Nonbinding
-	String key();
+	PreferenceKey key();
 }

src/main/java/org/aktin/dwh/PreferenceKey.java

@@ -7,8 +7,8 @@ package org.aktin.dwh;
  *
  */
 public enum PreferenceKey {
-	
-	keystorePath("tls.keystore.path"),
+
+	keystorePath("tls.keystore.file"),
 	keystorePass("tls.keystore.pass"),
 	commonName("local.cn"),
 	organisationName("local.o"),
@@ -16,7 +16,13 @@ public enum PreferenceKey {
 	locality("local.l"),
 	state("local.s"),
 	country("local.c"),
+	i2b2Project("i2b2.project"),
+	i2b2ServicePM("i2b2.service.pm"),
+	i2b2DatasourceCRC("i2b2.datasource.crc"),
+	rScriptBinary("rscript.binary")
+	
 	;
+
 	private String key;
 	private PreferenceKey(String key){
 		this.key = key;