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=75b3447c5182e7c7e386f1d89416063801245fa3;hb=489db3e2297debe1a32e5e98534d5dbf059e1c1d;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..75b3447c5 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 @@ -6,7 +6,6 @@ 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.core.SlcException; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; @@ -53,15 +52,15 @@ public class SpringArg 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 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."); }