X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FAntSlcApplication.java;h=8b8d2e4e5e3f564e85f646851f167603c2d6d3fa;hb=489db3e2297debe1a32e5e98534d5dbf059e1c1d;hp=ab2316ae02600cb703001625a0dfcd2b991fd5f6;hpb=79274c46a5c9aab66fb548a4d0515e7e882e1031;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
index ab2316ae0..8b8d2e4e5 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
@@ -27,9 +27,7 @@ import org.argeo.slc.core.structure.StructureRegistry;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.structure.tree.TreeSRegistry;
 import org.argeo.slc.logging.Log4jUtils;
-import org.argeo.slc.runtime.SlcExecutionContext;
 import org.argeo.slc.runtime.SlcExecutionOutput;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -146,7 +144,7 @@ public class AntSlcApplication {
 				}
 			}
 		} catch (Exception e) {
-			throw new SlcAntException("Cannot init system properties.", e);
+			throw new SlcException("Cannot init system properties.", e);
 		}
 	}
 
@@ -203,7 +201,7 @@ public class AntSlcApplication {
 			ctx.refresh();
 			return ctx;
 		} catch (Exception e) {
-			throw new SlcAntException(
+			throw new SlcException(
 					"Cannot create SLC execution application context.", e);
 		}
 	}
@@ -212,7 +210,7 @@ public class AntSlcApplication {
 		String scriptStr = slcExecution.getAttributes().get(
 				SlcAntConstants.EXECATTR_ANT_FILE);
 		if (scriptStr == null)
-			throw new SlcAntException("No Ant script provided");
+			throw new SlcException("No Ant script provided");
 
 		return scriptStr;
 	}
@@ -301,7 +299,7 @@ public class AntSlcApplication {
 			defs.load(in);
 			in.close();
 		} catch (IOException e) {
-			throw new SlcAntException("Cannot load task definitions", e);
+			throw new SlcException("Cannot load task definitions", e);
 		}
 		return defs;
 	}
@@ -362,7 +360,7 @@ public class AntSlcApplication {
 					projectHelper);
 			projectHelper.parse(project, script.getURL());
 		} catch (Exception e) {
-			throw new SlcAntException("Could not parse project for script "
+			throw new SlcException("Could not parse project for script "
 					+ scriptRelativePath, e);
 		}
 
@@ -379,7 +377,7 @@ public class AntSlcApplication {
 			}
 		} catch (Throwable e) {
 			exception = e;
-			throw new SlcAntException("SLC Ant execution failed", exception);
+			throw new SlcException("SLC Ant execution failed", exception);
 		} finally {
 			p.fireBuildFinished(exception);
 		}