move marmalade code out of main bootstrap, into sandbox.

it should be moved to the marmalade project (either a straight import, or doing an svndump of that area of the repo).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293363 13f79535-47bb-0310-9956-ffa450edef68

maven-core-it/integration-tests.txt

@@ -60,7 +60,7 @@ it0019
 it0018
 it0017
 it0016
-#it0015
+# it0015 reserved in rememberance of Marmalade. We knew you so little.
 it0014
 it0013
 it0012

maven-mboot2/src/main/java/MBoot.java

@@ -40,12 +40,12 @@ public class MBoot
 {
     String[] builds = new String[]{"maven-model", "maven-settings", "maven-monitor", "maven-plugin-api",
         "maven-artifact", "maven-plugin-descriptor", "maven-repository-metadata", "maven-artifact-manager",
-        "maven-artifact-test", "maven-script/maven-script-beanshell", "maven-script/maven-script-marmalade",
+        "maven-artifact-test", "maven-script/maven-script-beanshell",
         "maven-profile", "maven-project", "maven-plugin-registry", "maven-reporting/maven-reporting-api",
         "maven-reporting/maven-reporting-impl", "maven-core", "maven-archiver",
         "maven-plugin-tools/maven-plugin-tools-api", "maven-plugin-tools/maven-plugin-tools-java",
         "maven-plugin-tools/maven-plugin-tools-beanshell", "maven-plugin-tools/maven-plugin-tools-pluggy",
-        "maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
+        "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", "maven-plugins/maven-plugin-plugin",

maven-mboot2/src/main/java/model/ModelReader.java

@@ -229,7 +229,7 @@ public class ModelReader
                 version = parentVersion;
             }
 
-            // actually, these should be transtive (see MNG-77) - but some projects have circular deps that way (marmalade, and currently m2)
+            // actually, these should be transtive (see MNG-77) - but some projects have circular deps that way
             ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false );
 
             addDependencies( p.getDependencies(), parentDependencies, null, Collections.EMPTY_SET );

maven-site/src/site/fml/about.fml

@@ -159,10 +159,8 @@
       <question>What plugin languages will Maven 2.0 support? What about [insert language here]?</question>
       <answer>
         <p>
-          As of the current release, Maven supports pure Java, Beanshell and Marmalade. Java is the preferred
-          language for it's familiarity and speed, while Marmalade is preferred for porting Maven 1.x plugins, and
-          writing
-          plugins based on Ant tasks.
+          As of the current release, Maven supports pure Java and Beanshell. Java is the preferred
+          language for it's familiarity and speed.
         </p>
         <p>
           We get asked a lot whether Maven 2.0 will support other languages, in particular Groovy.

maven-site/src/site/fml/general.fml

@@ -35,7 +35,7 @@
       <question>How can I use Ant tasks in Maven 2?</question>
       <answer>
         <p>
-          There are 3 alternatives:
+          There are currently 2 alternatives:
         </p>
         <ul>
           <li>
@@ -44,10 +44,6 @@
             <a href="http://ant.apache.org/manual/antexternal.html">instructions given in the Ant
               documentation</a>
           </li>
-          <li>
-            You can write your plugin using Marmalade, and use the Ant tasks much like you would from Jelly in Maven
-            1.0.
-          </li>
           <li>
             If you have very small amounts of Ant script specific to your project, you can use the
             <a href="http://www.neonics.com/projects/maven-antrun-plugin/">AntRun plugin</a>.

maven-site/src/site/fml/maven1.fml

@@ -64,9 +64,6 @@
           <li>
             <i>No more Jelly</i>
             - Plugins are primarily written in Java, though there are providers for other scripting languages.
-            This release includes support for Marmalade, a scripting framework that supports an XML syntax similar to
-            Jelly
-            which can be used to integrate Ant tasks and has a Jelly compatibility layer.
           </li>
           <li>
             <i>Improved repository layout</i>
@@ -138,8 +135,7 @@
       <question>Will my Maven 1.0 plugins be supported?</question>
       <answer>
         <p>
-          Not directly. While Marmalade supports a Jelly compatibility layer - the different POM format and goal
-          architecture would prevent most plugins from working.
+          Not directly.
         </p>
         <p>
           We recommend building your Jelly plugins as thin wrappers around Java beans that do not use Maven 1.0 API's,

maven-site/src/site/xdoc/developers/mojo-api-specification.xml

@@ -25,8 +25,7 @@
   <body>
     <section name="Introduction">
       <p>Starting with Maven 2.0, plugins can be written in Java or any of a
-        number of scripting languages (currently just marmalade - we are
-        working to implement others). Additionally, Maven tries to stay out of
+        number of scripting languages. Additionally, Maven tries to stay out of
         the way of the programmer with its new Mojo API. This opens up the
         opportunity for many Mojos to be reused outside of Maven, or bridged
         into Maven from external systems like Ant.</p>
@@ -413,7 +412,7 @@
             <td>No. Default:
               <code>java</code>
             </td>
-            <td>The implementation language for this Mojo (marmalade, java,
+            <td>The implementation language for this Mojo (java,
               beanshell, etc.).</td>
           </tr>
           <tr>