You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/10/24 01:26:31 UTC
svn commit: r587693 - in
/maven/components/trunk/maven-project/src/main/java/org/apache/maven:
profiles/build/DefaultProfileAdvisor.java
project/build/model/DefaultModelLineageBuilder.java
Author: carlos
Date: Tue Oct 23 16:26:30 2007
New Revision: 587693
URL: http://svn.apache.org/viewvc?rev=587693&view=rev
Log:
Kept John's constructors but still use File/URL instead of String
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=587693&r1=587692&r2=587693&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java Tue Oct 23 16:26:30 2007
@@ -109,7 +109,7 @@
String projectId = ArtifactUtils.versionlessKey( groupId, artifactId );
- throw new ProjectBuildingException( projectId, e.getMessage(), pomFile.getAbsolutePath(), e );
+ throw new ProjectBuildingException( projectId, e.getMessage(), pomFile, e );
}
for ( Iterator it = activeProfiles.iterator(); it.hasNext(); )
@@ -166,7 +166,7 @@
catch ( ProfileActivationException e )
{
throw new ProjectBuildingException( modelId,
- "Failed to compute active profiles for repository aggregation.", pomFile.getAbsolutePath(), e );
+ "Failed to compute active profiles for repository aggregation.", pomFile, e );
}
LinkedHashSet remoteRepositories = new LinkedHashSet();
@@ -239,13 +239,13 @@
catch ( IOException e )
{
throw new ProjectBuildingException( model.getId(), "Cannot read profiles.xml resource from directory: "
- + projectDir, pomFile.getAbsolutePath(), e );
+ + projectDir, pomFile, e );
}
catch ( XmlPullParserException e )
{
throw new ProjectBuildingException( model.getId(),
"Cannot parse profiles.xml resource from directory: " + projectDir,
- pomFile.getAbsolutePath(), e );
+ pomFile, e );
}
}
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java?rev=587693&r1=587692&r2=587693&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java Tue Oct 23 16:26:30 2007
@@ -198,11 +198,11 @@
}
catch ( IOException e )
{
- throw new ProjectBuildingException( "unknown", "Failed to read model from: " + pomFile, pomFile.getAbsolutePath(), e );
+ throw new ProjectBuildingException( "unknown", "Failed to read model from: " + pomFile, pomFile, e );
}
catch ( XmlPullParserException e )
{
- throw new ProjectBuildingException( "unknown", "Failed to parse model from: " + pomFile, pomFile.getAbsolutePath(), e );
+ throw new ProjectBuildingException( "unknown", "Failed to parse model from: " + pomFile, pomFile, e );
}
finally
{
@@ -251,7 +251,7 @@
catch ( InvalidRepositoryException e )
{
throw new ProjectBuildingException( model.getId(), "Failed to create ArtifactRepository list for: "
- + pomFile, pomFile.getAbsolutePath(), e );
+ + pomFile, pomFile, e );
}
}