Author: mrdon
Date: Sat Jul 1 20:25:01 2006
New Revision: 418545
URL: http://svn.apache.org/viewvc?rev=418545&view=rev
Log:
More Struts Action renaming
STR-2898
Modified:
struts/struts1/trunk/src/site/resources/userGuide/.htaccess
struts/struts1/trunk/src/site/xdoc/learning.xml
struts/struts1/trunk/src/site/xdoc/roadmap.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
Modified: struts/struts1/trunk/src/site/resources/userGuide/.htaccess
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/resources/userGuide/.htaccess?rev=418545&r1=418544&r2=418545&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/resources/userGuide/.htaccess (original)
+++ struts/struts1/trunk/src/site/resources/userGuide/.htaccess Sat Jul 1
20:25:01 2006
@@ -1,18 +1,18 @@
-Redirect permanent /struts-action/userGuide/installation-1.0.html
http://struts.apache.org/struts-action/userGuide/installation-1_0.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0-b1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0-b2.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b2.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0-b3.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b3.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0.1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0_1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0.2.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0_2.html
-Redirect permanent /struts-action/userGuide/release-notes-1.0.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_0.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1-b1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1-b2.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b2.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1-b3.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b3.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1-rc1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1-rc1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1-rc2.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1-rc2.html
-Redirect permanent /struts-action/userGuide/release-notes-1.1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.2.4.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_2_4.html
-Redirect permanent /struts-action/userGuide/release-notes-1.2.7.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_2_7.html
-Redirect permanent /struts-action/userGuide/release-notes-1.2.8.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_2_8.html
-Redirect permanent /struts-action/userGuide/release-notes-1.3.1.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_3_1.html
-Redirect permanent /struts-action/userGuide/release-notes-1.3.2.html
http://struts.apache.org/struts-action/userGuide/release-notes-1_3_2.html
+Redirect permanent /struts-action/userGuide/installation-1.0.html
http://struts.apache.org/1.x/userGuide/installation-1_0.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0-b1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0-b1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0-b2.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0-b2.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0-b3.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0-b3.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0.1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0_1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0.2.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0_2.html
+Redirect permanent /struts-action/userGuide/release-notes-1.0.html
http://struts.apache.org/1.x/userGuide/release-notes-1_0.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1-b1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1-b1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1-b2.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1-b2.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1-b3.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1-b3.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1-rc1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1-rc1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1-rc2.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1-rc2.html
+Redirect permanent /struts-action/userGuide/release-notes-1.1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.2.4.html
http://struts.apache.org/1.x/userGuide/release-notes-1_2_4.html
+Redirect permanent /struts-action/userGuide/release-notes-1.2.7.html
http://struts.apache.org/1.x/userGuide/release-notes-1_2_7.html
+Redirect permanent /struts-action/userGuide/release-notes-1.2.8.html
http://struts.apache.org/1.x/userGuide/release-notes-1_2_8.html
+Redirect permanent /struts-action/userGuide/release-notes-1.3.1.html
http://struts.apache.org/1.x/userGuide/release-notes-1_3_1.html
+Redirect permanent /struts-action/userGuide/release-notes-1.3.2.html
http://struts.apache.org/1.x/userGuide/release-notes-1_3_2.html
Modified: struts/struts1/trunk/src/site/xdoc/learning.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/learning.xml?rev=418545&r1=418544&r2=418545&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/learning.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/learning.xml Sat Jul 1 20:25:01 2006
@@ -365,7 +365,7 @@
For a comprehensive listing of all resources related to
Apache Struts,
including articles, books, and third-party extensions,
- for Action 1, Shale, and Action 2,
+ for Struts 1 and Struts 2,
visit <a href="http://www.StrutsCentral.net/";>Struts
Central.</a>
</p>
Modified: struts/struts1/trunk/src/site/xdoc/roadmap.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/roadmap.xml?rev=418545&r1=418544&r2=418545&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/roadmap.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/roadmap.xml Sat Jul 1 20:25:01 2006
@@ -57,13 +57,10 @@
<ul>
<li>
- <a
href="http://issues.apache.org/struts/browse/STR?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Action 1)</a>
+ <a
href="http://issues.apache.org/struts/browse/STR?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Struts 1)</a>
</li>
<li>
- <a
href="http://issues.apache.org/struts/browse/WW?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Action 2)</a>
- </li>
- <li>
- <a
href="http://issues.apache.org/struts/browse/SHALE?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Shale)</a>
+ <a
href="http://issues.apache.org/struts/browse/WW?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Struts 2)</a>
</li>
<li>
<a
href="http://issues.apache.org/struts/browse/SB?report=com.atlassian.jira.plugin.system.project:openissues-panel";>Open
Issues (Sandbox)</a>
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml?rev=418545&r1=418544&r2=418545&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml Sat Jul 1
20:25:01 2006
@@ -449,7 +449,7 @@
<strong>Struts Configuration.</strong>
The Configuration
defines (among other things) the
- <a
href="../struts-action/apidocs/org/apache/struts/action/ActionMappings.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/ActionMappings.html">
ActionMappings</a>
<code>[org.apache.struts.action.ActionMappings]</code>
for an application.
@@ -460,7 +460,7 @@
routes HTTP
requests to other components in the framework. Requests
may be forwarded to JavaServer Pages or
- <a
href="../struts-action/apidocs/org/apache/struts/action/Action.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/Action.html">
Action</a>
<code>[org.apache.struts.action.Action]</code>
subclasses provided by the
@@ -473,7 +473,7 @@
<p>
An individual
- <a
href="../struts-action/apidocs/org/apache/struts/action/ActionMapping.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/ActionMapping.html">
ActionMapping</a>
<code>[org.apache.struts.action.ActionMapping]</code>
will usually contain a number of properties including:
@@ -539,7 +539,7 @@
requests. You can define your own set of input bean
classes, by
subclassing
- <a
href="../struts-action/apidocs/org/apache/struts/action/ActionForm.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/ActionForm.html">
ActionForm</a>
<code>[org.apache.struts.action.ActionForm].</code>
The ActionForm class makes it
@@ -566,11 +566,11 @@
<p>
Another element of the Configuration are the
- <a
href="../struts-action/apidocs/org/apache/struts/action/ActionFormBeans.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/ActionFormBeans.html">
ActionFormBeans</a>
<code>[org.apache.struts.action.ActionFormBeans].</code>
This is a collection of
- <a
href="../struts-action/apidocs/org/apache/struts/action/ActionFormBean.html">
+ <a
href="../1.x/apidocs/org/apache/struts/action/ActionFormBean.html">
descriptor objects</a>
that are used to create instances of the ActionForm
objects at runtime.
@@ -626,7 +626,7 @@
to support the internationalization features built into
the Java platform. All the field labels
and messages can be retrieved from a
- <a
href="../struts-action/apidocs/org/apache/struts/util/MessageResources.html">
+ <a
href="../1.x/apidocs/org/apache/struts/util/MessageResources.html">
message resource.</a>
To provide messages for another language, simply add
another file to the resource bundle.
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml?rev=418545&r1=418544&r2=418545&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml Sat Jul 1
20:25:01 2006
@@ -1313,11 +1313,9 @@
JavaServer Faces technology.</a>
JSF simplifies building user interfaces for JavaServer
applications, both for the web and for the desktop.
- To keep pace, Apache Struts is offering a new framework to
- go with this new technology, called
- <a href="http://struts.apache.org/struts-shale/index.html";>
- Struts Shale.</a>
- For teams looking for a step-wise transition to JSF, we
+ To keep pace, Struts 2 has support for this new
technology, allowing
+ Struts pages to use JSF components.
+ For teams looking for a step-wise transition to JSF and
Struts 1, we
offer Struts-Faces taglib,
which lets you use JSF components with your existing
Actions.
