Return-Path: 
 <scm-return-27047-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 39301 invoked from network); 30 Mar 2008 04:41:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Mar 2008 04:41:51 -0000
Received: (qmail 56556 invoked by uid 500); 30 Mar 2008 04:41:50 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 56548 invoked by uid 500); 30 Mar 2008 04:41:50 -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 56539 invoked by uid 99); 30 Mar 2008 04:41:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Mar 2008 21:41:50 -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; Sun, 30 Mar 2008 04:41:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 08DEB1A9832; Sat, 29 Mar 2008 21:41:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r642679 - in
 /geronimo/devtools/eclipse-plugin/trunk/plugins:
 org.apache.geronimo.deployment.v21.jaxbmodel/
 org.apache.geronimo.st.v20.core/ org.apache.geronimo.st.v20.core/META-INF/
 org.apache.geronimo.st.v20.core/src/ org.apache.geronimo....
Date: Sun, 30 Mar 2008 04:41:24 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080330044130.08DEB1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Sat Mar 29 21:41:14 2008
New Revision: 642679

URL: http://svn.apache.org/viewvc?rev=642679&view=rev
Log:
GERONIMODEVTOOLS-304 Remove all source code in the st.v20.core plugin

Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.options
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml Sat Mar 29 21:41:14 2008
@@ -48,6 +48,10 @@
 
     <build>
         <plugins>
+            <!--
+             |
+             | Disable the compilation of the Geronimo 2.1 server schemas
+             |
             <plugin>
                 <groupId>com.sun.tools.xjc.maven2</groupId>
                 <artifactId>maven-jaxb-plugin</artifactId>
@@ -63,6 +67,7 @@
                     <args>-extension</args>
                 </configuration>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath Sat Mar 29 21:41:14 2008
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF Sat Mar 29 21:41:14 2008
@@ -3,7 +3,7 @@
 Bundle-Name: Geronimo v20 Server Tools Core Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v20.core;singleton:=true
 Bundle-Version: 2.1.0
-Bundle-Activator: org.apache.geronimo.st.v20.core.Activator
+Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
 Bundle-Vendor: Apache.org
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -11,18 +11,9 @@
  org.eclipse.debug.core,
  org.eclipse.wst.common.project.facet.core,
  org.apache.geronimo.runtime.v20,
+ org.apache.geronimo.st.v21.core,
  org.apache.geronimo.st.core,
  org.eclipse.jst.common.frameworks,
  org.eclipse.wst.common.modulecore,
  org.apache.geronimo.deployment.v21.jaxbmodel
 Eclipse-LazyStart: true
-Export-Package: 
- org,
- org.apache,
- org.apache.geronimo,
- org.apache.geronimo.st,
- org.apache.geronimo.st.v20,
- org.apache.geronimo.st.v20.core,
- org.apache.geronimo.st.v20.core.internal,
- org.apache.geronimo.st.v20.core.jaxb,
- org.apache.geronimo.st.v20.core.operations

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=642679&r1=642678&r2=642679&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 Sat Mar 29 21:41:14 2008
@@ -25,7 +25,7 @@
         <runtimeType id="org.apache.geronimo.runtime.20"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor" version="2.0"
-            class="org.apache.geronimo.st.v20.core.GeronimoRuntime">
+            class="org.apache.geronimo.st.v21.core.GeronimoRuntime">
             <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5"/>
             <moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0"/>
             <moduleType types="jst.connector" versions="1.0, 1.5"/>
@@ -38,12 +38,12 @@
         <serverType id="org.apache.geronimo.server.20"
             name="%serverTypeName" description="%serverTypeDescription"
             runtime="true"
-            class="org.apache.geronimo.st.v20.core.GeronimoServer"
+            class="org.apache.geronimo.st.v21.core.GeronimoServer"
             initialState="stopped" supportsRemoteHosts="true"
             startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
             runtimeTypeId="org.apache.geronimo.runtime.20"
             launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
-            behaviourClass="org.apache.geronimo.st.v20.core.GeronimoServerBehaviour"
+            behaviourClass="org.apache.geronimo.st.v21.core.GeronimoServerBehaviour"
             hasConfiguration="false" launchModes="run,debug,profile">
         </serverType>
     </extension>
@@ -70,18 +70,17 @@
     </extension>
     
     
-    <!-- ======================================================================================= -->
-    <!--                                                                                         -->
-    <!-- Declare the 2.0 version of the "Geronimo Deployment" <project-facet> and the <action>   -->
-    <!-- that the user can perform on the facet (i.e., install)                                  -->
-    <!--                                                                                         -->
-    <!-- ======================================================================================= -->
     <!-- 
-    <extension point="org.eclipse.wst.common.project.facet.core.facets">        
-        <project-facet-version facet="org.apache.geronimo.facet" version="2.0">
-            <action type="install" id="geronimo.plan.install">
-                <delegate class="org.apache.geronimo.st.v20.core.operations.GeronimoV20FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v20.core.DeploymentPlanInstallConfig$Factory"/>
+     | 
+     | Declare the 1.2 version of the "Geronimo Deployment" <project-facet> and the <action>    
+     | that the user can perform on the facet (i.e., install)                                  
+     | 
+     -->
+    <extension point="org.eclipse.wst.common.project.facet.core.facets">
+        <project-facet-version facet="org.apache.geronimo.facet" version="1.2">
+            <action type="INSTALL" id="geronimo.plan.install">
+                <delegate class="org.apache.geronimo.st.v21.core.operations.GeronimoV21FacetInstallDelegate"/>
+                <config-factory class="org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig$Factory"/>
             </action>
             <constraint>
                 <or>
@@ -109,7 +108,6 @@
             </constraint>
         </project-facet-version>
     </extension>
-    -->
     
     
     <!-- 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml Sat Mar 29 21:41:14 2008
@@ -80,6 +80,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF Sat Mar 29 21:41:14 2008
@@ -7,7 +7,7 @@
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.commands,
- org.apache.geronimo.st.v20.core,
+ org.apache.geronimo.st.v21.core,
  org.apache.geronimo.st.ui,
  org.eclipse.ui.forms,
  org.eclipse.core.resources,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=642679&r1=642678&r2=642679&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Sat Mar 29 21:41:14 2008
@@ -92,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v20.core</artifactId>
+            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>