geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
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 GMT
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/"/>



Mime
View raw message