geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r499996 - /geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml
Date Thu, 25 Jan 2007 21:24:34 GMT
Author: pmcmahan
Date: Thu Jan 25 13:24:33 2007
New Revision: 499996

URL: http://svn.apache.org/viewvc?view=rev&rev=499996
Log:
- update 2.0 catalog to support 2.0-M2-SNAPSHOT assemblies

- remove support for 2.0-M1-SNAPSHOT since the configs published
  in the snapshot repo are incompatible with those assemblies

- make use of <obsolete> for catalg entries so that the plugin
  installer will remove the old module when it installs the newer
  version from the snapshot repo (effectively performing an upgrade)


Modified:
    geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml

Modified: geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml?view=diff&rev=499996&r1=499995&r2=499996
==============================================================================
--- geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml (original)
+++ geronimo/site/trunk/docs/plugins/geronimo-2.0/geronimo-plugins.xml Thu Jan 25 13:24:33
2007
@@ -27,8 +27,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty6//car</id>
@@ -41,6 +40,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/ca-helper-jetty//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo CA Helper Web App (Tomcat)</name>
@@ -53,8 +53,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -67,6 +66,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/ca-helper-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>Apache Directory 0.92 for Geronimo</name>
@@ -90,11 +90,11 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-directory//jar</dependency>
+    <obsoletes>org.apache.geronimo.configs/directory//car</obsoletes>
     <config-xml-content>
         <gbean xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1"
                 name="DirectoryService">
@@ -115,8 +115,7 @@
     <url>http://dojotoolkit.org/</url>
     <author>Dojo Foundation</author>
     <license osi-approved="true">BSD and Academic Free License v2.1</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -129,6 +128,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/dojo-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>Jakarta JSP Examples (Jetty)</name>
@@ -142,8 +142,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty6//car</id>
@@ -157,6 +156,7 @@
     </prerequisite>
     <dependency>commons-collections/commons-collections/3.1/jar</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/jsp-examples-jetty//car</obsoletes>
 </plugin>
 <plugin>
     <name>Jakarta JSP Examples (Tomcat)</name>
@@ -170,8 +170,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -184,6 +183,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/jsp-examples-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>LDAP Example Web App (Jetty)</name>
@@ -199,8 +199,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty6//car</id>
@@ -214,6 +213,7 @@
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/ldap-realm//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/ldap-demo-jetty//car</obsoletes>
 </plugin>
 <plugin>
     <name>LDAP Example Web App (Tomcat)</name>
@@ -229,8 +229,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -244,6 +243,7 @@
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/ldap-realm//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/ldap-demo-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>LDAP Example Security Realm</name>
@@ -259,11 +259,11 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/directory//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/ldap-realm//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo OpenJPA plugin</name>
@@ -275,9 +275,9 @@
     <url>http://cwiki.apache.org/confluence/display/openjpa/Index</url>
     <author>Apache Software Foundation</author>
     <license osi-approved="true">ASL 2</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+    <obsoletes>org.apache.geronimo.configs/openjpa//car</obsoletes>
 </plugin>
 <plugin>
     <name>Jakarta Servlet Examples (Jetty)</name>
@@ -291,8 +291,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty6//car</id>
@@ -305,6 +304,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/servlet-examples-jetty//car</obsoletes>
 </plugin>
 <plugin>
     <name>Jakarta Servlet Examples (Tomcat)</name>
@@ -318,8 +318,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -332,6 +331,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/servlet-examples-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>Tomcat Web Server</name>
@@ -341,8 +341,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
@@ -358,8 +357,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -387,8 +385,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -421,6 +418,7 @@
     <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-converter//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-util//jar</dependency>
+    <obsoletes>org.apache.geronimo.configs/webconsole-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo Welcome Web App (Jetty)</name>
@@ -436,8 +434,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty6//car</id>
@@ -450,6 +447,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/welcome-jetty//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo Welcome Web App (Tomcat)</name>
@@ -465,8 +463,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat6//car</id>
@@ -479,6 +476,7 @@
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/welcome-tomcat//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo Dojo App (jetty)</name>
@@ -492,8 +490,7 @@
     <url>http://dojotoolkit.org/</url>
     <author>Dojo Foundation</author>
     <license osi-approved="true">BSD and Academic Free License v2.1</license>
-    <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
-    <geronimo-version>2.0-M1</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
         <id>geronimo/jetty6//car</id>
@@ -506,6 +503,7 @@
         </description>
     </prerequisite>
     <dependency>geronimo/j2ee-server//car</dependency>
+    <obsoletes>org.apache.geronimo.configs/dojo-jetty6//car</obsoletes>
 </plugin>
 <plugin>
     <name>Geronimo Admin Console (Jetty)</name>
@@ -523,6 +521,7 @@
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
     <geronimo-version>2.0-M1-SNAPSHOT</geronimo-version>
+    <geronimo-version>2.0-M2-SNAPSHOT</geronimo-version>
     <geronimo-version>2.0-M1</geronimo-version>
     <geronimo-version>2.0-SNAPSHOT</geronimo-version>
     <prerequisite>
@@ -556,6 +555,7 @@
     <dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
     <dependency>geronimo/geronimo-converter//jar</dependency>
     <dependency>geronimo/geronimo-util//jar</dependency>
+    <obsoletes>org.apache.geronimo.configs/webconsole-jetty6//car</obsoletes>
 </plugin>
 <default-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</default-repository>
 </geronimo-plugin-list>



Mime
View raw message