geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r566783 - in /geronimo/server/trunk: ./ buildsupport/ buildsupport/buildsupport-maven-plugin/ buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/ buildsupport/groovy-build-library/ modules/geronimo-clien...
Date Thu, 16 Aug 2007 17:20:37 GMT
Author: jdillon
Date: Thu Aug 16 10:20:35 2007
New Revision: 566783

URL: http://svn.apache.org/viewvc?view=rev&rev=566783
Log:
(GERONIMO-3418) Hook up the new buildsupport-maven-plugin, drop the old groovy-build-library

Added:
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
      - copied, changed from r566772, 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/FixEclipseProjectsMojo.groovy
      - copied, changed from r566772, geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
Removed:
    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
    geronimo/server/trunk/buildsupport/groovy-build-library/
Modified:
    geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
    geronimo/server/trunk/buildsupport/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/pom.xml

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=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml Thu Aug 16 10:20:35
2007
@@ -30,25 +30,22 @@
     </parent>
     
     <artifactId>buildsupport-maven-plugin</artifactId>
-    <name>Geronimo Build Support, Groovy Library</name>
+    <name>Geronimo Build Support, Buildsupport Maven Plugin</name>
     <packaging>maven-plugin</packaging>
     
     <description>
         Provides build support goals for the Geronimo server build.
     </description>
     
-    
     <dependencies>
         <dependency>
             <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>
     
@@ -57,7 +54,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.groovy</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -70,13 +66,6 @@
             <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>
@@ -86,7 +75,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.groovy</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
             </plugin>
         </plugins>
     </reporting>

Copied: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy
(from r566772, 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/CopyXmlBeansSchemasMojo.groovy?view=diff&rev=566783&p1=geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy&r1=566772&p2=geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemasMojo.groovy&r2=566783
==============================================================================
--- 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/CopyXmlBeansSchemasMojo.groovy
Thu Aug 16 10:20:35 2007
@@ -27,10 +27,11 @@
  * Helper to copy XmlBeans schemas.
  *
  * @goal copy-xmlbeans-schemas
+ * @phase generate-resources
  *
  * @version $Rev$ $Date$
  */
-class CopyXmlBeansSchemas
+class CopyXmlBeansSchemasMojo
     extends GroovyMojoSupport
 {
     /**

Copied: geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy
(from r566772, 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/FixEclipseProjectsMojo.groovy?view=diff&rev=566783&p1=geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy&r1=566772&p2=geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjectsMojo.groovy&r2=566783
==============================================================================
--- 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/FixEclipseProjectsMojo.groovy
Thu Aug 16 10:20:35 2007
@@ -26,9 +26,12 @@
 /**
  * Helper to fix generate Eclipse project files.
  *
+ * @goal fix-eclipse-projects
+ * @phase validate
+ *
  * @version $Rev$ $Date$
  */
-class FixEclipseProjects
+class FixEclipseProjectsMojo
     extends GroovyMojoSupport
 {
     /**

Modified: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/pom.xml Thu Aug 16 10:20:35 2007
@@ -41,15 +41,21 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>1.0</version>
+                <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>
     </dependencyManagement>
     
     <modules>
-        <module>groovy-build-library</module>
+        <module>buildsupport-maven-plugin</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -65,28 +65,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -81,28 +81,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -57,28 +57,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -165,33 +165,18 @@
                     </execution>
                 </executions>
             </plugin>
-
+            
             <!--
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -64,28 +64,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Thu Aug
16 10:20:35 2007
@@ -60,28 +60,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -62,28 +62,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -86,28 +86,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -60,28 +60,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -60,28 +60,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -143,28 +143,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Thu Aug 16 10:20:35 2007
@@ -72,28 +72,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Thu Aug 16 10:20:35
2007
@@ -80,28 +80,13 @@
             HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>buildsupport-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>copy-xmlbeans-schemas</goal>
                         </goals>
-                        <configuration>
-                            <classpath>
-                                <element>
-                                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                                    <artifactId>groovy-build-library</artifactId>
-                                    <version>${version}</version>
-                                </element>
-                            </classpath>
-                            <source>
-                                <body>
-                                    org.apache.geronimo.buildsupport.CopyXmlBeansSchemas.execute(this)
-                                </body>
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=566783&r1=566782&r2=566783
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 16 10:20:35 2007
@@ -1371,13 +1371,13 @@
                <artifactId>jaxws-tools</artifactId>
                 <version>2.0</version>
            </dependency>
-    
+
            <dependency>
                <groupId>com.sun.xml.ws</groupId>
                <artifactId>jaxws-rt</artifactId>
                 <version>2.0</version>
            </dependency>
-     
+ 
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-xjc</artifactId>
@@ -1451,6 +1451,12 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>buildsupport-maven-plugin</artifactId>
+                    <version>${version}</version>
+                </plugin>
+                
+                <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>car-maven-plugin</artifactId>
                     <version>${version}</version>
@@ -1471,12 +1477,6 @@
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>groovy-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>1.0-beta-2-SNAPSHOT</version>
                 </plugin>
@@ -1485,7 +1485,6 @@
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
                     <version>2.3.1</version>
-
                     <executions>
                         <execution>
                             <goals>
@@ -1493,13 +1492,23 @@
                             </goals>
                         </execution>
                     </executions>
-
                     <configuration>
                         <download>true</download>
                         <quiet>false</quiet>
                     </configuration>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.codehaus.mojo.groovy</groupId>
+                    <artifactId>groovy-maven-plugin</artifactId>
+                    <version>1.0-beta-1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
@@ -1779,6 +1788,24 @@
                     <tagBase>https://svn.apache.org/repos/asf/geronimo/server/tags</tagBase>
                 </configuration>
             </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>
+                <configuration>
+                    <extractors>
+                        <extractor>java</extractor>
+                        <extractor>groovy</extractor>
+                    </extractors>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -1962,11 +1989,42 @@
                 <module>applications</module>
             </modules>
         </profile>
-
+        
+        <profile>
+            <id>idea</id>
+            
+            <build>
+                <defaultGoal>validate</defaultGoal>
+                
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-idea-plugin</artifactId>
+                        <configuration>
+                            <overwrite>true</overwrite>
+                            <downloadSources>true</downloadSources>
+                            <downloadJavadocs>true</downloadJavadocs>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                    <goal>idea</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        
         <profile>
             <id>makeeclipse</id>
             
             <build>
+                <defaultGoal>validate</defaultGoal>
+                
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -1982,28 +2040,13 @@
                     </plugin>
                     
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>buildsupport-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>validate</phase>
                                 <goals>
-                                    <goal>execute</goal>
+                                    <goal>fix-eclipse-projects</goal>
                                 </goals>
-                                <configuration>
-                                    <classpath>
-                                        <element>
-                                            <groupId>org.apache.geronimo.buildsupport</groupId>
-                                            <artifactId>groovy-build-library</artifactId>
-                                            <version>${version}</version>
-                                        </element>
-                                    </classpath>
-                                    <source>
-                                        <body>
-                                            org.apache.geronimo.buildsupport.FixEclipseProjects.execute(this)
-                                        </body>
-                                    </source>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>



Mime
View raw message