Return-Path: 
 <scm-return-17102-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 67157 invoked from network); 19 Jan 2007 19:18:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Jan 2007 19:18:10 -0000
Received: (qmail 34172 invoked by uid 500); 19 Jan 2007 19:18:16 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 34144 invoked by uid 500); 19 Jan 2007 19:18:16 -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 34133 invoked by uid 99); 19 Jan 2007 19:18:16 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 11:18:16 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
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; Fri, 19 Jan 2007 11:18:09 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4E4F11A981A; Fri, 19 Jan 2007 11:17:04 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r497913 - in /geronimo/devtools/eclipse-plugin/trunk: ./
 plugins/org.apache.geronimo.st.v12.core/plugin.xml
Date: Fri, 19 Jan 2007 19:17:04 -0000
To: scm@geronimo.apache.org
From: sppatel@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070119191704.4E4F11A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sppatel
Date: Fri Jan 19 11:17:03 2007
New Revision: 497913

URL: http://svn.apache.org/viewvc?view=rev&rev=497913
Log:
 r6137@sppatel (orig r497912):  sppatel | 2007-01-19 14:16:22 -0500
 remove facet and facet mappings, use same as 1.1

Modified:
    geronimo/devtools/eclipse-plugin/trunk/   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/plugin.xml

Propchange: geronimo/devtools/eclipse-plugin/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jan 19 11:17:03 2007
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:497902
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:497912
 47d51c14-9805-4038-8224-40f2b3020a56:/local/G1526-eclipse:3238

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/plugin.xml?view=diff&rev=497913&r1=497912&r2=497913
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/plugin.xml Fri Jan 19 11:17:03 2007
@@ -65,44 +65,7 @@
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping
             runtimeTypeId="org.apache.geronimo.runtime.12"
-            runtime-component="org.apache.geronimo.runtime" version="1.2"/>
-    </extension>
-    
-    <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.v12.core.operations.GeronimoV11FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v12.core.DeploymentPlanInstallConfig$Factory"/>
-            </action>
-            <constraint>
-                <or>
-                    <requires facet="jst.ear" version="1.2"/>
-                    <requires facet="jst.ear" version="1.3"/>
-                    <requires facet="jst.ear" version="1.4"/>
-                    <requires facet="jst.appclient" version="1.2"/>
-                    <requires facet="jst.appclient" version="1.3"/>
-                    <requires facet="jst.appclient" version="1.4"/>
-                    <requires facet="jst.connector" version="1.0"/>
-                    <requires facet="jst.connector" version="1.5"/>
-                    <requires facet="jst.ejb" version="1.1"/>
-                    <requires facet="jst.ejb" version="2.0"/>
-                    <requires facet="jst.ejb" version="2.1"/>
-                    <requires facet="jst.web" version="2.2"/>
-                    <requires facet="jst.web" version="2.3"/>
-                    <requires facet="jst.web" version="2.4"/>
-                    <requires facet="jst.utility" version="1.0"/>
-                </or>
-            </constraint>
-        </project-facet-version>
-    </extension>
-    
-    <extension id="org.apache.geronimo.defaultFacets"
-        name="Geronimo Default Facets"
-        point="org.eclipse.wst.common.project.facet.core.defaultFacets">
-        <default-facets>
-            <runtime-component id="org.apache.geronimo.runtime" version="1.2"/>
-            <facet id="org.apache.geronimo.facet" version="1.2"/>
-        </default-facets>
+            runtime-component="org.apache.geronimo.runtime" version="1.1"/>
     </extension>
   
 </plugin>