changeset 2741:c245bf78f9cb

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.
author Simon Tooke <stooke@redhat.com>
date Mon, 28 Aug 2017 08:17:05 -0400
parents 3d1c63f2b665
children 75ca7e4f3226
files agent/ipc/windows-named-pipes/client/src/test/java/com/redhat/thermostat/agent/ipc/winpipes/client/internal/WinPipesTransportImplTest.java common/core/src/test/resources/globalLogging.properties common/core/src/test/resources/userLogging.properties config/src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java config/src/test/java/com/redhat/thermostat/shared/config/internal/CommonPathsImplTest.java distribution/config/logging.properties distribution/scripts/thermostat-common distribution/windows/scripts/thermostat-common.cmd
diffstat 8 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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()) {
--- 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
--- 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
--- 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<LocaleResources> t = LocaleResources.createLocalizer();
 
--- 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;
     }
--- 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
--- 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
--- 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