You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/10/16 22:43:52 UTC
svn commit: r705355 - in /geronimo/devtools/eclipse-plugin/branches/2.1.4:
plugins/org.apache.geronimo.runtime.v20/
plugins/org.apache.geronimo.runtime.v20/META-INF/
plugins/org.apache.geronimo.runtime.v21/ testsuite/ testsuite/eclipse/
testsuite/launc...
Author: mcconne
Date: Thu Oct 16 13:43:51 2008
New Revision: 705355
URL: http://svn.apache.org/viewvc?rev=705355&view=rev
Log:
Synchronize testsuite with the appropriate two Geronimo servers
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v21/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/launcher/testsuite.properties
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/server/pom.xml
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Thu Oct 16 13:43:51 2008
@@ -4,14 +4,14 @@
Bundle-SymbolicName: org.apache.geronimo.runtime.v20;singleton:=true
Bundle-Version: 2.1.4
Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.0.1.jar,
- lib/geronimo-deploy-jsr88-2.0.1.jar,
- lib/geronimo-deployment-2.0.1.jar,
- lib/geronimo-j2ee-schema-2.0.1.jar,
- lib/geronimo-kernel-2.0.1.jar,
- lib/geronimo-system-2.0.1.jar,
- lib/geronimo-util-2.0.1.jar,
- lib/geronimo-deploy-config-2.0.1.jar,
+Bundle-ClassPath: lib/geronimo-common-2.0.2.jar,
+ lib/geronimo-deploy-jsr88-2.0.2.jar,
+ lib/geronimo-deployment-2.0.2.jar,
+ lib/geronimo-j2ee-schema-2.0.2.jar,
+ lib/geronimo-kernel-2.0.2.jar,
+ lib/geronimo-system-2.0.2.jar,
+ lib/geronimo-util-2.0.2.jar,
+ lib/geronimo-deploy-config-2.0.2.jar,
lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
Export-Package:
javax.enterprise.deploy.model,
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v20/pom.xml Thu Oct 16 13:43:51 2008
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
- <geronimoVersion>2.0.1</geronimoVersion>
+ <geronimoVersion>2.0.2</geronimoVersion>
</properties>
<build>
<resources>
@@ -61,27 +61,27 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
See also http://www.eclipse.org/legal/guidetolegaldoc.php
about.html references about_files to show licenses and notices to the user
at install time using Eclipse Update Manager, and after install.
-->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.runtime.v21/pom.xml Thu Oct 16 13:43:51 2008
@@ -61,27 +61,27 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
See also http://www.eclipse.org/legal/guidetolegaldoc.php
about.html references about_files to show licenses and notices to the user
at install time using Eclipse Update Manager, and after install.
-->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml Thu Oct 16 13:43:51 2008
@@ -43,7 +43,7 @@
<property name="abbot_swt_version" value="0.1.0.20080305_1254"/>
<property name="abbot_swt" value="abbot.swt-${abbot_swt_version}.zip"/>
<property name="abbot_protocol" value="?modtime=12047243638&protocol=http"/>
- <property name="gep_version" value="2.1.3"/>
+ <property name="gep_version" value="2.1.4"/>
</target>
<target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
@@ -134,6 +134,7 @@
<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">
@@ -229,7 +230,7 @@
<target name="gep-plugins" depends="init" description="Copy the GEP plugins into the test_eclipse installation">
<!--
|
- | Copy the GEP plugins to the testsuite Eclipse plugins directory
+ | Copy the GEP plugins to the launcher Eclipse plugins directory
|
-->
<mkdir dir="${test_eclipse}"/>
@@ -270,4 +271,16 @@
</copy>
</target>
+ <target name="gep-features" depends="init" description="Unzip the GEP feature(s) into the test_eclipse installation">
+ <!--
+ |
+ | Unzip the GEP feature(s) to the launcher Eclipse features directory (for branding testcases)
+ |
+ -->
+ <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/branches/2.1.4/testsuite/launcher/testsuite.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/launcher/testsuite.properties?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/launcher/testsuite.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/launcher/testsuite.properties Thu Oct 16 13:43:51 2008
@@ -16,6 +16,6 @@
#
# @version $Rev$ $Date$
#
-org.apache.geronimo.testsuite.v21=org.apache.geronimo.testsuite.v21-2.1.3
-org.apache.geronimo.testsuite.v20=org.apache.geronimo.testsuite.v20-2.1.3
-org.apache.geronimo.testsuite.common=org.apache.geronimo.testsuite.common-2.1.3
+org.apache.geronimo.testsuite.v21=org.apache.geronimo.testsuite.v21-2.1.4
+org.apache.geronimo.testsuite.v20=org.apache.geronimo.testsuite.v20-2.1.4
+org.apache.geronimo.testsuite.common=org.apache.geronimo.testsuite.common-2.1.4
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/pom.xml?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/pom.xml Thu Oct 16 13:43:51 2008
@@ -38,6 +38,11 @@
Geronimo Eclipse Plugin Integration Testsuite
</description>
+ <properties>
+ <geronimoVersion_1>2.1.4-SNAPSHOT</geronimoVersion_1>
+ <geronimoVersion_2>2.0.2</geronimoVersion_2>
+ </properties>
+
<dependencies>
<!--
|
@@ -47,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat6-javaee5</artifactId>
- <version>2.1.2</version>
+ <version>${geronimoVersion_1}</version>
<type>zip</type>
<classifier>bin</classifier>
<scope>test</scope>
@@ -112,7 +117,7 @@
<dependency>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat6-jee5</artifactId>
- <version>2.0.2</version>
+ <version>${geronimoVersion_2}</version>
<type>zip</type>
<classifier>bin</classifier>
<scope>test</scope>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/server/pom.xml?rev=705355&r1=705354&r2=705355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/server/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/server/pom.xml Thu Oct 16 13:43:51 2008
@@ -47,18 +47,18 @@
<tasks>
<!--
|
- | Unzip and rename the testsuite Geronimo server v2.1.2
+ | Unzip and rename the testsuite Geronimo server v2.1.4
|
-->
<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="geronimoVersion_1" value="2.1.4-SNAPSHOT"/>
<mkdir dir="${geronimo_install1}"/>
- <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimo_version1}/${geronimo_name1}-${geronimo_version1}-bin.zip"
+ <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimoVersion_1}/${geronimo_name1}-${geronimoVersion_1}-bin.zip"
dest="${geronimo_install1}"/>
<move todir="${geronimo_install1}server_v2.1">
- <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimo_version1}"/>
+ <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimoVersion_1}"/>
</move>
<!--
@@ -69,12 +69,12 @@
<property name="geronimo_install2" value="${basedir}/../launcher/"/>
<property name="geronimo_assembly2" value="org/apache/geronimo/assemblies"/>
<property name="geronimo_name2" value="geronimo-tomcat6-jee5"/>
- <property name="geronimo_version2" value="2.0.2"/>
+ <property name="geronimoVersion_2" value="2.0.2"/>
<mkdir dir="${geronimo_install2}"/>
- <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimo_version2}/${geronimo_name2}-${geronimo_version2}-bin.zip"
+ <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimoVersion_2}/${geronimo_name2}-${geronimoVersion_2}-bin.zip"
dest="${geronimo_install2}"/>
<move todir="${geronimo_install2}server_v2.0">
- <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimo_version2}"/>
+ <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimoVersion_2}"/>
</move>
</tasks>
</configuration>