geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r428718 - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/src/main/assembly/ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.installableruntime.tomcat.feature/ plugins/ plugins/org.apache....
Date Fri, 04 Aug 2006 13:17:49 GMT
Author: sppatel
Date: Fri Aug  4 06:17:47 2006
New Revision: 428718

URL: http://svn.apache.org/viewvc?rev=428718&view=rev
Log:
GERONIMODEVTOOLS-93 Support for non-plugin archives for installable runtimes

Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v11/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v11/
Modified:
    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.v11.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

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=428718&r1=428717&r2=428718&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 Fri Aug
 4 06:17:47 2006
@@ -27,8 +27,6 @@
                 <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.st.jmxagent</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.tomcat.j2ee.server.v11</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.jetty.j2ee.server.v11</include>
             </includes>
         </dependencySet>
         <!-- Features -->

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=428718&r1=428717&r2=428718&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
Fri Aug  4 06:17:47 2006
@@ -16,11 +16,12 @@
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
         %license
    </license>
+   
+   <data
+    id="geronimo-jetty-j2ee-1.1.zip"
+    download-size="0"
+    install-size="0"/>
 
-   <plugin
-         id="org.apache.geronimo.jetty.j2ee.server.v11"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
+    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
 
 </feature>

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=428718&r1=428717&r2=428718&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
Fri Aug  4 06:17:47 2006
@@ -16,11 +16,12 @@
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
         %license
    </license>
+   
+   <data
+    id="geronimo-tomcat-j2ee-1.1.zip"
+    download-size="0"
+    install-size="0"/>
 
-   <plugin
-         id="org.apache.geronimo.tomcat.j2ee.server.v11"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
+    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
+   
 </feature>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=428718&r1=428717&r2=428718&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
Fri Aug  4 06:17:47 2006
@@ -30,20 +30,16 @@
     
     <extension point="org.eclipse.wst.server.core.installableRuntimes">
         <installableRuntime id="org.apache.geronimo.runtime.tomcat.11"
-            featureVersion="1.1.0"
+            featureVersion="1.1.1"
             featureId="org.apache.geronimo.installableruntime.tomcat.feature"
             featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            bundleId="org.apache.geronimo.tomcat.j2ee.server.v11"
-            bundleVersion="1.0.0"
-            path="zips/geronimo-tomcat-j2ee-1.1.zip">
+            path="geronimo-tomcat-j2ee-1.1.zip">
         </installableRuntime>
         <installableRuntime id="org.apache.geronimo.runtime.jetty.11"
-            featureVersion="1.1.0"
+            featureVersion="1.1.1"
             featureId="org.apache.geronimo.installableruntime.jetty.feature"
             featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            bundleId="org.apache.geronimo.jetty.j2ee.server.v11"
-            bundleVersion="1.0.0"
-            path="zips/geronimo-jetty-j2ee-1.1.zip">
+            path="geronimo-jetty-j2ee-1.1.zip">
         </installableRuntime>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=428718&r1=428717&r2=428718&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Fri Aug  4 06:17:47 2006
@@ -89,10 +89,6 @@
     <module>org.apache.geronimo.deployment.model.edit</module>
     <module>org.apache.geronimo.v11.deployment.model</module>
     <module>org.apache.geronimo.v11.deployment.model.edit</module>
-    <module>org.apache.geronimo.jetty.j2ee.server.v1</module>
-    <module>org.apache.geronimo.tomcat.j2ee.server.v1</module>
-    <module>org.apache.geronimo.jetty.j2ee.server.v11</module>
-    <module>org.apache.geronimo.tomcat.j2ee.server.v11</module>
     <module>org.apache.geronimo.runtime.common</module>
     <module>org.apache.geronimo.runtime.v1</module>
     <module>org.apache.geronimo.runtime.v11</module>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=428718&r1=428717&r2=428718&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Aug  4 06:17:47 2006
@@ -103,10 +103,6 @@
     <org.apache.geronimo.deployment.model.edit_version>1.0.0</org.apache.geronimo.deployment.model.edit_version>
     <org.apache.geronimo.v11.deployment.model_version>1.0.0</org.apache.geronimo.v11.deployment.model_version>
     <org.apache.geronimo.v11.deployment.model.edit_version>1.0.0</org.apache.geronimo.v11.deployment.model.edit_version>
-    <org.apache.geronimo.jetty.j2ee.server.v1_version>1.0.0</org.apache.geronimo.jetty.j2ee.server.v1_version>
-    <org.apache.geronimo.tomcat.j2ee.server.v1_version>1.0.0</org.apache.geronimo.tomcat.j2ee.server.v1_version>
-    <org.apache.geronimo.jetty.j2ee.server.v11_version>1.0.0</org.apache.geronimo.jetty.j2ee.server.v11_version>
-    <org.apache.geronimo.tomcat.j2ee.server.v11_version>1.0.0</org.apache.geronimo.tomcat.j2ee.server.v11_version>
     <!-- Feature Versions -->
     <org.apache.geronimo.feature_version>1.1.0</org.apache.geronimo.feature_version>
     <org.apache.geronimo.installableruntime.tomcat.feature_version>1.1.0</org.apache.geronimo.installableruntime.tomcat.feature_version>



Mime
View raw message