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/05/23 19:08:58 UTC
svn commit: r777965 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/normalization/

Author: bentmann
Date: Sat May 23 17:08:57 2009
New Revision: 777965

URL: http://svn.apache.org/viewvc?rev=777965&view=rev
Log:
o Used more descriptive name for component

Added:
    maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
      - copied, changed from r777834, maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java
    maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java
      - copied, changed from r777834, maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java
Removed:
    maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java
    maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java
Modified:
    maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=777965&r1=777964&r2=777965&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Sat May 23 17:08:57 2009
@@ -41,7 +41,7 @@
 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 @@
     private List<ModelEventListener> listeners;
 
     @Requirement
-    private Normalizer normalizer;
+    private ModelNormalizer normalizer;
 
     @Requirement
     private Interpolator interpolator;

Copied: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java (from r777834, maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java?p2=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java&p1=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java&r1=777834&r2=777965&rev=777965&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultNormalizer.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java Sat May 23 17:08:57 2009
@@ -36,9 +36,9 @@
  * 
  * @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();

Copied: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java (from r777834, maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java?p2=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java&p1=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java&r1=777834&r2=777965&rev=777965&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/Normalizer.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java Sat May 23 17:08:57 2009
@@ -26,7 +26,7 @@
  * 
  * @author Benjamin Bentmann
  */
-public interface Normalizer
+public interface ModelNormalizer
 {
 
     /**