Author: wsmoak
Date: Thu Jul 13 20:37:16 2006
New Revision: 421793
URL: http://svn.apache.org/viewvc?rev=421793&view=rev
Log:
Remove the recently added 'resources' directory, and use 'dtds' to match the
website.
Set the plugin inheritance to false to avoid 'file not found' warnings in
sub-modules.
STR-1859
Removed:
struts/struts1/trunk/src/site/resources/resources/
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=421793&r1=421792&r2=421793&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Thu Jul 13 20:37:16 2006
@@ -141,13 +141,14 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
<id>copy-dtds</id>
<phase>site</phase>
<configuration>
<tasks>
- <copy
todir="${project.build.directory}/site/resources"
+ <copy todir="${project.build.directory}/site/dtds"
failonerror="false">
<fileset
dir="${basedir}/core/src/main/resources/org/apache/struts/resources"/>
<fileset
dir="${basedir}/tiles/src/main/resources/org/apache/struts/resources"/>
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=421793&r1=421792&r2=421793&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 20:37:16 2006
@@ -1893,7 +1893,7 @@
The format of this document is described by the Document
Type Definition
(DTD) maintained at
- <a href="../resources/struts-config_1_3.dtd">
+ <a href="../dtds/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
@@ -2055,7 +2055,7 @@
For a complete description of the elements that can be
used with the
action element, see the
- <a href="../resources/struts-config_1_3.dtd">
+ <a href="../dtds/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
