Added support for special value $PREFIX in ReatMetric configuration

Author: dariol83

README.md

@@ -140,7 +140,6 @@ Example of remoting configuration:
 ## Roadmap
 
 ### To version 1.1.0
-- Add support for a prefix tag (.e.g. $REATMETRIC) in ReatMetric configuration modules, in addition to $HOME, to allow the specification of a root path for the configuration via Java system property
 - persist implementation based on PostgreSQL and Timeseries
 - SNMP driver
 - SNMP generator for SNMP driver

eu.dariolucia.reatmetric.core/Documentation.adoc

@@ -62,7 +62,12 @@ eu.dariolucia.reatmetric.core.configuration. It is an XML file using namespace d
 _http://dariolucia.eu/reatmetric/core/configuration_.
 
 The elements that can contain a path support the special value $HOME, which is replaced at runtime with the contents
-of the _user.home_ system variable.
+of the _user.home_ system variable. A special value $PREFIX can also be used, which is replaced at runtime with the
+contents of the _reatmetric.prefix.dir_ system variable, which can be provided as Java property at start-up:
+
+----
+-Dreatmetric.prefix.dir=<path>
+----
 
 A commented example of such file is presented below.
 

eu.dariolucia.reatmetric.core/src/main/java/eu/dariolucia/reatmetric/core/configuration/ServiceCoreConfiguration.java

@@ -31,23 +31,30 @@ public class ServiceCoreConfiguration {
     private static final String HOME_VAR = "$HOME";
     private static final String HOME_DIR = System.getProperty("user.home");
 
+    private static final String PREFIX_VAR = "$PREFIX";
+    private static final String PREFIX_DIR = System.getProperty("reatmetric.prefix.dir", "");
+
     public static ServiceCoreConfiguration load(InputStream is) throws JAXBException {
         JAXBContext jc = JAXBContext.newInstance(ServiceCoreConfiguration.class);
         Unmarshaller u = jc.createUnmarshaller();
         ServiceCoreConfiguration configuration = (ServiceCoreConfiguration) u.unmarshal(is);
-        // Update $HOME
+        // Update $HOME and $PREFIX
         if(configuration.getArchiveLocation() != null) {
             configuration.setArchiveLocation(configuration.getArchiveLocation().replace(HOME_VAR, HOME_DIR));
+            configuration.setArchiveLocation(configuration.getArchiveLocation().replace(PREFIX_VAR, PREFIX_DIR));
         }
         configuration.setDefinitionsLocation(configuration.getDefinitionsLocation().replace(HOME_VAR, HOME_DIR));
         if(configuration.getLogPropertyFile() != null) {
             configuration.setLogPropertyFile(configuration.getLogPropertyFile().replace(HOME_VAR, HOME_DIR));
+            configuration.setLogPropertyFile(configuration.getLogPropertyFile().replace(PREFIX_VAR, PREFIX_DIR));
         }
         if(configuration.getSchedulerConfiguration() != null) {
             configuration.setSchedulerConfiguration(configuration.getSchedulerConfiguration().replace(HOME_VAR, HOME_DIR));
+            configuration.setSchedulerConfiguration(configuration.getSchedulerConfiguration().replace(PREFIX_VAR, PREFIX_DIR));
         }
         for(DriverConfiguration dc : configuration.getDrivers()) {
             dc.setConfiguration(dc.getConfiguration().replace(HOME_VAR, HOME_DIR));
+            dc.setConfiguration(dc.getConfiguration().replace(PREFIX_VAR, PREFIX_DIR));
         }
         //
         return configuration;

eu.dariolucia.reatmetric.driver.automation.base/src/main/java/eu/dariolucia/reatmetric/driver/automation/base/definition/AutomationConfiguration.java

@@ -31,13 +31,17 @@ public class AutomationConfiguration {
     private static final String HOME_VAR = "$HOME";
     private static final String HOME_DIR = System.getProperty("user.home");
 
+    private static final String PREFIX_VAR = "$PREFIX";
+    private static final String PREFIX_DIR = System.getProperty("reatmetric.prefix.dir", "");
+
     public static AutomationConfiguration load(InputStream is) throws IOException {
         try {
             JAXBContext jc = JAXBContext.newInstance(AutomationConfiguration.class);
             Unmarshaller u = jc.createUnmarshaller();
             AutomationConfiguration o = (AutomationConfiguration) u.unmarshal(is);
             if(o.getScriptFolder() != null) {
                 o.setScriptFolder(o.getScriptFolder().replace(HOME_VAR, HOME_DIR));
+                o.setScriptFolder(o.getScriptFolder().replace(PREFIX_VAR, PREFIX_DIR));
             }
             return o;
         } catch (JAXBException e) {

eu.dariolucia.reatmetric.driver.socket/src/main/java/eu/dariolucia/reatmetric/driver/socket/configuration/SocketConfiguration.java

@@ -40,6 +40,9 @@ public class SocketConfiguration {
     private static final String HOME_VAR = "$HOME";
     private static final String HOME_DIR = System.getProperty("user.home");
 
+    private static final String PREFIX_VAR = "$PREFIX";
+    private static final String PREFIX_DIR = System.getProperty("reatmetric.prefix.dir", "");
+
     public static SocketConfiguration load(InputStream is) throws IOException {
         try {
             JAXBContext jc = JAXBContext.newInstance(SocketConfiguration.class);
@@ -49,6 +52,7 @@ public static SocketConfiguration load(InputStream is) throws IOException {
                 for (MessageDefinition<?> md : sc.getMessageDefinitions()) {
                     if(md instanceof BinaryMessageDefinition) {
                         ((BinaryMessageDefinition) md).setLocation(((BinaryMessageDefinition) md).getLocation().replace(HOME_VAR, HOME_DIR));
+                        ((BinaryMessageDefinition) md).setLocation(((BinaryMessageDefinition) md).getLocation().replace(PREFIX_VAR, PREFIX_DIR));
                     }
                 }
             }

eu.dariolucia.reatmetric.driver.spacecraft/src/main/java/eu/dariolucia/reatmetric/driver/spacecraft/definition/SpacecraftConfiguration.java

@@ -32,6 +32,10 @@ public class SpacecraftConfiguration {
 
     private static final String HOME_VAR = "$HOME";
     private static final String HOME_DIR = System.getProperty("user.home");
+
+    private static final String PREFIX_VAR = "$PREFIX";
+    private static final String PREFIX_DIR = System.getProperty("reatmetric.prefix.dir", "");
+
     public static SpacecraftConfiguration load(InputStream is) throws IOException {
         try {
             JAXBContext jc = JAXBContext.newInstance(SpacecraftConfiguration.class);
@@ -40,6 +44,7 @@ public static SpacecraftConfiguration load(InputStream is) throws IOException {
             if(o.getPacketServiceConfiguration() != null) {
                 for (ServiceConfiguration sc : o.getPacketServiceConfiguration().getServices()) {
                     sc.setConfiguration(sc.getConfiguration().replace(HOME_VAR, HOME_DIR));
+                    sc.setConfiguration(sc.getConfiguration().replace(PREFIX_VAR, PREFIX_DIR));
                 }
             }
             return o;