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 2010/05/26 21:32:04 UTC
svn commit: r948551 - in
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model:
building/ interpolation/ path/ profile/ superpom/
Author: bentmann
Date: Wed May 26 19:32:04 2010
New Revision: 948551
URL: http://svn.apache.org/viewvc?rev=948551&view=rev
Log:
o Added setters to allow manual wiring of components, making model builder usable outside of plexus
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Wed May 26 19:32:04 2010
@@ -123,6 +123,110 @@ public class DefaultModelBuilder
@Requirement
private ReportingConverter reportingConverter;
+ public DefaultModelBuilder setModelProcessor( ModelProcessor modelProcessor )
+ {
+ this.modelProcessor = modelProcessor;
+ return this;
+ }
+
+ public DefaultModelBuilder setModelValidator( ModelValidator modelValidator )
+ {
+ this.modelValidator = modelValidator;
+ return this;
+ }
+
+ public DefaultModelBuilder setModelNormalizer( ModelNormalizer modelNormalizer )
+ {
+ this.modelNormalizer = modelNormalizer;
+ return this;
+ }
+
+ public DefaultModelBuilder setModelInterpolator( ModelInterpolator modelInterpolator )
+ {
+ this.modelInterpolator = modelInterpolator;
+ return this;
+ }
+
+ public DefaultModelBuilder setModelPathTranslator( ModelPathTranslator modelPathTranslator )
+ {
+ this.modelPathTranslator = modelPathTranslator;
+ return this;
+ }
+
+ public DefaultModelBuilder setModelUrlNormalizer( ModelUrlNormalizer modelUrlNormalizer )
+ {
+ this.modelUrlNormalizer = modelUrlNormalizer;
+ return this;
+ }
+
+ public DefaultModelBuilder setSuperPomProvider( SuperPomProvider superPomProvider )
+ {
+ this.superPomProvider = superPomProvider;
+ return this;
+ }
+
+ public DefaultModelBuilder setProfileSelector( ProfileSelector profileSelector )
+ {
+ this.profileSelector = profileSelector;
+ return this;
+ }
+
+ public DefaultModelBuilder setProfileInjector( ProfileInjector profileInjector )
+ {
+ this.profileInjector = profileInjector;
+ return this;
+ }
+
+ public DefaultModelBuilder setInheritanceAssembler( InheritanceAssembler inheritanceAssembler )
+ {
+ this.inheritanceAssembler = inheritanceAssembler;
+ return this;
+ }
+
+ public DefaultModelBuilder setDependencyManagementImporter(
+ DependencyManagementImporter dependencyManagementImporter )
+ {
+ this.dependencyManagementImporter = dependencyManagementImporter;
+ return this;
+ }
+
+ public DefaultModelBuilder setDependencyManagementInjector(
+ DependencyManagementInjector dependencyManagementInjector )
+ {
+ this.dependencyManagementInjector = dependencyManagementInjector;
+ return this;
+ }
+
+ public DefaultModelBuilder setLifecycleBindingsInjector( LifecycleBindingsInjector lifecycleBindingsInjector )
+ {
+ this.lifecycleBindingsInjector = lifecycleBindingsInjector;
+ return this;
+ }
+
+ public DefaultModelBuilder setPluginConfigurationExpander( PluginConfigurationExpander pluginConfigurationExpander )
+ {
+ this.pluginConfigurationExpander = pluginConfigurationExpander;
+ return this;
+ }
+
+ public DefaultModelBuilder setPluginManagementInjector( PluginManagementInjector pluginManagementInjector )
+ {
+ this.pluginManagementInjector = pluginManagementInjector;
+ return this;
+ }
+
+ public DefaultModelBuilder setReportConfigurationExpander( ReportConfigurationExpander reportConfigurationExpander )
+ {
+ this.reportConfigurationExpander = reportConfigurationExpander;
+ return this;
+ }
+
+ public DefaultModelBuilder setReportingConverter( ReportingConverter reportingConverter )
+ {
+ this.reportingConverter = reportingConverter;
+ return this;
+ }
+
public ModelBuildingResult build( ModelBuildingRequest request )
throws ModelBuildingException
{
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java Wed May 26 19:32:04 2010
@@ -42,6 +42,18 @@ public class DefaultModelProcessor
@Requirement
private ModelReader reader;
+ public DefaultModelProcessor setModelLocator( ModelLocator locator )
+ {
+ this.locator = locator;
+ return this;
+ }
+
+ public DefaultModelProcessor setModelReader( ModelReader reader )
+ {
+ this.reader = reader;
+ return this;
+ }
+
public File locatePom( File projectDirectory )
{
return locator.locatePom( projectDirectory );
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java Wed May 26 19:32:04 2010
@@ -107,6 +107,18 @@ public abstract class AbstractStringBase
recursionInterceptor = new PrefixAwareRecursionInterceptor( PROJECT_PREFIXES );
}
+ public AbstractStringBasedModelInterpolator setPathTranslator( PathTranslator pathTranslator )
+ {
+ this.pathTranslator = pathTranslator;
+ return this;
+ }
+
+ public AbstractStringBasedModelInterpolator setUrlNormalizer( UrlNormalizer urlNormalizer )
+ {
+ this.urlNormalizer = urlNormalizer;
+ return this;
+ }
+
protected List<ValueSource> createValueSources( final Model model, final File projectDir,
final ModelBuildingRequest config,
final ModelProblemCollector problems )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java Wed May 26 19:32:04 2010
@@ -44,6 +44,12 @@ public class DefaultModelPathTranslator
@Requirement
private PathTranslator pathTranslator;
+ public DefaultModelPathTranslator setPathTranslator( PathTranslator pathTranslator )
+ {
+ this.pathTranslator = pathTranslator;
+ return this;
+ }
+
public void alignToBaseDirectory( Model model, File basedir, ModelBuildingRequest request )
{
if ( model == null || basedir == null )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java Wed May 26 19:32:04 2010
@@ -41,6 +41,12 @@ public class DefaultModelUrlNormalizer
@Requirement
private UrlNormalizer urlNormalizer;
+ public DefaultModelUrlNormalizer setUrlNormalizer( UrlNormalizer urlNormalizer )
+ {
+ this.urlNormalizer = urlNormalizer;
+ return this;
+ }
+
public void normalize( Model model, ModelBuildingRequest request )
{
if ( model == null )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java Wed May 26 19:32:04 2010
@@ -43,7 +43,16 @@ public class DefaultProfileSelector
{
@Requirement( role = ProfileActivator.class )
- private List<ProfileActivator> activators;
+ private List<ProfileActivator> activators = new ArrayList<ProfileActivator>();
+
+ public DefaultProfileSelector addProfileActivator( ProfileActivator profileActivator )
+ {
+ if ( profileActivator != null )
+ {
+ activators.add( profileActivator );
+ }
+ return this;
+ }
public List<Profile> getActiveProfiles( Collection<Profile> profiles, ProfileActivationContext context,
ModelProblemCollector problems )
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java?rev=948551&r1=948550&r2=948551&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java Wed May 26 19:32:04 2010
@@ -47,6 +47,12 @@ public class DefaultSuperPomProvider
@Requirement
private ModelProcessor modelProcessor;
+ public DefaultSuperPomProvider setModelProcessor( ModelProcessor modelProcessor )
+ {
+ this.modelProcessor = modelProcessor;
+ return this;
+ }
+
public Model getSuperModel( String version )
{
if ( superModel == null )