geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r523524 - in /geronimo/server/trunk: ./ buildsupport/ buildsupport/groovy-build-library/ buildsupport/groovy-build-library/src/ buildsupport/groovy-build-library/src/main/ buildsupport/groovy-build-library/src/main/groovy/ buildsupport/groo...
Date Thu, 29 Mar 2007 01:22:43 GMT
Author: jdillon
Date: Wed Mar 28 18:22:40 2007
New Revision: 523524

URL: http://svn.apache.org/viewvc?view=rev&rev=523524
Log:
Add buildsupport module with groovy-build-library to hold onto shared code snips
Replaced eclipse .classpath hacks and xmlbeans copy hacks with shared groovy code

Added:
    geronimo/server/trunk/buildsupport/
    geronimo/server/trunk/buildsupport/groovy-build-library/
    geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt   (with props)
    geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt   (with props)
    geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml   (with props)
    geronimo/server/trunk/buildsupport/groovy-build-library/src/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy   (with props)
    geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy   (with props)
    geronimo/server/trunk/buildsupport/pom.xml   (with props)
Modified:
    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-directory/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-web-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/pom.xml

Added: geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt (added)
+++ geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt Wed Mar 28 18:22:40 2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt (added)
+++ geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt Wed Mar 28 18:22:40 2007
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml (added)
+++ geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml Wed Mar 28 18:22:40 2007
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>buildsupport</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>groovy-build-library</artifactId>
+    <name>Geronimo Build Support, Groovy Library</name>
+    
+    <description>
+        Library of Groovy scripts to support build muck.
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy (added)
+++ geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy Wed Mar 28 18:22:40 2007
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.buildsupport
+
+/**
+ * Helper to copy XmlBeans schemas.
+ *
+ * @version $Rev$ $Date$
+ */
+class CopyXmlBeansSchemas
+{
+    static void execute(source) {
+        def ant = new AntBuilder()
+        def project = source.project
+        
+        //
+        // FIXME: Change this to reflect its a hack for xmlbeans not clover
+        //
+        def dir = new File(project.basedir, 'target/clover/classes')
+        ant.mkdir(dir: dir)
+        
+        ant.copy(todir: dir) {
+            fileset(dir: project.build.outputDirectory) {
+                include(name: 'schemaorg_apache_xmlbeans/**')
+            }
+        }
+    }
+}
+

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/CopyXmlBeansSchemas.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy (added)
+++ geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy Wed Mar 28 18:22:40 2007
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.buildsupport
+
+/**
+ * Helper to fix generate Eclipse project files.
+ *
+ * @version $Rev$ $Date$
+ */
+class FixEclipseProjects
+{
+    static void execute(source) {
+        def project = source.project
+        def file = new File(project.basedir, '.classpath')
+        def dir = new File(project.basedir, 'target/generated-sources/xmlbeans')
+        
+        //
+        // FIXME: Change this to reflect its a hack for xmlbeans not clover
+        //
+        def targetPath = 'target/clover/classes'
+        
+        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...'
+                
+                def node = new Node(classpath, 'classpathentry', [ kind: 'lib', path: targetPath ])
+                new XmlNodePrinter(file.newPrintWriter()).print(classpath)
+            }
+        }
+    }
+}
+

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/groovy-build-library/src/main/groovy/org/apache/geronimo/buildsupport/FixEclipseProjects.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?view=auto&rev=523524
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (added)
+++ geronimo/server/trunk/buildsupport/pom.xml Wed Mar 28 18:22:40 2007
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <groupId>org.apache.geronimo.buildsupport</groupId>
+    <artifactId>buildsupport</artifactId>
+    <name>Geronimo Build Support</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Provides support for Geronimo build muck.
+    </description>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>1.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <modules>
+        <module>groovy-build-library</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/buildsupport/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/buildsupport/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/buildsupport/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -65,26 +65,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -80,12 +80,41 @@
                 </configuration>
             </plugin>
             
+            <!--
+            HACK: Copy XmlBeans generated schemas.
+            -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>execute</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>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>process-test-resources</id>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
@@ -95,27 +124,6 @@
                         <goals>
                             <goal>run</goal>
                         </goals>
-                    </execution>
-                    
-                    <!--
-                    HACK: Copy the generated XmlBeans bits for clover
-                    -->
-                    <execution>
-                        <id>generate-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -52,27 +52,32 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
+            
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/pom.xml?view=diff&rev=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Wed Mar 28 18:22:40 2007
@@ -164,33 +164,41 @@
                 </configuration>
             </plugin>
             
+            <!--
+            HACK: Copy XmlBeans generated schemas.
+            -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
-                    <!--
-                    HACK: Copy the generated XmlBeans bits for clover
-                    -->
                     <execution>
-                        <id>copy-xmlbeans-for-clover</id>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
                     <execution>
-                        <id>setup-test-var-directory</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>run</goal>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -151,8 +151,39 @@
                     </execution>
                 </executions>
             </plugin>
-
+            
+            <!--
+            HACK: Copy XmlBeans generated schemas.
+            -->
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>execute</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>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <!--
@@ -160,7 +191,6 @@
                           to create full unpacked archives to unpack with the dependency plugin/
                     -->
                     <execution>
-                        <id>unpack-test-deployments</id>
                         <phase>generate-test-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -183,27 +213,6 @@
                                 <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
                                 <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear"
                                     dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-
-                    <!--
-                    HACK: Copy the generated XmlBeans bits for clover
-                    -->
-                    <execution>
-                        <id>generate-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
                             </tasks>
                         </configuration>
                     </execution>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -64,26 +64,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Wed Mar 28 18:22:40 2007
@@ -60,26 +60,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -62,26 +62,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -84,27 +84,32 @@
                     <sourceSchemas>geronimo-openejb-2.0.xsd</sourceSchemas>
                 </configuration>
             </plugin>
+            
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -60,26 +60,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -60,26 +60,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -145,35 +145,43 @@
                     </execution>
                 </executions>
             </plugin>
-
+            
+            <!--
+            HACK: Copy XmlBeans generated schemas.
+            -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
-                    <!--
-                    HACK: Copy the generated XmlBeans bits for clover
-                    -->
                     <execution>
-                        <id>copy-xmlbeans-for-clover</id>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
 
+                <executions>
                     <execution>
-                        <id>setup-test-environment</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>run</goal>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -72,26 +72,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/pom.xml?view=diff&rev=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -90,26 +90,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

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=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Wed Mar 28 18:22:40 2007
@@ -80,26 +80,30 @@
             </plugin>
             
             <!--
-            HACK: Copy the generated XmlBeans bits for clover
+            HACK: Copy XmlBeans generated schemas.
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${project.build.outputDirectory}">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <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>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=523524&r1=523523&r2=523524
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Mar 28 18:22:40 2007
@@ -1840,6 +1840,7 @@
 
             <modules>
                 <module>repository</module>
+                <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1900,6 +1901,7 @@
 
             <modules>
                 <module>repository</module>
+                <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1935,6 +1937,7 @@
 
             <modules>
                 <module>repository</module>
+                <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1954,6 +1957,7 @@
             </activation>
 
             <modules>
+                <module>buildsupport</module>
                 <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
@@ -1989,19 +1993,16 @@
                                     <goal>execute</goal>
                                 </goals>
                                 <configuration>
+                                    <classpath>
+                                        <element>
+                                            <groupId>org.apache.geronimo.buildsupport</groupId>
+                                            <artifactId>groovy-build-library</artifactId>
+                                            <version>${version}</version>
+                                        </element>
+                                    </classpath>
                                     <source>
                                         <body>
-                                            def file = new File(project.basedir, '.classpath')
-                                            def dir = new File(project.basedir, 'target/generated-sources/xmlbeans')
-                                            def targetPath = 'target/clover/classes'
-                                            if (file.exists() &amp;&amp; dir.exists()) {
-                                                def classpath = new XmlParser().parse(file)
-                                                if (!classpath.classpathentry.findAll { it.'@path' == targetPath }) {
-                                                    println "Updating Eclipse .classpath for XMLBeans muck..."
-                                                    def node = new Node(classpath, "classpathentry", [ kind: 'lib', path: targetPath ])
-                                                    new XmlNodePrinter(file.newPrintWriter()).print(classpath)
-                                                }
-                                            }
+                                            org.apache.geronimo.buildsupport.FixEclipseProjects.execute(this)
                                         </body>
                                     </source>
                                 </configuration>



Mime
View raw message