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/09/27 18:44:22 UTC
svn commit: r699682 - in /maven/components/branches/jvz: ./ maven-core/
maven-core/src/main/java/org/apache/maven/extension/lineage/ maven-profile/
maven-project/ maven-project/src/main/java/org/apache/maven/profiles/
maven-project/src/main/java/org/ap...
Author: jvanzyl
Date: Sat Sep 27 09:44:21 2008
New Revision: 699682
URL: http://svn.apache.org/viewvc?rev=699682&view=rev
Log:
o merging down from trunk
Added:
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
- copied unchanged from r699681, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
- copied unchanged from r699681, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
- copied unchanged from r699681, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
- copied unchanged from r699681, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
maven/components/branches/jvz/maven-project/src/main/mdo/ (props changed)
- copied from r699681, maven/components/trunk/maven-project/src/main/mdo/
maven/components/branches/jvz/maven-project/src/main/mdo/profiles.mdo
- copied unchanged from r699681, maven/components/trunk/maven-project/src/main/mdo/profiles.mdo
Removed:
maven/components/branches/jvz/maven-profile/
Modified:
maven/components/branches/jvz/ (props changed)
maven/components/branches/jvz/build.xml
maven/components/branches/jvz/maven-core/pom.xml
maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
maven/components/branches/jvz/maven-project/pom.xml
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/components/branches/jvz/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java
maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
maven/components/branches/jvz/pom.xml
Propchange: maven/components/branches/jvz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 27 09:44:21 2008
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206
-/maven/components/trunk:688587-696625
+/maven/components/trunk:688587-696625,696644-699681
Modified: maven/components/branches/jvz/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/build.xml?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/build.xml (original)
+++ maven/components/branches/jvz/build.xml Sat Sep 27 09:44:21 2008
@@ -119,7 +119,7 @@
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
<modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
- <modello file="maven-profile/src/main/mdo/profiles.mdo"/>
+ <modello file="maven-project/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
</target>
Modified: maven/components/branches/jvz/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/pom.xml?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-core/pom.xml (original)
+++ maven/components/branches/jvz/maven-core/pom.xml Sat Sep 27 09:44:21 2008
@@ -41,10 +41,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (original)
+++ maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Sat Sep 27 09:44:21 2008
@@ -35,6 +35,7 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ModelAndFile;
+import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -68,6 +69,8 @@
private ProfileAdvisor profileAdvisor;
+ private ProjectWorkspace projectWorkspace;
+
private Logger logger;
public DefaultModelLineageBuilder()
@@ -96,7 +99,12 @@
List currentRemoteRepositories = remoteRepositories == null ? new ArrayList()
: new ArrayList( remoteRepositories );
- ModelAndFile current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
+ ModelAndFile current = projectWorkspace.getModelAndFile( pom );
+ if ( current == null )
+ {
+ current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
+ projectWorkspace.storeModelAndFile( current );
+ }
do
{
@@ -306,6 +314,7 @@
// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using file: " + parentPomFile );
+ result = projectWorkspace.getModelAndFile( parentPomFile );
if ( result != null && !parentModelMatches( modelParent, result.getModel() ) )
{
parentPomFile = null;
@@ -313,6 +322,13 @@
}
}
+ if ( result == null )
+ {
+// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using project groupId:artifactId:version." );
+
+ result = projectWorkspace.getModelAndFile( modelParent.getGroupId(), modelParent.getArtifactId(), modelParent.getVersion() );
+ }
+
if ( result != null )
{
// getLogger().debug( "Returning cached instance." );
@@ -405,6 +421,12 @@
}
}
+ if ( result != null )
+ {
+// getLogger().debug( "Caching parent model-and-file: " + result );
+ projectWorkspace.storeModelAndFile( result );
+ }
+
return result;
}
Modified: maven/components/branches/jvz/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/pom.xml?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/pom.xml (original)
+++ maven/components/branches/jvz/maven-project/pom.xml Sat Sep 27 09:44:21 2008
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
@@ -74,4 +70,16 @@
<artifactId>maven-shared-model</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/profiles.mdo</model>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Sat Sep 27 09:44:21 2008
@@ -165,9 +165,23 @@
return ModelContainerAction.NOP;
}
}
- return ModelContainerAction.DELETE;//TODO Verify - PluginManagement Section may make versions equal
+ return ModelContainerAction.JOIN;
+ }
+ if ( version == null )
+ {
+ if ( c.version == null )
+ {
+ if ( c.type.equals( type ) )
+ {
+ return ModelContainerAction.JOIN;
+ }
+ else
+ {
+ return ModelContainerAction.NOP;
+ }
+ }
+ return ModelContainerAction.JOIN;
}
-
if ( c.version.equals( version ) )
{
if ( c.type.equals( type ) )
Modified: maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Sat Sep 27 09:44:21 2008
@@ -557,6 +557,7 @@
Map<String, String> aliases = new HashMap<String, String>();
aliases.put( "project.", "pom.");
+ aliases.put( "\\$\\{project.build.", "\\$\\{build.");
if(!containsProjectVersion(interpolatorProperties))
{
Modified: maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java (original)
+++ maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java Sat Sep 27 09:44:21 2008
@@ -392,7 +392,7 @@
"http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/executions#collection/execution/inherited";
public static String configuration =
- "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/execution#collections/execution/configuration";
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/execution#collection/execution/configuration";
}
}
Modified: maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java (original)
+++ maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java Sat Sep 27 09:44:21 2008
@@ -307,8 +307,18 @@
if ( !parentDomainModel.matchesParent( domainModel.getModel().getParent() ) )
{
- logger.warn( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath() +
- ": Child ID = " + domainModel.getModel().getId() );
+ logger.warn( "Parent pom ids do not match: Parent File = " + parentFile.getAbsolutePath() + ", Parent ID = "
+ + parentDomainModel.getId() + ", Child ID = " + domainModel.getId() + ", Expected Parent ID = "
+ + domainModel.getModel().getParent().getId() );
+ List<DomainModel> parentDomainModels = getDomainModelParentsFromRepository( domainModel, artifactResolver );
+ if(parentDomainModels.size() == 0)
+ {
+ throw new IOException("Unable to find parent pom on local path or repo: "
+ + domainModel.getModel().getParent().getId());
+ }
+ logger.info("Attempting to lookup from the repository: Found parents: " + parentDomainModels.size());
+ domainModels.addAll( parentDomainModels );
+ return domainModels;
}
domainModels.add( parentDomainModel );
Propchange: maven/components/branches/jvz/maven-project/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Sep 27 09:44:21 2008
@@ -0,0 +1,2 @@
+/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/mdo:680477
+/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
Modified: maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml Sat Sep 27 09:44:21 2008
@@ -19,6 +19,12 @@
<component-set>
<components>
+
+ <component>
+ <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
+ <implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
+ </component>
+
<component>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Sat Sep 27 09:44:21 2008
@@ -107,10 +107,6 @@
File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
MavenProject project = getProject( f1 );
- Writer out = WriterFactory.newXmlWriter( System.out );
- MavenXpp3Writer writer = new MavenXpp3Writer();
- writer.write( out, project.getModel() );
- out.close();
assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 ) ).getDependencies().size() );
}
Modified: maven/components/branches/jvz/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java (original)
+++ maven/components/branches/jvz/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java Sat Sep 27 09:44:21 2008
@@ -130,7 +130,7 @@
*/
public String getResolvedValue()
{
- if( resolvedValue != null && !resolvedValue.startsWith ("<![CDATA[")
+ if( !uri.contains("#property") && resolvedValue != null && !resolvedValue.startsWith ("<![CDATA[")
&& (resolvedValue.contains( "=" ) || resolvedValue.contains( "<" )))
{
resolvedValue = "<![CDATA[" + resolvedValue + "]]>";
Modified: maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java (original)
+++ maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelMarshallerTest.java Sat Sep 27 09:44:21 2008
@@ -30,25 +30,7 @@
public class ModelMarshallerTest
{
- /*
- @Test
- public void aaa() throws IOException {
- List<ModelProperty> properties =
- ModelMarshaller.marshallXmlToModelProperties(
- new FileInputStream("/home/shane/checkout/SI_MAVEN_2_1_A/maven-core-it-runner/target/it-working-folder/it0060/subproject/pom.xml"),
- "http://apache.org/maven", null);
- for(ModelProperty mp : properties) {
- // System.out.println(mp);
- }
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList());
-
-
- for(ModelProperty mp : properties) {
- System.out.println(mp);
- }
- System.out.println(ModelMarshaller.unmarshalModelPropertiesToXml(properties, "http://apache.org/maven"));
- }
- */
+
@Test
public void unmarshalWithEmptyCollectionTags()
throws IOException
@@ -57,7 +39,7 @@
new ModelProperty( "http://apache.org/maven/project", null ),
new ModelProperty( "http://apache.org/maven/project/dependencies#collection", null ) );
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
- System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
+ // System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
}
@Test
@@ -68,7 +50,7 @@
new ModelProperty( "http://apache.org/maven/project", null ),
new ModelProperty( "http://apache.org/maven/project/modelVersion", "4.0.0" ) );
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
- System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
+ // System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
}
@Test
@@ -81,7 +63,7 @@
null );
String xml = ModelMarshaller.unmarshalModelPropertiesToXml( modelProperties, "http://apache.org/maven" );
- System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
+ // System.out.println( "COMPLETE:" + xml ); //TODO: Verify proper xml
}
@Test
Modified: maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java (original)
+++ maven/components/branches/jvz/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java Sat Sep 27 09:44:21 2008
@@ -81,9 +81,9 @@
List<ModelProperty> mps = datasource.mergeModelContainers(
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 3, 9 ) ) ),
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 9, 14 ) ) ) );
- for(ModelProperty mp : mps) {
- System.out.println(mp);
- }
+ // for(ModelProperty mp : mps) {
+ // System.out.println(mp);
+ // }
assertTrue(mps.contains(dup6a));
assertTrue(mps.contains(dup11a));
}
@@ -125,9 +125,6 @@
List<ModelProperty> mps = datasource.mergeModelContainers(
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 11 ) ) ) );
- for(ModelProperty mp : mps) {
- System.out.println(mp);
- }
assertFalse(mps.contains(dup10));
}
@@ -263,21 +260,10 @@
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 12 ) ) ) );
- for ( ModelProperty mp : joinedModelContainer.getProperties() )
- {
- System.out.println( "-" + mp );
- }
-
if ( !datasource.getModelProperties().containsAll( joinedModelContainer.getProperties() ) )
{
throw new IOException();
}
-
- for ( ModelProperty mp : datasource.getModelProperties() )
- {
- System.out.println( "+" + mp );
- }
-
}
Modified: maven/components/branches/jvz/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/pom.xml?rev=699682&r1=699681&r2=699682&view=diff
==============================================================================
--- maven/components/branches/jvz/pom.xml (original)
+++ maven/components/branches/jvz/pom.xml Sat Sep 27 09:44:21 2008
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>9-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -253,7 +253,6 @@
<module>maven-lifecycle</module>
<module>maven-model</module>
<module>maven-plugin-api</module>
- <module>maven-profile</module>
<module>maven-project</module>
<module>maven-reporting-api</module>
<module>maven-embedder</module>