Introduce directory based structure

git-svn-id: https://svn.argeo.org/slc/trunk@666 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 6bdb5bf16867cc5b3c8275232ca4d332661db2e8..8fdefc23f7b61e612792148c939b279df4aa6eac 100644 (file)
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -64,11 +64,6 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 \r
                // create structure root\r
                registerProjectAndParents(project);\r
-\r
-               // TreeSElement element = new TreeSElement(project.getDescription(),\r
-               // "Root");\r
-               // registry.register(getProjectPath(project), element);\r
-\r
        }\r
 \r
        private void registerProjectAndParents(Project project) {\r
@@ -99,6 +94,11 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                                                .getAbsolutePath());\r
                                description = properties\r
                                                .getProperty(SlcAntConfig.DIR_DESCRIPTION_PROPERTY);\r
+                       } else {\r
+                               if (i == 0) {// project it self\r
+                                       description = project.getDescription() != null ? project\r
+                                                       .getDescription() : "";\r
+                               }\r
                        }\r
                        TreeSElement element = new TreeSElement(description);\r
 \r
@@ -114,16 +114,9 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 \r
        /** Get the path of a project (root). */\r
        public static TreeSPath getProjectPath(Project project) {\r
-               // return TreeSPath.createRootPath(getProjectPathName(project));\r
                return (TreeSPath) project.getReference(REF_PROJECT_PATH);\r
        }\r
 \r
-       private static String getProjectPathName(Project project) {\r
-               String projectName = project.getName() != null ? project.getName()\r
-                               : "project";\r
-               return projectName;\r
-       }\r
-\r
        private File findSlcRootFile(File dir) {\r
                for (File file : dir.listFiles()) {\r
                        if (!file.isDirectory() && file.getName().equals(slcRootFileName)) {\r

diff --git a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties b/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties
deleted file mode 100644 (file)
index eef4086..0000000
--- a/org.argeo.slc/src/test/slc/root/Category1/SubCategory2/slcLocal.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.argeo.slc.ant.dirDescription=Second sub Category
\ No newline at end of file