Rename Ant constants

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

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
index fb073014cf38c4f8d897557ee8f4ba22ed997030..c84c96567d80d0df8e7e9a9558e09277db91fca5 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
@@ -3,9 +3,9 @@ package org.argeo.slc.ant.spring;
 import java.util.List;\r
 import java.util.Vector;\r
 \r
+import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.types.DataType;\r
-import org.argeo.slc.ant.SlcAntException;\r
-import org.argeo.slc.ant.SlcProjectHelper;\r
+import org.argeo.slc.ant.AntConstants;\r
 import org.argeo.slc.core.SlcException;\r
 import org.springframework.beans.BeanWrapper;\r
 import org.springframework.beans.BeanWrapperImpl;\r
@@ -17,6 +17,7 @@ public class SpringArg<T> extends DataType {
        private List<OverrideArg> overrides = new Vector<OverrideArg>();\r
 \r
        private String bean;\r
+       private String antref;\r
 \r
        // cache bean instance to avoid reading it twice if it is a prototype\r
        private T beanInstance = null;\r
@@ -28,17 +29,41 @@ public class SpringArg<T> extends DataType {
 \r
        /** Setter for the bean name. */\r
        public void setBean(String bean) {\r
+               checkValueAlreadySet();\r
                this.bean = bean;\r
        }\r
 \r
+       public String getAntref() {\r
+               return antref;\r
+       }\r
+\r
+       /** Sets a reference to an ant data type. */\r
+       public void setAntref(String antref) {\r
+               checkValueAlreadySet();\r
+               this.antref = antref;\r
+       }\r
+\r
        /**\r
-        * Retrieve the instance of the bean, and sets the overriden properties.\r
+        * Retrieve the instance of the bean, and sets the overridden properties.\r
         * <b>The value is cached.</b>\r
         */\r
        public T getBeanInstance() {\r
                if (beanInstance == null) {\r
-                       beanInstance = (T)getContext().getBean(bean);\r
-                       \r
+                       if (bean != null) {\r
+                               beanInstance = (T) getContext().getBean(bean);\r
+                               if (beanInstance == null)\r
+                                       throw new SlcException("No object found for Spring bean "\r
+                                                       + bean);\r
+                       } else if (antref != null) {\r
+                               beanInstance = (T) getProject().getReference(antref);\r
+                               if (beanInstance == null)\r
+                                       throw new SlcException("No object found for Ant reference "\r
+                                                       + antref);\r
+                       } else {\r
+                               throw new SlcException(\r
+                                               "Don't know how to retrieve bean instance");\r
+                       }\r
+\r
                        setOverridenProperties(beanInstance);\r
 \r
                        // FIXME: why are we doing this? Could not find any object using it\r
@@ -52,21 +77,20 @@ public class SpringArg<T> extends DataType {
                }\r
                return beanInstance;\r
        }\r
-       \r
-       protected void setOverridenProperties(Object obj){\r
+\r
+       protected void setOverridenProperties(Object obj) {\r
                BeanWrapper wrapper = new BeanWrapperImpl(obj);\r
                for (OverrideArg override : overrides) {\r
                        if (override.getName() == null) {\r
-                               throw new SlcAntException(\r
+                               throw new SlcException(\r
                                                "The name of the property to override has to be set.");\r
                        }\r
 \r
-//                     LogFactory.getLog(getClass()).debug(\r
-//                                     "Prop " + override.getName());\r
-                       wrapper.setPropertyValue(override.getName(), override\r
-                                       .getObject());\r
+                       // LogFactory.getLog(getClass()).debug(\r
+                       // "Prop " + override.getName());\r
+                       wrapper.setPropertyValue(override.getName(), override.getObject());\r
                }\r
-       \r
+\r
        }\r
 \r
        /** Creates an override subtag. */\r
@@ -79,7 +103,13 @@ public class SpringArg<T> extends DataType {
        /** The related Spring application context. */\r
        protected ApplicationContext getContext() {\r
                return (ApplicationContext) getProject().getReference(\r
-                               SlcProjectHelper.REF_ROOT_CONTEXT);\r
+                               AntConstants.REF_ROOT_CONTEXT);\r
+       }\r
+\r
+       protected void checkValueAlreadySet() {\r
+               if (antref != null || bean != null) {\r
+                       throw new BuildException("Value already set.");\r
+               }\r
        }\r
 \r
 }\r