Author: wsmoak
Date: Wed Nov 16 20:00:05 2005
New Revision: 345181
URL: http://svn.apache.org/viewcvs?rev=345181&view=rev
Log:
Examples now use the validator-rules.xml file found in struts-core.jar, and the
file is no longer copied during the build.
Minor improvements to the examples and blank apps.
Modified:
struts/apps/trunk/blank/src/webapp/WEB-INF/struts-config.xml
struts/apps/trunk/blank/src/webapp/WEB-INF/tiles-defs.xml
struts/apps/trunk/cookbook/src/webapp/WEB-INF/struts-config.xml
struts/apps/trunk/examples/src/webapp/WEB-INF/upload/struts-config.xml
struts/apps/trunk/examples/src/webapp/WEB-INF/validator/struts-config.xml
struts/apps/trunk/examples/src/webapp/welcome.jsp
struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml
struts/apps/trunk/maven.xml
Modified: struts/apps/trunk/blank/src/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/blank/src/webapp/WEB-INF/struts-config.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/blank/src/webapp/WEB-INF/struts-config.xml (original)
+++ struts/apps/trunk/blank/src/webapp/WEB-INF/struts-config.xml Wed Nov 16
20:00:05 2005
@@ -160,7 +160,8 @@
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property
property="pathnames"
- value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml"/>
+ value="/org/apache/struts/validator/validator-rules.xml,
+ /WEB-INF/validation.xml"/>
</plug-in>
</struts-config>
Modified: struts/apps/trunk/blank/src/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/blank/src/webapp/WEB-INF/tiles-defs.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/blank/src/webapp/WEB-INF/tiles-defs.xml (original)
+++ struts/apps/trunk/blank/src/webapp/WEB-INF/tiles-defs.xml Wed Nov 16
20:00:05 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN"
+ "http://jakarta.apache.org/struts/dtds/tiles-config_1_3.dtd";>
<!--
Modified: struts/apps/trunk/cookbook/src/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/WEB-INF/struts-config.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/WEB-INF/struts-config.xml (original)
+++ struts/apps/trunk/cookbook/src/webapp/WEB-INF/struts-config.xml Wed Nov 16
20:00:05 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+<!DOCTYPE struts-config PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
"http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
@@ -252,7 +252,7 @@
<!-- ========== Plug Ins Configuration
================================== -->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
- value="/WEB-INF/validator-rules.xml,
+
value="/org/apache/struts/validator/validator-rules.xml,
/WEB-INF/validation.xml" />
</plug-in>
Modified: struts/apps/trunk/examples/src/webapp/WEB-INF/upload/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/WEB-INF/upload/struts-config.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/examples/src/webapp/WEB-INF/upload/struts-config.xml
(original)
+++ struts/apps/trunk/examples/src/webapp/WEB-INF/upload/struts-config.xml Wed
Nov 16 20:00:05 2005
@@ -31,7 +31,9 @@
<message-resources
parameter="org.apache.struts.webapp.upload.UploadResources"/>
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/upload/validation.xml" />
+ <set-property property="pathnames"
+ value="/org/apache/struts/validator/validator-rules.xml,
+ /WEB-INF/upload/validation.xml" />
<set-property property="stopOnFirstError" value="false" />
</plug-in>
Modified:
struts/apps/trunk/examples/src/webapp/WEB-INF/validator/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/WEB-INF/validator/struts-config.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/examples/src/webapp/WEB-INF/validator/struts-config.xml
(original)
+++ struts/apps/trunk/examples/src/webapp/WEB-INF/validator/struts-config.xml
Wed Nov 16 20:00:05 2005
@@ -94,10 +94,10 @@
<!--
Add multiple validator resource files by setting the pathnames property
- with a comma delimitted list of resource files to load.
+ with a comma delimited list of resource files to load.
-->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+ <set-property property="pathnames"
value="/org/apache/struts/validator/validator-rules.xml,
/WEB-INF/validator/validation.xml,
/WEB-INF/validator/validation-bundles.xml,
/WEB-INF/validator/validation-i18nVariables.xml,
Modified: struts/apps/trunk/examples/src/webapp/welcome.jsp
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/welcome.jsp?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/examples/src/webapp/welcome.jsp (original)
+++ struts/apps/trunk/examples/src/webapp/welcome.jsp Wed Nov 16 20:00:05 2005
@@ -43,7 +43,7 @@
<h2>But, wait, there's more ...</h2>
- <p>In addion to this application, there are four other applications bundled
with Struts, ready for you to install:</p>
+ <p>In addion to this application, there are three other applications
available for you to install:</p>
<ul>
<li>Struts Blank</li>
@@ -53,7 +53,12 @@
<li>Struts MailReader</li>
</ul>
- <p><strong>Struts Blank</strong> is an application template. Explode this
WAR under your own application's name, and you can start coding! <strong>Struts
Documentation</strong> is a copy of everything you'll find on the website: User
Guide, Developer's Guide, FAQs, and How-Tos. <strong>Struts Mailreader</strong>
is a starter business application, much like the one most of you need to
developer. <strong>Struts Tiles Documentation</strong> explores the more
advanced features of Tiles.</p>
+ <p><strong>Struts Blank</strong> is an application template. Explode this WAR
+ under your own application's name, and you can start coding! <strong>Struts
+ Mailreader</strong> is a starter business application, much like the one most
+ of you need to develop. <strong>Struts Cookbook</strong> is a collection of
+ examples which demonstrate some of the more frequently used Struts Tags.</p>
+
<hr />
</body>
</html>
Modified: struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml (original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml Wed Nov
16 20:00:05 2005
@@ -7,7 +7,7 @@
$Revision: 1.43 $
$Date$
- Copyright 2000-2004 Apache Software Foundation
+ Copyright 2000-2005 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.
@@ -163,7 +163,7 @@
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
- value="/WEB-INF/validator-rules.xml,
+ value="/org/apache/struts/validator/validator-rules.xml,
/WEB-INF/validation.xml"/>
</plug-in>
Modified: struts/apps/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?rev=345181&r1=345180&r2=345181&view=diff
==============================================================================
--- struts/apps/trunk/maven.xml (original)
+++ struts/apps/trunk/maven.xml Wed Nov 16 20:00:05 2005
@@ -38,28 +38,6 @@
<goal name="copy-distribution">
<!-- override -->
</goal>
-
- <postGoal name="war:webapp">
-
- <!-- copy config files from core -->
- <ant:available file="${core.conf.share.dir}"
- property="core.share.available" />
- <j:choose>
- <j:when test="${core.share.available}">
- <ant:copy file="${core.conf.share.dir}/validator-rules.xml"
- todir="${maven.war.webapp.dir}/WEB-INF"
- overwrite="false"/>
- </j:when>
- <j:otherwise>
- <ant:echo>
- WARNING: ${core.conf.share.dir} not available;
- some XML config files will not be copied.
- </ant:echo>
- </j:otherwise>
- </j:choose>
-
- </postGoal>
-
<goal name="copy-webapp-src">
<ant:copy todir="${maven.war.webapp.dir}/WEB-INF/src/java"
overwrite="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
