From 8fd0bbd9ed14e06f9a6364b8c753645fcf456290 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 29 Feb 2016 18:44:50 +0100
Subject: [PATCH] Using "cryptomator" prefix for all JVM args now [ci skip]

---
 .../main/java/org/cryptomator/ui/settings/SettingsProvider.java | 2 +-
 main/ui/src/main/resources/log4j2.xml                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
index 565c5385e..7e1c6660e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
@@ -62,7 +62,7 @@ public class SettingsProvider implements Provider<Settings> {
 	}
 
 	private Path getSettingsPath() throws IOException {
-		String settingsPathProperty = System.getProperty("settingsPath");
+		String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
 		if (settingsPathProperty == null) {
 			return SETTINGS_DIR.resolve(SETTINGS_FILE);
 		} else {
diff --git a/main/ui/src/main/resources/log4j2.xml b/main/ui/src/main/resources/log4j2.xml
index 45a72cd96..025f97279 100644
--- a/main/ui/src/main/resources/log4j2.xml
+++ b/main/ui/src/main/resources/log4j2.xml
@@ -19,7 +19,7 @@
 			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
 		</Console>
 		<!-- <File fileName="${sys:logPath}" ...> not feasible for paths like ~/foo/bar -->
-		<ConfigurableFile name="File" pathPropertyName="logPath">
+		<ConfigurableFile name="File" pathPropertyName="cryptomator.logPath">
 			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
 		</ConfigurableFile>
 	</Appenders>