X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fspring%2FSpringArg.java;h=c84c96567d80d0df8e7e9a9558e09277db91fca5;hb=fa38c56c899d3f7347d960c4684fa293b1502c6c;hp=d94384d5ca70410508e2f6ed9c3af889f306e55a;hpb=5ecb072f6474a13dec2a40b2470add8b45d4db18;p=gpl%2Fargeo-slc.git

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 d94384d5c..c84c96567 100644
--- 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;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.DataType;
-import org.argeo.slc.ant.SlcAntConstants;
-import org.argeo.slc.ant.SlcAntException;
+import org.argeo.slc.ant.AntConstants;
 import org.argeo.slc.core.SlcException;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
@@ -53,15 +52,15 @@ public class SpringArg<T> extends DataType {
 			if (bean != null) {
 				beanInstance = (T) getContext().getBean(bean);
 				if (beanInstance == null)
-					throw new SlcAntException(
-							"No object found for Spring bean " + bean);
+					throw new SlcException("No object found for Spring bean "
+							+ bean);
 			} else if (antref != null) {
 				beanInstance = (T) getProject().getReference(antref);
 				if (beanInstance == null)
-					throw new SlcAntException(
-							"No object found for Ant reference " + antref);
+					throw new SlcException("No object found for Ant reference "
+							+ antref);
 			} else {
-				throw new SlcAntException(
+				throw new SlcException(
 						"Don't know how to retrieve bean instance");
 			}
 
@@ -83,7 +82,7 @@ public class SpringArg<T> extends DataType {
 		BeanWrapper wrapper = new BeanWrapperImpl(obj);
 		for (OverrideArg override : overrides) {
 			if (override.getName() == null) {
-				throw new SlcAntException(
+				throw new SlcException(
 						"The name of the property to override has to be set.");
 			}
 
@@ -104,7 +103,7 @@ public class SpringArg<T> extends DataType {
 	/** The related Spring application context. */
 	protected ApplicationContext getContext() {
 		return (ApplicationContext) getProject().getReference(
-				SlcAntConstants.REF_ROOT_CONTEXT);
+				AntConstants.REF_ROOT_CONTEXT);
 	}
 
 	protected void checkValueAlreadySet() {