Author: tv
Date: Sun Jan 10 16:30:20 2016
New Revision: 1723938
URL: http://svn.apache.org/viewvc?rev=1723938&view=rev
Log:
Update site with 4.0-M2 release
Modified:
turbine/site/doap/doap_Turbine.rdf
turbine/site/src/site/site.xml
turbine/site/xdocs/index.xml
turbine/site/xdocs/news.xml
Modified: turbine/site/doap/doap_Turbine.rdf
URL:
http://svn.apache.org/viewvc/turbine/site/doap/doap_Turbine.rdf?rev=1723938&r1=1723937&r2=1723938&view=diff
==============================================================================
--- turbine/site/doap/doap_Turbine.rdf (original)
+++ turbine/site/doap/doap_Turbine.rdf Sun Jan 10 16:30:20 2016
@@ -41,6 +41,20 @@ Turbine is developed in an open, partici
<revision>2.3.3</revision>
</Version>
</release>
+ <release>
+ <Version>
+ <name>Apache Turbine</name>
+ <created>2011-06-23</created>
+ <revision>4.0-M1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>Apache Turbine</name>
+ <created>2015-12-22</created>
+ <revision>4.0-M2</revision>
+ </Version>
+ </release>
<repository>
<SVNRepository>
<location
rdf:resource="http://svn.apache.org/repos/asf/turbine/core/trunk/"/>
Modified: turbine/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1723938&r1=1723937&r2=1723938&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Sun Jan 10 16:30:20 2016
@@ -58,13 +58,10 @@
<menu name="Turbine Releases">
<item name="Overview" href="/turbine/index.html"/>
<item name="Turbine 2.3.3" href="/turbine/turbine-2.3.3/index.html"/>
- <item name="Turbine 2.4-M1"
href="/turbine/turbine-2.4-M1/index.html"/>
- <item name="Turbine 4.0-M1"
href="/turbine/turbine-4.0-M1/index.html"/>
+ <item name="Turbine 4.0-M2"
href="/turbine/turbine-4.0-M2/index.html"/>
</menu>
<menu name="Turbine Development">
- <item name="Overview" href="/turbine/index.html"/>
- <item name="Turbine 2.3"
href="/turbine/development/turbine-2.3/index.html"/>
<item name="Turbine 4.0"
href="/turbine/development/turbine-4.0/index.html"/>
</menu>
Modified: turbine/site/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/index.xml?rev=1723938&r1=1723937&r2=1723938&view=diff
==============================================================================
--- turbine/site/xdocs/index.xml (original)
+++ turbine/site/xdocs/index.xml Sun Jan 10 16:30:20 2016
@@ -87,7 +87,7 @@
<a
href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-2.3.3/";>Apache
Mirrors</a></li>
<li>While <a href="turbine/development/turbine-4.0/">Turbine 4.0</a> is
- the shape of things to come. For production use
+ the shape of things to come, for production use
we recommend that you stick with the 2.3.x release series. Turbine 4.0 uses
different technologies like an <a href="http://avalon.apache.org/";>
Avalon-based</a> container and decoupled components from the
@@ -98,9 +98,9 @@
introduction of a pipeline concept that allows you to define via an XML
file
all the stages for processing a request.
You are encouraged to try out the current
- <a href="turbine/turbine-4.0-M1/">Milestone Release 4.0-M1</a>.
+ <a href="turbine/turbine-4.0-M2/">Milestone Release 4.0-M2</a>.
Download it from one of the
- <a
href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0-M1/";>Apache
Mirrors</a></li>
+ <a
href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0-M2/";>Apache
Mirrors</a></li>
</ul>
</p>
</section>
Modified: turbine/site/xdocs/news.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/news.xml?rev=1723938&r1=1723937&r2=1723938&view=diff
==============================================================================
--- turbine/site/xdocs/news.xml (original)
+++ turbine/site/xdocs/news.xml Sun Jan 10 16:30:20 2016
@@ -27,6 +27,14 @@
<body>
<section name="News And Status">
+ <h4>22 Dec 2015 - Release of Turbine 4.0-M2 Milestone</h4>
+ <p>
+ The Turbine Team is proud to announce the 4.0-M2 release of the Turbine
Framework.
+ Download source and binary releases through the Apache mirror system at
+ <a href="http://www.apache.org/dyn/closer.cgi/turbine";>the turbine
download site</a>.
+ See <a href="/turbine/turbine-4.0-M2/changes-report.html">what's new.</a>
+ </p>
+
<h4>18 Nov 2012 - Release of Turbine Maven Archetypes</h4>
<p>
The Turbine Team announces the release of two Maven archetypes for the
