diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ManifestException.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ManifestException.java deleted file mode 100644 index 9c95a8595..000000000 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ManifestException.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.tools.ant.taskdefs; - -/** - * Exception thrown indicating problems in a JAR Manifest - * - * @author Conor MacNeill - */ -public class ManifestException extends Exception -{ - - /** - * Constructs an exception with the given descriptive message. - * - * @param msg Description of or information about the exception. - */ - public ManifestException( String msg ) - { - super( msg ); - } -} diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java index a7d8fdd08..3d9041b9c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.zip.ZipFile; import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Manifest; -import org.apache.tools.ant.taskdefs.ManifestException; +import org.apache.tools.ant.taskdefs.manifest.Manifest; +import org.apache.tools.ant.taskdefs.manifest.ManifestException; import org.apache.tools.ant.types.FileScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java similarity index 99% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java index a4aa56ab0..5cf5289a5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs; +package org.apache.tools.ant.taskdefs.manifest; import java.io.BufferedReader; import java.io.File; @@ -32,6 +32,8 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * * @author Conor MacNeill * @author Stefan Bodewig + * @author Peter Donald + * @version $Revision$ $Date$ */ public class Manifest extends AbstractTask diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java new file mode 100644 index 000000000..a2aab55ae --- /dev/null +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package org.apache.tools.ant.taskdefs.manifest; + +import org.apache.avalon.framework.CascadingException; + +/** + * ManifestException is thrown when there is a problem parsing, generating or + * handling a Manifest. + * + * @author Peter Donald + * @version $Revision$ $Date$ + */ +public class ManifestException + extends CascadingException +{ + /** + * Basic constructor for exception that does not specify a message + */ + public ManifestException() + { + this( "", null ); + } + + /** + * Basic constructor with a message + * + * @param message the message + */ + public ManifestException( final String message ) + { + this( message, null ); + } + + /** + * Constructor that builds cascade so that other exception information can be retained. + * + * @param message the message + * @param throwable the throwable + */ + public ManifestException( final String message, final Throwable throwable ) + { + super( message, throwable ); + } +} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ManifestException.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ManifestException.java deleted file mode 100644 index 9c95a8595..000000000 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ManifestException.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.tools.ant.taskdefs; - -/** - * Exception thrown indicating problems in a JAR Manifest - * - * @author Conor MacNeill - */ -public class ManifestException extends Exception -{ - - /** - * Constructs an exception with the given descriptive message. - * - * @param msg Description of or information about the exception. - */ - public ManifestException( String msg ) - { - super( msg ); - } -} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java index a7d8fdd08..3d9041b9c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.zip.ZipFile; import org.apache.aut.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.taskdefs.Manifest; -import org.apache.tools.ant.taskdefs.ManifestException; +import org.apache.tools.ant.taskdefs.manifest.Manifest; +import org.apache.tools.ant.taskdefs.manifest.ManifestException; import org.apache.tools.ant.types.FileScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java similarity index 99% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java index a4aa56ab0..5cf5289a5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs; +package org.apache.tools.ant.taskdefs.manifest; import java.io.BufferedReader; import java.io.File; @@ -32,6 +32,8 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * * @author Conor MacNeill * @author Stefan Bodewig + * @author Peter Donald + * @version $Revision$ $Date$ */ public class Manifest extends AbstractTask diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java new file mode 100644 index 000000000..a2aab55ae --- /dev/null +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package org.apache.tools.ant.taskdefs.manifest; + +import org.apache.avalon.framework.CascadingException; + +/** + * ManifestException is thrown when there is a problem parsing, generating or + * handling a Manifest. + * + * @author Peter Donald + * @version $Revision$ $Date$ + */ +public class ManifestException + extends CascadingException +{ + /** + * Basic constructor for exception that does not specify a message + */ + public ManifestException() + { + this( "", null ); + } + + /** + * Basic constructor with a message + * + * @param message the message + */ + public ManifestException( final String message ) + { + this( message, null ); + } + + /** + * Constructor that builds cascade so that other exception information can be retained. + * + * @param message the message + * @param throwable the throwable + */ + public ManifestException( final String message, final Throwable throwable ) + { + super( message, throwable ); + } +}