werken      2002/07/08 15:03:24

  Modified:    src/java/org/apache/maven/app CLIManager.java Maven.java
  Log:
  Added -p/--pom option for specifying a non-default project descriptor.
  
  Revision  Changes    Path
  1.2       +4 -0      
jakarta-turbine-maven/src/java/org/apache/maven/app/CLIManager.java
  
  Index: CLIManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/CLIManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CLIManager.java   24 Jun 2002 18:33:18 -0000      1.1
  +++ CLIManager.java   8 Jul 2002 22:03:23 -0000       1.2
  @@ -97,6 +97,10 @@
                             "Set effective working directory",
                             false, false);
   
  +        options.addOption('p', "pom", true,
  +                          "Set project file",
  +                          false, false);
  +
           options.addOption('h', "help", false,
                             "Display help information.",
                             false, false);
  
  
  
  1.52      +9 -2      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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Maven.java        6 Jul 2002 16:18:21 -0000       1.51
  +++ Maven.java        8 Jul 2002 22:03:23 -0000       1.52
  @@ -911,8 +911,15 @@
               setDir(new File(cli.getOptionValue('d')));
           }
           
  -        setProjectFile(new File(getDir(),
  -                                PROJECT_DESCRIPTOR_FILE_NAME));
  +        if ( this.cli.hasOption('p'))
  +        {
  +            setProjectFile(new File(cli.getOptionValue('p')));
  +        }
  +        else
  +        {
  +            setProjectFile(new File(getDir(),
  +                                    PROJECT_DESCRIPTOR_FILE_NAME));
  +        }
           
           File projectBuildFile = new File(getDir(),
                                            PROJECT_BUILD_FILE_NAME);
  
  
  

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

Reply via email to