cvs commit: jakarta-turbine-maven/src/plugins/antlr plugin.jelly

[werken]

werken      2002/07/08 20:20:01

  Modified:    src/java/org/apache/maven/app MavenJellyContext.java
               src/java/org/apache/maven/jelly/tags/project
                        MavenTagLibrary.java
               src/plugins/antlr plugin.jelly
  Log:
  More hacks to hopefully soon support ANTLR.
  
  Revision  Changes    Path
  1.9       +7 -0      
jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java
  
  Index: MavenJellyContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MavenJellyContext.java    6 Jul 2002 16:18:21 -0000       1.8
  +++ MavenJellyContext.java    9 Jul 2002 03:20:01 -0000       1.9
  @@ -129,6 +129,13 @@
        */
       public Project getAntProject()
       {
  +        if ( this.antProject == null
  +             &&
  +             getParent() != null )
  +        {
  +            return ((MavenJellyContext)getParent()).getAntProject();
  +        }
  +        
           return this.antProject;
       }
   
  
  
  
  1.5       +2 -1      
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTagLibrary.java
  
  Index: MavenTagLibrary.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTagLibrary.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MavenTagLibrary.java      8 Jul 2002 13:07:27 -0000       1.4
  +++ MavenTagLibrary.java      9 Jul 2002 03:20:01 -0000       1.5
  @@ -77,5 +77,6 @@
           registerTag("directoryList", DirectoryList.class);
           registerTag("goalsToXML", GoalsToXML.class);
           registerTag("snapshot", SnapshotSignature.class);
  +        registerTag("addPath", AddPathTag.class);
       }        
   }
  
  
  
  1.2       +2 -1      jakarta-turbine-maven/src/plugins/antlr/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/antlr/plugin.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.jelly      9 Jul 2002 02:41:43 -0000       1.1
  +++ plugin.jelly      9 Jul 2002 03:20:01 -0000       1.2
  @@ -30,7 +30,8 @@
   
           ${maven.repo.local}/antlrall-2.7.1.jar
   
  -        <antlr target="${grammar}">
  +        <antlr target="${grammar}"
  +               outputdirectory="${maven.build.dir}/antlr">
               <classpath>
                   <path refid="maven.dependency.classpath"/>
               </classpath>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>