o Moved model builder classes into dedicated package such that o.a.m.model is reserved for the generated Modello classes

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790350 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-07-01 20:04:48 +00:00
parent ed6ff2be82
commit abca2a5252
45 changed files with 82 additions and 65 deletions

View File

@ -19,9 +19,9 @@ package org.apache.maven.project.validation;
* 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;

View File

@ -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

View File

@ -29,8 +29,8 @@ import org.apache.maven.artifact.Artifact;
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;

View File

@ -23,8 +23,8 @@ import java.util.List;
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;

View File

@ -29,16 +29,16 @@ import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
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;

View File

@ -23,8 +23,8 @@ import java.util.List;
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

View File

@ -25,9 +25,9 @@ import java.util.List;
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

View File

@ -5,8 +5,8 @@ import java.util.List;
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
{

View File

@ -29,9 +29,9 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
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;

View File

@ -43,7 +43,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException
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;

View File

@ -26,8 +26,8 @@ import java.util.Map;
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;

View File

@ -1,9 +0,0 @@
package org.apache.maven.model;
public interface ModelEventListener {
void fire(Model model);
}

View File

@ -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.Collections;
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;

View File

@ -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.Date;
import java.util.List;
import java.util.Properties;
import org.apache.maven.model.Profile;
import org.apache.maven.model.resolution.ModelResolver;
/**

View File

@ -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.HashMap;
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.
*

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -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.Date;
import java.util.List;
import java.util.Properties;
import org.apache.maven.model.Profile;
import org.apache.maven.model.resolution.ModelResolver;
/**

View File

@ -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 @@ package org.apache.maven.model;
import java.util.List;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
/**
* Collects the output of the model builder.
*

View File

@ -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 @@ package org.apache.maven.model;
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.

View File

@ -0,0 +1,11 @@
package org.apache.maven.model.building;
import org.apache.maven.model.Model;
public interface ModelEventListener {
void fire(Model model);
}

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -1,4 +1,4 @@
package org.apache.maven.model;
package org.apache.maven.model.building;
/*
* Licensed to the Apache Software Foundation (ASF) under one

View File

@ -27,11 +27,11 @@ import java.util.List;
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.inheritance;
*/
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
/**
* Handles inheritance of model values.

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation;
*/
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation;
*/
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import java.io.File;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.interpolation;
*/
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;

View File

@ -32,11 +32,11 @@ import org.apache.maven.model.Dependency;
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.management;
*/
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.

View File

@ -28,8 +28,8 @@ import java.util.Map;
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.normalization;
*/
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

View File

@ -25,9 +25,9 @@ import java.util.List;
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;

View File

@ -22,7 +22,7 @@ package org.apache.maven.model.path;
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.

View File

@ -21,12 +21,12 @@ package org.apache.maven.model.plugin;
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.plugin;
*/
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.

View File

@ -30,12 +30,12 @@ import org.apache.maven.model.Build;
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;

View File

@ -20,8 +20,8 @@ package org.apache.maven.model.profile;
*/
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.

View File

@ -19,9 +19,9 @@ package org.apache.maven.model.resolution;
* 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

View File

@ -28,7 +28,6 @@ import org.apache.maven.model.Build;
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.ReportPlugin;
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;

View File

@ -20,7 +20,7 @@ package org.apache.maven.model.validation;
*/
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.

View File

@ -22,9 +22,9 @@ package org.apache.maven.model.validation;
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;