geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r636573 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/ assembly/src/main/assembly/ features/org.apache.geronimo.v11.feature/ features/org.apache.geronimo.v20.feature/
Date Wed, 12 Mar 2008 23:27:31 GMT
Author: mcconne
Date: Wed Mar 12 16:27:29 2008
New Revision: 636573

URL: http://svn.apache.org/viewvc?rev=636573&view=rev
Log:
GERONIMODEVTOOLS-294 Change assemblies and updatesite to not include the deleted EMF plugins

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/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.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=636573&r1=636572&r2=636573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Wed Mar 12 16:27:29 2008
@@ -52,105 +52,136 @@
         </plugins>
     </build>
     <dependencies>
+           
+        <!-- 
+         |
+         | Plug-ins
+         |
+         -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.core</artifactId>
+            <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v11.core</artifactId>
+            <artifactId>org.apache.geronimo.deployment.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v20.core</artifactId>
+            <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
+            <artifactId>org.apache.geronimo.runtime.v11</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
+            <artifactId>org.apache.geronimo.runtime.v20</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v11.deployment.model.edit</artifactId>
+            <artifactId>org.apache.geronimo.runtime.v21</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.common</artifactId>
+            <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v11</artifactId>
+            <artifactId>org.apache.geronimo.st.ui</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v20</artifactId>
+            <artifactId>org.apache.geronimo.st.v11.core</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v21</artifactId>
+            <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.ui</artifactId>
+            <artifactId>org.apache.geronimo.st.v20.core</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
+            <artifactId>org.apache.geronimo.st.v20.ui</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v20.ui</artifactId>
+            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
             <version>${version}</version>
         </dependency>
+           
+        <!-- 
+         |
+         | Features
+         |
+         -->
         <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.v11.feature</artifactId>
-            <version>${version}</version>
+            <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
+            <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v20.feature</artifactId>
-            <version>${version}</version>
+            <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
+            <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.v21.feature</artifactId>
+            <artifactId>org.apache.geronimo.v11.feature</artifactId>
             <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
-            <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
+            <artifactId>org.apache.geronimo.v20.feature</artifactId>
+            <version>${version}</version>
         </dependency>
+           
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
-            <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
+            <artifactId>org.apache.geronimo.v21.feature</artifactId>
+            <version>${version}</version>
         </dependency>
+           
     </dependencies>
 </project>

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=636573&r1=636572&r2=636573&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 Wed Mar
12 16:27:29 2008
@@ -35,35 +35,38 @@
     </fileSets>
     <dependencySets>
 
-        <!-- Plug-ins -->
+        <!-- 
+         |
+         | Plug-ins
+         |
+         -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
       -->
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
  -->
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
     -->
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
     -->
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
       -->
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
             </includes>
         </dependencySet>
 
-        <!-- Features -->
+        <!-- 
+         |
+         | Features
+         |
+         -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>

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=636573&r1=636572&r2=636573&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 Mar
12 16:27:29 2008
@@ -25,35 +25,38 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
 
-        <!-- Plug-ins -->
+        <!-- 
+         |
+         | Plug-ins
+         |
+         -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
       -->
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
  -->
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
     -->
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
     -->
-<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
       -->
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
             </includes>
         </dependencySet>
 
-        <!-- Features -->
+        <!-- 
+         |
+         | Features
+         |
+         -->
         <dependencySet>
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml?rev=636573&r1=636572&r2=636573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
Wed Mar 12 16:27:29 2008
@@ -69,14 +69,7 @@
          version="2.1.0"/>
 
     <plugin
-         id="org.apache.geronimo.v11.deployment.model"
-         download-size="0"
-         install-size="0"
-         version="2.1.0"
-         unpack="false"/>
-    
-    <plugin
-         id="org.apache.geronimo.v11.deployment.model.edit"
+         id="org.apache.geronimo.deployment.v11.jaxbmodel"
          download-size="0"
          install-size="0"
          version="2.1.0"

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=636573&r1=636572&r2=636573&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
Wed Mar 12 16:27:29 2008
@@ -69,14 +69,7 @@
          version="2.1.0"/>
 
     <plugin
-         id="org.apache.geronimo.v11.deployment.model"
-         download-size="0"
-         install-size="0"
-         version="2.1.0"
-         unpack="false"/>
-    
-    <plugin
-         id="org.apache.geronimo.v11.deployment.model.edit"
+         id="org.apache.geronimo.deployment.v11.jaxbmodel"
          download-size="0"
          install-size="0"
          version="2.1.0"



Mime
View raw message