Create separate Hibernate project

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 11fdd64310494515431cb0c6384c4ce362a5b55a..9b2824886aca8503e3cc6dba6e73186729691772 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -127,8 +127,8 @@ public class SlcAntConfig {
        public static String DEFAULT_TEST_RUN_PROPERTY = "slc.defaultTestRun";\r
 \r
        // SLC LOCAL PROPERTIES\r
-       /** Property for the dir description (SLC local property file). */\r
-       public static String DIR_DESCRIPTION_PROPERTY = "slc.dirDescription";\r
+       /** Property for the dir label (SLC local property file). */\r
+       public static String DIR_LABEL_PROPERTY = "slc.dirLabel";\r
 \r
        private String slcRootFileName = "slcRoot.properties";\r
        private String slcLocalFileName = "slcLocal.properties";\r
@@ -155,15 +155,15 @@ public class SlcAntConfig {
                System.getProperties().putAll((Map<?, ?>) project.getUserProperties());\r
                Properties all = new Properties();\r
                all.putAll(System.getProperties());\r
-               prepareAllProperties(slcRootFile,all);\r
+               prepareAllProperties(slcRootFile, all);\r
 \r
                Log log = LogFactory.getLog(this.getClass());\r
                for (Object o : all.keySet()) {\r
                        String key = o.toString();\r
                        // System.out.println(key+"="+all.getProperty(key));\r
                        if (project.getUserProperty(key) == null) {// not already set\r
-//                             if (log.isDebugEnabled())\r
-//                                     log.debug(key + "=" + all.getProperty(key));\r
+                       // if (log.isDebugEnabled())\r
+                       // log.debug(key + "=" + all.getProperty(key));\r
                                project.setUserProperty(key, all.getProperty(key));\r
                        }\r
                }\r
@@ -246,7 +246,8 @@ public class SlcAntConfig {
                        }\r
                        // Default test run\r
                        if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {\r
-                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");\r
+                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY,\r
+                                               "defaultTestRun");\r
                        }\r
 \r
                        // Default log4j\r
@@ -280,7 +281,7 @@ public class SlcAntConfig {
        /**\r
         * Looks for a file named {@link #getSlcLocalFileName()} in the directory,\r
         * loads it as properties file and return the value of the property\r
-        * {@link #DIR_DESCRIPTION_PROPERTY}.\r
+        * {@link #DIR_LABEL_PROPERTY}.\r
         */\r
        public String getDescriptionForDir(File dir) {\r
                String description = dir.getName();\r
@@ -289,7 +290,7 @@ public class SlcAntConfig {
                if (slcLocal.exists()) {\r
                        Properties properties = loadFile(slcLocal.getAbsolutePath());\r
                        description = properties.getProperty(\r
-                                       SlcAntConfig.DIR_DESCRIPTION_PROPERTY, description);\r
+                                       SlcAntConfig.DIR_LABEL_PROPERTY, description);\r
                }\r
                return description;\r
        }\r