[OpenbravoERP-commits] devel/pi: Related to issue 39713: log4j buildvalidation fails if...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/0dbf22b1f296
changeset: 35177:0dbf22b1f296
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Fri Nov 30 13:02:36 2018 +0100
summary:   Related to issue 39713: log4j buildvalidation fails if no 
source.path is found.

Copy log4j config from config build validation won't fail if source folder is
not found. A message will be shown instead.

diffstat:

 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.class
 |  Bin 
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.java
            |    7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r b0ab5f6cbd20 -r 0dbf22b1f296 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.class
Binary file 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.class
 has changed
diff -r b0ab5f6cbd20 -r 0dbf22b1f296 
src-util/buildvalidation/src/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.java
--- 
a/src-util/buildvalidation/src/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.java
       Fri Nov 30 12:37:14 2018 +0100
+++ 
b/src-util/buildvalidation/src/org/openbravo/buildvalidation/CopyLog4jConfigurationFromTemplates.java
       Fri Nov 30 13:02:36 2018 +0100
@@ -49,7 +49,8 @@
       copyFromTemplateFile(sourcePath + CONFIG_DIR + LOG4J_WEB_CONF_FILE);
       copyFromTemplateFile(sourcePath + TEST_SRC_DIR + LOG4J_TEST_CONF_FILE);
     } catch (Exception e) {
-      return handleError(e);
+      System.out
+          .println("Copy log4j config from templates failed: Log4j may not be 
properly configured. Please check your configuration files manually.");
     }
 
     return new ArrayList<>();
@@ -84,8 +85,8 @@
       return sourcePath.toString();
     }
 
-    throw new NoSuchFileException("Source path directory is not valid. Cannot 
find "
-        + configDir.toString());
+    System.out.println(String.format("Config folder not found: %s", 
configDir.toString()));
+    throw new NoSuchFileException(configDir.toString());
   }
 
   @Override


_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits