From 489db3e2297debe1a32e5e98534d5dbf059e1c1d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 21 Jun 2008 18:17:16 +0000 Subject: [PATCH] Remove unused SlcAntException git-svn-id: https://svn.argeo.org/slc/trunk@1278 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/slc/ant/AntRunner.java | 4 ++-- .../org/argeo/slc/ant/AntSlcApplication.java | 13 +++++++------ .../org/argeo/slc/ant/SlcAntConstants.java | 6 +++--- .../org/argeo/slc/ant/SlcAntException.java | 19 ------------------- .../slc/ant/SlcExecutionBuildListener.java | 2 +- .../org/argeo/slc/ant/spring/SpringArg.java | 13 ++++++------- .../argeo/slc/ant/structure/SAwareTask.java | 7 +++---- .../org/argeo/slc/ant/test/SlcTestTask.java | 3 ++- .../org/argeo/slc/cli/DefaultSlcRuntime.java | 3 +-- 9 files changed, 25 insertions(+), 45 deletions(-) delete mode 100644 org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntException.java diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java index 4bedc9bac..1adb21058 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRunner.java @@ -10,6 +10,7 @@ import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; +import org.argeo.slc.core.SlcException; /** Run regular Ant script (that is, not SLC instrumented) */ public class AntRunner { @@ -60,8 +61,7 @@ public class AntRunner { } } catch (Throwable e) { exception = e; - throw new SlcAntException("Could not run Ant script " + buildFile, - e); + throw new SlcException("Could not run Ant script " + buildFile, e); } finally { p.fireBuildFinished(exception); } 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 ed214b49e..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 @@ -20,6 +20,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; import org.apache.tools.ant.listener.CommonsLoggingListener; +import org.argeo.slc.core.SlcException; import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.StructureRegistry; @@ -143,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); } } @@ -200,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); } } @@ -209,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; } @@ -298,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; } @@ -359,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); } @@ -376,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); } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConstants.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConstants.java index 3c798cacb..7e234b121 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConstants.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConstants.java @@ -19,7 +19,7 @@ public interface SlcAntConstants { */ public static final String SLC_TYPEDEFS_RESOURCE_PATH = "/org/argeo/slc/ant/typedefs.properties"; public static final String REF_SLC_EXECUTION = "slcExecution"; - + // SLC EXECUTION public static final String EXECTYPE_ANT = "org.apache.tools.ant"; public static final String EXECTYPE_SLC_ANT = "org.argeo.slc.ant"; @@ -27,7 +27,7 @@ public interface SlcAntConstants { public final static String EXECATTR_RUNTIME = "slc.runtime"; public final static String EXECATTR_ANT_FILE = "ant.file"; public final static String EXECATTR_ANT_TARGETS = "ant.targets"; - + // PROPERTIES /** Property for the root dir (SLC root property file). */ public final static String ROOT_DIR_PROPERTY = "slc.rootDir"; @@ -40,5 +40,5 @@ public interface SlcAntConstants { // LOG4J public final static String MDC_ANT_PROJECT = "slc.ant.project"; - + } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntException.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntException.java deleted file mode 100644 index 854df33cf..000000000 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntException.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.argeo.slc.ant; - -import org.argeo.slc.core.SlcException; - -/** Base for all SLC Ant exceptions. */ -public class SlcAntException extends SlcException { - static final long serialVersionUID = 1l; - - /** Constructor. */ - public SlcAntException(String message) { - super(message); - } - - /** Constructor. */ - public SlcAntException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java index da682ba6f..3e427b139 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java @@ -133,7 +133,7 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements .getReference(SlcAntConstants.REF_SLC_EXECUTION); if (slcExecution == null) - throw new SlcAntException("No SLC Execution registered."); + throw new SlcException("No SLC Execution registered."); return slcExecution; } 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."); } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java index 8402efd0d..8c0cf9d76 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java @@ -5,11 +5,10 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Target; - import org.argeo.slc.ant.SlcAntConstants; -import org.argeo.slc.ant.SlcAntException; -import org.argeo.slc.ant.spring.SpringArg; import org.argeo.slc.ant.spring.AbstractSpringTask; +import org.argeo.slc.ant.spring.SpringArg; +import org.argeo.slc.core.SlcException; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.StructureElement; @@ -117,7 +116,7 @@ public abstract class SAwareTask extends AbstractSpringTask { /** Create a reference to an external structure element. */ public StructureElementArg createStructureElement() { if (structureElementArg != null) - throw new SlcAntException("Arg already set."); + throw new SlcException("Arg already set."); structureElementArg = new StructureElementArg(); return structureElementArg; } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java index e5ccab51a..d5185b9c7 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java @@ -47,7 +47,8 @@ public class SlcTestTask extends SAwareTask { try { testRun = (WritableTestRun) getContext().getBean(testRunBeanT); if (log.isTraceEnabled()) - log.trace("Load test run bean from bean name " + testRunBeanT); + log.trace("Load test run bean from bean name " + + testRunBeanT); } catch (BeansException e) { // silent, will try defaults } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java index adae463c2..4b3aa0b15 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java @@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.AntSlcApplication; import org.argeo.slc.ant.SlcAntConstants; -import org.argeo.slc.ant.SlcAntException; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.runtime.SlcExecutionOutput; @@ -217,7 +216,7 @@ public class DefaultSlcRuntime { try { p.load(in); } catch (IOException e) { - throw new SlcAntException("Cannot read SLC root file", e); + throw new SlcException("Cannot read SLC root file", e); } return p; } -- 2.39.2