Return-Path: 
 <scm-return-30255-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 75129 invoked from network); 18 Jul 2008 20:19:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Jul 2008 20:19:14 -0000
Received: (qmail 74228 invoked by uid 500); 18 Jul 2008 20:19:14 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 74186 invoked by uid 500); 18 Jul 2008 20:19:14 -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 74177 invoked by uid 99); 18 Jul 2008 20:19:14 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2008 13:19:14 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jul 2008 20:18:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B792823889FE; Fri, 18 Jul 2008 13:18:23 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r678021 - in /geronimo/devtools/eclipse-plugin/trunk:
 pom.xml
 testsuite/eclipse/build.xml
 testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
Date: Fri, 18 Jul 2008 20:18:23 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080718201823.B792823889FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Fri Jul 18 13:18:23 2008
New Revision: 678021

URL: http://svn.apache.org/viewvc?rev=678021&view=rev
Log:
GERONIMODEVTOOLS-435 Abbot artifacts must reside in local maven repo

Modified:
    geronimo/devtools/eclipse-plugin/trunk/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=678021&r1=678020&r2=678021&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Jul 18 13:18:23 2008
@@ -198,6 +198,17 @@
                 <version>1.4.3</version>
             </dependency>
 
+            <dependency>
+                <groupId>abbot</groupId>
+                <artifactId>abbot.swt</artifactId>
+                <version>0.1.0.20080305_1254</version>
+            </dependency>
+
+            <dependency>
+                <groupId>abbot</groupId>
+                <artifactId>abbot.swt.eclipse</artifactId>
+                <version>0.1.0.20080305_1254</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
                         

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml?rev=678021&r1=678020&r2=678021&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Fri Jul 18 13:18:23 2008
@@ -182,6 +182,30 @@
         <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
               dest="${test_eclipse}eclipse"/>
+        <!--
+         |  
+         | Copy the SWT jars to the local maven repo
+         |  
+         -->
+        <mkdir dir="${LOCAL_M2_REPO}/abbot/abbot.swt/0.1.0.20080305_1254"/>
+        <copy file="${test_eclipse}eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar" 
+              tofile="${LOCAL_M2_REPO}/abbot/abbot.swt/0.1.0.20080305_1254/abbot.swt-0.1.0.20080305_1254.jar" 
+              failonerror="true" />
+        <mkdir dir="${LOCAL_M2_REPO}/abbot/abbot.swt.eclipse/0.1.0.20080305_1254"/>
+        <copy file="${test_eclipse}eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar" 
+              tofile="${LOCAL_M2_REPO}/abbot/abbot.swt.eclipse/0.1.0.20080305_1254/abbot.swt.eclipse-0.1.0.20080305_1254.jar" 
+              failonerror="true" />
+        <!--
+         |  
+         | Copy the SWT jars to the Eclipse plugins in the local maven repo
+         |  
+         -->
+        <copy file="${test_eclipse}eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar" 
+              tofile="${LOCAL_M2_REPO}/eclipse/eclipse/plugins/abbot.swt-0.1.0.20080305_1254.jar" 
+              failonerror="true" />
+        <copy file="${test_eclipse}eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar" 
+              tofile="${LOCAL_M2_REPO}/eclipse/eclipse/plugins/abbot.swt.eclipse-0.1.0.20080305_1254.jar" 
+              failonerror="true" />
     </target>
 
     <target name="gep-plugins" depends="init" description="Copy the GEP plugins into the test_eclipse installation">

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml?rev=678021&r1=678020&r2=678021&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml Fri Jul 18 13:18:23 2008
@@ -153,17 +153,11 @@
         <dependency>
             <groupId>abbot</groupId>
             <artifactId>abbot.swt</artifactId>
-            <version>0.1.0.20080305_1254</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/../../launcher/eclipse/eclipse/plugins/abbot.swt_0.1.0.20080305_1254.jar</systemPath>
         </dependency>
 
         <dependency>
             <groupId>abbot</groupId>
             <artifactId>abbot.swt.eclipse</artifactId>
-            <version>0.1.0.20080305_1254</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/../../launcher/eclipse/eclipse/plugins/abbot.swt.eclipse_0.1.0.20080305_1254.jar</systemPath>
         </dependency>
     </dependencies>