Author: husted
Date: Mon Nov 27 18:21:39 2006
New Revision: 479850
URL: http://svn.apache.org/viewvc?view=rev&rev=479850
Log:
WW-1458 Add link to XWork API docs. Move Shale reference to FAQ. Fix POM
reference to assembly plugin.
Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/index.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/src/site/site.xml
Modified: struts/site/src/site/fml/roadmap.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?view=diff&rev=479850&r1=479849&r2=479850
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Mon Nov 27 18:21:39 2006
@@ -298,10 +298,10 @@
<a
href="http://struts.apache.org/2.x/WW/migration-guide.html";>
Struts 2 Migration Guide.</a>
</p>
- </answer>
+ </answer>
</faq>
- <faq id="migrate_s1">
+ <faq id="migrate_reasons">
<question>What circumstances justify a migration?</question>
<answer>
<p>
@@ -353,6 +353,20 @@
It's a shiny new toy (find a new project).
</li>
</ol>
+ </answer>
+ </faq>
+
+ <faq id="jsf">
+ <question>Wouldn't it be just as easy to migrate to JavaServer
Faces?</question>
+ <answer>
+ <p>
+ <a
href="http://struts.apache.org/2.x/docs/javaserver-faces.html";>
+ Struts 2 supports JSF components,</a>
+ so it's not an either/or proposition.
+ For a complete JSF solution designed with
+ Struts developers in mind,
+ see <a href="http://shale.apache.org/";>Apache Shale.</a>
+ </p>
</answer>
</faq>
Modified: struts/site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=479850&r1=479849&r2=479850
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Mon Nov 27 18:21:39 2006
@@ -33,7 +33,7 @@
</p>
<a name="2.0.1"/>
- <subsection name="Struts 2.0.1 BETA Available">
+ <subsection name="20 Oct 2006 - Struts 2.0.1 BETA Release">
<p>
<a href="http://struts.apache.org/download.cgi#struts201";>Apache
Struts 2</a>
@@ -45,7 +45,7 @@
</subsection>
<a name="1.3.5"/>
- <subsection name="Struts 1.3.5 Released">
+ <subsection name="17 Sep 2006 - Struts 1.3.5 General Availability
Release">
<p>
The <strong>best available</strong> version of Struts is
@@ -59,7 +59,7 @@
</subsection>
<a name="1.2.9"/>
- <subsection name="Struts 1.2.9">
+ <subsection name="22 Mar 2005 - Struts 1.2.9 General Availability
Release">
<p>
<a href="announce.html#a20050322">
@@ -200,21 +200,6 @@
my next project?".</a>
</p>
</section>
-
- <section>
- <a name="shale"/>
- <subsection name="Hey! What Happened to Struts Shale?">
- <p>
- Shale started as an Apache Struts subproject and then
- <a href="announce.html#a20060628.1">graduated</a>
- to a full top-level Apache project in its own right.
- Apache Shale builds on JavaServer Faces (JSF), making JSF
- applications easier to develop. For details, visit the
- <a href="http://shale.apache.org";>Apache Shale</a>
- site.
- </p>
- </subsection>
- </section>
<section>
<p class="right">
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=479850&r1=479849&r2=479850
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Nov 27 18:21:39 2006
@@ -113,7 +113,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/all.xml</descriptor>
Modified: struts/struts2/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=479850&r1=479849&r2=479850
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Mon Nov 27 18:21:39 2006
@@ -75,12 +75,16 @@
href="struts2-core/apidocs/index.html"
/>
<item
- name="New API (experimental)"
- href="struts2-api/apidocs/index.html"
+ name="XWork 2 API"
+ href="xwork-apidocs/index.html"
/>
<item
name="Tag Reference"
href="http://struts.apache.org/WW/tag-reference.html";
+ />
+ <item
+ name="New API (experimental)"
+ href="struts2-api/apidocs/index.html"
/>
</menu>
