brett 2004/01/01 20:49:02
Modified: maven-project/src/java/org/apache/maven/project
DefaultProjectBuilder.java
Log:
fix for windows
Revision Changes Path
1.28 +2 -9
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultProjectBuilder.java 29 Dec 2003 20:05:49 -0000 1.27
+++ DefaultProjectBuilder.java 2 Jan 2004 04:49:02 -0000 1.28
@@ -41,8 +41,6 @@
private Artifactory artifactory;
- private String FILE_SEPARATOR = System.getProperty( "file.separator" );
-
// ----------------------------------------------------------------------
// Protected methods to be used by the Maven facade.
// ----------------------------------------------------------------------
@@ -132,7 +130,6 @@
project.setModel( model );
project.setInterpolatedModel( interpolateModel( model, properties ) );
-
}
catch ( XmlPullParserException e )
{
@@ -151,13 +148,9 @@
{
modelToExtend = StringUtils.interpolate( modelToExtend, properties );
- File parentModel;
+ File parentModel = new File( modelToExtend );
- if ( modelToExtend.startsWith( FILE_SEPARATOR ) )
- {
- parentModel = new File( modelToExtend );
- }
- else
+ if ( ! parentModel.isAbsolute() )
{
parentModel = new File( projectDescriptor.getParentFile(),
modelToExtend );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
