Author: wsmoak
Date: Sun Jul 9 20:54:03 2006
New Revision: 420412
URL: http://svn.apache.org/viewvc?rev=420412&view=rev
Log:
Include the DTDs in the website so they will be available in the release
distribution.
Update links in building-controller to point at the local copy.
STR-1859, suggested by Andreas (almost three years ago...) and discussed
recently by Craig and Paul.
Added:
struts/struts1/trunk/src/site/resources/resources/
struts/struts1/trunk/src/site/resources/resources/README.txt (with props)
Modified:
struts/struts1/trunk/pom.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=420412&r1=420411&r2=420412&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Sun Jul 9 20:54:03 2006
@@ -127,6 +127,29 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dtds</id>
+ <phase>site</phase>
+ <configuration>
+ <tasks>
+ <copy
todir="${project.build.directory}/site/resources"
+ failonerror="false">
+ <fileset
dir="${basedir}/core/src/main/resources/org/apache/struts/resources"/>
+ <fileset
dir="${basedir}/tiles/src/main/resources/org/apache/struts/resources"/>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<defaultGoal>install</defaultGoal>
Added: struts/struts1/trunk/src/site/resources/resources/README.txt
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/resources/resources/README.txt?rev=420412&view=auto
==============================================================================
--- struts/struts1/trunk/src/site/resources/resources/README.txt (added)
+++ struts/struts1/trunk/src/site/resources/resources/README.txt Sun Jul 9
20:54:03 2006
@@ -0,0 +1,21 @@
+Copyright 2006 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Struts Resources
+================
+
+The DTDs in this directory are included in struts-core.jar and
struts-tiles.jar.
+
+The files are provided here for reference; you should not need to include them
+in your web application.
Propchange: struts/struts1/trunk/src/site/resources/resources/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts1/trunk/src/site/resources/resources/README.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=420412&r1=420411&r2=420412&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
(original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml Sun
Jul 9 20:54:03 2006
@@ -1889,7 +1889,7 @@
The format of this document is described by the Document
Type Definition
(DTD) maintained at
- <a
href="http://struts.apache.org/dtds/struts-config_1_3.dtd";>
+ <a href="../resources/struts-config_1_3.dtd">
http://struts.apache.org/dtds/struts-config_1_3.dtd.</a>
This chapter covers the configuration elements that you
will typically
@@ -2051,9 +2051,10 @@
For a complete description of the elements that can be
used with the
action element, see the
- <a href="http://struts.apache.org/dtds/struts-config/1_3";>
- configuration DTD</a>
- and the
+ <a href="../resources/struts-config_1_3.dtd">
+ configuration DTD</a> or the online
+ <a
href="http://struts.apache.org/dtds/struts-config/1_3";>LiveDTD</a>
+ docs, and the
<a
href="../apidocs/org/apache/struts/action/ActionMapping.html">
ActionMapping documentation.</a>
</p>
