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/06/27 04:46:57 UTC
svn commit: r672096 - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ assembly/src/main/assembly/ eclipse/ features/
features/org.apache.geronimo.feature/
features/org.apache.geronimo.v20.feature/
features/org.apache.geronimo.v21.feature/ plug...
Author: mcconne
Date: Thu Jun 26 19:46:57 2008
New Revision: 672096
URL: http://svn.apache.org/viewvc?rev=672096&view=rev
Log:
GERONIMODEVTOOLS-402 Initial set of changes to support Ganymede
Modified:
geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Thu Jun 26 19:46:57 2008
@@ -21,7 +21,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}</name>
+ <name>Geronimo Eclipse Plugin :: Assembly</name>
<version>${org.apache.geronimo.feature_version}</version>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Thu Jun 26 19:46:57 2008
@@ -1,65 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- $Rev$ $Date$ -->
-
-<!-- site mirrorsURL="http://geronimo.apache.org/devtools/geronimo-eclipse-update- -xml.cgi" -->
-<site>
+<site mirrorsURL="http://geronimo.apache.org/devtools/geronimo-eclipse-update--xml.cgi">
<description>Apache Geronimo Eclipse Update Site</description>
-
- <!-- Category name must be org.eclipse.ws.server.core.ServerAdapter for dynamic installable adapter support in WTP -->
+
+ <!--
+ |
+ | Category name must be org.eclipse.ws.server.core.ServerAdapter for dynamic installable
+ | adapter support in WTP
+ |
+ -->
<category-def name="org.eclipse.wst.server.core.serverAdapter" label="Geronimo WTP Server Adapters"/>
<category-def name="Geronimo Runtime" label="Apache Geronimo Runtimes"/>
-
- <feature url="features/org.apache.geronimo.feature_2.1.1.jar" id="org.apache.geronimo.feature" version="2.1.1">
+
+
+ <!--
+ |
+ | Features
+ |
+ -->
+ <feature url="features/org.apache.geronimo.feature_1.0.0.jar" id="org.apache.geronimo.feature" version="1.0.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.feature_1.1.0.jar" id="org.apache.geronimo.feature" version="1.1.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.feature_1.2.0.jar" id="org.apache.geronimo.feature" version="1.2.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.feature_2.0.0.jar" id="org.apache.geronimo.feature" version="2.0.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.v10.feature_2.0.0.jar" id="org.apache.geronimo.v10.feature" version="2.0.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.v11.feature_2.0.0.jar" id="org.apache.geronimo.v11.feature" version="2.0.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.v20.feature_2.0.0.jar" id="org.apache.geronimo.v20.feature" version="2.0.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.feature_2.1.0.jar" id="org.apache.geronimo.feature" version="2.1.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.v20.feature_2.1.0.jar" id="org.apache.geronimo.v20.feature" version="2.1.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.v21.feature_2.1.0.jar" id="org.apache.geronimo.v21.feature" version="2.1.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.feature_2.1.1.jar" id="org.apache.geronimo.feature" version="2.1.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
-
<feature url="features/org.apache.geronimo.v20.feature_2.1.1.jar" id="org.apache.geronimo.v20.feature" version="2.1.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
-
<feature url="features/org.apache.geronimo.v21.feature_2.1.1.jar" id="org.apache.geronimo.v21.feature" version="2.1.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
-
- <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1.jar"
- id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.1">
+
+
+ <!--
+ |
+ | Jetty Runtimes
+ |
+ -->
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_1.0.0.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="1.0.0">
<category name="Geronimo Runtime"/>
</feature>
-
- <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1.jar"
- id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.1">
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_1.1.0.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="1.1.0">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_1.1.1.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="1.1.1">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.1">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.0">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.1">
+ <category name="Geronimo Runtime"/>
+ </feature>
+
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_1.0.0/geronimo-jetty-j2ee-1.0.zip" url="../../1.0/geronimo-jetty-j2ee-1.0.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_1.1.0/geronimo-jetty-j2ee-1.1.zip" url="../../1.1/geronimo-jetty-j2ee-1.1.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_1.1.1/geronimo-jetty-j2ee-1.1.1.zip" url="../../1.1.1/geronimo-jetty-j2ee-1.1.1.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip" url="../../2.0.1/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1/geronimo-jetty6-javaee5-2.1.1.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1.1-bin.zip"/>
+
+
+ <!--
+ |
+ | Tomcat Runtimes
+ |
+ -->
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_1.0.0.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="1.0.0">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_1.1.0.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="1.1.0">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_1.1.1.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="1.1.1">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.1">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.0">
+ <category name="Geronimo Runtime"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.1">
<category name="Geronimo Runtime"/>
</feature>
- <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1/geronimo-jetty6-javaee5-2.1.1.zip"
- url="runtimes/geronimo-jetty6-javaee5-2.1.1-bin.zip"/>
-
- <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1/geronimo-tomcat6-javaee5-2.1.1.zip"
- url="runtimes/geronimo-tomcat6-javaee5-2.1.1-bin.zip"/>
-
- <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1/geronimo-jetty6-jee5-2.0.2.zip"
- url="runtimes/geronimo-jetty6-jee5-2.0.2-bin.zip"/>
-
- <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1/geronimo-tomcat6-jee5-2.0.2.zip"
- url="runtimes/geronimo-tomcat6-jee5-2.0.2-bin.zip"/>
-
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_1.0.0/geronimo-tomcat-j2ee-1.0.zip" url="../../1.0/geronimo-tomcat-j2ee-1.0.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_1.1.0/geronimo-tomcat-j2ee-1.1.zip" url="../../1.1/geronimo-tomcat-j2ee-1.1.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_1.1.1/geronimo-tomcat-j2ee-1.1.1.zip" url="../../1.1.1/geronimo-tomcat-j2ee-1.1.1.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip" url="../../2.0.1/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1/geronimo-tomcat6-javaee5-2.1.1.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1.1-bin.zip"/>
+
</site>
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Thu Jun 26 19:46:57 2008
@@ -18,96 +18,92 @@
<!--
|
- | Download Europa Eclipse artifacts and unzip them into the user's local maven repo
- |
- |
- | @version $Rev$ $Date$
+ | Download Ganymede artifacts and unzip them into the user's local maven repo
|
-->
-<project name="EuropaArtifacts">
+<project name="GanymedeArtifacts">
<target name="init">
- <property name="base_url" value="http://www.eclipse.org/downloads/download.php?file="/>
- <property name="europa_url" value="${base_url}/technology/epp/downloads/release/europa/winter/"/>
- <property name="europa_jee_win32" value="eclipse-jee-europa-winter-win32.zip"/>
- <property name="europa_jee_linux" value="eclipse-jee-europa-winter-linux-gtk.tar"/>
- <property name="europa_jee_macos" value="eclipse-jee-europa-winter-macosx-carbon.tar"/>
- <property name="europa_jee_linux_gz" value="${europa_jee_linux}.gz"/>
- <property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
+ <property name="ganymede_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/R/"/>
+ <property name="ganymede_jee_win32" value="eclipse-jee-ganymede-win32.zip"/>
+ <property name="ganymede_jee_linux" value="eclipse-jee-ganymede-linux-gtk.tar"/>
+ <property name="ganymede_jee_macos" value="eclipse-jee-ganymede-macosx-carbon.tar"/>
+ <property name="ganymede_jee_linux_gz" value="${ganymede_jee_linux}.gz"/>
+ <property name="ganymede_jee_macos_gz" value="${ganymede_jee_macos}.gz"/>
<property name="protocol" value="&r=1&protocol=http"/>
</target>
<target name="win32" depends="init" description="Download Windows-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_win32} </echo>
+ <echo>## Downloading: ${ganymede_jee_win32} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo> <echo>## </echo>
+ <echo>## From: ${ganymede_url} </echo> <echo>## </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_win32}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_win32}"
+ <get src="${ganymede_url}${ganymede_jee_win32}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_win32} </echo>
+ <echo>## Unzipping: ${ganymede_jee_win32} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_win32}"
+ <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}"
dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
<target name="linux" depends="init" description="Download Linux-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_linux_gz} </echo>
+ <echo>## Downloading: ${ganymede_jee_linux_gz} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo> <echo>## </echo>
+ <echo>## From: ${ganymede_url} </echo> <echo>## </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_linux_gz}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux_gz}"
+ <get src="${ganymede_url}${ganymede_jee_linux_gz}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_linux_gz} </echo>
+ <echo>## Unzipping: ${ganymede_jee_linux_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux_gz}"/>
- <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux}"
+ <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"/>
+ <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux}"
dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
<target name="macos" depends="init" description="Download Mac-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_macos_gz} </echo>
+ <echo>## Downloading: ${ganymede_jee_macos_gz} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo> <echo>## </echo>
+ <echo>## From: ${ganymede_url} </echo> <echo>## </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_macos_gz}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos_gz}"
+ <get src="${ganymede_url}${ganymede_jee_macos_gz}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_macos_gz} </echo>
+ <echo>## Unzipping: ${ganymede_jee_macos_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos_gz}"/>
- <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos}"
+ <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"/>
+ <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos}"
dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Thu Jun 26 19:46:57 2008
@@ -21,7 +21,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}</name>
+ <name>Geronimo Eclipse Plugin :: Downloads</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml Thu Jun 26 19:46:57 2008
@@ -40,7 +40,7 @@
</url>
<requires>
- <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
+ <import feature="org.eclipse.jst" version="2.0.0" match="greaterOrEqual"/>
</requires>
<plugin
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml Thu Jun 26 19:46:57 2008
@@ -40,7 +40,7 @@
</url>
<requires>
- <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
+ <import feature="org.eclipse.jst" version="2.0.0" match="greaterOrEqual"/>
</requires>
<includes
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/feature.xml Thu Jun 26 19:46:57 2008
@@ -41,7 +41,7 @@
</url>
<requires>
- <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
+ <import feature="org.eclipse.jst" version="2.0.0" match="greaterOrEqual"/>
</requires>
<includes
Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Thu Jun 26 19:46:57 2008
@@ -21,7 +21,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}</name>
+ <name>Geronimo Eclipse Plugin :: Features</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Thu Jun 26 19:46:57 2008
@@ -21,7 +21,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}</name>
+ <name>Geronimo Eclipse Plugin :: Plugins</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu Jun 26 19:46:57 2008
@@ -22,7 +22,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}</name>
+ <name>Geronimo Eclipse Plugin</name>
<version>2.1.1</version>
<parent>
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=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Thu Jun 26 19:46:57 2008
@@ -24,93 +24,92 @@
| @version $Rev$ $Date$
|
-->
-<project name="EuropaTestsuiteArtifacts">
+<project name="TestsuiteArtifacts">
<target name="init">
- <property name="base_url" value="http://www.eclipse.org/downloads/download.php?file="/>
- <property name="europa_url" value="${base_url}/technology/epp/downloads/release/europa/winter/"/>
- <property name="europa_jee_win32" value="eclipse-jee-europa-winter-win32.zip"/>
- <property name="europa_jee_linux" value="eclipse-jee-europa-winter-linux-gtk.tar"/>
- <property name="europa_jee_macos" value="eclipse-jee-europa-winter-macosx-carbon.tar"/>
- <property name="europa_jee_linux_gz" value="${europa_jee_linux}.gz"/>
- <property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
+ <property name="ganymede_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/R/"/>
+ <property name="ganymede_jee_win32" value="eclipse-jee-ganymede-win32.zip"/>
+ <property name="ganymede_jee_linux" value="eclipse-jee-ganymede-linux-gtk.tar"/>
+ <property name="ganymede_jee_macos" value="eclipse-jee-ganymede-macosx-carbon.tar"/>
+ <property name="ganymede_jee_linux_gz" value="${ganymede_jee_linux}.gz"/>
+ <property name="ganymede_jee_macos_gz" value="${ganymede_jee_macos}.gz"/>
<property name="protocol" value="&r=1&protocol=http"/>
<property name="test_eclipse" value="${basedir}/../launcher/eclipse/"/>
- <property name="test_framework_url" value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800/"/>
- <property name="test_framework" value="eclipse-test-framework-3.3.2.zip"/>
+ <property name="test_framework_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.4-200806172000/"/>
+ <property name="test_framework" value="eclipse-test-framework-3.4.zip"/>
</target>
<target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_win32} </echo>
+ <echo>## Downloading: ${ganymede_jee_win32} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo>
+ <echo>## From: ${ganymede_url} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_win32}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_win32}"
+ <get src="${ganymede_url}${ganymede_jee_win32}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_win32} </echo>
+ <echo>## Unzipping: ${ganymede_jee_win32} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${test_eclipse}"/>
- <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_win32}"
+ <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_win32}"
dest="${test_eclipse}"/>
</target>
<target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_linux_gz} </echo>
+ <echo>## Downloading: ${ganymede_jee_linux_gz} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo> <echo>## </echo>
+ <echo>## From: ${ganymede_url} </echo> <echo>## </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_linux_gz}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux_gz}"
+ <get src="${ganymede_url}${ganymede_jee_linux_gz}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_linux_gz} </echo>
+ <echo>## Unzipping: ${ganymede_jee_linux_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${test_eclipse}"/>
- <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux_gz}"/>
- <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux}"
+ <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux_gz}"/>
+ <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_linux}"
dest="${test_eclipse}"/>
</target>
<target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Downloading: ${europa_jee_macos_gz} </echo>
+ <echo>## Downloading: ${ganymede_jee_macos_gz} </echo>
<echo>## </echo>
- <echo>## From: ${europa_url} </echo> <echo>## </echo>
+ <echo>## From: ${ganymede_url} </echo> <echo>## </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${europa_url}${europa_jee_macos_gz}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos_gz}"
+ <get src="${ganymede_url}${ganymede_jee_macos_gz}${protocol}"
+ dest="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
<echo>#################################################################################</echo>
<echo>## </echo>
- <echo>## Unzipping: ${europa_jee_macos_gz} </echo>
+ <echo>## Unzipping: ${ganymede_jee_macos_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
<mkdir dir="${test_eclipse}"/>
- <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos_gz}"/>
- <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos}"
+ <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos_gz}"/>
+ <untar src="${LOCAL_M2_REPO}/eclipse-downloads/${ganymede_jee_macos}"
dest="${test_eclipse}"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Thu Jun 26 19:46:57 2008
@@ -26,7 +26,7 @@
<artifactId>testsuite-eclipse</artifactId>
<packaging>pom</packaging>
<version>2.1.1</version>
- <name>Geronimo Devtools Testsuite :: Eclipse Downloads</name>
+ <name>Geronimo Eclipse Plugin :: Testsuite :: Downloads</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml Thu Jun 26 19:46:57 2008
@@ -26,7 +26,7 @@
<artifactId>testsuite-launcher</artifactId>
<packaging>pom</packaging>
<version>2.1.1</version>
- <name>Geronimo Devtools Testsuite :: Equinox Launcher</name>
+ <name>Geronimo Eclipse Plugin :: Testsuite :: Launcher</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml Thu Jun 26 19:46:57 2008
@@ -26,7 +26,7 @@
<artifactId>testsuite-plugins</artifactId>
<packaging>pom</packaging>
<version>2.1.1</version>
- <name>Geronimo Devtools Testsuite :: Eclipse Plugins</name>
+ <name>Geronimo Eclipse Plugin :: Testsuite :: Plugins</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=672096&r1=672095&r2=672096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Thu Jun 26 19:46:57 2008
@@ -26,7 +26,7 @@
<artifactId>testsuite</artifactId>
<packaging>pom</packaging>
<version>2.1.1</version>
- <name>Geronimo Devtools Testsuite</name>
+ <name>Geronimo Eclipse Plugin :: Testsuite</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>