struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r329357 - in /struts/apps/trunk: cookbook/src/webapp/WEB-INF/validation.xml mailreader/maven.xml maven.xml
Date Sat, 29 Oct 2005 03:00:53 GMT
Author: wsmoak
Date: Fri Oct 28 20:00:45 2005
New Revision: 329357

URL: http://svn.apache.org/viewcvs?rev=329357&view=rev
Log:
Moved postgoal to copy validator-rules.xml from core up to the parent build file so it will
apply to all webapps.
Changed the includes/excludes to reflect the new directory names 'mailreader' and 'mailreader-dao'.
Changed cookbook to use the Validator 1.2.0 DTD.

Modified:
    struts/apps/trunk/cookbook/src/webapp/WEB-INF/validation.xml
    struts/apps/trunk/mailreader/maven.xml
    struts/apps/trunk/maven.xml

Modified: struts/apps/trunk/cookbook/src/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/src/webapp/WEB-INF/validation.xml?rev=329357&r1=329356&r2=329357&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/src/webapp/WEB-INF/validation.xml (original)
+++ struts/apps/trunk/cookbook/src/webapp/WEB-INF/validation.xml Fri Oct 28 20:00:45 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+         "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
+         "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
 
 <form-validation>
 

Modified: struts/apps/trunk/mailreader/maven.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/maven.xml?rev=329357&r1=329356&r2=329357&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/maven.xml (original)
+++ struts/apps/trunk/mailreader/maven.xml Fri Oct 28 20:00:45 2005
@@ -8,23 +8,6 @@
         <!-- Include the source code in the mailreader webapp -->
         <attainGoal name="copy-webapp-src"/>
 
-        <!-- 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>
 
 </project>

Modified: struts/apps/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?rev=329357&r1=329356&r2=329357&view=diff
==============================================================================
--- struts/apps/trunk/maven.xml (original)
+++ struts/apps/trunk/maven.xml Fri Oct 28 20:00:45 2005
@@ -9,20 +9,14 @@
     <goal name="dist">
 
         <maven:reactor  basedir="${basedir}"
-                        includes="dao/project.xml"
+                        includes="mailreader-dao/project.xml"
                         goals="jar:install"
                         banner="Building mailreader DAO jar"
                         ignoreFailures="false"/>
                         
         <maven:reactor  basedir="${basedir}"
-                        includes="shared/project.xml"
-                        goals="java:compile,war:webapp,war:war"
-                        banner="Building default mailreader app"
-                        ignoreFailures="false"/>
-		
-        <maven:reactor  basedir="${basedir}"
                         includes="*/project.xml"
-                        excludes="shared/project.xml,dao/project.xml,build/project.xml"
+                        excludes="mailreader-dao/project.xml,build/project.xml"
                         goals="java:compile,war:webapp,war:war"
                         banner="Building Struts apps"
                         ignoreFailures="false"/>
@@ -44,6 +38,28 @@
 	<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: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message