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 d94384d5ca70410508e2f6ed9c3af889f306e55a..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
@@ -5,8 +5,7 @@ import java.util.Vector;
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.types.DataType;\r
-import org.argeo.slc.ant.SlcAntConstants;\r
-import org.argeo.slc.ant.SlcAntException;\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
@@ -53,15 +52,15 @@ public class SpringArg<T> extends DataType {
                        if (bean != null) {\r
                                beanInstance = (T) getContext().getBean(bean);\r
                                if (beanInstance == null)\r
-                                       throw new SlcAntException(\r
-                                                       "No object found for Spring bean " + bean);\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 SlcAntException(\r
-                                                       "No object found for Ant reference " + antref);\r
+                                       throw new SlcException("No object found for Ant reference "\r
+                                                       + antref);\r
                        } else {\r
-                               throw new SlcAntException(\r
+                               throw new SlcException(\r
                                                "Don't know how to retrieve bean instance");\r
                        }\r
 \r
@@ -83,7 +82,7 @@ public class SpringArg<T> extends DataType {
                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
@@ -104,7 +103,7 @@ public class SpringArg<T> extends DataType {
        /** The related Spring application context. */\r
        protected ApplicationContext getContext() {\r
                return (ApplicationContext) getProject().getReference(\r
-                               SlcAntConstants.REF_ROOT_CONTEXT);\r
+                               AntConstants.REF_ROOT_CONTEXT);\r
        }\r
 \r
        protected void checkValueAlreadySet() {\r