Return-Path: 
 <scm-return-21235-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 11278 invoked from network); 16 Aug 2007 16:52:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Aug 2007 16:52:55 -0000
Received: (qmail 42813 invoked by uid 500); 16 Aug 2007 16:52:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 42675 invoked by uid 500); 16 Aug 2007 16:52:52 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 42664 invoked by uid 99); 16 Aug 2007 16:52:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2007 09:52:52 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2007 16:52:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 169C71A981A; Thu, 16 Aug 2007 09:52:32 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r566772 - in
 /geronimo/server/trunk/buildsupport/buildsupport-maven-plugin: ./ pom.xml
 src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
 src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
Date: Thu, 16 Aug 2007 16:52:31 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070816165232.169C71A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Thu Aug 16 09:52:30 2007
New Revision: 566772

URL: http://svn.apache.org/viewvc?view=rev&rev=566772
Log:
Convert to a real mvn plugin using the sexy groovy integration

Added:
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/
      - copied from r566771, geronimo/server/trunk/buildsupport/groovy-build-library/
Modified:
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml?view=diff&rev=566772&r1=566771&r2=566772
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml Thu Aug 16 09:52:30 2007
@@ -29,26 +29,35 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>groovy-build-library</artifactId>
+    <artifactId>buildsupport-maven-plugin</artifactId>
     <name>Geronimo Build Support, Groovy Library</name>
+    <packaging>maven-plugin</packaging>
     
     <description>
-        Library of Groovy scripts to support build muck.
+        Provides build support goals for the Geronimo server build.
     </description>
     
+    
     <dependencies>
         <dependency>
-            <groupId>groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <groupId>org.codehaus.mojo.groovy</groupId>
+            <artifactId>groovy-mojo-support</artifactId>
+            <version>1.0-beta-1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>2.0.5</version>
         </dependency>
     </dependencies>
     
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.codehaus.mojo.groovy</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                
+                <version>1.0-beta-1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -57,7 +66,29 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo.groovy</groupId>
+                        <artifactId>groovy-mojo-tools</artifactId>
+                        <version>1.0-beta-1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
+    
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo.groovy</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>1.0-beta-1</version>
+            </plugin>
+        </plugins>
+    </reporting>
 
 </project>

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy?view=diff&rev=566772&r1=566771&r2=566772
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy Thu Aug 16 09:52:30 2007
@@ -19,17 +19,28 @@
 
 package org.apache.geronimo.buildsupport
 
+import org.codehaus.mojo.groovy.GroovyMojoSupport
+
+import org.apache.maven.project.MavenProject
+
 /**
  * Helper to copy XmlBeans schemas.
  *
+ * @goal copy-xmlbeans-schemas
+ *
  * @version $Rev$ $Date$
  */
 class CopyXmlBeansSchemas
+    extends GroovyMojoSupport
 {
-    static void execute(source) {
-        def ant = new AntBuilder()
-        def project = source.project
-        
+    /**
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    MavenProject project
+    
+    void execute() {
         //
         // FIXME: Change this to reflect its a hack for xmlbeans not clover
         //

Modified: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy?view=diff&rev=566772&r1=566771&r2=566772
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy Thu Aug 16 09:52:30 2007
@@ -19,15 +19,26 @@
 
 package org.apache.geronimo.buildsupport
 
+import org.codehaus.mojo.groovy.GroovyMojoSupport
+
+import org.apache.maven.project.MavenProject
+
 /**
  * Helper to fix generate Eclipse project files.
  *
  * @version $Rev$ $Date$
  */
 class FixEclipseProjects
+    extends GroovyMojoSupport
 {
-    static void execute(source) {
-        def project = source.project
+    /**
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    MavenProject project
+    
+    void execute() {
         def file = new File(project.basedir, '.classpath')
         def dir = new File(project.basedir, 'target/generated-sources/xmlbeans')
         
@@ -39,7 +50,7 @@
         if (file.exists() && dir.exists()) {
             def classpath = new XmlParser().parse(file)
             if (!classpath.classpathentry.findAll { it.'@path' == targetPath }) {
-                println 'Updating Eclipse .classpath for XMLBeans muck...'
+                log.info('Updating Eclipse .classpath for XMLBeans muck...')
                 
                 def node = new Node(classpath, 'classpathentry', [ kind: 'lib', path: targetPath ])
                 new XmlNodePrinter(file.newPrintWriter()).print(classpath)