You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/08/16 18:52:31 UTC
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
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)