You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/12/17 19:32:01 UTC
svn commit: r727460 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/builder/
main/java/org/apache/maven/project/builder/impl/
test/java/org/apache/maven/project/builder/
Author: jvanzyl
Date: Wed Dec 17 10:32:01 2008
New Revision: 727460
URL: http://svn.apache.org/viewvc?rev=727460&view=rev
Log:
o adding some test code to share with shane
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=727460&r1=727459&r2=727460&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java Wed Dec 17 10:32:01 2008
@@ -74,6 +74,8 @@
private File projectDirectory;
private List<ModelProperty> modelProperties;
+
+ private int lineageCount;
/**
* Constructor
@@ -258,7 +260,6 @@
}
catch ( XmlPullParserException e )
{
- e.printStackTrace();
throw new IOException( e.getMessage() );
}
}
@@ -316,6 +317,16 @@
this.eventHistory = eventHistory;
}
+ public int getLineageCount()
+ {
+ return lineageCount;
+ }
+
+ public void setLineageCount( int lineageCount )
+ {
+ this.lineageCount = lineageCount;
+ }
+
/**
* Returns true if this.asString.equals(o.asString()), otherwise false.
*
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=727460&r1=727459&r2=727460&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Wed Dec 17 10:32:01 2008
@@ -142,6 +142,7 @@
PomClassicDomainModel dm = (PomClassicDomainModel) mavenParents.get( 0 );
parentFile = dm.getFile();
domainModel.setParentFile( parentFile );
+ domainModel.setLineageCount( mavenParents.size() );
}
domainModels.addAll( mavenParents );
@@ -210,10 +211,12 @@
try
{
File f = new File( projectDirectory, parent.getRelativePath() ).getCanonicalFile();
+
if ( f.isDirectory() )
{
f = new File( f, "pom.xml" );
}
+
return f.exists();
}
catch ( IOException e )
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=727460&r1=727459&r2=727460&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Dec 17 10:32:01 2008
@@ -50,12 +50,14 @@
artifacts.put( "nexus-test-harness-launcher" , nexusLauncher );
artifacts.put( "nexus-test-harness", nexusAggregator );
- PomArtifactResolver resolver = new FileBasedPomArtifactResolver( artifacts );
+ PomArtifactResolver resolver = new FileBasedPomArtifactResolver( new File( BASE_POM_DIR, "nexus" ) );
// make a version that doesn't require a null mixin set. for most pom construction tests we're
// not going to use mixins.
PomClassicDomainModel model = projectBuilder.buildModel( nexusLauncher, null, resolver );
+ assertEquals( 3, model.getLineageCount() );
+
// This will get extremely tedious unless we can shorten these into small expressions to
// retrieve the target values for testing.
@@ -68,7 +70,7 @@
List executions = plugin.getExecutions();
- //assertEquals( 7, executions.size() );
+ assertEquals( 7, executions.size() );
}
// Need to get this to walk around a directory and automatically build up the artifact set. If we
@@ -78,6 +80,24 @@
{
private Map<String,File> artifacts = new HashMap<String,File>();
+ private File basedir;
+
+ public FileBasedPomArtifactResolver( File basedir )
+ {
+ this.basedir = basedir;
+
+ for ( File file : basedir.listFiles() )
+ {
+ String fileName = file.getName();
+ if ( file.getName().endsWith( ".pom" ) )
+ {
+ int i = fileName.indexOf( ".pom" );
+ String id = fileName.substring( 0, i - 1 );
+ artifacts.put( id, file );
+ }
+ }
+ }
+
public FileBasedPomArtifactResolver( Map<String, File> artifacts )
{
this.artifacts = artifacts;