New runtime working end to end

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / SlcAntConfig.java

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index d92a5f8920ceab76be1d70c7976ab146a8eed18b..61b78cc7cd4207a7b7c41e4559a22bf1de5ce827 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -108,12 +108,6 @@ public class SlcAntConfig {
        // SLC ROOT PROPERTIES\r
        /** Property for the root file (SLC root property file). */\r
        public final static String ROOT_FILE_PROPERTY = "slc.rootFile";\r
-       /** Property for the root dir (SLC root property file). */\r
-       public final static String ROOT_DIR_PROPERTY = "slc.rootDir";\r
-       /** Property for the conf dir (SLC root property file). */\r
-       public final static String CONF_DIR_PROPERTY = "slc.confDir";\r
-       /** Property for the work dir (SLC root property file). */\r
-       public final static String WORK_DIR_PROPERTY = "slc.workDir";\r
        /**\r
         * Comma-separated list of property file names to load from the conf dir and\r
         * add to project user properties\r
@@ -194,30 +188,30 @@ public class SlcAntConfig {
                        final File workDir;\r
                        // Root dir\r
                        final File rootDir = slcRootFile.getParentFile();\r
-                       all.setProperty(ROOT_DIR_PROPERTY, fileUrlPrefix\r
+                       all.setProperty(SlcAntConstants.ROOT_DIR_PROPERTY, fileUrlPrefix\r
                                        + rootDir.getCanonicalPath());\r
 \r
                        // Conf dir\r
-                       if (all.getProperty(CONF_DIR_PROPERTY) == null) {\r
-                               confDir = new File(rootProps.getProperty(CONF_DIR_PROPERTY,\r
+                       if (all.getProperty(SlcAntConstants.CONF_DIR_PROPERTY) == null) {\r
+                               confDir = new File(rootProps.getProperty(SlcAntConstants.CONF_DIR_PROPERTY,\r
                                                rootDir.getAbsolutePath() + "/../conf"))\r
                                                .getCanonicalFile();\r
-                               all.setProperty(CONF_DIR_PROPERTY, fileUrlPrefix\r
+                               all.setProperty(SlcAntConstants.CONF_DIR_PROPERTY, fileUrlPrefix\r
                                                + confDir.getAbsolutePath());\r
                        } else {\r
-                               confDir = new File(all.getProperty(CONF_DIR_PROPERTY))\r
+                               confDir = new File(all.getProperty(SlcAntConstants.CONF_DIR_PROPERTY))\r
                                                .getCanonicalFile();\r
                        }\r
 \r
                        // Work dir\r
-                       if (all.getProperty(WORK_DIR_PROPERTY) == null) {\r
-                               workDir = new File(rootProps.getProperty(WORK_DIR_PROPERTY,\r
+                       if (all.getProperty(SlcAntConstants.WORK_DIR_PROPERTY) == null) {\r
+                               workDir = new File(rootProps.getProperty(SlcAntConstants.WORK_DIR_PROPERTY,\r
                                                rootDir.getAbsolutePath() + "/../work"))\r
                                                .getCanonicalFile();\r
-                               all.setProperty(WORK_DIR_PROPERTY, fileUrlPrefix\r
+                               all.setProperty(SlcAntConstants.WORK_DIR_PROPERTY, fileUrlPrefix\r
                                                + workDir.getAbsolutePath());\r
                        } else {\r
-                               workDir = new File(all.getProperty(WORK_DIR_PROPERTY))\r
+                               workDir = new File(all.getProperty(SlcAntConstants.WORK_DIR_PROPERTY))\r
                                                .getCanonicalFile();\r
                        }\r
 \r