# HG changeset patch # User Simon Tooke # Date 1503922625 14400 # Node ID c245bf78f9cb293463b1c198da2e96879913a02a # Parent 3d1c63f2b6654e54e84cae8946843c0b53f9b8fb Rename USER_THERMOSTAT_HOME from .thermostat to .thermostat-ng This patch renames the user data directory from ~/.thermostat to ~/.thermostat-ng, allowing old Thermostat and new Thermostat to coexist peacefully. diff -r 3d1c63f2b665 -r c245bf78f9cb agent/ipc/windows-named-pipes/client/src/test/java/com/redhat/thermostat/agent/ipc/winpipes/client/internal/WinPipesTransportImplTest.java --- a/agent/ipc/windows-named-pipes/client/src/test/java/com/redhat/thermostat/agent/ipc/winpipes/client/internal/WinPipesTransportImplTest.java Fri Aug 25 09:55:37 2017 -0400 +++ b/agent/ipc/windows-named-pipes/client/src/test/java/com/redhat/thermostat/agent/ipc/winpipes/client/internal/WinPipesTransportImplTest.java Mon Aug 28 08:17:05 2017 -0400 @@ -106,7 +106,7 @@ public static void main(String args[]) { try { - WinPipesIPCProperties props = new WinPipesIPCPropertiesProvider().create(System.getProperties(), new File(System.getProperty("user.home") + "/.thermostat/etc/ipc.properties")); + WinPipesIPCProperties props = new WinPipesIPCPropertiesProvider().create(System.getProperties(), new File(System.getProperty("user.home") + "/.thermostat-ng/etc/ipc.properties")); ClientTransport tr = new WinPipesTransportImpl(props); IPCMessageChannel ch = tr.connect("command-channel"); if (!ch.isOpen()) { diff -r 3d1c63f2b665 -r c245bf78f9cb common/core/src/test/resources/globalLogging.properties --- a/common/core/src/test/resources/globalLogging.properties Fri Aug 25 09:55:37 2017 -0400 +++ b/common/core/src/test/resources/globalLogging.properties Mon Aug 28 08:17:05 2017 -0400 @@ -5,7 +5,7 @@ # You may use standard configs for log handlers. # See: http://docs.oracle.com/javase/7/docs/api/java/util/logging/FileHandler.html # For example: -#java.util.logging.FileHandler.pattern = %h/.thermostat/logs/thermostat.log +#java.util.logging.FileHandler.pattern = %h/.thermostat-ng/logs/thermostat.log #java.util.logging.FileHandler.limit = 50000 #java.util.logging.FileHandler.append = true #java.util.logging.FileHandler.count = 1 diff -r 3d1c63f2b665 -r c245bf78f9cb common/core/src/test/resources/userLogging.properties --- a/common/core/src/test/resources/userLogging.properties Fri Aug 25 09:55:37 2017 -0400 +++ b/common/core/src/test/resources/userLogging.properties Mon Aug 28 08:17:05 2017 -0400 @@ -5,7 +5,7 @@ # You may use standard configs for log handlers. # See: http://docs.oracle.com/javase/7/docs/api/java/util/logging/FileHandler.html # For example: -#java.util.logging.FileHandler.pattern = %h/.thermostat/logs/thermostat.log +#java.util.logging.FileHandler.pattern = %h/.thermostat-ng/logs/thermostat.log #java.util.logging.FileHandler.limit = 50000 #java.util.logging.FileHandler.append = true #java.util.logging.FileHandler.count = 1 diff -r 3d1c63f2b665 -r c245bf78f9cb config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java --- a/config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java Fri Aug 25 09:55:37 2017 -0400 +++ b/config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java Mon Aug 28 08:17:05 2017 -0400 @@ -86,7 +86,7 @@ private static final String THERMOSTAT_SYSTEM_USER = "THERMOSTAT_SYSTEM_USER"; - private static final String THERMOSTAT_USER_DIR = ".thermostat"; + private static final String THERMOSTAT_USER_DIR = ".thermostat-ng"; private static final Translate t = LocaleResources.createLocalizer(); diff -r 3d1c63f2b665 -r c245bf78f9cb config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java --- a/config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java Fri Aug 25 09:55:37 2017 -0400 +++ b/config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java Mon Aug 28 08:17:05 2017 -0400 @@ -178,7 +178,7 @@ userHome = System.getenv(USER_THERMOSTAT_HOME_PROPERTY); } if (userHome == null) { - userHome = System.getProperty("user.home") + s + ".thermostat"; + userHome = System.getProperty("user.home") + s + ".thermostat-ng"; } return userHome; } diff -r 3d1c63f2b665 -r c245bf78f9cb distribution/config/logging.properties --- a/distribution/config/logging.properties Fri Aug 25 09:55:37 2017 -0400 +++ b/distribution/config/logging.properties Mon Aug 28 08:17:05 2017 -0400 @@ -53,7 +53,7 @@ #java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter # Configure a file handler -#java.util.logging.FileHandler.pattern = %h/.thermostat/logs/thermostat.log +#java.util.logging.FileHandler.pattern = %h/.thermostat-ng/logs/thermostat.log #java.util.logging.FileHandler.limit = 50000 #java.util.logging.FileHandler.append = true #java.util.logging.FileHandler.count = 1 diff -r 3d1c63f2b665 -r c245bf78f9cb distribution/scripts/thermostat-common --- a/distribution/scripts/thermostat-common Fri Aug 25 09:55:37 2017 -0400 +++ b/distribution/scripts/thermostat-common Mon Aug 28 08:17:05 2017 -0400 @@ -85,9 +85,9 @@ # Thermostat user home if [[ "${USER_THERMOSTAT_HOME}" = "" ]]; then if [ $CYGWIN_MODE -eq 1 ]; then - USER_THERMOSTAT_HOME="`cygpath -u ${USERPROFILE}`/.thermostat" + USER_THERMOSTAT_HOME="`cygpath -u ${USERPROFILE}`/.thermostat-ng" else - USER_THERMOSTAT_HOME="${HOME}/.thermostat" + USER_THERMOSTAT_HOME="${HOME}/.thermostat-ng" fi fi export USER_THERMOSTAT_HOME diff -r 3d1c63f2b665 -r c245bf78f9cb distribution/windows/scripts/thermostat-common.cmd --- a/distribution/windows/scripts/thermostat-common.cmd Fri Aug 25 09:55:37 2017 -0400 +++ b/distribution/windows/scripts/thermostat-common.cmd Mon Aug 28 08:17:05 2017 -0400 @@ -36,7 +36,7 @@ set THERMOSTAT_HOME=%~dp0.. set THERMOSTAT_LIBS=%THERMOSTAT_HOME%\libs -set USER_THERMOSTAT_HOME=%USERPROFILE%\.thermostat +set USER_THERMOSTAT_HOME=%USERPROFILE%\.thermostat-ng :: Duplicated in ThermostatVmMainLabelDecorator set THERMOSTAT_MAIN=com.redhat.thermostat.main.Thermostat