Author: wsmoak
Date: Thu Dec 15 19:58:54 2005
New Revision: 357114
URL: http://svn.apache.org/viewcvs?rev=357114&view=rev
Log:
Build the example app with Maven rather than calling an Ant target, and advance
to version 1.0.1-SNAPSHOT.
Modified:
struts/scripting/trunk/maven.xml
struts/scripting/trunk/project.properties
struts/scripting/trunk/project.xml
Modified: struts/scripting/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/maven.xml?rev=357114&r1=357113&r2=357114&view=diff
==============================================================================
--- struts/scripting/trunk/maven.xml (original)
+++ struts/scripting/trunk/maven.xml Thu Dec 15 19:58:54 2005
@@ -6,13 +6,19 @@
xmlns:maven="jelly:maven">
+ <preGoal name="war:war">
+ <attainGoal name="jar:jar"/>
+ <ant:copy todir="${maven.war.webapp.dir}/WEB-INF/lib/" overwrite="false"
+ file="${maven.build.dir}/${maven.final.name}.jar" />
+ </preGoal>
+
<postGoal name="dist">
<attainGoal name="jar:install"/>
</postGoal>
<postGoal name="dist:prepare-bin-filesystem">
- <attainGoal name="jar:jar"/>
+ <attainGoal name="war:war"/>
<attainGoal name="readme"/>
<ant:echo message="jar ${maven.build.dir}/${maven.final.name}.jar" />
<ant:copy todir="${maven.dist.bin.assembly.dir}">
@@ -22,21 +28,6 @@
</ant:fileset>
</ant:copy>
- <ant:mkdir dir="${basedir}/dist" />
- <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
- todir="${basedir}/dist" />
- <ant:ant dir="${basedir}" antfile="build.xml" target="example">
- <ant:property name="nojar" value="nojar" />
- </ant:ant>
-
- <!--
- <ant:unzip src="${basedir}/dist/struts-example.war"
- dest="${basedir}/dist/tmp" />
- <ant:copy file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar"
- todir="${basedir}/dist/tmp/WEB-INF/lib" />
- <ant:zip destfile="${basedir}/dist/struts-example.war"
- basedir="${basedir}/dist/tmp" />
- -->
<ant:copy file="${basedir}/dist/struts-example.war"
todir="${maven.dist.bin.assembly.dir}" />
Modified: struts/scripting/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/project.properties?rev=357114&r1=357113&r2=357114&view=diff
==============================================================================
--- struts/scripting/trunk/project.properties (original)
+++ struts/scripting/trunk/project.properties Thu Dec 15 19:58:54 2005
@@ -13,3 +13,7 @@
maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository
maven.xdoc.date = left
+
+maven.war.src = ${maven.src.dir}/struts-example
+maven.war.classes.excludes = **/*
+maven.war.final.name=struts-example.war
Modified: struts/scripting/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/scripting/trunk/project.xml?rev=357114&r1=357113&r2=357114&view=diff
==============================================================================
--- struts/scripting/trunk/project.xml (original)
+++ struts/scripting/trunk/project.xml Thu Dec 15 19:58:54 2005
@@ -28,7 +28,7 @@
<id>struts-scripting</id>
<name>Struts Scripting</name>
- <currentVersion>1.0.0</currentVersion>
+ <currentVersion>1.0.1-SNAPSHOT</currentVersion>
<inceptionYear>2003</inceptionYear>
<package>org.apache.struts.scripting</package>
@@ -150,6 +150,17 @@
</properties>
<url>http://struts.apache.org/</url>
<comment>Required</comment>
+ </dependency>
+
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <cactus.bundle>true</cactus.bundle>
+ </properties>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
