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 23:45:23 UTC
svn commit: r677440 - 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/
main/java/org/apache/maven/project/builder/impl/
test/java/org/apache/maven/project/inher...
Author: sisbell
Date: Wed Jul 16 14:45:22 2008
New Revision: 677440
URL: http://svn.apache.org/viewvc?rev=677440&view=rev
Log:
Rule - do not inherit project name. Old interpolation code now being applied to new model.
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/PomClassicTransformer.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=677440&r1=677439&r2=677440&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 14:45:22 2008
@@ -46,6 +46,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.Parent;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
@@ -504,7 +505,9 @@
Model model = readModelFromLocalPath( "unknown", projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
buildArtifactRepositories( getSuperModel() ), artifactResolver) );
- /*
+ Parent parent = legacy_model.getParent();
+
+ model.setParent(null);
MavenProject project = buildInternal(model,
config,
buildArtifactRepositories( getSuperModel() ),
@@ -512,12 +515,12 @@
STRICT_MODEL_PARSING,
true,
true );
- //TODO: Compare models
- */
+
+ project.getModel().setParent(parent);
PomClassicDomainModel domainModel = null;
PomClassicDomainModel legacy_domainModel = null;
try {
- domainModel = new PomClassicDomainModel(model);
+ domainModel = new PomClassicDomainModel(project.getModel());
legacy_domainModel = new PomClassicDomainModel(legacy_project.getModel());
if(!domainModel.equals(legacy_domainModel)) {
@@ -872,8 +875,9 @@
// getLogger().debug( "Caching project: " + project.getId() + " (also keyed by file: " + project.getFile() + ")" );
- projectWorkspace.storeProjectByCoordinate( project );
- projectWorkspace.storeProjectByFile( project );
+ //TODO: SI - Disable for now
+ // projectWorkspace.storeProjectByCoordinate( project );
+ // projectWorkspace.storeProjectByFile( project );
project.setManagedVersionMap( createManagedVersionMap( projectId, project.getDependencyManagement(), projectDescriptor ) );
Modified: maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.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/PomClassicTransformer.java?rev=677440&r1=677439&r2=677440&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1_A/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Wed Jul 16 14:45:22 2008
@@ -120,7 +120,8 @@
List<ModelProperty> tmp = ModelMarshaller.marshallXmlToModelProperties(
((PomClassicDomainModel) domainModel).getInputStream(), ProjectUri.baseUri, uris);
-
+ List clearedProperties = new ArrayList<ModelProperty>();
+
//Missing Version Rule
if (getPropertyFor(ProjectUri.version, tmp) == null) {
ModelProperty parentVersion = getPropertyFor(ProjectUri.Parent.version, tmp);
@@ -209,13 +210,18 @@
}
//Remove Plugin Repository Inheritance Rule
- List<ModelProperty> pluginRepoProperties = new ArrayList<ModelProperty>();
for(ModelProperty mp : tmp) {
if(domainModels.indexOf(domainModel) > 0 && mp.getUri().startsWith(ProjectUri.PluginRepositories.xUri)){
- pluginRepoProperties.add(mp);
+ clearedProperties.add(mp);
+ }
+ }
+
+ //Project Name Inheritance Rule
+ for(ModelProperty mp : tmp) {
+ if(domainModels.indexOf(domainModel) > 0 && mp.getUri().equals(ProjectUri.name)){
+ clearedProperties.add(mp);
}
}
- tmp.removeAll(pluginRepoProperties);
//Ordered Dependency Rule
@@ -244,17 +250,16 @@
projectNames.add(0, artifactId.getValue());
}
-
+ tmp.removeAll(clearedProperties);
modelProperties.addAll(tmp);
//Remove Parent Info
- /*
for (ModelProperty mp : tmp) {
if (mp.getUri().startsWith(ProjectUri.Parent.xUri)) {
modelProperties.remove(mp);
}
}
- */
+
}
return modelProperties;
}
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=677440&r1=677439&r2=677440&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 14:45:22 2008
@@ -136,7 +136,7 @@
Arrays.asList(new ArtifactModelContainerFactory(), new IdModelContainerFactory()));
PomClassicDomainModel transformedDomainModel = ((PomClassicDomainModel) ctx.transform(domainModels, transformer,
transformer, properties));
- logger.info(transformedDomainModel.getEventHistory());
+ //logger.info(transformedDomainModel.getEventHistory());
return new MavenProject(transformedDomainModel.getModel());
}
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=677440&r1=677439&r2=677440&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 14:45:22 2008
@@ -53,6 +53,6 @@
protected File getLocalRepositoryPath()
{
- return getTestFile( "maven-project/src/test/resources/inheritance-repo/" + getTestSeries() );
+ return getTestFile("src/test/resources/inheritance-repo/" + getTestSeries() );
}
}