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 2008/07/16 09:30:44 UTC
svn commit: r677181 - in
/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src:
main/java/org/apache/maven/project/
main/java/org/apache/maven/project/builder/impl/
test/java/org/apache/maven/project/inheritance/
Author: sisbell
Date: Wed Jul 16 00:30:44 2008
New Revision: 677181
URL: http://svn.apache.org/viewvc?rev=677181&view=rev
Log:
Logging.
Modified:
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=677181&r1=677180&r2=677181&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Jul 16 00:30:44 2008
@@ -71,6 +71,7 @@
import org.apache.maven.project.workspace.ProjectWorkspace;
import org.apache.maven.project.builder.PomArtifactResolver;
import org.apache.maven.project.builder.ProjectBuilder;
+import org.apache.maven.project.builder.PomClassicDomainModel;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -498,8 +499,8 @@
MavenProject legacy_project = projectWorkspace.getProject( projectDescriptor );
- if ( legacy_project == null )
- {
+ // if ( legacy_project == null )
+ // {
// getLogger().debug( "Allowing project-build to proceed for: " + projectDescriptor );
Model legacy_model = readModelLegacy( "unknown", projectDescriptor, STRICT_MODEL_PARSING );
@@ -524,12 +525,17 @@
true );
//TODO: Compare models
*/
+ try {
+ System.out.println("-----------------***");
+ System.out.println(new PomClassicDomainModel(model).asString());
+ System.out.println(new PomClassicDomainModel(legacy_project.getModel()).asString());
+ System.out.println("------------------");
+ throw new ProjectBuildingException("", "");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // }
- }
-// else
-// {
-// getLogger().debug( "Returning cached project: " + project );
-// }
return legacy_project;
}
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=677181&r1=677180&r2=677181&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Wed Jul 16 00:30:44 2008
@@ -179,12 +179,12 @@
}
Model model = domainModel.getModel();
- /*
+
logger.info("-----------------");
- logger.info("Project Directory =" + projectDirectory.getAbsolutePath());
+ System.out.println("Project Directory =" + projectDirectory.getAbsolutePath());
logger.info("Parent Path = " + model.getParent().getRelativePath());
logger.info("Relative Path = " + new File(projectDirectory, model.getParent().getRelativePath()));
- */
+
File parentFile = new File(projectDirectory, model.getParent().getRelativePath()).getCanonicalFile();
//logger.info("Parent File = " + parentFile.getAbsolutePath());
if (parentFile.isDirectory()) {
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?rev=677181&r1=677180&r2=677181&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java Wed Jul 16 00:30:44 2008
@@ -53,6 +53,6 @@
protected File getLocalRepositoryPath()
{
- return getTestFile( "src/test/resources/inheritance-repo/" + getTestSeries() );
+ return getTestFile( "maven-project/src/test/resources/inheritance-repo/" + getTestSeries() );
}
}