Author: wsmoak
Date: Sun Aug 7 05:48:48 2005
New Revision: 230660
URL: http://svn.apache.org/viewcvs?rev=230660&view=rev
Log:
Update Maven build files for Struts EL to include the 'exercise-taglib' webapp
Added:
struts/el/trunk/project.properties
Modified:
struts/el/trunk/maven.xml
struts/el/trunk/project.xml
Modified: struts/el/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/el/trunk/maven.xml?rev=230660&r1=230659&r2=230660&view=diff
==============================================================================
--- struts/el/trunk/maven.xml (original)
+++ struts/el/trunk/maven.xml Sun Aug 7 05:48:48 2005
@@ -1,6 +1,8 @@
<project default="jar:jar"
xmlns:j="jelly:core"
- xmlns:ant="jelly:ant">
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
<!-- Prepare additional Jar resources -->
<postGoal name="java:jar-resources">
<!-- Generate TLDs -->
@@ -11,4 +13,44 @@
style="doc/stylesheets/tld.xsl"
includes="struts-*.xml"/>
</postGoal>
-</project>
\ No newline at end of file
+
+ <!--
+ Build the .war file.
+ -->
+ <postGoal name="dist">
+ <attainGoal name="war"/>
+ </postGoal>
+
+ <preGoal name="war:war">
+
+ <!-- Include struts-el .jar file in WEB-INF/lib -->
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/lib/"
overwrite="false"
+ file="${basedir}/target/struts-el-1.3.0-dev.jar" />
+
+ <!-- Include properties under WEB-INF/classes -->
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/"
overwrite="false">
+ <ant:fileset dir="${basedir}/src/exercise-taglib"
+ includes="**/*.properties">
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Include source code in example webapp -->
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/src/"
overwrite="false">
+ <ant:fileset dir="${basedir}/src/exercise-taglib"
+ excludes="**/.svn/**">
+ </ant:fileset>
+ </ant:copy>
+ </preGoal>
+
+ <!-- Compile the source for the webapp in addition to the taglib
+ See: http://maven.apache.org/faq.html#multiple-source-directories -->
+ <preGoal name="java:compile">
+ <ant:path
+ id="exercise.src.dir"
+ location="${basedir}/src/exercise-taglib"/>
+ <maven:addPath
+ id="maven.compile.src.set"
+ refid="exercise.src.dir"/>
+ </preGoal>
+
+</project>
Added: struts/el/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/el/trunk/project.properties?rev=230660&view=auto
==============================================================================
--- struts/el/trunk/project.properties (added)
+++ struts/el/trunk/project.properties Sun Aug 7 05:48:48 2005
@@ -0,0 +1,12 @@
+
+# The 'webapp' directory which includes WEB-INF
+maven.war.src = web/exercise-taglib
+
+# Include only the classes that should be in the .jar file
+maven.jar.includes = org/apache/strutsel/**,META-INF/**
+
+# Include only the classes and properties for the webapp in the .war file
+maven.war.classes.includes = org/apache/struts/webapp/exercise/**
+
+# Preserve original filename
+maven.war.final.name = strutsel-exercise-taglib.war
Modified: struts/el/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/el/trunk/project.xml?rev=230660&r1=230659&r2=230660&view=diff
==============================================================================
--- struts/el/trunk/project.xml (original)
+++ struts/el/trunk/project.xml Sun Aug 7 05:48:48 2005
@@ -98,22 +98,29 @@
</properties>
<url>http://struts.apache.org/</url>
</dependency>
-
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.0.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <cactus.bundle>true</cactus.bundle>
+ </properties>
<url>http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html</url>
</dependency>
-
+
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.0.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <cactus.bundle>true</cactus.bundle>
+ </properties>
<url>http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/intro.html</url>
</dependency>
-
+
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
