You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by hc...@apache.org on 2007/01/30 23:46:40 UTC

svn commit: r501617 - in /geronimo/site/trunk: docs/downloads.html docs/index.html docs/newshistory.html xdocs/downloads.xml xdocs/index.xml xdocs/newshistory.xml

Author: hcunico
Date: Tue Jan 30 14:46:38 2007
New Revision: 501617

URL: http://svn.apache.org/viewvc?view=rev&rev=501617
Log:
updated links for documentation and downloads. Moved   old news to history.

Modified:
    geronimo/site/trunk/docs/downloads.html
    geronimo/site/trunk/docs/index.html
    geronimo/site/trunk/docs/newshistory.html
    geronimo/site/trunk/xdocs/downloads.xml
    geronimo/site/trunk/xdocs/index.xml
    geronimo/site/trunk/xdocs/newshistory.xml

Modified: geronimo/site/trunk/docs/downloads.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/downloads.html?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/docs/downloads.html (original)
+++ geronimo/site/trunk/docs/downloads.html Tue Jan 30 14:46:38 2007
@@ -329,7 +329,7 @@
 			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 
-	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC11/sample-applications.html">Sample applications</a></b></p>
+	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC20/working-examples.html">Sample applications</a></b></p>
 	</ul>
 	</p>
                                                                                 <hr color="#666666" width="100%" size="2" />
@@ -403,7 +403,7 @@
 			<a href="http://www.apache.org/dist/geronimo/1.2-beta/geronimo-tomcat-minimal-1.2-beta.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 
-	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC11/sample-applications.html">Sample applications</a></b></p>
+	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC12/sample-applications.html">Sample applications</a></b></p>
 	</ul>
 	</p>
                                                                                 <hr color="#666666" width="100%" size="2" />

Modified: geronimo/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/index.html?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/docs/index.html (original)
+++ geronimo/site/trunk/docs/index.html Tue Jan 30 14:46:38 2007
@@ -274,8 +274,7 @@
                     This version of Geronimo represents a point in time view into our progress towards a Java Enterprise Edition 5.0 Server runtime.  It includes the latest Jetty and Tomcat 
                     servlet engines so users can experiment with Servlet 2.5, JSP 2.1 as well as JSF 1.1 and JSTL 1.2.  Also included is Apache's OpenJPA for Java Persistence as well as the latest
                     Javamail 1.4 and Java Activation Framework.  This is a milestone release so it is not recommended for high load deployments.  The Apache Geronimo team would very much like
-                    user feedback so we can meet your needs as we continue the Drive to Five.  
-			See the <a href="downloads.html">Downloads page</a> for download information.
+                    user feedback so we can meet your needs as we continue the Drive to Five.
 		</blockquote>
 		<hr color="#666666" width="100%" size="2" />
 	</p>
@@ -290,33 +289,13 @@
 		<hr color="#666666" width="100%" size="2" />
 	</p>
                                                                                 <p>
-		2006-11-13<br />
-		<strong>Geronimo Eclipse Plugin v1.2.0 has been released and is available for user download.</strong>
-		<blockquote>
-            The Geronimo Eclipse Plugin v1.2.0 is mainly a bug-fix release, improving stability and adding support for the Geronimo 1.1.1 release.
-			See the <a href="devtools.html">Subprojects section</a> for download information.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2006-10-12<br />
-		<strong>Geronimo v1.1.1 Certified on Azul Compute Appliances</strong>
-		<blockquote>
-            The Apache Geronimo Project is pleased to announce the J2EE 1.4 Certification of Apache Geronimo v1.1.1 running on an Azul Compute Appliance. The testing was performed on an Azul Compute Appliance Model 1920B (8 chip / 192 cores, 64GB memory) coupled with Azul VM release 2.3.1.2 (HotSpot™ Java™ 1.4.2_12), 64-bit Server mode. The Apache Geronimo Project wishes to thank Azul Systems for providing the machine time on the Azul Compute Appliance used for this certification effort. For more information on Azul Compute Appliances, please visit <a href="http://www.azulsystems.com">http://www.azulsystems.com</a>.<br /><br />
-
-    	</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2006-10-05<br />
-		<strong>Webcast: Geronimo v1.1.1 Overview: Management (Web) Console and Plugins</strong>
-		<blockquote>
-            Join members of the Apache Geronimo Developer Community for a technical overview and explanation of features in Apache Geronimo v1.1.1, the full-featured, fully-certified J2EE server from the Apache Software Foundation.   You will learn how to download Geronimo, install and run it. You'll receive a walk-through of the management console which provides an easy to use user interface and learn about the new plugin architecture which provides a simple user experience.<br /><br />
-
-			Click <a href="http://tinyurl.com/qymc2">here</a> to access the webcast.
-
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
+	  2006-11-13<br />
+	  <strong>Geronimo Eclipse Plugin v1.2.0 has been released and is available for user download.</strong>
+	  <blockquote>
+		  The Geronimo Eclipse Plugin v1.2.0 is mainly a bug-fix release, improving stability and adding support for the Geronimo 1.1.1 release.
+		  See the <a href="devtools.html">Subprojects section</a> for download information.
+	  </blockquote>
+	  <hr color="#666666" width="100%" size="2" />
 	</p>
                                                 </blockquote>
         </td>

Modified: geronimo/site/trunk/docs/newshistory.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/newshistory.html?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/docs/newshistory.html (original)
+++ geronimo/site/trunk/docs/newshistory.html Tue Jan 30 14:46:38 2007
@@ -254,15 +254,6 @@
         <td>
             <blockquote>
                                                             <p>
-				  2006-11-13<br />
-				  <strong>Geronimo Eclipse Plugin v1.2.0 has been released and is available for user download.</strong>
-				  <blockquote>
-				      The Geronimo Eclipse Plugin v1.2.0 is mainly a bug-fix release, improving stability and adding support for the Geronimo 1.1.1 release.
-				      See the <a href="devtools.html">Subprojects section</a> for download information.
-				  </blockquote>
-				  <hr color="#666666" width="100%" size="2" />
-				</p>
-                                                                                <p>
 					2006-10-12<br />
 					<strong>Geronimo v1.1.1 Certified on Azul Compute Appliances</strong>
 					<blockquote>

Modified: geronimo/site/trunk/xdocs/downloads.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/downloads.xml?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/xdocs/downloads.xml (original)
+++ geronimo/site/trunk/xdocs/downloads.xml Tue Jan 30 14:46:38 2007
@@ -19,41 +19,41 @@
 
 <subsection  name="Binaries">
 	<p>
-	<strong>Java Enterprise Edition 5.0 Milestone Version 2.0-M1 - Released December 22, 2006</strong>
+	<strong>Java Enterprise Edition 5.0 Milestone Version 2.0-M2 - Released January 30, 2007</strong>
 	<ul>
-		<li style="list-style-type:square"><a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/RELEASE-NOTES-2.0-M1.txt" class="externalLink" title="External Link">2.0-M1 Release Notes</a></li>
+		<li style="list-style-type:square"><a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/RELEASE-NOTES-2.0-M2.txt" class="externalLink" title="External Link">2.0-M2 Release Notes</a></li>
 		<p>
 			Downloads are provided for both Windows and Unix (including Linux, Mac OS X) operating systems.  Each Geronimo package includes one of two possible Web containers, Tomcat or Jetty.  Please choose the download with your preferred Web container in the name.  Both Tomcat and Jetty are fully supported in Geronimo. For more background on each, please see the <a href="http://tomcat.apache.org/">Tomcat home page</a> and the <a href="http://jetty.mortbay.org/jetty/">Jetty home page</a>.
 		</p>
 		<br/>
-        <p><strong>Java EE 5 Milestone 1</strong></p>
+        <p><strong>Java EE 5 Milestone 2</strong></p>
 		<br/>
 		<b>Linux/Mac OS X/Unix Downloads</b>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M1 with Jetty 6 (tar.gz)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M2 with Jetty 6 (tar.gz)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M1 with Tomcat 6 (tar.gz)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M2 with Tomcat 6 (tar.gz)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<br/>
 		<b>Windows Downloads</b>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.zip" class="externalLink" title="External Link">Geronimo 2.0-M1 with Jetty 6 (zip)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.zip.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-jee5-2.0-M1.zip.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.zip" class="externalLink" title="External Link">Geronimo 2.0-M2 with Jetty 6 (zip)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.zip.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-jee5-2.0-M2.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.zip" class="externalLink" title="External Link">Geronimo 2.0-M1 with Tomcat 6 (zip)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.zip.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-jee5-2.0-M1.zip.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.zip" class="externalLink" title="External Link">Geronimo 2.0-M2 with Tomcat 6 (zip)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.zip.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-jee5-2.0-M2.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<br/>
             <p><strong>Little-G</strong></p>
@@ -63,33 +63,33 @@
 		<br/>
 		<b>Linux/Mac OS X/Unix Downloads</b>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-jetty6-minimal-2.0-M1.tar.gz" class="externalLink" title="External Link">Little-G 2.0-M1 with Jetty 6 (tar.gz)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-minimal-2.0-M1.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-minimal-2.0-M1.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty6-minimal-2.0-M1.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-jetty6-minimal-2.0-M2.tar.gz" class="externalLink" title="External Link">Little-G 2.0-M2 with Jetty 6 (tar.gz)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-minimal-2.0-M2.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-minimal-2.0-M2.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty6-minimal-2.0-M2.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.tar.gz" class="externalLink" title="External Link">Little-G 2.0-M1 with Tomcat 6 (tar.gz)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.tar.gz" class="externalLink" title="External Link">Little-G 2.0-M2 with Tomcat 6 (tar.gz)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<br/>
 		<b>Windows Downloads</b>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-jetty-minimal-2.0-M1.zip" class="externalLink" title="External Link">Litle-G 2.0-M1 with Jetty 6 (zip)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty-minimal-2.0-M1.zip.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty-minimal-2.0-M1.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-jetty-minimal-2.0-M1.zip.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-jetty-minimal-2.0-M2.zip" class="externalLink" title="External Link">Litle-G 2.0-M2 with Jetty 6 (zip)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty-minimal-2.0-M2.zip.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty-minimal-2.0-M2.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-jetty-minimal-2.0-M2.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.zip" class="externalLink" title="External Link">Little-G 2.0-M1 with Tomcat 6 (zip)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.zip.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-tomcat6-minimal-2.0-M1.zip.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.zip" class="externalLink" title="External Link">Little-G 2.0-M2 with Tomcat 6 (zip)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.zip.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-tomcat6-minimal-2.0-M2.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 
-	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC11/sample-applications.html">Sample applications</a></b></p>
+	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC20/working-examples.html">Sample applications</a></b></p>
 	</ul>
 	</p>
 
@@ -165,7 +165,7 @@
 			<a href="http://www.apache.org/dist/geronimo/1.2-beta/geronimo-tomcat-minimal-1.2-beta.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 
-	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC11/sample-applications.html">Sample applications</a></b></p>
+	    <p>Download <b><a href="http://cwiki.apache.org/GMOxDOC12/sample-applications.html">Sample applications</a></b></p>
 	</ul>
 	</p>
 
@@ -369,19 +369,19 @@
 <subsection name="Source Code">
 
 	<p>
-	<strong>Version 2.0-M1 - Released December 22, 2006</strong>
+	<strong>Version 2.0-M2 - Released December 22, 2006</strong>
 	<ul>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-2.0-M1_src.zip" class="externalLink" title="External Link">Geronimo 2.0-M1 Source (zip)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.zip.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.zip.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-2.0-M2_src.zip" class="externalLink" title="External Link">Geronimo 2.0-M2 Source (zip)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.zip.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.zip.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.zip.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 		<li style="list-style-type:square">
-			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M1/geronimo-2.0-M1_src.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M1 Source (tar.gz)</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
-			<a href="http://www.apache.org/dist/geronimo/2.0-M1/geronimo-2.0-M1_src.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
+			<a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/geronimo-2.0-M2_src.tar.gz" class="externalLink" title="External Link">Geronimo 2.0-M2 Source (tar.gz)</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.tar.gz.asc" class="externalLink" title="External Link">PGP</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.tar.gz.sha1" class="externalLink" title="External Link">SHA-1</a>
+			<a href="http://www.apache.org/dist/geronimo/2.0-M2/geronimo-2.0-M2_src.tar.gz.md5" class="externalLink" title="External Link">MD5</a>
 		</li>
 	</ul>
 	<hr color="#666666" width="100%" size="2"/>

Modified: geronimo/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/index.xml?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/xdocs/index.xml (original)
+++ geronimo/site/trunk/xdocs/index.xml Tue Jan 30 14:46:38 2007
@@ -45,6 +45,21 @@
 
 	<subsection name="Geronimo News">
 
+<!--
+    <p>
+		2007-01-30<br />
+		<strong>Apache Geronimo 2.0-M2 has been released and is available for user download.</strong>
+		<blockquote>
+                    This new milestone release of Apache Geronimo represents another snapshot of our progress towards a Java Enterprise Edition 5.0 Server runtime.  It includes the latest Jetty and Tomcat 
+                    servlet engines so users can experiment with Servlet 2.5, JSP 2.1 as well as JSF 1.1 and JSTL 1.2.  Also included is Apache's OpenJPA for Java Persistence as well as the latest
+                    Javamail 1.4 and Java Activation Framework. Last but not least, this miletone release includes EJB 3 and enhanced Web services support. Review the <a href="http://www.apache.org/dyn/closer.cgi/geronimo/2.0-M2/RELEASE-NOTES-2.0-M2.txt">2.0-M2 Release Notes</a> for further details on these updates.
+					<br />  <br />
+					This is a milestone release so it is not recommended for high load deployments.  The Apache Geronimo team would very much like user feedback so we can meet your needs as we continue the Drive to Five.  
+			See the <a href="downloads.html">Downloads page</a> for download information.
+		</blockquote>
+		<hr color="#666666" width="100%" size="2"/>
+	</p>
+-->
 	<p>
 		2006-12-22<br />
 		<strong>Apache Geronimo 2.0-M1 has been released and is available for user download.</strong>
@@ -52,8 +67,7 @@
                     This version of Geronimo represents a point in time view into our progress towards a Java Enterprise Edition 5.0 Server runtime.  It includes the latest Jetty and Tomcat 
                     servlet engines so users can experiment with Servlet 2.5, JSP 2.1 as well as JSF 1.1 and JSTL 1.2.  Also included is Apache's OpenJPA for Java Persistence as well as the latest
                     Javamail 1.4 and Java Activation Framework.  This is a milestone release so it is not recommended for high load deployments.  The Apache Geronimo team would very much like
-                    user feedback so we can meet your needs as we continue the Drive to Five.  
-			See the <a href="downloads.html">Downloads page</a> for download information.
+                    user feedback so we can meet your needs as we continue the Drive to Five.
 		</blockquote>
 		<hr color="#666666" width="100%" size="2"/>
 	</p>
@@ -70,37 +84,14 @@
 	</p>
 	
 	<p>
-		2006-11-13<br />
-		<strong>Geronimo Eclipse Plugin v1.2.0 has been released and is available for user download.</strong>
-		<blockquote>
-            The Geronimo Eclipse Plugin v1.2.0 is mainly a bug-fix release, improving stability and adding support for the Geronimo 1.1.1 release.
-			See the <a href="devtools.html">Subprojects section</a> for download information.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2"/>
+	  2006-11-13<br />
+	  <strong>Geronimo Eclipse Plugin v1.2.0 has been released and is available for user download.</strong>
+	  <blockquote>
+		  The Geronimo Eclipse Plugin v1.2.0 is mainly a bug-fix release, improving stability and adding support for the Geronimo 1.1.1 release.
+		  See the <a href="devtools.html">Subprojects section</a> for download information.
+	  </blockquote>
+	  <hr color="#666666" width="100%" size="2"/>
 	</p>
-	
-	<p>
-		2006-10-12<br />
-		<strong>Geronimo v1.1.1 Certified on Azul Compute Appliances</strong>
-		<blockquote>
-            The Apache Geronimo Project is pleased to announce the J2EE 1.4 Certification of Apache Geronimo v1.1.1 running on an Azul Compute Appliance. The testing was performed on an Azul Compute Appliance Model 1920B (8 chip / 192 cores, 64GB memory) coupled with Azul VM release 2.3.1.2 (HotSpot™ Java™ 1.4.2_12), 64-bit Server mode. The Apache Geronimo Project wishes to thank Azul Systems for providing the machine time on the Azul Compute Appliance used for this certification effort. For more information on Azul Compute Appliances, please visit <a href="http://www.azulsystems.com">http://www.azulsystems.com</a>.<br /><br />
-
-    	</blockquote>
-		<hr color="#666666" width="100%" size="2"/>
-	</p>
-
-	<p>
-		2006-10-05<br />
-		<strong>Webcast: Geronimo v1.1.1 Overview: Management (Web) Console and Plugins</strong>
-		<blockquote>
-            Join members of the Apache Geronimo Developer Community for a technical overview and explanation of features in Apache Geronimo v1.1.1, the full-featured, fully-certified J2EE server from the Apache Software Foundation.   You will learn how to download Geronimo, install and run it. You'll receive a walk-through of the management console which provides an easy to use user interface and learn about the new plugin architecture which provides a simple user experience.<br /><br />
-
-			Click <a href="http://tinyurl.com/qymc2">here</a> to access the webcast.
-
-		</blockquote>
-		<hr color="#666666" width="100%" size="2"/>
-	</p>
-	
 	</subsection>
 	
 	<a href="newshistory.html"><img align="right" src="images/newsarchive_96x15.gif" border="0"/></a>

Modified: geronimo/site/trunk/xdocs/newshistory.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/newshistory.xml?view=diff&rev=501617&r1=501616&r2=501617
==============================================================================
--- geronimo/site/trunk/xdocs/newshistory.xml (original)
+++ geronimo/site/trunk/xdocs/newshistory.xml Tue Jan 30 14:46:38 2007
@@ -28,6 +28,29 @@
         <section name="News Archive">
 
             <subsection name="2006">
+	
+				<p>
+					2006-10-12<br />
+					<strong>Geronimo v1.1.1 Certified on Azul Compute Appliances</strong>
+					<blockquote>
+						The Apache Geronimo Project is pleased to announce the J2EE 1.4 Certification of Apache Geronimo v1.1.1 running on an Azul Compute Appliance. The testing was performed on an Azul Compute Appliance Model 1920B (8 chip / 192 cores, 64GB memory) coupled with Azul VM release 2.3.1.2 (HotSpot™ Java™ 1.4.2_12), 64-bit Server mode. The Apache Geronimo Project wishes to thank Azul Systems for providing the machine time on the Azul Compute Appliance used for this certification effort. For more information on Azul Compute Appliances, please visit <a href="http://www.azulsystems.com">http://www.azulsystems.com</a>.<br /><br />
+
+					</blockquote>
+					<hr color="#666666" width="100%" size="2"/>
+				</p>
+
+				<p>
+					2006-10-05<br />
+					<strong>Webcast: Geronimo v1.1.1 Overview: Management (Web) Console and Plugins</strong>
+					<blockquote>
+						Join members of the Apache Geronimo Developer Community for a technical overview and explanation of features in Apache Geronimo v1.1.1, the full-featured, fully-certified J2EE server from the Apache Software Foundation.   You will learn how to download Geronimo, install and run it. You'll receive a walk-through of the management console which provides an easy to use user interface and learn about the new plugin architecture which provides a simple user experience.<br /><br />
+
+						Click <a href="http://tinyurl.com/qymc2">here</a> to access the webcast.
+
+					</blockquote>
+					<hr color="#666666" width="100%" size="2"/>
+				</p>
+
 				<p>
 					2006-09-18<br />
 					<strong>Geronimo v1.1.1 has been released and is available for user download</strong>