From f5cd6adbe7f68c99352f1c1b93625aa00cc88887 Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Fri, 29 Apr 2005 00:29:04 +0000
Subject: [PATCH] Cleaning up errors I introduced with search-and-replace, and
 with marmalade scripting support. I'm marking marmalade support out for now,
 until I can get that stuff dragged back into the present.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165242 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml                                        | 4 ++--
 .../src/main/resources/META-INF/plexus/components.xml     | 2 +-
 maven-core/src/main/resources/META-INF/plexus/plexus.xml  | 8 ++++----
 maven-mboot2/src/main/java/MBoot.java                     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 4c15c15d86..61a87346ec 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -59,12 +59,12 @@
       <artifactId>plexus-i18n</artifactId>
       <version>1.0-beta-3</version>
     </dependency>
-    <dependency>
+    <!-- dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-script-marmalade</artifactId>
       <version>2.0-SNAPSHOT</version>
       <scope>runtime</scope>
-    </dependency>
+    </dependency -->
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 8955aa0cc6..621c3adaec 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -52,7 +52,7 @@
           <role>org.apache.maven.project.MavenProjectBuilder</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.plugin.MojoManager</role>
+          <role>org.apache.maven.plugin.PluginManager</role>
         </requirement>
       </requirements>
       <configuration>
diff --git a/maven-core/src/main/resources/META-INF/plexus/plexus.xml b/maven-core/src/main/resources/META-INF/plexus/plexus.xml
index bc3afee9f9..33eab811f7 100644
--- a/maven-core/src/main/resources/META-INF/plexus/plexus.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/plexus.xml
@@ -2,23 +2,23 @@
   <component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
     <listeners>
       <listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
-        <role>org.apache.maven.plugin.MojoManager</role>
+        <role>org.apache.maven.plugin.PluginManager</role>
       </listener>
     </listeners>
     <component-discoverers>
       <component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
     </component-discoverers>
   </component-discoverer-manager>
-  <component-factory-manager implementation="org.codehaus.plexus.component.factory.DefaultComponentFactoryManager">
+  <!-- component-factory-manager implementation="org.codehaus.plexus.component.factory.DefaultComponentFactoryManager">
     <component-factories>
       <component-factory implementation="org.codehaus.plexus.component.factory.marmalade.MarmaladeClasspathComponentFactory">
         <id>marmalade</id>
       </component-factory>
     </component-factories>
-  </component-factory-manager>
+  </component-factory-manager -->
   <components>
     <component>
-      <role>org.apache.maven.plugin.MojoManager</role>
+      <role>org.apache.maven.plugin.PluginManager</role>
       <implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
       <requirements>
         <requirement>
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 05f578f53b..4c6e0af55e 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -36,12 +36,12 @@ import java.util.TreeMap;
 public class MBoot
 {
     String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api",
-                                   "maven-plugin-descriptor", "maven-artifact", "maven-script/maven-script-marmalade",
+                                   "maven-plugin-descriptor", "maven-artifact", /*"maven-script/maven-script-marmalade",*/
                                    "maven-project", "maven-core", "maven-archiver",
                                    "maven-plugin-tools/maven-plugin-tools-api",
                                    "maven-plugin-tools/maven-plugin-tools-java",
                                    "maven-plugin-tools/maven-plugin-tools-pluggy",
-                                   "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
+                                   /*"maven-plugin-tools/maven-plugin-tools-marmalade",*/ "maven-core-it-verifier"};
 
     String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin", "maven-plugins/maven-compiler-plugin",
                                          "maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin",