From 5981cf5792e3ca344b55e8b069ad3239a1ef6fe9 Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Wed, 16 Sep 2015 14:30:14 +0200
Subject: [PATCH] Remove support for java7.home property in the configuration
 file in favor of the JAVA7_HOME environment variable.

---
 config.properties                                      | 2 --
 src/main/groovy/betsy/common/config/Configuration.java | 9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/config.properties b/config.properties
index a4807c59..cd14f444 100644
--- a/config.properties
+++ b/config.properties
@@ -2,8 +2,6 @@ partner.ipAndPort=localhost:2000
 
 downloads.dir=downloads
 
-java7.home=C:/Program Files/Java/jdk1.7.0_25
-
 maven.container=maven
 maven.home=maven/apache-maven-3.2.1
 maven.download.url=https://lspi.wiai.uni-bamberg.de/svn/betsy/apache-maven-3.2.1.zip
diff --git a/src/main/groovy/betsy/common/config/Configuration.java b/src/main/groovy/betsy/common/config/Configuration.java
index 1ed280ec..43d0f4ea 100644
--- a/src/main/groovy/betsy/common/config/Configuration.java
+++ b/src/main/groovy/betsy/common/config/Configuration.java
@@ -125,17 +125,14 @@ public static void setPartnerIpAndPort(String newPartnerAddress) {
     public static Path getJava7Home() {
         // Trying to determine JDK7 Path using SysEnv
         String java7env = System.getenv("JAVA7_HOME");
-        Path java7home;
-
         if (java7env == null) {
             // Fallback to properties file
-            java7home = Paths.get(PROPERTIES.getProperty("java7.home"));
-        } else {
-            java7home = Paths.get(java7env);
+            throw new ConfigurationException("JAVA7_HOME is not set");
         }
 
+        Path java7home = Paths.get(java7env);
         if (!Files.isDirectory(java7home)) {
-            throw new ConfigurationException("Found [" + java7home + "] for key [java7.home] " + "Path to JAVA_HOME, but the directory does not exist!");
+            throw new ConfigurationException("Found [" + java7home + "] via JAVA7_HOME but the directory does not exist!");
         }
 
         return java7home;