Author: husted
Date: Wed Jul 12 10:58:49 2006
New Revision: 421353
URL: http://svn.apache.org/viewvc?rev=421353&view=rev
Log:
STR-2910 Commit work-in-progress
Modified:
struts/struts1/trunk/pom.xml
struts/struts1/trunk/scripting/pom.xml
struts/struts1/trunk/scripting/src/site/site.xml
struts/struts1/trunk/src/site/site.xml
struts/struts1/trunk/tiles/pom.xml
struts/struts1/trunk/tiles/src/site/site.xml
struts/struts1/trunk/tiles/src/site/xdoc/index.xml
struts/struts1/trunk/tiles/src/site/xdoc/installation.xml
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Wed Jul 12 10:58:49 2006
@@ -35,7 +35,7 @@
<version>1.3.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts</name>
- <url>http://struts.apache.org</url>
+ <url>http://struts.apache.org/</url>
<description>Apache Struts</description>
<inceptionYear>2000</inceptionYear>
@@ -56,7 +56,7 @@
<distributionManagement>
<site>
<id>apache-site</id>
- <url>scp://people.apache.org/www/struts.apache.org/1.x/</url>
+ <url>scp://people.apache.org/www/struts.apache.org/struts1/</url>
</site>
</distributionManagement>
@@ -107,7 +107,7 @@
<organization>
<name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
+ <url>http://www.apache.org/</url>
</organization>
<build>
@@ -123,7 +123,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0-beta-4</version>
</plugin>
</plugins>
</pluginManagement>
Modified: struts/struts1/trunk/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Wed Jul 12 10:58:49 2006
@@ -34,7 +34,7 @@
<artifactId>struts-scripting</artifactId>
<packaging>jar</packaging>
<name>Struts Scripting</name>
- <url>http://struts.apache.org</url>
+ <url>http://struts.apache.org/1.x/struts-scripting/index.html</url>
<distributionManagement>
<site>
Modified: struts/struts1/trunk/scripting/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/src/site/site.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/src/site/site.xml (original)
+++ struts/struts1/trunk/scripting/src/site/site.xml Wed Jul 12 10:58:49 2006
@@ -3,26 +3,20 @@
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org</href>
+ <href>http://www.apache.org/</href>
</bannerLeft>
<bannerRight>
<name>Apache Struts</name>
<src>http://struts.apache.org/images/struts.gif</src>
- <href>http://struts.apache.org</href>
+ <href>http://struts.apache.org/index.html</href>
</bannerRight>
<body>
- <links>
- <item name="Apache" href="http://www.apache.org"; />
- <item name="Struts 1" href="http://struts.apache.org/1.x"; />
- <item name="Struts 2" href="http://struts.apache.org/2.0"; />
- </links>
<menu name="Struts 1 - Scripting">
<item name="Welcome" href="index.html"/>
<item name="Features" href="index.html#features"/>
<item name="Documentation" href="index.html#documentation"/>
<item name="User Guide" href="user-guide.html"/>
<item name="Source Guide" href="source-guide.html"/>
- <item name="Download"
href="http://struts.apache.org/downloads.html"/>
</menu>
<menu name="Components">
@@ -53,7 +47,7 @@
href="apidocs/index.html"/>
<item
name="Apache Struts Home"
- href="http://struts.apache.org/"/>
+ href="http://struts.apache.org/index.html"/>
</menu>
${reports}
Modified: struts/struts1/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Wed Jul 12 10:58:49 2006
@@ -3,18 +3,18 @@
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org</href>
+ <href>http://www.apache.org/</href>
</bannerLeft>
<bannerRight>
<name>Apache Struts</name>
<src>http://struts.apache.org/images/struts.gif</src>
- <href>http://struts.apache.org</href>
+ <href>http://struts.apache.orgt/index.html</href>
</bannerRight>
<body>
<links>
- <item name="Apache" href="http://www.apache.org"; />
- <item name="Struts 1" href="http://struts.apache.org/1.x"; />
- <item name="Struts 2" href="http://struts.apache.org/2.0"; />
+ <item name="Apache" href="http://www.apache.org/"; />
+ <item name="Struts 1"
href="http://struts.apache.org/1.x/index.html"; />
+ <item name="Struts 2"
href="http://struts.apache.org/2.0/index.html"; />
</links>
<menu name="Struts 1">
<item
Modified: struts/struts1/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/pom.xml (original)
+++ struts/struts1/trunk/tiles/pom.xml Wed Jul 12 10:58:49 2006
@@ -34,12 +34,12 @@
<artifactId>struts-tiles</artifactId>
<packaging>jar</packaging>
<name>Struts Tiles</name>
- <url>http://struts.apache.org</url>
-
+ <url>http://struts.apache.org/1.x/struts-tiles/</url>
+
<distributionManagement>
<site>
<id>apache-site</id>
-
<url>scp://people.apache.org/www/struts.apache.org/1.x/struts-tiles</url>
+
<url>scp://people.apache.org/www/struts.apache.org/1.x/struts-tiles/</url>
</site>
</distributionManagement>
Modified: struts/struts1/trunk/tiles/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/site/site.xml?rev=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/site.xml (original)
+++ struts/struts1/trunk/tiles/src/site/site.xml Wed Jul 12 10:58:49 2006
@@ -3,19 +3,14 @@
<bannerLeft>
<name>Apache Software Foundation</name>
<src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org</href>
+ <href>http://www.apache.org/</href>
</bannerLeft>
<bannerRight>
<name>Apache Struts</name>
<src>http://struts.apache.org/images/struts.gif</src>
- <href>http://struts.apache.org</href>
+ <href>http://struts.apache.org/index.html</href>
</bannerRight>
<body>
- <links>
- <item name="Apache" href="http://www.apache.org"; />
- <item name="Struts 1" href="http://struts.apache.org/1.x"; />
- <item name="Struts 2" href="http://struts.apache.org/2.0"; />
- </links>
<menu name="Struts Tiles">
<item href="index.html" name="Tiles Home"/>
<item href="installation.html" name="Installation"/>
@@ -55,7 +50,7 @@
href="apidocs/index.html"/>
<item
name="Apache Struts Home"
- href="http://struts.apache.org/"/>
+ href="http://struts.apache.org/index.html"/>
</menu>
${reports}
</body>
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=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/index.xml Wed Jul 12 10:58:49 2006
@@ -24,10 +24,19 @@
<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
website or
- application and to create reusable view components. This site will give
you
- all the information you need to get started.</p>
+ <p>
+ Welcome to the Struts Tiles component.Tiles is a templating
+ system. (Include on steriods.) It can be used to create a common look
+ and feel for a web application. Tiles can also be used to create
+ reusable view components. This site will help
+ you get started with Tiles.
+ </p>
+ <p>
+ Tiles can also be used without Struts. A new release of Tiles,
+ Tiles 2, is being prepared. If you would like to use Tiles without
+ Struts, see the new <a href="">Tiles 2 subproject.</a>
+ The focus of this site is using Tiles <em>with</em> Struts.
+ </p>
</section>
<section name="Tiles Features" href="Features">
@@ -41,7 +50,7 @@
<li>
Definitions can take place :
<ul>
- <li>in a centralized xml file</li>
+ <li>in a centralized XML file</li>
<li>directly in JSP pages</li>
<li>programatically in Actions</li>
</ul>
@@ -134,7 +143,7 @@
</li>
<li>
- For example, the key could be user provilege,
+ For example, the key could represent user privileges,
browser type, arbitrary name stored in session, etc.
</li>
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=421353&r1=421352&r2=421353&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/src/site/xdoc/installation.xml (original)
+++ struts/struts1/trunk/tiles/src/site/xdoc/installation.xml Wed Jul 12
10:58:49 2006
@@ -23,110 +23,52 @@
<body>
-<section name="Quick Install for Testing, Documentation and Tutorial"
+<section name="Quick Install"
href="QuickInstall">
<ul>
- <li>Download Tiles binary distribution</li>
- <li>Unzip distribution</li>
- <li>Create a new web application containing Tiles and all
dependencies.</li>
- <li>Create one or more Tiles Definitions XML files in the /WEB-INF
- directory of the new application.</li>
- <li>Deploy the new application.</li>
+ <li>
+ Create a new web application based on the Struts Blank example.
+ </li>
+ <li>
+ Edit the struts-config and uncomment the section that refers
+ to the "Tiles PlugIn".</li>
+ <li>
+ Create one or more Tiles Definitions XML files in the /WEB-INF
+ directory of the new application.
+ </li>
+ <li>
+ Deploy the new application.
+ </li>
</ul>
</section>
-<section name="Prerequisite Software" href="Prerequisites">
- <p>A full listing of Tiles dependencies can be found
- <a href="dependencies.html">here.</a> This sections discusses those
- items that are required at runtime.</p>
-
- <ul>
- <li><strong>Java Development Kit</strong> - Tiles will work with any
- compliant JDK version 1.3 or later.</li>
- <li><strong>Servlet Container</strong> - Tiles supports any servlet
- container that is compatible with the Servlet API Specification,
- version 2.2 or later, and the JavaServer Pages (JSP)
Specification,
- version 1.1 or later. One popular choice is to download Apache's
- <a href="http://jakarta.apache.org/tomcat";>Tomcat</a></li>
- <li><strong>XML Parser</strong> - Tiles <strong>requires</strong> the
- presence of an XML parser that is compatible with the Java API for
- XML Parsing (JAXP) specification, 1.1 or later. If you are using
- JDK 1.4 or later, an XML parser is provided with the JDK.
Otherwise
- you can download and install the JAXP
- <a href="http://java.sun.com/xml";>reference implementation</a> or
- any other JAXP compliant parser, such as
- <a href="http://xml.apache.org/xerces-j";>Xerces</a>. </li>
- <li><strong>Jakarta Commons Packages</strong> -
- Tiles utilizes several packages from the
- <a href="http://jakarta.apache.org/commons/";>Jakarta Commons
- 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>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
- don't need to install it again. Tiles can run without the
framework.
- In this case you lose some features.</li>
- </ul>
-</section>
-<section name="Install A Tiles Binary Distribution" href="Installing">
- <p>First, download a binary distribution of Tiles, currently distributed
- 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
- for you). The distribution consists of the following contents:</p>
- <ul>
- <li><strong>struts-tiles-VERSION.jar</strong> - This JAR file contains
all of
- the Java classes included in Tiles. It should be copied into the
- <code>WEB-INF/lib</code> directory of your web application.
- <em>WARNING</em> - If you are going to be hosting multiple tiles
- based applications on the same servlet container, you will be
- tempted to place the JAR file into the shared
- repository supported by your container. Be advised that this will
- likely cause you to encounter ClassNotFoundException problems
- unless <em>all</em> of your application classes are stored in the
- shared repository.
- </li>
- </ul>
- <p>To use Tiles in your own application, you will need to follow
- these steps:</p>
+<section name="Configuring the Plugin" href="Installing">
+
+ <p>
+ Here's how to use Tiles in your own application:
+ </p>
+
<ul>
- <li>Copy the prerequisite Jar files into
+ <li>
+ Ensure that a <code>struts-tiles.jar</code> is available in
the <code>WEB-INF/lib</code> directory of your web application.
</li>
- <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</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
- will be the standard Struts ActionServlet:</li>
+ <li>
+ <p>
+ Add this <code>init-param</code> to the Action
+ Servlet definition in web.xml:</p>
<source><![CDATA[
- <servlet>
- <servlet-name>action</servlet-name>
- <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
- </init-param>
<init-param>
<param-name>chainConfig</param-name>
<param-value>org/apache/struts/tiles/chain-config.xml</param-value>
</init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
]]></source>
- <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
- is a sample Tiles Plugin configuration.
+
+ </li>
+ <li>
+ Configure the Tiles Plugin to load your definitions.
<source><![CDATA[
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property
@@ -134,76 +76,20 @@
value="/WEB-INF/tiles-defs.xml"/>
</plug-in>
]]></source>
- </li>
- <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>
- <li>Create a configuration file for definitions. Its name must
- match the one provided before in <code>WEB-INF/web.xml</code>.
- Several comma separated names can be provided.
- </li>
- </ul>
- </li>
- <li>Modify the <code>WEB-INF/web.xml</code> file of your web
application
- to include the following tag library declarations:
- Note that this step is not necessary in a Servlet 2.3/2.4
envrironment.
-
- <source><![CDATA[
-<taglib>
- <taglib-uri>/WEB-INF/tiles.tld</taglib-uri>
- <taglib-location>/WEB-INF/tiles.tld</taglib-location>
-</taglib>
- ]]></source>
- </li>
- </ul>
- <ul>
- <li>At the top of each JSP page that will use the Tiles custom tags,
- add line(s) declaring the Tiles custom tag libraries used on this
- particular page, like this:
-
- <source><![CDATA[
- <%@ taglib uri="/WEB-INF/tiles.tld" prefix="tiles" %>
- ]]></source>
-
</li>
- </ul>
- <ul>
- <li>For Servlet 2.3/2.4 applications replace the above taglib
reference with
- the following:
+ <li>
+ At the top of each JSP page that will use the Tiles custom tags,
+ add a line that declares the Tiles custom tag library.
<source><![CDATA[
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
]]></source>
</li>
- <li>When compiling the Java classes that comprise your application,
- be sure to include the <code>tiles.jar</code> and
- <code>commons-*.jar</code> files (copied earlier) on the
- CLASSPATH that is submitted to the compiler.</li>
- </ul>
- <p>Note to version 1.0 users :</p>
- <ul>
- <li>You should use a <code>tiles.jar</code> built with version
1.0.x.</li>
- <li>If you have downloaded a Tiles version build with version 1.0.x,
you
- already have it. </li>
</ul>
- <p>Note to Struts 1.1 and 1.2 users :</p>
- <ul>
- <li>You should also initialize a
<code>TilesRequestProcessor</code>.</li>
- <li>To do so, add following lines in your
<code>struts-config.xml</code>
- file :
-
- <source><![CDATA[
- <controller processorClass="org.apache.struts.tiles.TilesRequestProcessor">
- </controller>
- ]]></source>
-
- </li>
- </ul>
</section>
-<section name="Installing Tiles with your servlet container" href="Containers">
+<section name="Avoiding ClassNotFoundExceptions" href="Containers">
<p><strong>WARNING</strong> - Do <strong>NOT</strong> add
<code>tiles.jar</code> to the classpath of your servlet container in
an attempt to avoid placing it in the <code>/WEB-INF/lib</code>
@@ -218,18 +104,7 @@
is running.</li>
</ul>
- <h4>Status of various containers</h4>
- <p>For the status of additional containers, please refer to the
- <a
href="http://struts.apache.org/struts-doc-1.2.x/userGuide/installation.html#Containers";>
- Struts installation page</a>).
- </p>
</section>
-<section name="Building Tiles From Source" href="Building">
- <p>First, download a source distribution of Tiles. See
- <a href="cvs-usage.html">here</a> for more info. (Note: Tiles can also
- be found <a href="http://www.lifl.fr/~dumoulin/tiles/";>here</a>.) You
- can then use the included Maven build script to build Tiles.</p>
-</section>
</body>
</document>
