You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/07/10 05:52:22 UTC
svn commit: r420411 - in /struts/struts1/trunk: apps/src/site/ el/src/site/
el/src/site/xdoc/ extras/src/site/ faces/src/main/resources/META-INF/
faces/src/site/ faces/src/site/xdoc/ scripting/src/site/
scripting/src/site/xdoc/ src/site/xdoc/userGuide/...
Author: husted
Date: Sun Jul 9 20:52:21 2006
New Revision: 420411
URL: http://svn.apache.org/viewvc?rev=420411&view=rev
Log:
STR-2598
* Update EL welcome page
* Remove redundant "FAQ" page
* Conform spelling of "website"
* Update other references to "Struts Action"
Removed:
struts/struts1/trunk/el/src/site/xdoc/struts-el.xml
Modified:
struts/struts1/trunk/apps/src/site/site.xml
struts/struts1/trunk/el/src/site/site.xml
struts/struts1/trunk/el/src/site/xdoc/index.xml
struts/struts1/trunk/extras/src/site/site.xml
struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml
struts/struts1/trunk/faces/src/site/site.xml
struts/struts1/trunk/faces/src/site/xdoc/index.xml
struts/struts1/trunk/scripting/src/site/site.xml
struts/struts1/trunk/scripting/src/site/xdoc/index.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
struts/struts1/trunk/taglib/src/site/site.xml
struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml
struts/struts1/trunk/taglib/src/site/xdoc/faq.xml
struts/struts1/trunk/taglib/src/site/xdoc/index.xml
struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml
struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml
struts/struts1/trunk/tiles/src/site/site.xml
struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml
struts/struts1/trunk/tiles/src/site/xdoc/examples.xml
struts/struts1/trunk/tiles/src/site/xdoc/index.xml
struts/struts1/trunk/tiles/src/site/xdoc/installation.xml
Modified: struts/struts1/trunk/apps/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/apps/src/site/site.xml (original)
+++ struts/struts1/trunk/apps/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -72,7 +72,7 @@
name="Apache Struts Home"
href="http://struts.apache.org/"/>
<item
- name="Struts Action 1"
+ name="Struts 1"
href="../index.html"/>
</menu>
Modified: struts/struts1/trunk/el/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/el/src/site/site.xml (original)
+++ struts/struts1/trunk/el/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action - EL Taglibs">
+<project name="Struts 1 - EL Taglibs">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/el/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/el/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/el/src/site/xdoc/index.xml Sun Jul 9 20:52:21 2006
@@ -18,7 +18,7 @@
-->
<document>
<properties>
- <title>Struts Action Framework - EL Taglibs</title>
+ <title>Struts EL</title>
</properties>
<body>
@@ -27,39 +27,59 @@
<a name="welcome"/>
<p>
- This subproject is an extension of the Struts tag library.
- Each JSP custom tag
- in this library is a subclass of an associated tag in the
- Struts tag library.
- One difference is that this tag library does not use
- "rtexprvalues", it uses
- the expression evaluation engine in the Jakarta Taglibs
- implementation of the
- JSP Standard Tag Library (version 1.0) to evaluate attribute
+ Struts EL is an extension of the Struts Taglib component
+ that uses JSTL (the JavaServer Pages Standard Tag Library)
+ as a foundation technology.
+ Each JSP custom tag in this library is a JSTL-aware
+ subclass of a corresponding tag in Struts Taglib.
+ Since JSTL is a prerequisite,
+ only those tags without a JSTL corrollary were ported to
+ Struts EL.
+ </p>
+ <p>
+ Since this component utilizes JSTL, the JSTL expression
+ language ("EL"), and Struts Taglib, an understanding of all
+ three is a prerequisite.
+ </p>
+ </section>
+
+ <section name="Evaluating Expressions">
+ <p>
+ Unlike the Struts Taglib component,
+ Struts EL does not use runtime scriptlet expressions ("rtexprvalues"),
+ EL uses the expression evaluation engine in the Jakarta Taglibs
+ implementation of JSTL (version 1.0) to evaluate attribute
values.
</p>
+
<p>
- In addition, some of the Struts tags were not ported to this
- library, as it was
- determined that their functionality was entirely supplied by
- the JSTL. These
- particular Struts tags, and the reason for their non-porting
- will be described
- in the documentation for this library.
+ The base Struts Taglib contains tags which rely on the
+ evaluation of "rtexprvalue"s to render dynamic
+ attribute values. For instance, to print a message from a
+ properties
+ file based on a resource key, you would use the
+ <code>bean:write</code>
+ tag, perhaps like this:
</p>
+ <source>
+ <![CDATA[<bean:message key='<%= stringvar %>'/>]]>
+ </source>
+
<p>
- In order to fully understand the correct utilization of this
- library, you must
- understand the use and operation of the Struts tag library,
- and the use and
- operation of the JavaServer Pages Standard Tag Library
- (hereafter called the
- "JSTL"), along with the expression language (sometimes called
- the "EL") used
- for evaluating attribute values.
+ This assumes that
+ <code>stringvar</code>
+ exists as a JSP scripting
+ variable. If you're using the
+ <strong>Struts-EL</strong>
+ library, the
+ reference looks very similar, but slightly different, like
+ this:
</p>
+ <source>
+ <![CDATA[<bean-el:message key="${stringvar}"/>]]>
+ </source>
</section>
-
+
<section name="Tag Mapping">
<p>
In implementing the Struts-EL library, every Struts tag that
@@ -69,6 +89,8 @@
library. This section reviews which Struts tags are NOT
implemented in the
Struts-EL library, and which JSTL tags provide that feature.
+ (See the <a href="tagreference.html">
+ reference</a> for the tags that are implemented.)
</p>
<p>
Many of the non-porting decisions were based on the fact that
Modified: struts/struts1/trunk/extras/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/extras/src/site/site.xml (original)
+++ struts/struts1/trunk/extras/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action - Extras">
+<project name="Struts 1 - Extras">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml (original)
+++ struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml Sun Jul 9 20:52:21 2006
@@ -352,7 +352,7 @@
<description>
Struts action to be executed.
</description>
- <display-name>Struts Action</display-name>
+ <display-name>Struts 1</display-name>
<property-name>action</property-name>
<property-class>java.lang.String</property-class>
</property>
Modified: struts/struts1/trunk/faces/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/faces/src/site/site.xml (original)
+++ struts/struts1/trunk/faces/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -19,7 +19,7 @@
*/
-->
-<project name="Struts Action - Faces">
+<project name="Struts 1 - Faces">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/faces/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/faces/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/faces/src/site/xdoc/index.xml Sun Jul 9 20:52:21 2006
@@ -19,16 +19,16 @@
<document>
<properties>
- <title>Struts Action Framework - Faces</title>
+ <title>Struts 1 - Faces</title>
</properties>
<body>
- <section name="Struts Action and JavaServer Faces Integration Library">
+ <section name="Struts and JavaServer Faces Integration Library">
<a name="welcome"/>
<p>The "Struts-Faces" package contains an add-on library that supports the use of
- JavaServer Faces (JSF) user interface technology in a Struts Action based web
+ JavaServer Faces (JSF) user interface technology in a Struts-based web
application, in place of the Struts custom tag libraries.</p>
<p>The Struts-Faces Integration Library should work with any implementation
@@ -50,8 +50,7 @@
<p>Please report any bugs, or log any enhancement requests, in the
<a href="http://issues.apache.org/struts/">Struts JIRA Issue Tracker</a>,
- using project <code>Struts Action Framework</code> and component
- <code>Faces</code>.</p>
+ using <code>Struts</code> and <code>Faces</code>.</p>
</section>
Modified: struts/struts1/trunk/scripting/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/src/site/site.xml (original)
+++ struts/struts1/trunk/scripting/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action - Scripting">
+<project name="Struts 1 - Scripting">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/scripting/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/scripting/src/site/xdoc/index.xml Sun Jul 9 20:52:21 2006
@@ -18,7 +18,7 @@
-->
<document>
<properties>
- <title>Struts Action Framework - Scripting</title>
+ <title>Apache Struts - Scripting</title>
</properties>
<body>
@@ -34,7 +34,7 @@
Struts Scripting allows an application to be developed rapidly with
the quick development cycle (edit file -> refresh browser) that one
would expect in a scripting environment. Furthermore, it enables other
- non-Java trained members of a development team, such as web designers who
+ non-Java trained members of a development grup, such as web designers who
may have a scripting background, to be more involved, leaving the Java
developers to create the reusable services the Struts actions will interact
with. Finally, when used with Java-like languages such as <a
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml Sun Jul 9 20:52:21 2006
@@ -44,7 +44,7 @@
<li>Modify the file
<code>$ORION_HOME/config/default-web-site.xml</code>
(or
- the configuration file for any other Orion web site)
+ the configuration file for any other Orion website)
to include the following
declarations, after the declaration for the <default-web-app>
if any:
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml Sun Jul 9 20:52:21 2006
@@ -181,7 +181,7 @@
$WAS_HOME/AppServer/hosts/default_host/struts-example/servlets/org/apache/struts/resources/struts-config_1_0.dtd</code>
<br/>
or be connected to the Internet to fetch the dtd from
- the Jakarta web site.
+ the Jakarta website.
</li>
<li>Start your webapp in the Admin Console</li>
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=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml Sun Jul 9 20:52:21 2006
@@ -1146,7 +1146,7 @@
<p>
Just as a HTTP server can be used to host several distinct
- web sites,
+ websites,
a servlet container can be used to host more than one web
application.
The Java servlet platform provides a well-defined
Modified: struts/struts1/trunk/taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/site.xml (original)
+++ struts/struts1/trunk/taglib/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action - Taglibs">
+<project name="Struts 1 - Taglibs">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml Sun Jul 9 20:52:21 2006
@@ -31,7 +31,7 @@
This chapter focuses on the task of building the
<em>View</em>
components
- for use with the Struts Action Framework.
+ for use with Struts.
Many applications rely on JavaServer Pages (JSP)
technology to create the
presentation layer.
@@ -179,7 +179,7 @@
<p>
Please note that the i18n support in a framework like
- Struts Action is limited to
+ Struts is limited to
the
<strong>presentation</strong>
of internationalized text and images to the user.
Modified: struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml Sun Jul 9 20:52:21 2006
@@ -34,7 +34,7 @@
<a href="http://java.sun.com/products/jsp/jstl/">
JavaServer Pages
Standard Tag Library (JSTL).</a>
- The Struts Action team encourages the use of the standard tags
+ The Apache Struts group encourages the use of the standard tags
over the Struts
specific tags when possible.
</p>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml Sun Jul 9 20:52:21 2006
@@ -31,7 +31,7 @@
a JSP view and the other components of a Web application.
Since a dynamic Web application often depends on gathering
data from a user, input forms play an important role in
- the Struts Action Framework. Consequently, the majority of the
+ the Struts. Consequently, the majority of the
HTML tags involve HTML forms.
</p>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml Sun Jul 9 20:52:21 2006
@@ -32,7 +32,7 @@
in the
<a href="http://java.sun.com/products/jsp/jstl/">
JavaServer Pages Standard Tag Library (JSTL).</a>
- The Struts Action team encourages the use of the standard tags
+ The Apache Struts group encourages the use of the standard tags
over the Struts specific tags when possible.
</p>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/faq.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/faq.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/faq.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/faq.xml Sun Jul 9 20:52:21 2006
@@ -127,22 +127,20 @@
<a name="jsf"/>
<subsection name="What about JSTL and JavaServer Faces?">
<p>
- Struts Action Framework works well with the
+ The framework works well with the
<a href="http://java.sun.com/products/jsp/jstl/">
- JavaServer Standard Tag Library</a>
- .
+ JavaServer Standard Tag Library.</a>
For a JSTL rendition of the original Struts JSP tags,
see the
<a href="http://struts.apache.org/struts-el/index.html">
- Struts EL subproject</a>
- .
+ Struts EL subproject.</a>
</p>
<p>
If you'd like to start using
<a href="http://java.sun.com/j2ee/javaserverfaces/">
JavaServer Faces</a>
- components in your Struts Action Framework application,
+ components in your application,
please see the
<a href="http://struts.apache.org/struts-faces/index.html">
Struts Faces</a>
@@ -150,7 +148,7 @@
If you'd like to get a fresh start in a pure JSF
environment,
please see the
- <a href="http://struts.apache.org/shale/index.html">Struts
+ <a href="http://shale.apache.org/">Struts
Shale</a>
framework.
</p>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/index.xml Sun Jul 9 20:52:21 2006
@@ -19,7 +19,7 @@
<document>
<properties>
- <title>Struts Action Framework - Taglib</title>
+ <title>Struts 1 - Taglib</title>
</properties>
<body>
Modified: struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml Sun Jul 9 20:52:21 2006
@@ -39,11 +39,11 @@
except with explicit JSP expressions (<%= %>).
</p>
<p>
- The Struts Action Framework provides much more powerful features
+ The framework provides much more powerful features
related to
indexed properties, but in truth most of the heavy lifting
is not even in
- the Struts Action Framework, but in the Jakarta Commons Beanutils
+ the framework, but in the Jakarta Commons Beanutils
package. This
package is used by the framework to provide this functionality.
You can see the
Modified: struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml Sun Jul 9 20:52:21 2006
@@ -140,8 +140,7 @@
<p>
An extension to version 1.1, named sslext, helps solve many
- of these issues for Struts Action
- developers. It extends the ActionConfig class,
+ of the HTTP/HTTPS switching issues. It extends the ActionConfig class,
RequestProcessor, and Plugin classes to
define a framework where developers may specify the
transmission protocol behavior for
Modified: struts/struts1/trunk/tiles/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/site.xml (original)
+++ struts/struts1/trunk/tiles/src/site/site.xml Sun Jul 9 20:52:21 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Struts Action - Tiles">
+<project name="Struts 1 - Tiles">
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
Modified: struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml Sun Jul 9 20:52:21 2006
@@ -78,7 +78,7 @@
<ul>
<li>
- Define common page layouts and reuse them across your web site
+ Define common page layouts and reuse them across your website
</li>
<li>
@@ -166,7 +166,7 @@
<subsection href="setup" name="Enabling your application for Tiles">
<p>
-The Tiles framework is bundled with Struts Action but not enabled by default. To enable Tiles you need to:
+Tiles is bundled with the framework but not enabled by default. To enable Tiles you need to:
</p>
<ul>
@@ -191,7 +191,7 @@
<pre><%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %></pre>
<ul>
<li>
- If you plan to use Tiles definitions defined in a centralized file, you need to create this file and instruct Struts Action to load the Tiles plugin which will create the factory corresponding to the file. You can have more than one definitions file.
+ If you plan to use Tiles definitions defined in a centralized file, you need to create this file and instruct the framework to load the Tiles plugin which will create the factory corresponding to the file. You can have more than one definitions file.
<ul>
<li>
@@ -212,7 +212,7 @@
<ul>
<li>
- <strong>Note:</strong> This plugin creates one factory for each Struts Action modules. The plugin first reads the factory parameters from <code>web.xml</code> and then overloads them with the ones defined in the first <code>struts-config.xml</code> file.
+ <strong>Note:</strong> This plugin creates one factory for each module. The plugin first reads the factory parameters from <code>web.xml</code> and then overloads them with the ones defined in the first <code>struts-config.xml</code> file.
</li>
</ul>
</li>
Modified: struts/struts1/trunk/tiles/src/site/xdoc/examples.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/xdoc/examples.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/examples.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/examples.xml Sun Jul 9 20:52:21 2006
@@ -140,7 +140,7 @@
<p>The scenario above can be avoided by defining Tiles in an XML configuration
file. The file is loaded at servlet startup using the Tiles Servlet or
- a Struts Action plugin. The example below defines the Tile in an XML file and
+ a plugin. The example below defines the Tile in an XML file and
uses the Tiles insert tag in a JSP to invoke it.</p>
<strong>file: WEB-INF/tiles-defs.xml</strong>
@@ -271,9 +271,9 @@
<section name="Tiles Controllers">
</section>
-<section name="Using Tiles With Struts Action">
+<section name="Using Tiles With Struts">
- <subsection name="Tiles Controller Invoking a Struts Action">
+ <subsection name="Tiles Controller Invoking an Action">
</subsection>
<subsection name="Forwarding To A Tiles Definition">
Modified: struts/struts1/trunk/tiles/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/index.xml Sun Jul 9 20:52:21 2006
@@ -18,14 +18,14 @@
-->
<document>
<properties>
- <title>Struts Action Framework - Tiles</title>
+ <title>Struts 1 - Tiles</title>
</properties>
<body>
<section name="Welcome To Tiles">
<p>Welcome to the Struts Tiles component. Tiles is a templating
- framework. It can be used to create a common look & feel for a web site or
+ framework. It can be used to create a common look & feel for a website or
application and to create reusable view components. This site will give you
all the information you need to get started.</p>
</section>
@@ -58,7 +58,7 @@
<ul>
<li>
Define common page layouts and reuse
- them across your web site.
+ them across your website.
</li>
<li>
Define menu layouts, and use them by
Modified: struts/struts1/trunk/tiles/src/site/xdoc/installation.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/xdoc/installation.xml?rev=420411&r1=420410&r2=420411&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/installation.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/installation.xml Sun Jul 9 20:52:21 2006
@@ -63,8 +63,8 @@
Project</a>. See the <a href="dependencies.html">Dependencies List</a>
for specific versions. These dependencies can be downloaded using
the Maven build process.</li>
- <li><strong>Struts Action Framework</strong> - If you are planning to use
- Tiles with Struts Action, you should download and install the framework from
+ <li><strong>Apache Struts</strong> - If you are planning to use
+ Tiles with Struts, you should download and install the framework from
<a href="http://struts.apache.org/">
Apache Struts Project</a>.
If you have acquired Tiles with the framework distribution, you
@@ -75,7 +75,7 @@
<section name="Install A Tiles Binary Distribution" href="Installing">
<p>First, download a binary distribution of Tiles, currently distributed
- with the Struts Action Framework.</p>
+ with Struts.</p>
<p>Unpack the Tiles binary distribution into a convenient directory.
(If you build Tiles from the source distribution,
the result of the build will already be an unpacked binary distribution
@@ -102,7 +102,7 @@
<li>If you want to use the <em>definitions configuration file</em>, you
need to initialize the definitions factory. This can be done as follows:
<ul>
- <li><strong>Using Tiles With Struts Action</strong> -
+ <li><strong>Using Tiles With Struts</strong> -
Modify the <code>WEB-INF/web.xml</code> file
for your web application to use a <code><servlet>
</code> that responds to Struts actions. Usually, this
@@ -122,7 +122,7 @@
<load-on-startup>2</load-on-startup>
</servlet>
]]></source>
- <li><strong>Using Tiles With Struts Action</strong> -
+ <li><strong>Using Tiles with Struts</strong> -
You will also need to
configure the Tiles Plugin and the Tiles Request Processor to
allow the framework to respond to Tiles-based Action Forwards. Below
@@ -135,7 +135,7 @@
</plug-in>
]]></source>
</li>
- <li><strong>Using Tiles Without Struts Action</strong> -
+ <li><strong>Using Tiles without Struts</strong> -
If you don't want to use the framework, use the
<code>org.apache.struts.tiles.TilesServlet</code> as the servlet.
</li>