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/04/13 21:14:46 UTC
svn commit: r764568 [1/5] - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/test/java/org/apache/maven/project/harness/
maven-mercury/src/main/java/org/apache/maven/mercury/
maven-mercury/src/main/java/org/a...
Author: sisbell
Date: Mon Apr 13 19:14:44 2009
New Revision: 764568
URL: http://svn.apache.org/viewvc?rev=764568&view=rev
Log:
Moved legacy builder code to maven-mercury. Moved over interpolator code from model-builder to maven-project-builder to reduce the dependencies. Reduce the amount of parsing to and from model properties.
Added:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/factories/ (props changed)
- copied from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories/
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/profile/ (props changed)
- copied from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ (props changed)
- copied from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BaseProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DistributionManagementProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DistributionManagementProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/IssueManagementProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/IssueManagementProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/LicensesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/LicensesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/MailingListProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/MailingListProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ModelListener.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModuleProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ModuleProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/OrganizationProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/OrganizationProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ParentProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ParentProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PluginProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PluginsManagementProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PluginsProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PluginsProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PrerequisitesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PrerequisitesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/Processor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/Processor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java (with props)
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PropertiesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/PropertiesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ReportingProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/RepositoriesProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/RepositoriesProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ScmProcessor.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ScmProcessor.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java (contents, props changed)
- copied, changed from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
Removed:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/processor/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules/
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/
maven/components/trunk/maven-project-builder/src/test/java/
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor2.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultDependencyScopeTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultExecutionIdTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DependencyManagementDataSourceRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DuplicateFiltersTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingGroupIdTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingVersionTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ModulesNotInheritedTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NameNotInheritedTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginExecutionTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/OverideConfigTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/PackagingNotInheritedTransformerRule.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/RelativePathNotInheritedTransformerRule.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=764568&r1=764567&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Mon Apr 13 19:14:44 2009
@@ -73,9 +73,9 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.builder.PomInterpolatorTag;
-import org.apache.maven.project.builder.PomTransformer;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
+import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.realm.RealmManagementException;
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=764568&r1=764567&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java Mon Apr 13 19:14:44 2009
@@ -31,7 +31,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.project.builder.legacy.PomClassicDomainModel;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.model.ModelProperty;
import org.codehaus.plexus.util.WriterFactory;
@@ -171,16 +171,6 @@
return ( pomFile != null ) ? pomFile.getParentFile() : null;
}
- public String getValueOfProjectUri( String projectUri, boolean withResolvedValue )
- throws IOException
- {
- if ( projectUri.contains( "#collection" ) || projectUri.contains( "#set" ) )
- {
- throw new IllegalArgumentException( "projectUri: contains a collection or set" );
- }
- return asMap( withResolvedValue ).get( projectUri );
- }
-
public void setValueOnModel( String expression, Object value )
{
context.setValue( expression, value );
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=764568&r1=764567&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Mon Apr 13 19:14:44 2009
@@ -30,9 +30,9 @@
import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
-import org.apache.maven.project.builder.PomInterpolatorTag;
-import org.apache.maven.project.builder.PomTransformer;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
+import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelContainer;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor2.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor2.java?rev=764568&r1=764567&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor2.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor2.java Mon Apr 13 19:14:44 2009
@@ -10,7 +10,7 @@
import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
-import org.apache.maven.project.processor.ProcessorContext;
+import org.apache.maven.project.builder.ProcessorContext;
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.codehaus.plexus.component.annotations.Component;
@@ -62,7 +62,7 @@
{
throw new MetadataReaderException( "Failed to create domain model. Message = " + e.getMessage(), e );
}
-
+/*
try
{
MavenDomainModel model = new MavenDomainModel(ProcessorContext.build(domainModels, interpolatorProperties));
@@ -72,5 +72,7 @@
{
throw new MetadataReaderException( "Unable to transform model", e );
}
+ */
+ return null;
}
}
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=764568&r1=764567&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java Mon Apr 13 19:14:44 2009
@@ -28,11 +28,11 @@
import java.util.List;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.PomTransformer;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.factories.ExclusionModelContainerFactory;
+import org.apache.maven.project.builder.legacy.PomClassicDomainModel;
+import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.project.builder.profile.ProfileContext;
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.shared.model.InterpolatorProperty;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/factories/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/factories:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
import org.apache.maven.shared.model.ModelDataSource;
import org.apache.maven.shared.model.DataSourceException;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/DataSourceRule.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DataSourceRule.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/JoinRule.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/JoinRule.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.ModelMarshaller;
import org.apache.maven.shared.model.InputStreamDomainModel;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
import org.apache.maven.shared.model.DomainModelFactory;
import org.apache.maven.shared.model.DomainModel;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomClassicDomainModelFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModelFactory.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,11 +25,14 @@
import org.apache.maven.shared.model.*;
import org.apache.maven.shared.model.impl.DefaultModelDataSource;
+import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.rules.*;
import org.apache.maven.project.builder.factories.PluginExecutionIdModelContainerFactory;
import org.apache.maven.project.builder.factories.AlwaysJoinModelContainerFactory;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.factories.IdModelContainerFactory;
+import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
/**
* Provides methods for transforming model properties into a domain model for the pom classic format and vice versa.
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRemovalRule.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRemovalRule.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java?p2=maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.project.builder.legacy;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/TransformerRule.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/TransformerRule.java:688587-696625,696644-699681
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/profile/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/profile:688587-696625,696644-699681
Propchange: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules:688587-696625,696644-699681
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultDependencyScopeTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultDependencyScopeTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultDependencyScopeTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultDependencyScopeTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -5,8 +5,8 @@
import org.apache.maven.shared.model.ModelContainer;
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.shared.model.impl.DefaultModelDataSource;
-import org.apache.maven.project.builder.TransformerRule;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
+import org.apache.maven.project.builder.legacy.TransformerRule;
import org.apache.maven.project.builder.ProjectUri;
import java.util.List;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultExecutionIdTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultExecutionIdTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultExecutionIdTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DefaultExecutionIdTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -3,7 +3,7 @@
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.TransformerRemovalRule;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import java.util.List;
import java.util.ArrayList;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DependencyManagementDataSourceRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DependencyManagementDataSourceRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DependencyManagementDataSourceRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DependencyManagementDataSourceRule.java Mon Apr 13 19:14:44 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.DataSourceRule;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
+import org.apache.maven.project.builder.legacy.DataSourceRule;
import org.apache.maven.shared.model.*;
import org.apache.maven.shared.model.impl.DefaultModelDataSource;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DuplicateFiltersTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DuplicateFiltersTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DuplicateFiltersTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/DuplicateFiltersTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,7 +1,7 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingGroupIdTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingGroupIdTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingGroupIdTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingGroupIdTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,10 +1,11 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRule;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.TransformerRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
-import static org.apache.maven.project.builder.PomTransformer.getPropertyFor;
+
+import static org.apache.maven.project.builder.legacy.PomTransformer.getPropertyFor;
import java.util.List;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingVersionTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingVersionTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingVersionTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/MissingVersionTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -2,9 +2,9 @@
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
-import org.apache.maven.project.builder.TransformerRule;
-import org.apache.maven.project.builder.PomTransformer;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.PomTransformer;
+import org.apache.maven.project.builder.legacy.TransformerRule;
import java.util.List;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ModulesNotInheritedTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ModulesNotInheritedTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ModulesNotInheritedTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/ModulesNotInheritedTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.PomTransformer;
+import org.apache.maven.project.builder.legacy.PomTransformer;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NameNotInheritedTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NameNotInheritedTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NameNotInheritedTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NameNotInheritedTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,7 +1,7 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginExecutionTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginExecutionTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginExecutionTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginExecutionTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,9 +1,9 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.factories.PluginExecutionIdModelContainerFactory;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.shared.model.ModelDataSource;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/NotInheritedPluginTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,8 +1,8 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.PomTransformer;
+import org.apache.maven.project.builder.legacy.PomTransformer;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
import org.apache.maven.shared.model.ModelDataSource;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/OverideConfigTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/OverideConfigTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/OverideConfigTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/OverideConfigTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,9 +1,9 @@
package org.apache.maven.project.builder.rules;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.PomTransformer;
-import org.apache.maven.project.builder.JoinRule;
import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
+import org.apache.maven.project.builder.legacy.JoinRule;
+import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.shared.model.*;
import org.apache.maven.shared.model.impl.DefaultModelDataSource;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/PackagingNotInheritedTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/PackagingNotInheritedTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/PackagingNotInheritedTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/PackagingNotInheritedTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,7 +1,7 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Modified: maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/RelativePathNotInheritedTransformerRule.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/RelativePathNotInheritedTransformerRule.java?rev=764568&r1=764415&r2=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/RelativePathNotInheritedTransformerRule.java (original)
+++ maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/rules/RelativePathNotInheritedTransformerRule.java Mon Apr 13 19:14:44 2009
@@ -1,7 +1,7 @@
package org.apache.maven.project.builder.rules;
-import org.apache.maven.project.builder.TransformerRemovalRule;
import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.project.builder.legacy.TransformerRemovalRule;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.DataSourceException;
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BaseProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BaseProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BaseProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BaseProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BuildProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BuildProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/BuildProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/CiManagementProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ContributorsProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 19:14:44 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java&r1=764415&r2=764568&rev=764568&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/DevelopersProcessor.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java Mon Apr 13 19:14:44 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.processor;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one