commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant AntTagLibrary.java
Date Thu, 15 Apr 2004 04:51:24 GMT
dion        2004/04/14 21:51:24

  Modified:    jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant
                        AntTagLibrary.java
  Log:
  One of the things that have changed between Ant 1.5.x and 1.6.0 is
  that <ant> and friends now check whether they are part of a circular
  invocation by comparing the current build file location with the one
  of the file they are supposed to call.  This new code assumed that
  ant.file has been set.
  
  Actually, in the context of Jelly the value doesn't matter at all, so
  you could set it to something arbitrary.  I've chosen to use the
  String form of JellyContext#getCurrentURL in my patch, but you may
  want to use something different.
  
  Stefan
  
  Revision  Changes    Path
  1.30      +2 -0      jakarta-commons/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java
  
  Index: AntTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTagLibrary.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AntTagLibrary.java	25 Feb 2004 01:23:59 -0000	1.29
  +++ AntTagLibrary.java	15 Apr 2004 04:51:24 -0000	1.30
  @@ -134,6 +134,8 @@
           
           project.init();
           project.getBaseDir();
  +        project.setProperty("ant.file", 
  +                            context.getCurrentURL().toExternalForm());
   
           return project;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message