ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive Jar.java
Date Sat, 09 Feb 2002 05:51:20 GMT
donaldp     02/02/08 21:51:20

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest
                        Section.java ManifestUtil.java ManifestTask.java
                        Manifest.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive
                        Jar.java
  Added:       proposal/myrmidon/src/java/org/apache/aut/manifest
                        ManifestException.java Attribute.java
  Removed:     proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest
                        ManifestException.java Attribute.java
  Log:
  STart to move the ant-indepenet manifest stuff into aut
  
  Revision  Changes    Path
  1.3       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Section.java
  
  Index: Section.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Section.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Section.java	9 Feb 2002 05:19:10 -0000	1.2
  +++ Section.java	9 Feb 2002 05:51:20 -0000	1.3
  @@ -14,6 +14,8 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Iterator;
  +import org.apache.aut.manifest.Attribute;
  +import org.apache.aut.manifest.ManifestException;
   
   /**
    * Class to represent an individual section in the Manifest. A section
  @@ -23,7 +25,7 @@
    * @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: 1.2 $ $Date: 2002/02/09 05:19:10 $
  + * @version $Revision: 1.3 $ $Date: 2002/02/09 05:51:20 $
    */
   public class Section
   {
  
  
  
  1.3       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java
  
  Index: ManifestUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ManifestUtil.java	9 Feb 2002 05:19:10 -0000	1.2
  +++ ManifestUtil.java	9 Feb 2002 05:51:20 -0000	1.3
  @@ -16,6 +16,8 @@
   import java.io.BufferedReader;
   import java.util.jar.Attributes;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.aut.manifest.Attribute;
  +import org.apache.aut.manifest.ManifestException;
   
   /**
    * Utility methods for manifest stuff.
  @@ -23,7 +25,7 @@
    * @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: 1.2 $ $Date: 2002/02/09 05:19:10 $
  + * @version $Revision: 1.3 $ $Date: 2002/02/09 05:51:20 $
    */
   public final class ManifestUtil
   {
  
  
  
  1.2       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java
  
  Index: ManifestTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManifestTask.java	9 Feb 2002 05:19:10 -0000	1.1
  +++ ManifestTask.java	9 Feb 2002 05:51:20 -0000	1.2
  @@ -17,6 +17,8 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.aut.manifest.Attribute;
  +import org.apache.aut.manifest.ManifestException;
   
   /**
    * Class to manage Manifest information
  @@ -24,7 +26,7 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/09 05:19:10 $
  + * @version $Revision: 1.2 $ $Date: 2002/02/09 05:51:20 $
    */
   public class ManifestTask
       extends AbstractTask
  
  
  
  1.4       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Manifest.java	9 Feb 2002 05:19:10 -0000	1.3
  +++ Manifest.java	9 Feb 2002 05:51:20 -0000	1.4
  @@ -13,6 +13,8 @@
   import java.util.Iterator;
   import java.util.Set;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.aut.manifest.Attribute;
  +import org.apache.aut.manifest.ManifestException;
   
   /**
    * Class to manage Manifest information
  @@ -20,7 +22,7 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.3 $ $Date: 2002/02/09 05:19:10 $
  + * @version $Revision: 1.4 $ $Date: 2002/02/09 05:51:20 $
    */
   public class Manifest
   {
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/manifest/ManifestException.java
  
  Index: ManifestException.java
  ===================================================================
  /*
   * 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.aut.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: 1.1 $ $Date: 2002/02/09 05:51:20 $
   */
  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 );
      }
  }
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/manifest/Attribute.java
  
  Index: Attribute.java
  ===================================================================
  /*
   * 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.aut.manifest;
  
  import java.io.PrintWriter;
  import java.io.IOException;
  import java.util.jar.Attributes;
  
  /**
   * Class to hold manifest attributes
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @author <a href="mailto:conor@apache.org">Conor MacNeill</a>
   * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
   * @version $Revision: 1.1 $ $Date: 2002/02/09 05:51:20 $
   */
  public class Attribute
  {
      /**
       * The attribute's name
       */
      private String m_name;
  
      /**
       * The attribute's value
       */
      private String m_value;
  
      /**
       * Construct an empty attribute
       */
      public Attribute()
      {
      }
  
      /**
       * Construct a manifest by specifying its name and value
       *
       * @param name the attribute's name
       * @param value the Attribute's value
       */
      public Attribute( final String name, final String value )
      {
          m_name = name;
          m_value = value;
      }
  
      /**
       * Set the Attribute's name
       *
       * @param name the attribute's name
       */
      public void setName( final String name )
      {
          m_name = name;
      }
  
      /**
       * Set the Attribute's value
       *
       * @param value the attribute's value
       */
      public void setValue( final String value )
      {
          m_value = value;
      }
  
      /**
       * Get the Attribute's name
       *
       * @return the attribute's name.
       */
      public String getName()
      {
          return m_name;
      }
  
      /**
       * Get the Attribute's value
       *
       * @return the attribute's value.
       */
      public String getValue()
      {
          return m_value;
      }
  
      /**
       * Add a continuation line from the Manifest file When lines are too
       * long in a manifest, they are continued on the next line by starting
       * with a space. This method adds the continuation data to the attribute
       * value by skipping the first character.
       *
       * @param line The feature to be added to the Continuation attribute
       */
      public void addContinuation( final String line )
      {
          m_value += line.substring( 1 );
      }
  
      public boolean equals( Object object )
      {
          if( !( object instanceof Attribute ) )
          {
              return false;
          }
  
          final Attribute other = (Attribute)object;
          final String name = other.m_name;
          return
              ( null != m_name && null != name &&
              m_name.toLowerCase().equals( name.toLowerCase() ) &&
              null != m_value && m_value.equals( other.m_value ) );
      }
  
  }
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Jar.java	9 Feb 2002 05:19:10 -0000	1.4
  +++ Jar.java	9 Feb 2002 05:51:20 -0000	1.5
  @@ -22,7 +22,7 @@
   import org.apache.aut.zip.ZipOutputStream;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.manifest.Manifest;
  -import org.apache.tools.ant.taskdefs.manifest.ManifestException;
  +import org.apache.aut.manifest.ManifestException;
   import org.apache.tools.ant.taskdefs.manifest.ManifestUtil;
   import org.apache.tools.ant.types.FileScanner;
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message