Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Used more descriptive name for component 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777965 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-23 17:08:57 +00:00
parent c3f9346b47
commit ff7d13487d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -41,7 +41,7 @@ import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.Interpolator;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.lifecycle.LifecycleBindingsInjector;
import org.apache.maven.model.normalization.Normalizer;
import org.apache.maven.model.normalization.ModelNormalizer;
import org.apache.maven.model.plugin.PluginConfigurationExpander;
import org.apache.maven.model.profile.ProfileActivationException;
import org.apache.maven.model.profile.ProfileSelector;
@ -79,7 +79,7 @@ public class DefaultMavenProjectBuilder
private List<ModelEventListener> listeners;
@Requirement
private Normalizer normalizer;
private ModelNormalizer normalizer;
@Requirement
private Interpolator interpolator;

6
maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java → maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
View File

@ -36,9 +36,9 @@ import org.codehaus.plexus.component.annotations.Component;
*
* @author Benjamin Bentmann
*/
@Component( role = Normalizer.class )
public class DefaultNormalizer
implements Normalizer
@Component( role = ModelNormalizer.class )
public class DefaultModelNormalizer
implements ModelNormalizer
{
private DuplicateMerger merger = new DuplicateMerger();

2
maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java → maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
View File

@ -26,7 +26,7 @@ import org.apache.maven.model.Model;
*
* @author Benjamin Bentmann
*/
public interface Normalizer
public interface ModelNormalizer
{
/**