Move Katalyzer from properties to YAML configuration.

Addresses issue #1.

.gitignore

@@ -1,6 +1,6 @@
 config.yaml
 katalyze/bin
-katalyze/katalyzer.properties
+katalyze/katalyzer.yaml
 .metadata
 *.class
 *~

katalyze/katalyzer.yaml.template

@@ -0,0 +1,71 @@
+# AutoAnalyst Katalyzer YAML configuration file
+
+# ---- INPUTS ---------------------------------------------------------------------------
+
+# These are currently not in use
+#input: tcp://192.168.1.1:4714
+#input: data/kattislog_vm2010.txt
+
+# ---- OUTPUTS ---------------------------------------------------------------------------
+#
+
+# --- Database export
+db:
+    enable:     true
+    driver:     com.mysql.jdbc.Driver
+    connection: jdbc:mysql://localhost/icat?user=icat&password=THISISNOTAPASSWORD
+
+# --- Web Server
+web:
+    enable:     true
+    compress:   true
+    port:       8099
+
+# --- File publisher
+#file:
+#    enable:          true
+#    targetDirectory: /Users/Stein/Dev/icat/output
+
+# -- Twitter
+twitter:
+    enable:         false
+    oAuthConsumer:  ["", ""]
+    accessToken:    ["", ""]
+    hashtag:        "#katalyzer"
+
+# -- Event Stream
+eventStream:
+    enable:     true
+    target:     /Users/Stein/Dev/icat/bin/eventstream.xml
+
+# The eventStream.target file needs to be writable by the katalyzer process in order for
+# the event stream to be available. This also applies if you are only accessing the event
+# stream using http
+
+
+# ---- RULES ---------------------------------------------------------------------------
+
+rule:
+
+    # ProblemFirstSolved - whenever a problem is solved for the first time
+    problemFirstSolved:
+        enable:   true
+
+    # NewLeader - when a team takes the lead, or gets into the top n positions
+    newLeader:
+        enable:   true
+	ranks:    10
+        breakingRanks: 5
+
+    # RejectedSubmission - when the judges reject a submission from
+    # one of the top n teams
+    rejectedSubmission:
+        enable:   true
+        ranks:    10
+
+    # RankPredictor - when a team submits a solution that would put
+    # the team among the top n teams
+    rankPredictor:
+        enable:   true
+        ranks:    10
+#        exec:     "./capture.sh {teamId} {time} {currentRank} {potentialRank}"

katalyze/src/katalyzeapp/ConfigReader.java

@@ -10,6 +10,8 @@
 import org.apache.commons.configuration.*;
 import org.apache.log4j.Logger;
 
+import com.github.mbredel.commons.configuration.*;
+
 import config.TwitterConfig;
 import rules.*;
 import clics.ExtendedScoreDump;
@@ -30,17 +32,17 @@
 public class ConfigReader {
 	static Logger logger = Logger.getLogger(ConfigReader.class);
 
-	BaseConfiguration config;
+	Configuration config;
 
 
 	public ConfigReader(Reader in) throws ConfigurationException {
 
-		PropertiesConfiguration loadedConfig = new PropertiesConfiguration();
+		YAMLConfiguration loadedConfig = new YAMLConfiguration();
 		loadedConfig.load(in);
 		this.config = loadedConfig;
 	}
 
-	public ConfigReader(BaseConfiguration config) {
+	public ConfigReader(Configuration config) {
 		this.config = config;
 	}
 

katalyze/src/katalyzeapp/Katalyze.java

@@ -3,12 +3,12 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 
-import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.log4j.Logger;
 import org.apache.log4j.xml.DOMConfigurator;
 
+import com.github.mbredel.commons.configuration.*;
 
 public class Katalyze {
 
@@ -24,7 +24,7 @@ public static void main(String[] args) throws Exception {
 
 		String fileName = null;
 		String configFileName = null;
-		BaseConfiguration config = null;
+		Configuration config = null;
 
 		for (int i = 0; i < args.length; ++i) {
 			if ("-input".equals(args[i]) && i<args.length-1){
@@ -39,11 +39,11 @@ public static void main(String[] args) throws Exception {
 		}
 
 		if (configFileName == null) {
-			configFileName = new String("katalyzer.properties");
+			configFileName = new String("katalyzer.yaml");
 		}
 
 		try {
-			config = new PropertiesConfiguration(configFileName);
+			config = new YAMLConfiguration(configFileName);
 		} catch (ConfigurationException e) {
 			logger.error(String.format("Unable to parse config file %s", configFileName));
 		}

katalyze/src/katalyzeapp/Katalyzer.java

@@ -8,7 +8,7 @@
 
 import java.io.*;
 
-import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
 import org.apache.log4j.Logger;
 
 public class Katalyzer {
@@ -19,7 +19,7 @@ public class Katalyzer {
 	Contest contest;
 	ContestMessages handlers;
 
-	public Katalyzer(BaseConfiguration config) throws Exception {
+	public Katalyzer(Configuration config) throws Exception {
 		this.contest = new Contest();
 		this.handlers = new ContestMessages(contest);