X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcProjectHelper.java;fp=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FSlcProjectHelper.java;h=79160073b66ae6d79e919dbacfa34a30ecdd1297;hb=40768ea8b087bc653a49c2400045f4c191e8e3b4;hp=f0afc92efd7788bb79a9faa807377b9234a8d49b;hpb=2d2e8673ee9a9c610dcd831833cb67c3a508c372;p=gpl%2Fargeo-slc.git 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 f0afc92ef..79160073b 100644 --- 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 @@ -7,13 +7,13 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.helper.ProjectHelperImpl; -import org.argeo.slc.core.structure.StructurePath; import org.argeo.slc.core.structure.tree.TreeSElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; public class SlcProjectHelper extends ProjectHelperImpl { public static String PROP_APPLICATION_CONTEXT = "org.argeo.slc.slcRootContext"; + //public static String PROP_REGISTRY_MODE = "org.argeo.slc.slcRegistryMode"; public static String REF_ROOT_CONTEXT = "slcApplicationContext"; public static String REF_STRUCTURE_REGISTRY = "slcStructureRegistry"; @@ -27,18 +27,19 @@ public class SlcProjectHelper extends ProjectHelperImpl { ApplicationContext context = new FileSystemXmlApplicationContext(acPath); project.addReference(REF_ROOT_CONTEXT, context); - // init structure register - TreeSRegistry registry = new TreeSRegistry(); - project.addReference(REF_STRUCTURE_REGISTRY, registry); + // init structure register if it does not exist + TreeSRegistry registry = new TreeSRegistry(); + project.addReference(REF_STRUCTURE_REGISTRY, registry); - // call the underlying implementation to do the actual work - super.parse(project, source); + // call the underlying implementation to do the actual work + super.parse(project, source); - String projectDescription = project.getDescription() != null ? project - .getDescription() : "Root"; - TreeSElement element = TreeSElement.createRootElelment( - getProjectPathName(project), projectDescription); - registry.register(element); + String projectDescription = project.getDescription() != null ? project + .getDescription() + : "Root"; + TreeSElement element = TreeSElement.createRootElelment( + getProjectPathName(project), projectDescription); + registry.register(element); } private static void stdOut(Object o) {