cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/app Maven.java

[jvanzyl]

jvanzyl     2002/11/11 15:51:24

  Modified:    src/java/org/apache/maven/app Maven.java
  Log:
  o Trying to use MavenJellyContext constants where appropriate.
  
  Revision  Changes    Path
  1.124     +11 -11    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.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- Maven.java        11 Nov 2002 23:17:41 -0000      1.123
  +++ Maven.java        11 Nov 2002 23:51:23 -0000      1.124
  @@ -741,19 +741,19 @@
        */
       private void initializeJellyVariables() throws MalformedURLException
       {
  -        getJellyContext().setVariable("maven.obj", this);
  -        getJellyContext().setVariable("maven.home", getMavenHome());
  -        //getJellyContext().setVariable("maven.bin",getMavenBin());
  +        getJellyContext().setVariable(MavenJellyContext.MAVEN_OBJECT, this);
  +        getJellyContext().setVariable(MavenJellyContext.MAVEN_HOME, getMavenHome());
   
  -        getJellyContext().setVariable(
  -            "org.apache.commons.jelly.werkz.Project", getWerkzProject());
  +        getJellyContext().setVariable(MavenJellyContext.WERKZ_PROJECT, 
getWerkzProject());
   
           if (hasProjectBuildFile())
           {
  -            getJellyContext().setVariable("maven.project.buildFile.url",
  +            getJellyContext().setVariable(MavenJellyContext.MAVEN_BUILD_FILE_URL,
                                             getProjectBuildFile().toURL());
           }
  -
  +        
  +        //!! Can probably get rid of all this crap. jvz.
  +        
           getJellyContext().setVariable("projectFileName", getProjectFileName());
   
           HashMap toolbox = new HashMap();
  @@ -799,7 +799,7 @@
           System.setOut(demuxOut);
           System.setErr(demuxErr);
   
  -        getJellyContext().setVariable( "maven.ant.project", antProject );
  +        getJellyContext().setVariable( MavenJellyContext.MAVEN_ANT_PROJECT, 
antProject );
       }
   
       /** Perform pre-build initialization.
  @@ -856,7 +856,7 @@
        */
       private void initializeDriver() throws Exception
       {
  -        getJellyContext().setVariable("pom", getProject());
  +        getJellyContext().setVariable(MavenJellyContext.MAVEN_POM, getProject());
   
           InputStream driverInputStream = getResourceAsStream(DRIVER_SCRIPT_NAME);
   
  @@ -919,7 +919,7 @@
               
               JellyContext context = getJellyContext();
   
  -            context.setVariable("goals", getGoalNames());
  +            context.setVariable(MavenJellyContext.MAVEN_GOALS, getGoalNames());
               
               runGoals(goalNames);
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>