Author: jmitchell Date: Sat Jan 15 21:39:44 2005 New Revision: 125340 URL: http://svn.apache.org/viewcvs?view=rev&rev=125340 Log: reshuffle the examples layout to fit what maven likes (by default) Added: struts/apps/trunk/examples/src/webapp/WEB-INF/ - copied from r125323, struts/apps/trunk/examples/WEB-INF/ struts/apps/trunk/examples/src/webapp/exercise/ - copied from r125323, struts/apps/trunk/examples/exercise/ struts/apps/trunk/examples/src/webapp/index.html - copied unchanged from r125323, struts/apps/trunk/examples/index.html struts/apps/trunk/examples/src/webapp/upload/ - copied from r125323, struts/apps/trunk/examples/upload/ struts/apps/trunk/examples/src/webapp/validator/ - copied from r125323, struts/apps/trunk/examples/validator/ struts/apps/trunk/examples/src/webapp/welcome.jsp - copied unchanged from r125323, struts/apps/trunk/examples/welcome.jsp Removed: struts/apps/trunk/examples/WEB-INF/ struts/apps/trunk/examples/exercise/ struts/apps/trunk/examples/index.html struts/apps/trunk/examples/upload/ struts/apps/trunk/examples/validator/ struts/apps/trunk/examples/welcome.jsp Modified: struts/apps/trunk/maven.xml struts/apps/trunk/project.xml
Deleted: /struts/apps/trunk/examples/index.html Url: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/index.html?view=auto&rev=125339 ============================================================================== Copied: struts/apps/trunk/examples/src/webapp/index.html (from r125323, struts/apps/trunk/examples/index.html) Url: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/index.html?view=diff&rev=125340&p1=struts/apps/trunk/examples/index.html&r1=125323&p2=struts/apps/trunk/examples/src/webapp/index.html&r2=125340 ============================================================================== Copied: struts/apps/trunk/examples/src/webapp/welcome.jsp (from r125323, struts/apps/trunk/examples/welcome.jsp) Url: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/welcome.jsp?view=diff&rev=125340&p1=struts/apps/trunk/examples/welcome.jsp&r1=125323&p2=struts/apps/trunk/examples/src/webapp/welcome.jsp&r2=125340 ============================================================================== Deleted: /struts/apps/trunk/examples/welcome.jsp Url: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/welcome.jsp?view=auto&rev=125339 ============================================================================== Modified: struts/apps/trunk/maven.xml Url: http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?view=diff&rev=125340&p1=struts/apps/trunk/maven.xml&r1=125339&p2=struts/apps/trunk/maven.xml&r2=125340 ============================================================================== --- struts/apps/trunk/maven.xml (original) +++ struts/apps/trunk/maven.xml Sat Jan 15 21:39:44 2005 @@ -7,6 +7,7 @@ <j:set var="shared.war.dir" value="../shared/target/mailreader"/> + <goal name="apps:build-all"> <maven:reactor basedir="${basedir}" @@ -16,7 +17,8 @@ ignoreFailures="false"/> <maven:reactor basedir="${basedir}" - includes="mailreader-*/project.xml" + includes="*/project.xml" + excludes="shared/project.xml" goals="java:compile, war:webapp, war:war" banner="Building Struts apps" ignoreFailures="false"/> Modified: struts/apps/trunk/project.xml Url: http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?view=diff&rev=125340&p1=struts/apps/trunk/project.xml&r1=125339&p2=struts/apps/trunk/project.xml&r2=125340 ============================================================================== --- struts/apps/trunk/project.xml (original) +++ struts/apps/trunk/project.xml Sat Jan 15 21:39:44 2005 @@ -169,6 +169,7 @@ <!-- ################################################################ --> <dependencies> + <dependency> <groupId>struts</groupId> <artifactId>struts</artifactId> @@ -180,6 +181,15 @@ </properties> </dependency> + <dependency> + <groupId>struts</groupId> + <artifactId>struts-taglib</artifactId> + <version>1.0-SNAPSHOT</version> + <properties> + <war.bundle>true</war.bundle> + <cactus.bundle>true</cactus.bundle> + </properties> + </dependency> <dependency> <groupId>commons-beanutils</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
