Improved: Convert ‘Config#ofbizHome’ and ‘Config#logDir’ to a path

(OFBIZ-11192) git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867399 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 23, 2019 · 6f54d35 · 6f54d35
1 parent e3acbf6
commit 6f54d35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ComponentContainer.java
@@ -71,7 +71,7 @@ public void init(List<StartupCommand> ofbizCommands, String name, String configF
         // load the components from framework/base/config/component-load.xml (root components)
         try {
             for (ComponentLoaderConfig.ComponentDef def: ComponentLoaderConfig.getRootComponents()) {
-                loadComponentFromConfig(Start.getInstance().getConfig().ofbizHome, def);
+                loadComponentFromConfig(Start.getInstance().getConfig().ofbizHome.toString(), def);
             }
         } catch (IOException | ComponentException e) {
             throw new ContainerException(e);

diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,13 +15,15 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- *******************************************************************************/
+ */
 package org.apache.ofbiz.base.start;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
@@ -34,14 +36,16 @@
  * one of the properties files in the start component
  */
 public final class Config {
+    /** The default directory where log files are stored. */
+    public static final Path DEFAULT_LOG_DIRECTORY = Paths.get("runtime", "logs");
 
-    public final String ofbizHome;
+    public final Path ofbizHome;
     public final InetAddress adminAddress;
     public final String adminKey;
     public final int portOffset;
     public final int adminPort;
     public final List<String> loaders;
-    public final String logDir;
+    public final Path logDir;
     public final boolean shutdownAfterLoad;
     public final boolean useShutdownHook;
 
@@ -57,14 +61,14 @@ public final class Config {
         portOffset = getPortOffsetValue(ofbizCommands, "0");
         adminPort = getAdminPort(props, 0, portOffset);
         loaders = Arrays.asList(getProperty(props, "ofbiz.start.loaders", "").split(","));
-        logDir = getAbsolutePath(props, "ofbiz.log.dir", "runtime/logs", ofbizHome);
+        logDir = getAbsolutePath(props, "ofbiz.log.dir", DEFAULT_LOG_DIRECTORY, ofbizHome);
         shutdownAfterLoad = getProperty(props, "ofbiz.auto.shutdown", "false").equalsIgnoreCase("true");
         useShutdownHook = getProperty(props, "ofbiz.enable.hook", "true").equalsIgnoreCase("true");
 
         System.out.println("Set OFBIZ_HOME to - " + ofbizHome);
 
         // set system properties
-        System.setProperty("ofbiz.home", ofbizHome);
+        System.setProperty("ofbiz.home", ofbizHome.toString());
         System.setProperty("java.awt.headless", getProperty(props, "java.awt.headless", "true"));
         System.setProperty("derby.system.home", getProperty(props, "derby.system.home", "runtime/data/derby"));
 
@@ -78,12 +82,13 @@ private static String getProperty(Properties props, String key, String defaultVa
                 .orElse(props.getProperty(key, defaultValue));
     }
 
-    private static String getOfbizHome(String homeProp) {
-        return homeProp.equals(".") ? System.getProperty("user.dir").replace('\\', '/') : homeProp;
+    private static Path getOfbizHome(String homeProp) {
+        return Paths.get(homeProp).toAbsolutePath().normalize();
     }
 
-    private static String getAbsolutePath(Properties props, String key, String defaultValue, String ofbizHome) {
-        return getProperty(props, key, ofbizHome + "/" + props.getProperty(key, defaultValue));
+    private static Path getAbsolutePath(Properties props, String key, Path defaultValue, Path ofbizHome) {
+        return Paths.get(getProperty(props, key,
+                ofbizHome.resolve(props.getProperty(key, defaultValue.toString())).toString()));
     }
 
     private Properties getPropertiesFile(List<StartupCommand> ofbizCommands) throws StartupException {

diff --git a/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java b/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupControlPanel.java
@@ -60,7 +60,7 @@ static Config init(List<StartupCommand> ofbizCommands) {
      */
     static void start(Config config, AtomicReference<ServerState> serverState, List<StartupCommand> ofbizCommands,
             ContainerLoader loader) throws StartupException {
-        createLogDirectoryIfMissing(config.logDir);
+        createLogDirectoryIfMissing(config.logDir.toString());
 
         if (config.useShutdownHook) {
             createRuntimeShutdownHook(loader, serverState);