You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/08 12:12:12 UTC
svn commit: r732683 - in /maven/components/trunk/maven-project/src:
main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
test/java/org/apache/maven/project/builder/PomConstructionTest.java
Author: sisbell
Date: Thu Jan 8 03:12:11 2009
New Revision: 732683
URL: http://svn.apache.org/viewvc?rev=732683&view=rev
Log:
Fix: 3944 - we can just use the existence of the project directory to determine whether it is in the build. This will be a contract of the setProjectDirectory method
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.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=732683&r1=732682&r2=732683&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 Thu Jan 8 03:12:11 2009
@@ -141,6 +141,11 @@
this.parentFile = parentFile;
}
+ /**
+ * This should only be set for projects that are in the build. Setting for poms in the repo may cause unstable behavior.
+ *
+ * @param projectDirectory
+ */
public void setProjectDirectory(File projectDirectory)
{
this.projectDirectory = projectDirectory;
@@ -153,7 +158,7 @@
public boolean isPomInBuild()
{
- return projectDirectory != null && new File(projectDirectory, "pom.xml").isFile();
+ return projectDirectory != null;
}
/**
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=732683&r1=732682&r2=732683&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 Thu Jan 8 03:12:11 2009
@@ -410,7 +410,7 @@
new File( pom.getValue( "properties/siteOut" ).toString() ) );
}
- /* FIXME: cf. MNG-3944
+ /* FIXME: cf. MNG-3944*/
public void testInterpolationOfBasedirInPomWithUnusualName()
throws Exception
{
@@ -418,7 +418,7 @@
assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop0" ).toString() ) );
assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop1" ).toString() ) );
}
- //*/
+
private PomArtifactResolver artifactResolver( String basedir )
{