cvs commit: maven/src/java/org/apache/maven/cli App.java

[evenisse]

evenisse    2004/03/24 03:04:53

  Modified:    src/java/org/apache/maven/cli Tag: MAVEN-1_0-BRANCH App.java
  Log:
  MAVEN-1182
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.37.4.13 +8 -3      maven/src/java/org/apache/maven/cli/App.java
  
  Index: App.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/App.java,v
  retrieving revision 1.37.4.12
  retrieving revision 1.37.4.13
  diff -u -r1.37.4.12 -r1.37.4.13
  --- App.java  24 Mar 2004 06:01:09 -0000      1.37.4.12
  +++ App.java  24 Mar 2004 11:04:53 -0000      1.37.4.13
  @@ -291,11 +291,16 @@
               {
                   descriptorFile = new File( descriptorName );
               }
  -            System.setProperty("user.dir", 
descriptorFile.getParentFile().getCanonicalPath());
           }
           else
           {
  -            descriptorFile = new File( System.getProperty( "user.dir" ), 
descriptorName );
  +            descriptorFile = new File(descriptorName);
  +        }
  +        
  +        descriptorFile = descriptorFile.getAbsoluteFile();
  +        if ( !getCli().hasOption( WORKING_DIR ) )
  +        {
  +            System.setProperty("user.dir", 
descriptorFile.getParentFile().getCanonicalPath());
           }
   
           return descriptorFile;
  
  
  

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