maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/verifier ProjectVerifier.java
Date Mon, 02 Dec 2002 07:31:43 GMT
jvanzyl     2002/12/01 23:31:43

  Modified:    src/java/org/apache/maven CreateDependencyClasspath.java
                        Maven.java
               src/java/org/apache/maven/plugin PluginManager.java
               src/java/org/apache/maven/verifier ProjectVerifier.java
  Log:
  o now derived from the base maven component.
  
  Revision  Changes    Path
  1.20      +2 -25     jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java
  
  Index: CreateDependencyClasspath.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CreateDependencyClasspath.java	1 Dec 2002 04:34:29 -0000	1.19
  +++ CreateDependencyClasspath.java	2 Dec 2002 07:31:43 -0000	1.20
  @@ -58,7 +58,6 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.maven.jelly.MavenJellyContext;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  @@ -80,6 +79,7 @@
    * @version $Id$
    */
   public class CreateDependencyClasspath
  +    extends AbstractMavenComponent
   {
       // ------------------------------------------------------------
       // I N S T A N C E  M E M B E R S
  @@ -91,32 +91,9 @@
       /** Reference id for the generated classpath. */
       private String refid;
   
  -    /** Jelly context */
  -    private MavenJellyContext context;
  -
       // --------------------------------------------------------------
       // A C C E S S O R S
       // --------------------------------------------------------------
  -
  -    /**
  -     * Set the maven context.
  -     *
  -     * @param context The maven jelly context.
  -     */
  -    public void setContext( MavenJellyContext context )
  -    {
  -        this.context = context;
  -    }
  -
  -    /**
  -     * Set the jelly context.
  -     *
  -     * @return The maven jelly context.
  -     */
  -    public MavenJellyContext getContext()
  -    {
  -        return context;
  -    }
   
       /**
        * Set the ref id.
  
  
  
  1.6       +2 -24     jakarta-turbine-maven/src/java/org/apache/maven/Maven.java
  
  Index: Maven.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/Maven.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Maven.java	2 Dec 2002 02:15:12 -0000	1.5
  +++ Maven.java	2 Dec 2002 07:31:43 -0000	1.6
  @@ -66,7 +66,6 @@
   import org.apache.commons.logging.LogFactory;
   import org.apache.maven.jelly.JellyPropsHandler;
   import org.apache.maven.jelly.JellyUtils;
  -import org.apache.maven.jelly.MavenJellyContext;
   import org.apache.maven.plugin.PluginManager;
   import org.apache.maven.verifier.ProjectVerifier;
   import org.apache.tools.ant.DemuxOutputStream;
  @@ -98,6 +97,7 @@
    * @todo Get rid of the instances stack. The only thing that needs it is the dvsl bean.
    */
   public class Maven
  +    extends AbstractMavenComponent
   {
       // ------------------------------------------------------------
       // C O N S T A N T S
  @@ -132,9 +132,6 @@
       /** List of string goal names on the command-line. */
       private List goalNames;
   
  -    /** Jelly conext. */
  -    private MavenJellyContext context;
  -
       // ------------------------------------------------------------
       // C O N S T R U C T O R S
       // ------------------------------------------------------------
  @@ -209,25 +206,6 @@
           {
               goalNames.remove( i );
           }
  -    }
  -
  -    /**
  -     * Set the context.
  -     *
  -     * @param jellyContext Maven jelly context.
  -     */
  -    public void setContext( MavenJellyContext jellyContext )
  -    {
  -        this.context = jellyContext;
  -    }
  -
  -    /** Retrieve the Jelly context.
  -     *
  -     *  @return The Jelly context.
  -     */
  -    public MavenJellyContext getContext()
  -    {
  -        return context;
       }
   
       // ------------------------------------------------------------
  
  
  
  1.9       +3 -24     jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java
  
  Index: PluginManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PluginManager.java	2 Dec 2002 01:17:50 -0000	1.8
  +++ PluginManager.java	2 Dec 2002 07:31:43 -0000	1.9
  @@ -60,6 +60,7 @@
   import com.werken.werkz.Goal;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.maven.AbstractMavenComponent;
   import org.apache.maven.CreateDependencyClasspath;
   import org.apache.maven.MavenConstants;
   import org.apache.maven.MavenUtils;
  @@ -99,6 +100,7 @@
    *
    */
   public class PluginManager
  +    extends AbstractMavenComponent
   {
       /** Plug-in main script name. */
       public static final String PLUGIN_SCRIPT_NAME = "plugin.jelly";
  @@ -130,9 +132,6 @@
       /** ${maven.home}/bin/plugins directory. */
       private File pluginsDir;
   
  -    /** Jelly conext. */
  -    private MavenJellyContext context;
  -
       /** Plugins cache. */
       private Properties pluginsCache;
   
  @@ -1066,26 +1065,6 @@
           in.close();
   
           return props;
  -    }
  -
  -    /**
  -     * Set Jelly context.
  -     *
  -     * @param context The maven jelly context.
  -     */
  -    public void setContext( MavenJellyContext context )
  -    {
  -        this.context = context;
  -    }
  -
  -    /**
  -     * Retrieve the Jelly context.
  -     *
  -     * @return The Jelly context.
  -     */
  -    public MavenJellyContext getContext()
  -    {
  -        return context;
       }
   
       /**
  
  
  
  1.6       +3 -23     jakarta-turbine-maven/src/java/org/apache/maven/verifier/ProjectVerifier.java
  
  Index: ProjectVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/verifier/ProjectVerifier.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ProjectVerifier.java	2 Dec 2002 05:36:37 -0000	1.5
  +++ ProjectVerifier.java	2 Dec 2002 07:31:43 -0000	1.6
  @@ -60,7 +60,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.maven.MavenConstants;
  -import org.apache.maven.jelly.MavenJellyContext;
  +import org.apache.maven.AbstractMavenComponent;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.repository.Artifact;
   import org.apache.maven.repository.DefaultArtifactFactory;
  @@ -91,6 +91,7 @@
    *       the standard betwixt mechanism for reading it in.
    */
   public class ProjectVerifier
  +    extends AbstractMavenComponent
   {
       /** Log. */
       private static final Log log = LogFactory.getLog( ProjectVerifier.class );
  @@ -113,31 +114,10 @@
       /** Map of failed downloads. Key is URL, value is Boolean */
       private Map failedDownloads = new HashMap();
   
  -    /** Maven Jelly context being used. */
  -    private MavenJellyContext context;
  -
       /** Default ctor. */
       public ProjectVerifier()
       {
           failedDependencies = new ArrayList();
  -    }
  -
  -    /**
  -     * Sets the context attribute.
  -     * @param context The Maven Jelly Context to use
  -     */
  -    public void setContext( MavenJellyContext context )
  -    {
  -        this.context = context;
  -    }
  -
  -    /**
  -     * Gets the context attribute.
  -     * @return the Maven Jelly Context being used
  -     */
  -    public MavenJellyContext getContext()
  -    {
  -        return context;
       }
   
       /**
  
  
  

Mime
View raw message