vmassol     2002/06/16 10:17:50

  Modified:    src/java/org/apache/maven BaseProjectTask.java
  Log:
  this task now exports all ant properties that start with "maven" (i.e. maven ant 
properties)
  
  Revision  Changes    Path
  1.17      +25 -2     
jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java
  
  Index: BaseProjectTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BaseProjectTask.java      6 Jun 2002 16:10:40 -0000       1.16
  +++ BaseProjectTask.java      16 Jun 2002 17:17:50 -0000      1.17
  @@ -59,6 +59,7 @@
   import java.io.File;
   import java.util.ArrayList;
   import java.util.HashMap;
  +import java.util.Enumeration;
   
   import org.apache.tools.ant.BuildException;
   
  @@ -145,7 +146,9 @@
               
               context.put("callbacks", new HashMap());
               context.put("escape", new Escape());
  -            
  +
  +            exportAntProperties(context);
  +
               return context;
           }
           catch (Exception e)
  @@ -154,6 +157,26 @@
               // the stacktrace will appear in the standard
               // ant output.
               throw new BuildException(e);
  +        }
  +    }
  +
  +    /**
  +     * Export all Ant Maven properties to the Velocity context (ie all
  +     * properties starting with "maven" will be exported).
  +     *
  +     * @param context the Velocity context
  +     */
  +    protected void exportAntProperties(Context context)
  +    {
  +        Enumeration props = getProject().getProperties().keys();
  +        while (props.hasMoreElements())
  +        {
  +            String property = (String) props.nextElement();
  +            if (property.startsWith("maven"))
  +            {
  +                context.put(property,
  +                    getProject().getProperty(property));
  +            }
           }
       }
   }
  
  
  

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

Reply via email to