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/17 19:32:47 UTC
svn commit: r766094 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/listeners/
maven-core/src/test/java/org/apache/maven/listeners/
maven-core/src/test/java/org/apache/maven/project/harness/
maven-mercury/src/main/java/org/apach...
Author: sisbell
Date: Fri Apr 17 17:32:45 2009
New Revision: 766094
URL: http://svn.apache.org/viewvc?rev=766094&view=rev
Log:
Renamed the maven.project packages to maven.model.*. Broke out processors into subpackage.
Added:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (contents, props changed)
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (contents, props changed)
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
- copied, changed from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed)
- copied from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/
Removed:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DomainModel.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelEventListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PomClassicDomainModel.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/Processor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProcessorContext.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProjectUri.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.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/MavenDomainModel.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.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/listeners/BuildExtensionListener.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Fri Apr 17 17:32:45 2009
@@ -8,7 +8,7 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
-import org.apache.maven.project.builder.ProjectUri;
+import org.apache.maven.model.ProjectUri;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java Fri Apr 17 17:32:45 2009
@@ -1,7 +1,7 @@
package org.apache.maven.listeners;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.builder.ModelEventListener;
+import org.apache.maven.model.ModelEventListener;
public interface MavenModelEventListener
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java Fri Apr 17 17:32:45 2009
@@ -14,9 +14,9 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ProjectUri;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.dag.CycleDetectedException;
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=766094&r1=766093&r2=766094&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 Fri Apr 17 17:32:45 2009
@@ -25,9 +25,9 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
+import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.builder.PomClassicDomainModel;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomTestWrapper
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=766094&r1=766093&r2=766094&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 Fri Apr 17 17:32:45 2009
@@ -29,11 +29,11 @@
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.model.DomainModel;
+import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.InterpolatorProperty;
import org.apache.maven.model.interpolator.PomInterpolatorTag;
-import org.apache.maven.project.builder.DomainModel;
-import org.apache.maven.project.builder.ProcessorContext;
import org.codehaus.plexus.component.annotations.Component;
/**
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=766094&r1=766093&r2=766094&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 Fri Apr 17 17:32:45 2009
@@ -28,7 +28,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Parent;
-import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.model.PomClassicDomainModel;
public final class MavenDomainModel
extends PomClassicDomainModel
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java Fri Apr 17 17:32:45 2009
@@ -1,7 +1,4 @@
-package org.apache.maven.project.builder;
-
-import java.io.IOException;
-import java.util.List;
+package org.apache.maven.model;
public interface DomainModel {
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
import java.util.List;
Propchange: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 17 17:32:45 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.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/ModelEventListener.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Propchange: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 17 17:32:45 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-model-builder/src/main/java/org/apache/maven/model/Processor.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
import java.util.List;
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,28 @@
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Resource;
-import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.model.processors.BuildProcessor;
+import org.apache.maven.model.processors.CiManagementProcessor;
+import org.apache.maven.model.processors.ContributorsProcessor;
+import org.apache.maven.model.processors.DependencyManagementProcessor;
+import org.apache.maven.model.processors.DevelopersProcessor;
+import org.apache.maven.model.processors.DistributionManagementProcessor;
+import org.apache.maven.model.processors.IssueManagementProcessor;
+import org.apache.maven.model.processors.LicensesProcessor;
+import org.apache.maven.model.processors.MailingListProcessor;
+import org.apache.maven.model.processors.ModelProcessor;
+import org.apache.maven.model.processors.ModuleProcessor;
+import org.apache.maven.model.processors.OrganizationProcessor;
+import org.apache.maven.model.processors.ParentProcessor;
+import org.apache.maven.model.processors.PluginsManagementProcessor;
+import org.apache.maven.model.processors.PrerequisitesProcessor;
+import org.apache.maven.model.processors.ProfilePropertiesProcessor;
+import org.apache.maven.model.processors.ProfilesModuleProcessor;
+import org.apache.maven.model.processors.ProfilesProcessor;
+import org.apache.maven.model.processors.PropertiesProcessor;
+import org.apache.maven.model.processors.ReportingProcessor;
+import org.apache.maven.model.processors.RepositoriesProcessor;
+import org.apache.maven.model.processors.ScmProcessor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
public class ProcessorContext
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java (from r766088, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java&r1=766088&r2=766094&rev=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java Fri Apr 17 17:32:45 2009
@@ -23,10 +23,10 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
+import org.apache.maven.model.PomClassicDomainModel;
+import org.apache.maven.model.ProjectUri;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.ProjectUri;
import org.codehaus.plexus.component.annotations.Component;
@Component(role=Interpolator.class)
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java Fri Apr 17 17:32:45 2009
@@ -3,7 +3,7 @@
import java.io.IOException;
import java.util.List;
-import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.model.PomClassicDomainModel;
public interface Interpolator
{
Propchange: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 17 17:32:45 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder: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:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder:688587-696625,696644-699681
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,6 +30,7 @@
import java.util.Map;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Processor;
public abstract class BaseProcessor implements Processor
{
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,10 @@
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.Processor;
import org.apache.maven.model.Resource;
public class BuildProcessor
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Processor;
/*
* hold original pom
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
import java.util.Properties;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
- package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,5 +1,4 @@
-package org.apache.maven.project.builder;
-
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java?rev=766094&r1=766088&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java Fri Apr 17 17:32:45 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder;
+package org.apache.maven.model.processors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri Apr 17 17:32:45 2009
@@ -36,7 +36,11 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.model.Build;
+import org.apache.maven.model.DomainModel;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ModelEventListener;
+import org.apache.maven.model.PomClassicDomainModel;
+import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.DefaultInterpolator;
import org.apache.maven.model.interpolator.Interpolator;
@@ -48,10 +52,6 @@
import org.apache.maven.profiles.ProfileManagerInfo;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.builder.DomainModel;
-import org.apache.maven.project.builder.ModelEventListener;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.ProcessorContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.RepositorySystem;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Fri Apr 17 17:32:45 2009
@@ -24,8 +24,8 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.ModelEventListener;
import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.project.builder.ModelEventListener;
public class DefaultProjectBuilderConfiguration
implements ProjectBuilderConfiguration
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=766094&r1=766093&r2=766094&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java Fri Apr 17 17:32:45 2009
@@ -25,7 +25,7 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
-import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.model.PomClassicDomainModel;
import org.apache.maven.project.MavenProject;
public class PomTestWrapper