Move manifest to a separate package

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271211 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ManifestException.java

@@ -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 <a href="mailto:conor@apache.org">Conor MacNeill</a>
- */
-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 );
-    }
-}

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;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java → 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 <a href="mailto:conor@apache.org">Conor MacNeill</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @version $Revision$ $Date$
  */
 public class Manifest
     extends AbstractTask

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 <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @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 );
+    }
+}

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ManifestException.java

@@ -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 <a href="mailto:conor@apache.org">Conor MacNeill</a>
- */
-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 );
-    }
-}

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;
 
 /**

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java → 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 <a href="mailto:conor@apache.org">Conor MacNeill</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @version $Revision$ $Date$
  */
 public class Manifest
     extends AbstractTask

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 <a href="mailto:peter@apache.org">Peter Donald</a>
+ * @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 );
+    }
+}