geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r684310 - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/ assembly/src/main/assembly/ features/ features/org.apache.geronimo.v20.feature/ features/org.apache.geronimo.v21.feature/
Date Sat, 09 Aug 2008 18:07:17 GMT
Author: tkirby
Date: Sat Aug  9 11:07:16 2008
New Revision: 684310

URL: http://svn.apache.org/viewvc?rev=684310&view=rev
Log:
GERONIMODEVTOOLS-469 Remove Core Geronimo Feature

Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.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.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/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=684310&r1=684309&r2=684310&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Sat Aug  9 11:07:16 2008
@@ -22,7 +22,7 @@
     <artifactId>assembly</artifactId>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Assembly</name>
-    <version>${org.apache.geronimo.feature_version}</version>
+    <version>${org.apache.geronimo.v21.feature_version}</version>
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
@@ -132,12 +132,6 @@
          -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.feature</artifactId>
-            <version>${version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.server.jetty.v20.feature</artifactId>
             <version>${org.apache.geronimo.server.jetty.v20.feature_version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=684310&r1=684309&r2=684310&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Sat Aug
 9 11:07:16 2008
@@ -69,7 +69,6 @@
             <outputDirectory>eclipse/features/</outputDirectory>
             <unpack>true</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>

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=684310&r1=684309&r2=684310&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 Sat Aug  9
11:07:16 2008
@@ -76,9 +76,6 @@
     <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.feature_2.1.2.jar"     id="org.apache.geronimo.feature"
    version="2.1.2">
-        <category name="org.eclipse.wst.server.core.serverAdapter"/>
-    </feature>
     <feature url="features/org.apache.geronimo.v20.feature_2.1.2.jar" id="org.apache.geronimo.v20.feature"
version="2.1.2">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>

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=684310&r1=684309&r2=684310&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 Sat Aug
 9 11:07:16 2008
@@ -68,7 +68,6 @@
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>

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=684310&r1=684309&r2=684310&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
Sat Aug  9 11:07:16 2008
@@ -44,10 +44,32 @@
         <import feature="org.eclipse.jst" version="2.0.0" match="greaterOrEqual"/>
     </requires>
     
-    <includes
-        id="org.apache.geronimo.feature"
-        version="2.1.2"
-        name="Geronimo Core Feature"/>
+    <plugin
+         id="org.apache.geronimo.st.core"
+         download-size="115"
+         install-size="115"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.st.ui"
+         download-size="144"
+         install-size="144"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.st.schemas"
+         download-size="70"
+         install-size="70"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.runtime.common"
+         download-size="1145"
+         install-size="1145"
+         version="2.1.2"/>
         
     <plugin
          id="org.apache.geronimo.st.v20.core"

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=684310&r1=684309&r2=684310&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
Sat Aug  9 11:07:16 2008
@@ -45,10 +45,32 @@
         <import feature="org.eclipse.jst" version="2.0.0" match="greaterOrEqual"/>
     </requires>
     
-    <includes
-        id="org.apache.geronimo.feature"
-        version="2.1.2"
-        name="Geronimo Core Feature"/>
+    <plugin
+         id="org.apache.geronimo.st.core"
+         download-size="115"
+         install-size="115"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.st.ui"
+         download-size="144"
+         install-size="144"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.st.schemas"
+         download-size="70"
+         install-size="70"
+         version="2.1.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.geronimo.runtime.common"
+         download-size="1145"
+         install-size="1145"
+         version="2.1.2"/>
         
     <plugin
          id="org.apache.geronimo.st.v21.core"

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=684310&r1=684309&r2=684310&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Sat Aug  9 11:07:16 2008
@@ -29,7 +29,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
-        <module>org.apache.geronimo.feature</module>
         <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.v21.feature</module>
         <module>org.apache.geronimo.server.jetty.v20.feature</module>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=684310&r1=684309&r2=684310&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Aug  9 11:07:16 2008
@@ -84,7 +84,6 @@
                         
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
-        <org.apache.geronimo.feature_version>2.1.2</org.apache.geronimo.feature_version>
         <org.apache.geronimo.v20.feature_version>2.1.2</org.apache.geronimo.v20.feature_version>
         <org.apache.geronimo.v21.feature_version>2.1.2</org.apache.geronimo.v21.feature_version>
         <org.apache.geronimo.server.jetty.v20.feature_version>2.1.2</org.apache.geronimo.server.jetty.v20.feature_version>



Mime
View raw message