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 Maven.java
Date Mon, 02 Dec 2002 02:03:02 GMT
jvanzyl     2002/12/01 18:03:01

  Modified:    src/java/org/apache/maven Maven.java
  Log:
  o moved taglib setup to the maven jelly context class.
  
  Revision  Changes    Path
  1.3       +3 -21     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Maven.java	2 Dec 2002 01:48:33 -0000	1.2
  +++ Maven.java	2 Dec 2002 02:03:01 -0000	1.3
  @@ -60,7 +60,6 @@
   import com.werken.werkz.Session;
   import org.apache.commons.grant.GrantProject;
   import org.apache.commons.jelly.tags.ant.AntTagLibrary;
  -import org.apache.commons.jelly.tags.jeez.JeezTagLibrary;
   import org.apache.commons.jelly.tags.werkz.JellyBuildListener;
   import org.apache.commons.jelly.tags.werkz.JellySession;
   import org.apache.commons.logging.Log;
  @@ -68,8 +67,6 @@
   import org.apache.maven.jelly.JellyPropsHandler;
   import org.apache.maven.jelly.JellyUtils;
   import org.apache.maven.jelly.MavenJellyContext;
  -import org.apache.maven.jelly.tags.MavenJeezTagLibrary;
  -import org.apache.maven.jelly.tags.project.MavenTagLibrary;
   import org.apache.maven.plugin.PluginManager;
   import org.apache.maven.verifier.ProjectVerifier;
   import org.apache.tools.ant.DemuxOutputStream;
  @@ -96,8 +93,6 @@
    *
    * @todo Filter the Maven version number into a Java constant that will change
    *       during compilation.
  - * @todo Move the setup of a MavenJellyContext into the class itself
  - *       instead of populating with tag libs in here.
    */
   public class Maven
   {
  @@ -247,7 +242,6 @@
   
           initializeAnt();
           initializeJelly();
  -        initializeTagLibs();
           initializeDriver();
   
           // Create the dependency classpath for this plugin so that the
  @@ -285,6 +279,8 @@
   
           System.setOut( demuxOut );
           System.setErr( demuxErr );
  +
  +        AntTagLibrary.setProject( getContext(), getAntProject() );
       }
   
       /**
  @@ -303,20 +299,6 @@
           listener.setEmacsMode( getContext().getEmacsModeOn().booleanValue() );
   
           getAntProject().addBuildListener( listener );
  -    }
  -
  -    /**
  -     * Initialize the core <code>jeez</code> Jelly tag library.
  -     */
  -    private void initializeTagLibs()
  -    {
  -        JeezTagLibrary jeezTagLib = new MavenJeezTagLibrary();
  -
  -        getContext().registerTagLibrary( "jelly:jeez", jeezTagLib );
  -        getContext().registerTagLibrary( "", jeezTagLib );
  -        getContext().registerTagLibrary( "jelly:maven", new MavenTagLibrary() );
  -
  -        AntTagLibrary.setProject( getContext(), getAntProject() );
       }
   
       /**
  
  
  

Mime
View raw message