Return-Path: 
 <scm-return-27955-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 70536 invoked from network); 23 Apr 2008 23:45:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Apr 2008 23:45:54 -0000
Received: (qmail 3113 invoked by uid 500); 23 Apr 2008 23:45:55 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 3066 invoked by uid 500); 23 Apr 2008 23:45:55 -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 3055 invoked by uid 99); 23 Apr 2008 23:45:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 16:45:55 -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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 23:45:09 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 712311A9838; Wed, 23 Apr 2008 16:45:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r651109 - in /geronimo/devtools/eclipse-plugin/trunk:
 assembly/
 assembly/src/main/assembly/
 features/org.apache.geronimo.installableruntime.jetty.feature/
 features/org.apache.geronimo.installableruntime.tomcat.feature/
 plugins/org.apache.ge...
Date: Wed, 23 Apr 2008 23:45:28 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080423234529.712311A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Wed Apr 23 16:45:26 2008
New Revision: 651109

URL: http://svn.apache.org/viewvc?rev=651109&view=rev
Log:
GERONIMODEVTOOLS-291 Create staging site for GEP 2.1.0 release

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/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.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=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Wed Apr 23 16:45:26 2008
@@ -35,7 +35,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>geronimo-eclipse-plugin-${version}-RC1</finalName>
+                    <finalName>geronimo-eclipse-plugin-${version}</finalName>
                     <descriptors>
                         <descriptor>src/main/assembly/deployable.xml</descriptor>
                         <descriptor>src/main/assembly/updatesite.xml</descriptor>

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=651109&r1=651108&r2=651109&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 Wed Apr 23 16:45:26 2008
@@ -28,32 +28,32 @@
     <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="eclipse/features/org.apache.geronimo.feature_2.1.0.jar" id="org.apache.geronimo.feature" version="2.1.0">
+    <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="eclipse/features/org.apache.geronimo.v20.feature_2.1.0.jar" id="org.apache.geronimo.v20.feature" version="2.1.0">
+    <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="eclipse/features/org.apache.geronimo.v21.feature_2.1.0.jar" id="org.apache.geronimo.v21.feature" version="2.1.0">
+    <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="eclipse/features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0.jar"
+    <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="eclipse/features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0.jar"
+    <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>
 
-    <archive path="eclipse/features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.0.zip"
+    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.zip"
              url="runtimes/geronimo-jetty6-javaee5-2.1-bin.zip"/>
 
-    <archive path="eclipse/features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.0.zip"
+    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.zip"
              url="runtimes/geronimo-tomcat6-javaee5-2.1-bin.zip"/>
 
 </site>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Wed Apr 23 16:45:26 2008
@@ -32,7 +32,7 @@
          -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
-            <outputDirectory>eclipse/plugins/</outputDirectory>
+            <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
@@ -55,7 +55,7 @@
          -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
-            <outputDirectory>eclipse/features/</outputDirectory>
+            <outputDirectory>features/</outputDirectory>
             <includes>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml Wed Apr 23 16:45:26 2008
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-jetty6-javaee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
+    id="geronimo-jetty6-javaee5-2.1.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml Wed Apr 23 16:45:26 2008
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-tomcat6-javaee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
+    id="geronimo-tomcat6-javaee5-2.1.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Wed Apr 23 16:45:26 2008
@@ -54,7 +54,6 @@
      --> 
 	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
         <runtime-component-type id="org.apache.geronimo.runtime"/>
-        <runtime-component-version type="org.apache.geronimo.runtime" version="1.1"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.0"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.1"/>
 
@@ -66,17 +65,6 @@
             <type
                 class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/>
         </adapter>
-
-        <supported>
-            <runtime-component id="org.apache.geronimo.runtime" version="1.1"/>
-            <facet id="org.apache.geronimo.facet" version="1.1"/>
-            <facet id="jst.web"         version="2.2,2.3,2.4"/>
-            <facet id="jst.ejb"         version="1.1,2.0,2.1"/>
-            <facet id="jst.ear"         version="1.2,1.3,1.4"/>
-            <facet id="jst.connector"   version="1.0,1.5"/>
-            <facet id="jst.appclient"   version="1.2,1.3,1.4"/>
-            <facet id="jst.utility"     version="1.0"/>
-        </supported>
 
         <supported>
             <runtime-component id="org.apache.geronimo.runtime" version="2.0"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Wed Apr 23 16:45:26 2008
@@ -48,14 +48,12 @@
 
     	<image id="org.apache.geronimo.runtime.image" 
     		icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.runtime.11,
-            		 org.apache.geronimo.runtime.20,
+            typeIds="org.apache.geronimo.runtime.20,
             		 org.apache.geronimo.runtime.21"/>
 
         <image id="org.apache.geronimo.server.image" 
         	icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.server.11,
-            		 org.apache.geronimo.server.20,
+            typeIds="org.apache.geronimo.server.20,
             		 org.apache.geronimo.server.21"/>
     </extension>
 
@@ -70,13 +68,11 @@
      -->
     <extension point="org.eclipse.wst.server.ui.wizardFragments">
         <fragment id="org.apache.geronimo.runtime.wizardFragment"
-            typeIds="org.apache.geronimo.runtime.11,
-            		 org.apache.geronimo.runtime.20,
+            typeIds="org.apache.geronimo.runtime.20,
                      org.apache.geronimo.runtime.21"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
         <fragment id="org.apache.geronimo.server.wizardFragment"
-            typeIds="org.apache.geronimo.server.11,
-            		 org.apache.geronimo.server.20,
+            typeIds="org.apache.geronimo.server.20,
                      org.apache.geronimo.server.21"
             class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
     </extension>
@@ -143,8 +139,7 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.testenv" order="20"
             insertionId="org.eclipse.wst.server.editor.overview.left"
-            typeIds="org.apache.geronimo.server.11, 
-                     org.apache.geronimo.server.20,
+            typeIds="org.apache.geronimo.server.20, 
                      org.apache.geronimo.server.21"
             class="org.apache.geronimo.st.ui.sections.ServerEditorTestEnvSection">
         </section>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml Wed Apr 23 16:45:26 2008
@@ -48,20 +48,32 @@
         </serverType>
     </extension>
     
+    
+    <!--
+     |
+     | Extend WTP installableRuntimes so that the new Geronimo server or runtime type          
+     | can be discovered via the GeronimoRuntimeWizardFragment extension. Note that 
+     | the featureSite tag should be one of the following:
+     |
+     |  1. featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
+     |  2. fatureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
+     |
+     -->
     <extension point="org.eclipse.wst.server.core.installableRuntimes">
         <installableRuntime id="org.apache.geronimo.runtime.tomcat.20"
             featureVersion="2.0.1"
             featureId="org.apache.geronimo.installableruntime.tomcat.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
+            featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
             path="geronimo-tomcat6-jee5-2.0.1.zip">
         </installableRuntime>
         <installableRuntime id="org.apache.geronimo.runtime.jetty.20"
             featureVersion="2.0.1"
             featureId="org.apache.geronimo.installableruntime.jetty.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
+            featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
             path="geronimo-jetty6-jee5-2.0.1.zip">
         </installableRuntime>
     </extension>
+    
     
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=651109&r1=651108&r2=651109&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml Wed Apr 23 16:45:26 2008
@@ -68,24 +68,28 @@
     </extension>
     
     
-    <!-- ======================================================================================= -->
-    <!--                                                                                         -->
-    <!-- Extend WTP installableRuntimes so that the new Geronimo server or runtime type          -->
-    <!-- can be discovered via the GeronimoRuntimeWizardFragment extension                       -->
-    <!--                                                                                         -->
-    <!-- ======================================================================================= -->
+    <!--
+     |
+     | Extend WTP installableRuntimes so that the new Geronimo server or runtime type          
+     | can be discovered via the GeronimoRuntimeWizardFragment extension. Note that 
+     | the featureSite tag should be one of the following:
+     |
+     |  1. featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
+     |  2. fatureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
+     |
+     -->
     <extension point="org.eclipse.wst.server.core.installableRuntimes">
         <installableRuntime id="org.apache.geronimo.runtime.tomcat.21"
             featureVersion="2.1.0"
             featureId="org.apache.geronimo.installableruntime.tomcat.feature"
             featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
-            path="geronimo-tomcat6-javaee5-2.1.0.zip">
+            path="geronimo-tomcat6-javaee5-2.1.zip">
         </installableRuntime>
         <installableRuntime id="org.apache.geronimo.runtime.jetty.21"
             featureVersion="2.1.0"
             featureId="org.apache.geronimo.installableruntime.jetty.feature"
             featureSite="http://people.apache.org/~mcconne/releases/2.1.0/RC1/staging_site/"
-            path="geronimo-jetty6-javaee5-2.1.0.zip">
+            path="geronimo-jetty6-javaee5-2.1.zip">
         </installableRuntime>
     </extension>