Improve Spring/Ant bridge

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

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 51392cbddbd14c485aab5d902be62883eea3a332..e9275ad874679e7340ed3f862140f97f85626ab0 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -32,19 +32,6 @@ import org.springframework.context.support.FileSystemXmlApplicationContext;
 public class SlcProjectHelper extends ProjectHelper2 {\r
        private static Log log;\r
 \r
-       /** The Ant reference to the Spring application context used. */\r
-       public static String REF_ROOT_CONTEXT = "slcApplicationContext";\r
-       /** The Ant reference to the SLC structure registry used. */\r
-       public static String REF_STRUCTURE_REGISTRY = "slcStructureRegistry";\r
-       /** The Ant reference to the <code>TreePath</code> of the current project */\r
-       public static String REF_PROJECT_PATH = "slcProjectPath";\r
-       /**\r
-        * Resource path to the property file listing the SLC specific Ant tasks:\r
-        * /org/argeo/slc/ant/taskdefs.properties\r
-        */\r
-       private static String SLC_TASKDEFS_RESOURCE_PATH = "/org/argeo/slc/ant/taskdefs.properties";\r
-       private static String SLC_TYPEDEFS_RESOURCE_PATH = "/org/argeo/slc/ant/typedefs.properties";\r
-\r
        protected SlcAntConfig slcAntConfig = null;\r
 \r
        @Override\r
@@ -101,7 +88,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
 \r
                // Init structure registry\r
                DefaultSRegistry registry = new DefaultSRegistry();\r
-               project.addReference(REF_STRUCTURE_REGISTRY, registry);\r
+               project.addReference(SlcAntConstants.REF_STRUCTURE_REGISTRY, registry);\r
        }\r
 \r
        /**\r
@@ -118,7 +105,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
        private void registerProjectAndParents(Project project,\r
                        SlcAntConfig slcAntConfig) {\r
                StructureRegistry<TreeSPath> registry = (StructureRegistry<TreeSPath>) project\r
-                               .getReference(REF_STRUCTURE_REGISTRY);\r
+                               .getReference(SlcAntConstants.REF_STRUCTURE_REGISTRY);\r
                File rootDir = new File(project\r
                                .getUserProperty(SlcAntConfig.ROOT_DIR_PROPERTY))\r
                                .getAbsoluteFile();\r
@@ -158,7 +145,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
                        }\r
                        registry.register(currPath, element);\r
                }\r
-               project.addReference(REF_PROJECT_PATH, currPath);\r
+               project.addReference(SlcAntConstants.REF_PROJECT_PATH, currPath);\r
        }\r
 \r
        /** Gets the path of a project (root). */\r
@@ -177,7 +164,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
                AbstractApplicationContext context = new FileSystemXmlApplicationContext(\r
                                '/' + acPath);\r
                context.registerShutdownHook();\r
-               project.addReference(REF_ROOT_CONTEXT, context);\r
+               project.addReference(SlcAntConstants.REF_ROOT_CONTEXT, context);\r
 \r
                createAndRegisterSlcExecution(project);\r
                // Add build listeners declared in Spring context\r
@@ -190,7 +177,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
 \r
        /** Loads the SLC specific Ant tasks. */\r
        protected static void addCustomTaskAndTypes(Project project) {\r
-               Properties taskdefs = getDefs(project, SLC_TASKDEFS_RESOURCE_PATH);\r
+               Properties taskdefs = getDefs(project, SlcAntConstants.SLC_TASKDEFS_RESOURCE_PATH);\r
                for (Object o : taskdefs.keySet()) {\r
                        String name = o.toString();\r
                        try {\r
@@ -200,7 +187,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
                                log.error("Unknown class for task " + name, e);\r
                        }\r
                }\r
-               Properties typedefs = getDefs(project, SLC_TYPEDEFS_RESOURCE_PATH);\r
+               Properties typedefs = getDefs(project, SlcAntConstants.SLC_TYPEDEFS_RESOURCE_PATH);\r
                for (Object o : typedefs.keySet()) {\r
                        String name = o.toString();\r
                        try {\r
@@ -233,10 +220,10 @@ public class SlcProjectHelper extends ProjectHelper2 {
                        slcExecution.setHost(SlcExecution.UNKOWN_HOST);\r
                }\r
 \r
-               if (project.getReference(SlcProjectHelper.REF_ROOT_CONTEXT) != null) {\r
-                       slcExecution.setType(SlcExecutionBuildListener.SLC_ANT_TYPE);\r
+               if (project.getReference(SlcAntConstants.REF_ROOT_CONTEXT) != null) {\r
+                       slcExecution.setType(SlcAntConstants.EXECTYPE_SLC_ANT);\r
                } else {\r
-                       slcExecution.setType(SlcExecutionBuildListener.ANT_TYPE);\r
+                       slcExecution.setType(SlcAntConstants.EXECTYPE_ANT);\r
                }\r
 \r
                slcExecution.setUser(System.getProperty("user.name"));\r
@@ -244,12 +231,12 @@ public class SlcProjectHelper extends ProjectHelper2 {
                slcExecution.getAttributes().put("ant.file",\r
                                project.getProperty("ant.file"));\r
 \r
-               project.addReference(SlcExecutionBuildListener.REF_SLC_EXECUTION,\r
+               project.addReference(SlcAntConstants.REF_SLC_EXECUTION,\r
                                slcExecution);\r
 \r
                // Add build listeners declared in Spring context\r
                Map<String, ProjectRelatedBuildListener> listeners = ((ListableBeanFactory) project\r
-                               .getReference(REF_ROOT_CONTEXT)).getBeansOfType(\r
+                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT)).getBeansOfType(\r
                                ProjectRelatedBuildListener.class, false, true);\r
                for (ProjectRelatedBuildListener listener : listeners.values()) {\r
                        listener.init(project);\r