svn commit: r769453 - /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java

[sisbell]

Author: sisbell
Date: Tue Apr 28 16:31:56 2009
New Revision: 769453

URL: http://svn.apache.org/viewvc?rev=769453&view=rev
Log:
Removed hard-coding of plugins. Plugins come into builder with default configs. 
Need to null these out so that pluginMng will be applied.

Modified:
    
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=769453&r1=769452&r2=769453&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
 Tue Apr 28 16:31:56 2009
@@ -268,8 +268,8 @@
     public static void addPluginsToModel(Model target, Set<Plugin> plugins)
     {
        Build build = target.getBuild();
-       addPlugin(build, "maven-compiler-plugin");
-       addPlugin(build, "maven-resources-plugin");
+   //  addPlugin(build, "maven-compiler-plugin");
+    // addPlugin(build, "maven-resources-plugin");
        //addPlugin(build, "maven-deploy-plugin");
        //addPlugin(build, "maven-jar-plugin");
     // addPlugin(build, "maven-surefire-plugin");
@@ -283,7 +283,7 @@
             [java] PLUGIN: org.apache.maven.plugins:maven-resources-plugin
             [java] PLUGIN: org.apache.maven.plugins:maven-surefire-plugin
             [java] PLUGIN: org.apache.maven.plugins:maven-deploy-plugin
-/*     
+       */
        List<Plugin> mPlugins = target.getBuild().getPlugins();
        
        List<Plugin> lifecyclePlugins = new ArrayList<Plugin>();
@@ -292,13 +292,14 @@
        {
                if( !containsPlugin( p, mPlugins) )
                {
+                       p.setConfiguration(null);
                        lifecyclePlugins.add(p);
-                       System.out.println("PLUGIN: " + p.getKey());
+                       //System.out.println("PLUGIN: " + p.getKey() +":" + 
((p.getConfiguration() != null) ? p.getConfiguration().toString() : "") );
                }
        }
        
        target.getBuild().getPlugins().addAll(lifecyclePlugins);
-    */ 
+
     }
     
     private static boolean containsPlugin(Plugin plugin, List<Plugin> plugins)