werken      2002/07/05 08:02:25

  Modified:    src/bin  driver.jelly
               src/java/org/apache/maven/app Maven.java
  Log:
  -- Hooked driver.jelly back into the execution before plugin
     loading, so we have a place to update-pom, verify-project,
     or generate-ant-build type of things.
  
  Revision  Changes    Path
  1.6       +6 -0      jakarta-turbine-maven/src/bin/driver.jelly
  
  Index: driver.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- driver.jelly      19 Jun 2002 17:21:52 -0000      1.5
  +++ driver.jelly      5 Jul 2002 15:02:25 -0000       1.6
  @@ -7,5 +7,11 @@
   
     -->
   
  +  <echo>
  +  
  +    I am a driver.jelly file executing.
  +
  +  </echo>
  +
   </project>
   
  
  
  
  1.44      +22 -1     jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
  
  Index: Maven.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Maven.java        5 Jul 2002 12:29:53 -0000       1.43
  +++ Maven.java        5 Jul 2002 15:02:25 -0000       1.44
  @@ -135,6 +135,9 @@
       /** Filename of project descriptor. */
       public static final String PROJECT_DESCRIPTOR_FILE_NAME = "project.xml";
   
  +    /** Initialization jellyscript name. */
  +    public static final String DRIVER_SCRIPT_NAME = "driver.jelly";
  +
       /** Plug-in main script name. */
       public static final String PLUGIN_SCRIPT_NAME = "plugin.jelly";
   
  @@ -332,6 +335,12 @@
                                      "plugins");
       }
   
  +    public File getDriverFile()
  +    {
  +        return new File( getMavenBin(),
  +                         DRIVER_SCRIPT_NAME );
  +    }
  +
       /** Retrieve the directory containing all plugins.
        *
        *  @return The directory containing all plugins.
  @@ -666,10 +675,22 @@
           loadProjectBuildFile();
       }
   
  -    private void initializeDriver() 
  +    private void initializeDriver() throws Exception
       {
           getJellyContext().setVariable("pom",
                                          getProjectDescriptor().getProject());
  +
  +        File driver = getDriverFile();
  +
  +        if ( ! driver.exists() )
  +        {
  +            return;
  +        }
  +
  +        JellyUtils.runScript( driver,
  +                              getMavenBin().toURL(),
  +                              getJellyContext(),
  +                              getXMLOutput() );
       }
   
       /** Initialize all plugins.
  
  
  

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

Reply via email to