Return-Path: 
 <scm-return-13672-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 53185 invoked from network); 21 Jul 2006 22:41:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Jul 2006 22:41:17 -0000
Received: (qmail 66038 invoked by uid 500); 21 Jul 2006 22:41:16 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 66011 invoked by uid 500); 21 Jul 2006 22:41:16 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 66000 invoked by uid 99); 21 Jul 2006 22:41:16 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 15:41:16 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jul 2006 15:41:16 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 003561A981A; Fri, 21 Jul 2006 15:40:55 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r424485 -
 /geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
Date: Fri, 21 Jul 2006 22:40:55 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060721224056.003561A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Fri Jul 21 15:40:55 2006
New Revision: 424485

URL: http://svn.apache.org/viewvc?rev=424485&view=rev
Log:
Only define one antrun... else the pain will come

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml?rev=424485&r1=424484&r2=424485&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml Fri Jul 21 15:40:55 2006
@@ -120,6 +120,15 @@
 
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -134,25 +143,12 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
-                </configuration>
-            </plugin>
-            
-            <!--
-            HACK: Copy the generated XmlBeans bits for clover
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
+                    
+                    <!--
+                    HACK: Copy the generated XmlBeans bits for clover
+                    -->
                     <execution>
+                        <id>generate-resources</id>
                         <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -185,9 +181,9 @@
                         <exclude>**/Abstract*.java</exclude>
                         
                         <!--
-                           | FIXME: This test was disabled because it is failing in non-obvious ways
-                           |        and requires someone with more insight to resolve
-                         -->
+                        FIXME: This test was disabled because it is failing in non-obvious ways
+                               and requires someone with more insight to resolve
+                        -->
                         <exclude>**/Connector15DCBTest.java</exclude>
                     </excludes>
                 </configuration>