You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/01 22:04:50 UTC
svn commit: r790350 - in /maven/components/trunk:
maven-compat/src/main/java/org/apache/maven/project/validation/
maven-core/src/main/java/org/apache/maven/listeners/
maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/main/java/org/apache...
Author: bentmann
Date: Wed Jul 1 20:04:48 2009
New Revision: 790350
URL: http://svn.apache.org/viewvc?rev=790350&view=rev
Log:
o Moved model builder classes into dedicated package such that o.a.m.model is reserved for the generated Modello classes
Added:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
- copied, changed from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
- copied, changed from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
- copied, changed from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java
- copied, changed from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java
Removed:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Wed Jul 1 20:04:48 2009
@@ -19,9 +19,9 @@
* under the License.
*/
-import org.apache.maven.model.DefaultModelBuildingRequest;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.DefaultModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
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=790350&r1=790349&r2=790350&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 Wed Jul 1 20:04:48 2009
@@ -1,7 +1,7 @@
package org.apache.maven.listeners;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.ModelEventListener;
+import org.apache.maven.model.building.ModelEventListener;
public interface MavenModelEventListener
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java Wed Jul 1 20:04:48 2009
@@ -29,8 +29,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.ModelUtils;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.building.ModelUtils;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Jul 1 20:04:48 2009
@@ -23,8 +23,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Repository;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Jul 1 20:04:48 2009
@@ -29,16 +29,16 @@
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Build;
-import org.apache.maven.model.DefaultModelBuildingRequest;
-import org.apache.maven.model.FileModelSource;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuilder;
-import org.apache.maven.model.ModelBuildingException;
-import org.apache.maven.model.ModelBuildingRequest;
-import org.apache.maven.model.ModelBuildingResult;
-import org.apache.maven.model.ModelProblem;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.UrlModelSource;
+import org.apache.maven.model.building.DefaultModelBuildingRequest;
+import org.apache.maven.model.building.FileModelSource;
+import org.apache.maven.model.building.ModelBuilder;
+import org.apache.maven.model.building.ModelBuildingException;
+import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingResult;
+import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Wed Jul 1 20:04:48 2009
@@ -23,8 +23,8 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.ModelBuildingRequest;
-import org.apache.maven.model.ModelEventListener;
+import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelEventListener;
@Deprecated
public class DefaultProjectBuilderConfiguration
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java Wed Jul 1 20:04:48 2009
@@ -25,9 +25,9 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.ModelBuildingRequest;
-import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelEventListener;
public class DefaultProjectBuildingRequest
implements ProjectBuildingRequest
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Wed Jul 1 20:04:48 2009
@@ -5,8 +5,8 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.building.ModelBuildingRequest;
public interface ProjectBuildingRequest
{
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java Wed Jul 1 20:04:48 2009
@@ -29,9 +29,9 @@
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.FileModelSource;
-import org.apache.maven.model.ModelSource;
import org.apache.maven.model.Repository;
+import org.apache.maven.model.building.FileModelSource;
+import org.apache.maven.model.building.ModelSource;
import org.apache.maven.model.resolution.InvalidRepositoryException;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.model.resolution.UnresolvableModelException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Jul 1 20:04:48 2009
@@ -43,7 +43,7 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Wed Jul 1 20:04:48 2009
@@ -26,8 +26,8 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java&r1=790338&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,6 +26,10 @@
import java.util.List;
import java.util.Map;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Profile;
+import org.apache.maven.model.Repository;
import org.apache.maven.model.inheritance.InheritanceAssembler;
import org.apache.maven.model.interpolation.ModelInterpolationException;
import org.apache.maven.model.interpolation.ModelInterpolator;
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java (from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java&r1=790338&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.model.Profile;
import org.apache.maven.model.resolution.ModelResolver;
/**
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/DefaultModelBuildingResult.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,6 +25,9 @@
import java.util.List;
import java.util.Map;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+
/**
* Collects the output of the model builder.
*
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/FileModelSource.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingException.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java (from r790338, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java&r1=790338&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingRequest.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.model.Profile;
import org.apache.maven.model.resolution.ModelResolver;
/**
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelBuildingResult.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,9 @@
import java.util.List;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+
/**
* Collects the output of the model builder.
*
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelData.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,9 @@
import java.util.List;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+
/**
* Holds a model along with some auxiliary information. This internal utility class assists the model builder during POM
* processing by providing a means to transport information that cannot be (easily) extracted from the model itself.
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelEventListener.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,6 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
+
+import org.apache.maven.model.Model;
public interface ModelEventListener {
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelProblem.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelSource.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/ModelUtils.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelUtils.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java (from r790296, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java&r1=790296&r2=790350&rev=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/UrlModelSource.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java Wed Jul 1 20:04:48 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java Wed Jul 1 20:04:48 2009
@@ -27,11 +27,11 @@
import java.util.Map;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.merge.MavenModelMerger;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles inheritance of model values.
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.path.PathTranslator;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.interpolation.AbstractValueSource;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import java.io.File;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.Interpolator;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java Wed Jul 1 20:04:48 2009
@@ -32,11 +32,11 @@
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.merge.MavenModelMerger;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles injection of plugin/dependency management into the model.
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java Wed Jul 1 20:04:48 2009
@@ -28,8 +28,8 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.merge.MavenModelMerger;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles normalization of a model. In this context, normalization is the process of producing a canonical
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java Wed Jul 1 20:04:48 2009
@@ -25,9 +25,9 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java Wed Jul 1 20:04:48 2009
@@ -22,7 +22,7 @@
import java.io.File;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Resolves relative paths of a model against a specific base directory.
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java Wed Jul 1 20:04:48 2009
@@ -21,12 +21,12 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.xml.Xpp3Dom;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles expansion of general plugin configuration into individual executions and report sets.
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java Wed Jul 1 20:04:48 2009
@@ -30,12 +30,12 @@
import org.apache.maven.model.BuildBase;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBase;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
import org.apache.maven.model.Profile;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.merge.MavenModelMerger;
import org.codehaus.plexus.component.annotations.Component;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java Wed Jul 1 20:04:48 2009
@@ -20,8 +20,8 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles profile injection into the model.
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java Wed Jul 1 20:04:48 2009
@@ -19,9 +19,9 @@
* under the License.
*/
-import org.apache.maven.model.ModelBuilder;
-import org.apache.maven.model.ModelSource;
import org.apache.maven.model.Repository;
+import org.apache.maven.model.building.ModelBuilder;
+import org.apache.maven.model.building.ModelSource;
/**
* Resolves a POM from its coordinates. During the build process, the {@link ModelBuilder} will add any relevant
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Wed Jul 1 20:04:48 2009
@@ -28,7 +28,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Profile;
@@ -36,6 +35,7 @@
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java Wed Jul 1 20:04:48 2009
@@ -20,7 +20,7 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Checks the model for missing or invalid values.
Modified: maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=790350&r1=790349&r2=790350&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java (original)
+++ maven/components/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java Wed Jul 1 20:04:48 2009
@@ -22,9 +22,9 @@
import java.io.InputStream;
import java.util.List;
-import org.apache.maven.model.DefaultModelBuildingRequest;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelBuildingRequest;
+import org.apache.maven.model.building.DefaultModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.PlexusTestCase;