geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r569150 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/src/main/assembly/ features/ features/org.apache.geronimo.feature/ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.installableruntime...
Date Thu, 23 Aug 2007 21:25:32 GMT
Author: mcconne
Date: Thu Aug 23 14:25:30 2007
New Revision: 569150

URL: http://svn.apache.org/viewvc?rev=569150&view=rev
Log:
GERONIMODEVTOOLS-141 Upgrade JST version from 1.6 to 2.0 (thanks to Ted Kirby for the patch)

Added:
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.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/features/org.apache.geronimo.v10.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v11.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/features/pom.xml

Added: 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=569150&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Thu Aug 23
14:25:30 2007
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- $Rev: 533812 $ $Date: 2007-04-30 13:38:23 -0400 (Mon, 30 Apr 2007) $ -->
+
+<!-- site mirrorsURL="http://geronimo.apache.org/devtools/geronimo-eclipse-update- -xml.cgi"
-->
+<site>
+
+    <description>Apache Geronimo Eclipse Update Site</description>
+    
+    <!-- Category name must be org.eclipse.ws.server.core.ServerAdapter for dynamic installable
adapter support in WTP -->
+    <category-def name="org.eclipse.wst.server.core.serverAdapter" label="Geronimo WTP
Server Adapters"/>
+    <category-def name="Geronimo Runtime" label="Apache Geronimo Runtimes"/>
+    
+    <feature url="features/org.apache.geronimo.feature_2.0.0.jar" id="org.apache.geronimo.feature"
version="2.0.0">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature>
+    <feature url="features/org.apache.geronimo.v10.feature_2.0.0.jar" id="org.apache.geronimo.v10.feature"
version="2.0.0">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature>
+    <feature url="features/org.apache.geronimo.v11.feature_2.0.0.jar" id="org.apache.geronimo.v11.feature"
version="2.0.0">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature>
+    <!--
+    <feature url="features/org.apache.geronimo.v12.feature_2.0.0.jar" id="org.apache.geronimo.v12.feature"
version="2.0.0">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature> -->
+    <feature url="features/org.apache.geronimo.v20.feature_2.0.0.jar" id="org.apache.geronimo.v20.feature"
version="2.0.0">
+        <category name="org.eclipse.wst.server.core.serverAdapter"/>
+    </feature>
+    
+    <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0.jar"
+             id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.0">
+        <category name="Geronimo Runtime"/>
+    </feature>
+    
+    <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0.jar"
+             id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.0">
+        <category name="Geronimo Runtime"/>
+    </feature>
+    
+    <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.0/geronimo-tomcat6-jee5-2.0.zip"
+             url="runtimes/geronimo-tomcat6-jee5-2.0.2.zip"/>
+    <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.0/geronimo-jetty6-jee5-2.0.zip"
+             url="runtimes/geronimo-jetty6-jee5-2.0.2.zip"/>
+    
+</site>

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=569150&r1=569149&r2=569150&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 Thu Aug
23 14:25:30 2007
@@ -45,4 +45,10 @@
             </includes>
         </dependencySet>
     </dependencySets>
+    <files>
+        <file>
+            <source>src/main/assembly/site.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+    </files>
 </assembly>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?rev=569150&r1=569149&r2=569150&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
Thu Aug 23 14:25:30 2007
@@ -23,7 +23,7 @@
     </url>
     
     <requires>
-        <import feature="org.eclipse.jst" version="1.6.0" match="compatible"/>
+        <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
     
     <plugin

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=569150&r1=569149&r2=569150&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
Thu Aug 23 14:25:30 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-jetty-j2ee-1.2.zip"
+    id="geronimo-jetty6-jee5-2.0.zip"
     download-size="0"
     install-size="0"/>
 

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=569150&r1=569149&r2=569150&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
Thu Aug 23 14:25:30 2007
@@ -38,7 +38,7 @@
    </license>
    
    <data
-    id="geronimo-tomcat-j2ee-1.2.zip"
+    id="geronimo-tomcat6-jee5-2.0.zip"
     download-size="0"
     install-size="0"/>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml?rev=569150&r1=569149&r2=569150&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v10.feature/feature.xml
Thu Aug 23 14:25:30 2007
@@ -23,7 +23,7 @@
     </url>
     
     <requires>
-        <import feature="org.eclipse.jst" version="1.6.0" match="compatible"/>
+        <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
     
     <includes

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=569150&r1=569149&r2=569150&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
Thu Aug 23 14:25:30 2007
@@ -23,7 +23,7 @@
     </url>
     
     <requires>
-        <import feature="org.eclipse.jst" version="1.6.0" match="compatible"/>
+        <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
     
     <includes

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml?rev=569150&r1=569149&r2=569150&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v12.feature/feature.xml
Thu Aug 23 14:25:30 2007
@@ -23,7 +23,7 @@
     </url>
     
     <requires>
-        <import feature="org.eclipse.jst" version="1.6.0" match="compatible"/>
+        <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
     
     <includes

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=569150&r1=569149&r2=569150&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
Thu Aug 23 14:25:30 2007
@@ -23,7 +23,7 @@
     </url>
     
     <requires>
-        <import feature="org.eclipse.jst" version="1.6.0" match="compatible"/>
+        <import feature="org.eclipse.jst" version="2.0.0" match="compatible"/>
     </requires>
 
     <includes

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=569150&r1=569149&r2=569150&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Thu Aug 23 14:25:30 2007
@@ -32,7 +32,7 @@
         <module>org.apache.geronimo.feature</module>
         <module>org.apache.geronimo.v10.feature</module>
         <module>org.apache.geronimo.v11.feature</module>
-        <module>org.apache.geronimo.v12.feature</module>
+    <!--<module>org.apache.geronimo.v12.feature</module>-->
         <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.installableruntime.jetty.feature</module>
         <module>org.apache.geronimo.installableruntime.tomcat.feature</module>



Mime
View raw message