Author: jvanzyl
Date: Fri Sep 23 14:48:11 2005
New Revision: 291208

URL: http://svn.apache.org/viewcvs?rev=291208&view=rev
Log:
o removing marmalade references

Removed:
    maven/components/trunk/maven-site/src/site/apt/ant-tasks.apt
    
maven/components/trunk/maven-site/src/site/xdoc/developers/developing-plugins-with-marmalade.xml
Modified:
    
maven/components/trunk/maven-site/src/site/apt/developers/plugin-development-guide.apt
    maven/components/trunk/maven-site/src/site/apt/lifecycle.apt
    maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt
    maven/components/trunk/maven-site/src/site/site.xml
    maven/components/trunk/maven-site/src/site/xdoc/index.xml

Modified: 
maven/components/trunk/maven-site/src/site/apt/developers/plugin-development-guide.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/plugin-development-guide.apt?rev=291208&r1=291207&r2=291208&view=diff
==============================================================================
--- 
maven/components/trunk/maven-site/src/site/apt/developers/plugin-development-guide.apt
 (original)
+++ 
maven/components/trunk/maven-site/src/site/apt/developers/plugin-development-guide.apt
 Fri Sep 23 14:48:11 2005
@@ -53,8 +53,5 @@
 
 * Resources
 
-    [[1]] {{{developers/developing-plugins-with-marmalade.html}Developing 
plugins
-          with Marmalade}}
-          
-    [[2]] {{{developers/mojo-api-specification.html}Mojo API specification}}
+    [[1]] {{{developers/mojo-api-specification.html}Mojo API specification}}
           

Modified: maven/components/trunk/maven-site/src/site/apt/lifecycle.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/lifecycle.apt?rev=291208&r1=291207&r2=291208&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/lifecycle.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/lifecycle.apt Fri Sep 23 
14:48:11 2005
@@ -223,7 +223,7 @@
 @phase generate-sources
 ----
 
-  <<Note:>> <Some plugin languages such as Marmalade have different ways of 
specifying mojo level declarations.
+  <<Note:>> <Some plugin languages have different ways of specifying mojo 
level declarations.
   Please refer to the specific plugin development documentation for more 
information.>
 
   Once this is specified, it will automatically be registered when the goal is 
listed in the project POM, as described

Modified: maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt?rev=291208&r1=291207&r2=291208&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt 
(original)
+++ maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt Fri Sep 
23 14:48:11 2005
@@ -58,7 +58,7 @@
 
   A Mojo is really just a goal in Maven 2, and plug-ins consist of 
   any number of goals (Mojos).  Mojos can be defined as annotated Java classes 
or
-  as a XML plugin script if a plugin is defined in Marmalade.  A Mojo 
specifies 
+  Beanshell script.  A Mojo specifies 
   metadata about a goal: a goal name, which phase of the lifecycle it fits 
into, 
   and the parameters it is expecting.
   
@@ -175,8 +175,8 @@
   isn't going to be the best choice for performance, and the development team
   thought it wise to adopt an approach which would allow plugin developers to
   choose from an array of plugin implementation choices.  The first choice in 
-  Maven 2 should be Java plugins, but if you are used to defining plugins in 
Jelly
-  you may also define a plugin using a scripting language known as Marmalade.
+  Maven 2 should be Java plugins, but you may also use one of the supported
+  scripting languages like Beanshell.
   
   To summarize, the development team saw some critical gaps in the API and 
   architecture of Maven 1.0 plug-ins, and the team decided that addressing

Modified: maven/components/trunk/maven-site/src/site/site.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/site.xml?rev=291208&r1=291207&r2=291208&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/site.xml (original)
+++ maven/components/trunk/maven-site/src/site/site.xml Fri Sep 23 14:48:11 2005
@@ -38,7 +38,6 @@
     </menu>
     <menu name="Plugin Developers">
       <item name="Plugin Development Guide" 
href="/developers/plugin-development-guide.html"/>
-      <item name="Developing Plugins with Marmalade" 
href="/developers/developing-plugins-with-marmalade.html"/>
     </menu>
     <menu name="Developers">
       <item name="Developers Guide" href="/developers/development-guide.html"/>

Modified: maven/components/trunk/maven-site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/xdoc/index.xml?rev=291208&r1=291207&r2=291208&view=diff
==============================================================================
--- maven/components/trunk/maven-site/src/site/xdoc/index.xml (original)
+++ maven/components/trunk/maven-site/src/site/xdoc/index.xml Fri Sep 23 
14:48:11 2005
@@ -147,11 +147,6 @@
                   </i>
                 </li>
         -->
-        <li>
-          <i>
-            <a 
href="developers/developing-plugins-with-marmalade.html">Developing Plugins 
with Marmalade</a>
-          </i>
-        </li>
       </ul>
       <p>
         <b>More coming soon -</b>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to