Return-Path: 
 <scm-return-31962-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 14945 invoked from network); 22 Sep 2008 02:49:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Sep 2008 02:49:26 -0000
Received: (qmail 40187 invoked by uid 500); 22 Sep 2008 02:49:22 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 40143 invoked by uid 500); 22 Sep 2008 02:49:22 -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 40134 invoked by uid 99); 22 Sep 2008 02:49:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Sep 2008 19:49:22 -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; Mon, 22 Sep 2008 02:48:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B220C23889F7; Sun, 21 Sep 2008 19:49:04 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r697659 - in
 /geronimo/devtools/eclipse-plugin/trunk/testsuite:
 eclipse/build.xml pom.xml server/pom.xml
Date: Mon, 22 Sep 2008 02:49:04 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080922024904.B220C23889F7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Sun Sep 21 19:49:04 2008
New Revision: 697659

URL: http://svn.apache.org/viewvc?rev=697659&view=rev
Log:
GERONIMODEVTOOLS-512 Fix Geronimo branding when running testsuite

Modified:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml

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=697659&r1=697658&r2=697659&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Sun Sep 21 19:49:04 2008
@@ -134,9 +134,10 @@
         <antcall target="test-framework"/>
         <antcall target="abbot"/>
         <antcall target="gep-plugins"/>
+        <antcall target="gep-features"/>
     </target>
 
-    <target name="cleanup" depends="init" description="Cleanup from previos invocatins of the testsuite">
+    <target name="cleanup" depends="init" description="Cleanup from previous invocatins of the testsuite">
         <!--
         ##############################################################################################   
         ##                                                                                          ##
@@ -226,7 +227,7 @@
               failonerror="true" />
     </target>
 
-    <target name="gep-plugins" depends="init" description="Copy the GEP plugins into the test_eclipse installation">
+    <target name="gep-plugins" depends="init" description="Copy the GEP plugin(s) into the test_eclipse installation">
         <!--
         |  
         | Copy the GEP plugins to the testsuite Eclipse plugins directory
@@ -270,4 +271,16 @@
         </copy>
     </target>
 
+    <target name="gep-features" depends="init" description="Copy the GEP feature(s) into the test_eclipse installation">
+        <!--
+        |  
+        | Unzip the GEP feature(s) to the testsuite Eclipse features directory
+        |  
+        -->
+        <mkdir dir="${test_eclipse}"/>
+        <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.v21.feature/${gep_version}/org.apache.geronimo.v21.feature-${gep_version}.jar"
+               dest="${test_eclipse}eclipse/features/org.apache.geronimo.v21.feature_${gep_version}"
+               overwrite="true"/>
+    </target>
+
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=697659&r1=697658&r2=697659&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Sun Sep 21 19:49:04 2008
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-tomcat6-javaee5</artifactId>
-            <version>2.1.2</version>
+            <version>2.1.3</version>
             <type>zip</type>
             <classifier>bin</classifier>
             <scope>test</scope>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml?rev=697659&r1=697658&r2=697659&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml Sun Sep 21 19:49:04 2008
@@ -26,7 +26,7 @@
     <artifactId>testsuite-server</artifactId>
     <packaging>pom</packaging>
     <version>2.1.3</version>
-    <name>Geronimo Eclipse Plugin :: Testsuite :: Server</name>
+    <name>Geronimo Eclipse Plugin :: Testsuite :: Server(s)</name>
                                                 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
@@ -47,13 +47,13 @@
                             <tasks>
                                 <!--
                                  |
-                                 | Unzip and rename the testsuite Geronimo server v2.1.2
+                                 | Unzip and rename the testsuite Geronimo server v2.1.3
                                  |
                                  -->
                                 <property name="geronimo_install1"       value="${basedir}/../launcher/"/>
                                 <property name="geronimo_assembly1"      value="org/apache/geronimo/assemblies"/>
                                 <property name="geronimo_name1"          value="geronimo-tomcat6-javaee5"/>
-                                <property name="geronimo_version1"       value="2.1.2"/>
+                                <property name="geronimo_version1"       value="2.1.3"/>
                                 <mkdir dir="${geronimo_install1}"/>
                                 <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimo_version1}/${geronimo_name1}-${geronimo_version1}-bin.zip"
                                       dest="${geronimo_install1}"/>
@@ -63,7 +63,7 @@
                                  
                                 <!--
                                  |
-                                 | Unzip and rename the testsuite Geronimo server v2.0
+                                 | Unzip and rename the testsuite Geronimo server v2.0.2
                                  |
                                  -->
                                 <property name="geronimo_install2"       value="${basedir}/../launcher/"/>