Author: husted
Date: Thu Jul 13 05:46:55 2006
New Revision: 421605
URL: http://svn.apache.org/viewvc?rev=421605&view=rev
Log:
STR-2910 Roll back changes to POM from beta5 problem determination
Change sidebar links to relative to promote local use of docs
Update Tile Resource links. Add quotes to the top of the user guide sections so
the title doesn't abut with the initial subsection.
Modified:
struts/struts1/trunk/apps/src/site/site.xml
struts/struts1/trunk/el/src/site/site.xml
struts/struts1/trunk/extras/src/site/site.xml
struts/struts1/trunk/faces/src/site/site.xml
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/src/site/xdoc/faqs/works.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml
struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
struts/struts1/trunk/taglib/src/site/site.xml
struts/struts1/trunk/taglib/src/site/xdoc/index.xml
struts/struts1/trunk/tiles/src/site/site.xml
struts/struts1/trunk/tiles/src/site/xdoc/userGuide.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=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/apps/src/site/site.xml (original)
+++ struts/struts1/trunk/apps/src/site/site.xml Thu Jul 13 05:46:55 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.org/</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="Struts 1" href="http://struts.apache.org/1.x/"; />
+ <item name="Struts 2" href="http://struts.apache.org/2.0/"; />
</links>
<menu name="Apps">
Modified: struts/struts1/trunk/el/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/el/src/site/site.xml (original)
+++ struts/struts1/trunk/el/src/site/site.xml Thu Jul 13 05:46:55 2006
@@ -3,22 +3,21 @@
<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/</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/"; />
+ <item name="Struts 2" href="http://struts.apache.org/2.0/"; />
</links>
<menu name="Struts 1 - El Taglibs">
<item name="Welcome" href="index.html"/>
- <item name="FAQ" href="struts-el.html"/>
</menu>
<menu name="Reference">
<item name="Bean EL" href="tagreference.html#struts-bean-el.tld"/>
@@ -55,8 +54,8 @@
name="Javadoc"
href="apidocs/index.html"/>
<item
- name="Apache Struts Home"
- href="http://struts.apache.org/"/>
+ name="Struts 1"
+ href="../index.html"/>
</menu>
${reports}
Modified: struts/struts1/trunk/extras/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/site.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/extras/src/site/site.xml (original)
+++ struts/struts1/trunk/extras/src/site/site.xml Thu Jul 13 05:46:55 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.org/</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/"; />
+ <item name="Struts 2" href="http://struts.apache.org/2.0/"; />
</links>
<menu name="FAQs and HOWTOs">
<item name="Dispatching And Validating"
@@ -48,8 +48,8 @@
name="Javadoc"
href="apidocs/index.html"/>
<item
- name="Apache Struts Home"
- href="http://struts.apache.org/"/>
+ name="Struts 1"
+ href="../index.html"/>
</menu>
${reports}
</body>
Modified: struts/struts1/trunk/faces/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/site.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/faces/src/site/site.xml (original)
+++ struts/struts1/trunk/faces/src/site/site.xml Thu Jul 13 05:46:55 2006
@@ -23,18 +23,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.org/</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/"; />
+ <item name="Struts 2" href="http://struts.apache.org/2.0/"; />
</links>
<menu name="Components">
@@ -64,8 +64,8 @@
name="Javadoc"
href="apidocs/index.html"/>
<item
- name="Apache Struts Home"
- href="http://struts.apache.org/"/>
+ name="Struts 1"
+ href="../index.html"/>
</menu>
${reports}
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Thu Jul 13 05:46:55 2006
@@ -56,7 +56,7 @@
<distributionManagement>
<site>
<id>apache-site</id>
- <url>scp://people.apache.org/www/struts.apache.org/struts1/</url>
+ <url>scp://people.apache.org/www/struts.apache.org/1.x/</url>
</site>
</distributionManagement>
Modified: struts/struts1/trunk/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Thu Jul 13 05:46:55 2006
@@ -34,7 +34,7 @@
<artifactId>struts-scripting</artifactId>
<packaging>jar</packaging>
<name>Struts Scripting</name>
- <url>http://struts.apache.org/1.x/struts-scripting/index.html</url>
+ <url>http://struts.apache.org</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=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/src/site/site.xml (original)
+++ struts/struts1/trunk/scripting/src/site/site.xml Thu Jul 13 05:46:55 2006
@@ -8,9 +8,14 @@
<bannerRight>
<name>Apache Struts</name>
<src>http://struts.apache.org/images/struts.gif</src>
- <href>http://struts.apache.org/index.html</href>
+ <href>http://struts.apache.org/</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"/>
@@ -46,8 +51,8 @@
name="Javadoc"
href="apidocs/index.html"/>
<item
- name="Apache Struts Home"
- href="http://struts.apache.org/index.html"/>
+ name="Struts 1"
+ href="../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=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Thu Jul 13 05:46:55 2006
@@ -8,13 +8,13 @@
<bannerRight>
<name>Apache Struts</name>
<src>http://struts.apache.org/images/struts.gif</src>
- <href>http://struts.apache.orgt/index.html</href>
+ <href>http://struts.apache.org/</href>
</bannerRight>
<body>
<links>
<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"; />
+ <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">
<item
Modified: struts/struts1/trunk/src/site/xdoc/faqs/works.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/works.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/works.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/works.xml Thu Jul 13 05:46:55 2006
@@ -24,9 +24,7 @@
<body>
<section href="faq" name="How does Struts work?">
- <subsection href="how" name="How does Struts work?">
-
- <blockquote>
+ <blockquote>
<p>
[From the <a href="kickstart.html#how">Kickstart FAQ</a>]
<br/>
<em>"Java Servlets are designed to handle requests made by
Web
@@ -39,7 +37,7 @@
This makes Web applications much easier to design, create,
and maintain."</em>
</p>
- </blockquote>
+ </blockquote>
<p>
That's a good high-level description,
@@ -96,7 +94,7 @@
</p>
</li>
<li>
- <p>
+ <p>
In the framework configuration file(s), you associate
paths with
the controller components of your application, known
@@ -334,8 +332,6 @@
<code>.do</code>
extension).
</p>
- </subsection>
-
</section>
</body>
</document>
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
(original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml Thu
Jul 13 05:46:55 2006
@@ -25,6 +25,10 @@
<body>
<section name="4. Building Controller Components">
+ <blockquote><p><em>
+ "It would be so nice if something made sense for a change."
+ </em></p></blockquote>
+
<a name="overview"/>
<subsection name="4.1 Overview">
@@ -49,7 +53,7 @@
Write an ActionForm class to mediate between the Model
and the View.
<a href="../faqs/actionForm.html">(See also
- Building an ActionForm.)</a>
+ Building an ActionForm.)</a>
</li>
<li>
@@ -1233,13 +1237,13 @@
<source><![CDATA[
<%
- for (int i = 0; i < 10; i++) {
- String name = "value(foo-" + i + ")";
+ for (int i = 0; i < 10; i++) {
+ String name = "value(foo-" + i + ")";
%>
- <html:text property="<%= name %>"/>
- <br/>
+ <html:text property="<%= name %>"/>
+ <br/>
<%
- }
+ }
%>
]]></source>
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml Thu Jul 13
05:46:55 2006
@@ -25,6 +25,13 @@
<body>
<section name="2. Building Model Components">
+ <blockquote><p><em>
+ "If I had a world of my own, everything would be nonsense.
+ Nothing would be what it is, because everything would be what it
+ isn't. And contrary wise, what is, it wouldn't be. And what it
+ wouldn't be, it would. You see?"
+ </em></p></blockquote>
+
<a name="overview"/>
<subsection name="2.1 Overview">
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml Thu Jul 13
05:46:55 2006
@@ -25,6 +25,11 @@
<body>
<section name="3. Building View Components">
+ <blockquote><p><em>
+ "What if I should fall right through the center of the earth...
+ oh, and come out the other side, where people walk upside down."
+ </em></p></blockquote>
+
<a name="overview"/>
<subsection name="3.1 Overview">
@@ -34,7 +39,7 @@
but does not provide any actual view components of its
own.
Several <a href="#presentation_frameworks">
- presentation technologies</a> are available,
+ presentation technologies</a> are available,
including, among others, Cocoon, JSP, Velocity Templates,
and XSLT.
</p>
Modified: struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml?rev=421605&r1=421604&r2=421605&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml Thu Jul 13
05:46:55 2006
@@ -25,6 +25,11 @@
<body>
<section name="5. Configuring Applications">
+ <blockquote><p><em>
+ "An author doesn't necessarily understand the meaning of his own
+ story better than anyone else."
+ </em></p></blockquote>
+
<a name="config-overview"/>
<subsection name="5.1 Overview">
@@ -524,7 +529,7 @@
<p>
Since version 1.1, you have two options: you can list
- <a href="#5_4_1_Configure_the_ActionServlet_Instance">
+ <a href="#dd_config">
multiple struts-config files</a>
as a
comma-delimited list, or you can subdivide a larger
@@ -571,7 +576,7 @@
under a given module, so choose something meaningful!).
For example:
</p>
-
+
<source><
