From 8d1be44456859312fcaa52ea3d85a0791f7581dc Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Fri, 17 Apr 2009 17:32:45 +0000 Subject: [PATCH] Renamed the maven.project packages to maven.model.*. Broke out processors into subpackage. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766094 13f79535-47bb-0310-9956-ffa450edef68 --- .../listeners/BuildExtensionListener.java | 2 +- .../listeners/MavenModelEventListener.java | 2 +- .../listeners/BuildExtensionListenerTest.java | 2 +- .../maven/project/harness/PomTestWrapper.java | 2 +- .../mercury/MavenDependencyProcessor.java | 4 +-- .../maven/mercury/MavenDomainModel.java | 2 +- .../builder => model}/DomainModel.java | 5 +--- .../builder => model}/ModelEventListener.java | 2 +- .../builder => model}/ModelListener.java | 2 +- .../PomClassicDomainModel.java | 2 +- .../{project/builder => model}/Processor.java | 2 +- .../builder => model}/ProcessorContext.java | 25 +++++++++++++++++-- .../builder => model}/ProjectUri.java | 2 +- .../interpolator/DefaultInterpolator.java | 4 +-- .../model/interpolator/Interpolator.java | 2 +- .../processors}/BaseProcessor.java | 3 ++- .../processors}/BuildProcessor.java | 4 ++- .../processors}/CiManagementProcessor.java | 2 +- .../processors}/ContributorsProcessor.java | 2 +- .../processors}/DependenciesProcessor.java | 2 +- .../DependencyManagementProcessor.java | 2 +- .../processors}/DependencyProcessor.java | 2 +- .../processors}/DevelopersProcessor.java | 2 +- .../DistributionManagementProcessor.java | 2 +- .../processors}/IssueManagementProcessor.java | 2 +- .../processors}/LicensesProcessor.java | 2 +- .../processors}/MailingListProcessor.java | 2 +- .../processors}/ModelProcessor.java | 3 ++- .../processors}/ModuleProcessor.java | 2 +- .../processors}/OrganizationProcessor.java | 2 +- .../processors}/ParentProcessor.java | 2 +- .../processors}/PluginProcessor.java | 2 +- .../PluginsManagementProcessor.java | 2 +- .../processors}/PluginsProcessor.java | 2 +- .../processors}/PrerequisitesProcessor.java | 2 +- .../ProfilePropertiesProcessor.java | 2 +- .../processors}/ProfilesModuleProcessor.java | 2 +- .../processors}/ProfilesProcessor.java | 3 ++- .../processors}/PropertiesProcessor.java | 2 +- .../processors}/ReportingProcessor.java | 3 +-- .../processors}/RepositoriesProcessor.java | 2 +- .../processors}/ScmProcessor.java | 2 +- .../project/DefaultMavenProjectBuilder.java | 8 +++--- .../DefaultProjectBuilderConfiguration.java | 2 +- .../maven/project/harness/PomTestWrapper.java | 2 +- 45 files changed, 77 insertions(+), 55 deletions(-) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/DomainModel.java (58%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/ModelEventListener.java (79%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/ModelListener.java (95%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/PomClassicDomainModel.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/Processor.java (96%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/ProcessorContext.java (89%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model}/ProjectUri.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/BaseProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/BuildProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/CiManagementProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ContributorsProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/DependenciesProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/DependencyManagementProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/DependencyProcessor.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/DevelopersProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/DistributionManagementProcessor.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/IssueManagementProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/LicensesProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/MailingListProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ModelProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ModuleProcessor.java (96%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/OrganizationProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ParentProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/PluginProcessor.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/PluginsManagementProcessor.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/PluginsProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/PrerequisitesProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ProfilePropertiesProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ProfilesModuleProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ProfilesProcessor.java (94%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/PropertiesProcessor.java (97%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ReportingProcessor.java (99%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/RepositoriesProcessor.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/{project/builder => model/processors}/ScmProcessor.java (98%) diff --git a/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java b/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java index 58d084842d..affad9d271 100644 --- a/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java +++ b/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java @@ -8,7 +8,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; 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; diff --git a/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java b/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java index d7bf7c69fb..8e180d96ec 100644 --- a/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java +++ b/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java @@ -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 diff --git a/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java b/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java index f62feaa5ed..992b242f15 100644 --- a/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java +++ b/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java @@ -14,9 +14,9 @@ import org.apache.maven.execution.ReactorManager; 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; diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java index 6483d991b2..b60158aa90 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java @@ -25,9 +25,9 @@ import java.util.Iterator; 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 diff --git a/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java b/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java index cc630293ea..6708ce2e6f 100644 --- a/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java +++ b/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java @@ -29,11 +29,11 @@ import org.apache.maven.mercury.builder.api.DependencyProcessor; 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; /** diff --git a/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java b/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java index 67c9c7b4c0..98f268cbf6 100644 --- a/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java +++ b/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java @@ -28,7 +28,7 @@ import org.apache.maven.mercury.artifact.ArtifactMetadata; 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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java b/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java similarity index 58% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java rename to maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java index 4fd9cff20b..6ee7cadd44 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java @@ -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 { diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java similarity index 79% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java rename to maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java index f0f8759f4a..b8de7d8cbe 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelEventListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model; import java.util.List; diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java b/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java similarity index 95% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java rename to maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java index d65b67b9fc..49cc5ef78d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelListener.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java b/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java rename to maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java index 8e5a33ed1b..d11278919b 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java b/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java similarity index 96% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/Processor.java index bf938bdc77..c75f669538 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/Processor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model; import java.util.List; diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java b/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java similarity index 89% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java rename to maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java index 0561a75951..cf7d786d3a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java @@ -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.PluginExecution; 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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java b/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java rename to maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java index a44c2da7d4..1ff548c95f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java index 839464b5b6..e125e4a85a 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java @@ -23,10 +23,10 @@ import javax.xml.stream.XMLStreamReader; 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) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java index 3811b0f8ea..63c2972db7 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/Interpolator.java @@ -3,7 +3,7 @@ package org.apache.maven.model.interpolator; import java.io.IOException; import java.util.List; -import org.apache.maven.project.builder.PomClassicDomainModel; +import org.apache.maven.model.PomClassicDomainModel; public interface Interpolator { diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java index b4fbd13ad4..1ceba9f289 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/BaseProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java @@ -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.List; import java.util.Map; import org.apache.maven.model.Model; +import org.apache.maven.model.Processor; public abstract class BaseProcessor implements Processor { diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java index 10021961de..99f2832ead 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/BuildProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java @@ -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.Build; 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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java index 78a37f2e73..60fe4e97f8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/CiManagementProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java index 2a9fe4505b..fe58fdc760 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ContributorsProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java index 433c95f9ff..a2602fe3c6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependenciesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java index a3cce1afba..b162384f7e 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyManagementProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java index 37326999f6..4088077b98 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DependencyProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java index cecfb9e836..2b31e20966 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DevelopersProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DistributionManagementProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/DistributionManagementProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java index c302194917..1cc137d2c6 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/DistributionManagementProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/IssueManagementProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/IssueManagementProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java index a10c47f0a6..68296a6a1f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/IssueManagementProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/LicensesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/LicensesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java index fdefdcf5ed..76971ef65c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/LicensesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/MailingListProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/MailingListProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java index 91538f92f9..d4ad2d4046 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/MailingListProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java index 3df88feb7a..9d75918b0c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModelProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java @@ -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 java.util.List; 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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModuleProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java similarity index 96% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ModuleProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java index 4bcea21031..61367c0d35 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ModuleProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/OrganizationProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/OrganizationProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java index e8e42838ae..3bd7831325 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/OrganizationProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ParentProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ParentProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java index f6e87cb8db..c3a003a127 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ParentProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java index 7282be9a48..0360b199db 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsManagementProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsManagementProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java index 3aacc361c7..068d7f162c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsManagementProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java index 621c383061..6a2bb3b6ff 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PluginsProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PrerequisitesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PrerequisitesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java index eebeccdf64..c48698319c 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PrerequisitesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java index b7283bf1ba..2f6b8ec0d8 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java @@ -1,4 +1,4 @@ -package org.apache.maven.project.builder; +package org.apache.maven.model.processors; import java.util.Properties; diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java index 9498a48f14..9118650301 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java similarity index 94% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java index c647506b29..2a201df767 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesProcessor.java @@ -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.ArrayList; import java.util.List; import org.apache.maven.model.Model; +import org.apache.maven.model.ProcessorContext; import org.apache.maven.model.Profile; diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PropertiesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/PropertiesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java index 7614691170..ded083e926 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/PropertiesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PropertiesProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ReportingProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java similarity index 99% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ReportingProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java index c1e0bf0801..4cb11c3204 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ReportingProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ReportingProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/RepositoriesProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/RepositoriesProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java index 1d8fbb4f2e..dead8c00f3 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/RepositoriesProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/RepositoriesProcessor.java @@ -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 diff --git a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ScmProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/project/builder/ScmProcessor.java rename to maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java index 2fad6eb64d..d5659de70d 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/project/builder/ScmProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/ScmProcessor.java @@ -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 diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index dd70be06ab..85c8421faf 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -36,7 +36,11 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; 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.ProfileActivationException; 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; diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java index 7bf51e0bc6..22553e16b0 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java @@ -24,8 +24,8 @@ import java.util.List; 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 diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java index a8d07c4a60..b0b95231c7 100644 --- a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java +++ b/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java @@ -25,7 +25,7 @@ import java.util.Iterator; 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