You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/03/25 07:34:48 UTC
svn commit: r388713 - in /incubator/webwork2: build.xml osbuild.xml
Author: mrdon
Date: Fri Mar 24 22:34:47 2006
New Revision: 388713
URL: http://svn.apache.org/viewcvs?rev=388713&view=rev
Log:
Splitting the build so that the standard build doesn't retrieve LGPL jars or compile related code. This should allow
us to keep the integration code.
Modified:
incubator/webwork2/build.xml
incubator/webwork2/osbuild.xml
Modified: incubator/webwork2/build.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=388713&r1=388712&r2=388713&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Fri Mar 24 22:34:47 2006
@@ -5,8 +5,14 @@
<property name="compile.version" value="1.4"/>
<property name="test.compile.version" value="1.4"/>
- <import file="osbuild.xml"/>
+ <property name="optional.sources" value="org/apache/struts/action2/views/jasperreports/**,
+ org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java,
+ org/apache/struts/action2/dispatcher/ChartResult.java
+ " />
+ <property name="optional.test.sources" value="org/apache/struts/action2/dispatcher/ChartResultTest.java" />
+ <import file="osbuild.xml"/>
+
<!-- overriding the one found in osbuild.xml to exclude xwork-tiger,
which breaks the unit tests currently -->
<path id="cp">
@@ -28,6 +34,12 @@
<property name="docs.tags" value="${docs}/tags"/>
<target name="init" depends="common.init" unless="skip.ivy">
+ <echo>
+ The default build only retrieves dependencies that released under a license compatible
+ with the Apache Software Foundation. To optionally download the optional LGPL dependencies
+ and compile the dependent Action 2 code, run the 'compile-optional' task.
+ </echo>
+
<taskdef name="ivy-configure" classname="fr.jayasoft.ivy.ant.IvyConfigure" classpathref="cp"/>
<taskdef name="ivy-resolve" classname="fr.jayasoft.ivy.ant.IvyResolve" classpathref="cp"/>
<taskdef name="ivy-retrieve" classname="fr.jayasoft.ivy.ant.IvyRetrieve" classpathref="cp"/>
@@ -35,7 +47,7 @@
<taskdef name="ivy-report" classname="fr.jayasoft.ivy.ant.IvyReport" classpathref="cp"/>
<taskdef name="ivy-deliver" classname="fr.jayasoft.ivy.ant.IvyDeliver" classpathref="cp"/>
- <ivy-retrieve/>
+ <ivy-retrieve conf="build,default,source,ajax,freemarker,velocity,fileupload,sitemesh,quickstart,xslt,portlet,spring,pico,plexus,tiger,tiles" />
</target>
<target name="javadocs" depends="common.init">
@@ -212,6 +224,21 @@
<!--
<delete dir="webapps/wwia/build"/>
-->
+ </target>
+
+ <target name="init-optional" depends="init" unless="skip.ivy">
+ <echo>
+ This task retrieves optional dependencies that are released under licenses that are
+ not endorsed by the Apache Software Foundation. In particular, these dependencies
+ use the LGPL license - http://opensource.org/licenses/lgpl-license.php
+ </echo>
+ <taskdef name="ivy-retrieve" classname="fr.jayasoft.ivy.ant.IvyRetrieve" classpathref="cp"/>
+
+ <ivy-retrieve conf="fileupload-pell,jasperreports,jfree,cewolf,hibernate" />
+ </target>
+
+ <target name="compile-optional" depends="compile, init-optional" description="compile optional files">
+ <compile srcdir="${src.java}" destdir="${build.java}" includes="${optional.sources}" />
</target>
</project>
Modified: incubator/webwork2/osbuild.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/osbuild.xml?rev=388713&r1=388712&r2=388713&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/osbuild.xml Fri Mar 24 22:34:47 2006
@@ -54,6 +54,7 @@
<exclude name="**/Abstract*.java"/>
<include name="**/${testcase}Test.java"/>
<include name="**/${testcase}TestCase.java"/>
+
</patternset>
<path id="cp">
@@ -111,13 +112,14 @@
<attribute name="destdir"/>
<attribute name="classpath" default=""/>
<attribute name="classpathref" default="cp"/>
+ <attribute name="includes" default="**/*.java"/>
<attribute name="excludes" default=""/>
<attribute name="source" default="${compile.version}"/>
<attribute name="target" default="${compile.version}"/>
<sequential>
<mkdir dir="@{destdir}"/>
<javac srcdir="@{srcdir}" destdir="@{destdir}" classpath="@{classpath}" classpathref="@{classpathref}"
- debug="on" source="@{source}" target="@{target}"/>
+ debug="on" source="@{source}" target="@{target}" excludes="@{excludes}" />
<copy filtering="no" todir="@{destdir}">
<fileset dir="@{srcdir}">
<exclude name="**/*.java"/>
@@ -128,7 +130,7 @@
</macrodef>
<target name="compile" depends="init,precompile" description="compile project">
- <compile srcdir="${src.java}" destdir="${build.java}"/>
+ <compile srcdir="${src.java}" destdir="${build.java}" excludes="${optional.sources}" />
</target>
<target name="jar" depends="compile" description="build the project jar file">
@@ -163,7 +165,7 @@
<target name="test-compile" unless="skip.tests">
<compile srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}"
- source="${test.compile.version}" target="${test.compile.version}"/>
+ source="${test.compile.version}" target="${test.compile.version}" />
<taskdef resource="clovertasks"/>
<taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
@@ -177,7 +179,7 @@
</files>
</clover-setup>
- <compile srcdir="${src.java}" destdir="${build.java-test}"/>
+ <compile srcdir="${src.java}" destdir="${build.java-test}" />
</target>
<target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
@@ -187,6 +189,8 @@
<macrodef name="run-junit">
<attribute name="classpathref" default="junit.cp" />
+ <attribute name="includes" default="**/*Test.java"/>
+ <attribute name="excludes" default=""/>
<sequential>
<mkdir dir="${dist.docs}/junit"/>
<junit haltonfailure="no" haltonerror="yes" fork="yes" forkmode="once" failureproperty="test.failure">
@@ -198,10 +202,13 @@
<formatter type="plain" useFile="false"/>
<formatter type="xml"/>
-
+
+
<batchtest todir="${dist.docs}/junit">
<fileset dir="${src.test}">
+ <exclude name="@{excludes}" />
<patternset refid="src.test.pattern"/>
+ <include name="@{includes}" />
</fileset>
</batchtest>
</junit>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org