Remove unused SlcAntException

git-svn-id: https://svn.argeo.org/slc/trunk@1278 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 4bedc9bace8a0af2a255f78d6642315327afb150..1adb21058def17953382d3c1bd6f966545ccc39b 100644 (file)
--- 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;\r
 import org.apache.tools.ant.ProjectHelper;\r
 import org.apache.tools.ant.helper.ProjectHelper2;\r
+import org.argeo.slc.core.SlcException;\r
 \r
 /** Run regular Ant script (that is, not SLC instrumented) */\r
 public class AntRunner {\r
@@ -60,8 +61,7 @@ public class AntRunner {
                        }\r
                } catch (Throwable e) {\r
                        exception = e;\r
-                       throw new SlcAntException("Could not run Ant script " + buildFile,\r
-                                       e);\r
+                       throw new SlcException("Could not run Ant script " + buildFile, e);\r
                } finally {\r
                        p.fireBuildFinished(exception);\r
                }\r

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 ed214b49e0d38955a1b8028798522d7b79407404..8b8d2e4e5e3f564e85f646851f167603c2d6d3fa 100644 (file)
--- 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 3c798cacb98520b44235029b9fe491da59f386f3..7e234b1210b768cab181cd43d988c6d1a7840c93 100644 (file)
--- 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 (file)
index 854df33..0000000
--- 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;\r
-\r
-import org.argeo.slc.core.SlcException;\r
-\r
-/** Base for all SLC Ant exceptions. */\r
-public class SlcAntException extends SlcException {\r
-       static final long serialVersionUID = 1l;\r
-\r
-       /** Constructor. */\r
-       public SlcAntException(String message) {\r
-               super(message);\r
-       }\r
-\r
-       /** Constructor. */\r
-       public SlcAntException(String message, Throwable cause) {\r
-               super(message, cause);\r
-       }\r
-\r
-}\r

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 da682ba6fe606236a53cc9966b344a961342b673..3e427b1397d6e3ad39eb74540b89f2754e752daa 100644 (file)
--- 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);\r
 \r
                if (slcExecution == null)\r
-                       throw new SlcAntException("No SLC Execution registered.");\r
+                       throw new SlcException("No SLC Execution registered.");\r
                return slcExecution;\r
        }\r
 \r

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..75b3447c5182e7c7e386f1d89416063801245fa3 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
@@ -6,7 +6,6 @@ import java.util.Vector;
 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.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

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 8402efd0dc709c3f96c98db5b3f5b4f640e480e3..8c0cf9d76bd7fb7a6786ad94fb19d857671eab93 100644 (file)
--- 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;
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Target;\r
-\r
 import org.argeo.slc.ant.SlcAntConstants;\r
-import org.argeo.slc.ant.SlcAntException;\r
-import org.argeo.slc.ant.spring.SpringArg;\r
 import org.argeo.slc.ant.spring.AbstractSpringTask;\r
+import org.argeo.slc.ant.spring.SpringArg;\r
+import org.argeo.slc.core.SlcException;\r
 import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.StructureAware;\r
 import org.argeo.slc.core.structure.StructureElement;\r
@@ -117,7 +116,7 @@ public abstract class SAwareTask extends AbstractSpringTask {
        /** Create a reference to an external structure element. */\r
        public StructureElementArg createStructureElement() {\r
                if (structureElementArg != null)\r
-                       throw new SlcAntException("Arg already set.");\r
+                       throw new SlcException("Arg already set.");\r
                structureElementArg = new StructureElementArg();\r
                return structureElementArg;\r
        }\r

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 e5ccab51a2ec8ed34d2f2dc6be03acbc4304fb5f..d5185b9c72886650ad4cc76b6496f73110d098a9 100644 (file)
--- 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 {\r
                                testRun = (WritableTestRun) getContext().getBean(testRunBeanT);\r
                                if (log.isTraceEnabled())\r
-                                       log.trace("Load test run bean from bean name " + testRunBeanT);\r
+                                       log.trace("Load test run bean from bean name "\r
+                                                       + testRunBeanT);\r
                        } catch (BeansException e) {\r
                                // silent, will try defaults\r
                        }\r

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 adae463c2b4cc564dab651a2a018bae1d2aed783..4b3aa0b153479f74d1d65dc23fcfb152ca5e381a 100644 (file)
--- 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;
        }