Author: solomax
Date: Thu Oct 25 09:00:37 2012
New Revision: 1402030
URL: http://svn.apache.org/viewvc?rev=1402030&view=rev
Log:
build.xml is updated to work as expected on clean sources
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1402030&r1=1402029&r2=1402030&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Oct 25 09:00:37 2012
@@ -79,8 +79,7 @@
</path>
<!-- compile classpath -->
- <path id="compile.classpath">
- <fileset dir="${red5.lib}/plugins" includes="*.jar" />
+ <path id="check.classpath">
<fileset dir="${red5.server.lib}" includes="*.jar" />
<fileset dir="${red5.client.lib}" includes="*.jar" />
<fileset dir="${red5.lib}" includes="*.jar" />
@@ -89,9 +88,10 @@
<fileset dir="${junit.lib.dir}" includes="*.jar" />
<fileset dir="${dtd-generator.lib.dir}" includes="*.jar" />
<fileset dir="${project.lib.dir}" includes="*.jar" />
- <!--
- <fileset dir="${java.home}/lib/" includes="rt.jar" />
- -->
+ </path>
+ <path id="compile.classpath">
+ <fileset dir="${red5.lib}/plugins" includes="*.jar" />
+ <path refid="check.classpath"/>
</path>
<target name="info" unless="java6.installed">
@@ -631,9 +631,12 @@
<!-- Build entire project -->
<target name="build project" depends="clean, prepare, compile" />
- <path id="rat.classpath">
+ <path id="check.rat.classpath">
<fileset dir="${rat.lib.dir}" includes="*.jar" />
+ </path>
+ <path id="rat.classpath">
<path refid="compile.classpath" />
+ <path refid="check.rat.classpath" />
</path>
<target name="report_rat" depends="-retrieve-rat">
<!-- define the RAT task -->
@@ -670,11 +673,15 @@
</patternset>
<!-- Anakia Build classpath -->
- <path id="anakia.classpath">
- <path refid="compile.classpath" />
+ <path id="check.anakia.classpath">
<fileset dir="${anakia.lib.dir}" includes="*.jar" />
<fileset dir="${mainlibs.lib.dir}"
includes="commons-collections*.jar,commons-lang*.jar,velocity*.jar" />
</path>
+
+ <path id="anakia.classpath">
+ <path refid="compile.classpath" />
+ <path refid="check.anakia.classpath" />
+ </path>
<target name="anakia"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-anakia">
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
@@ -798,19 +805,19 @@
</target>
<target name="-availability-check" unless="red5.installed"
description="Check which libraries need to be retrieved"
depends="prepare.mkdir">
- <available classpathref="compile.classpath"
classname="javax.persistence.spi.PersistenceProvider"
property="mainlib.installed" />
- <available classpathref="compile.classpath"
classname="org.apache.axis2.Version" property="om.installed" />
- <available classpathref="compile.classpath"
classname="org.junit.Test" property="junit.installed" />
- <available classpathref="compile.classpath"
classname="com.thaiopensource.relaxng.translate.Driver"
property="dtd-generator.installed" />
- <available classpathref="compile.classpath"
classname="org.apache.commons.cli.CommandLine" property="cmdadmin.installed" />
- <available classpathref="anakia.classpath"
classname="org.apache.oro.text.GlobCompiler" property="anakia.installed" />
- <available classpathref="rat.classpath"
classname="org.apache.rat.Report" property="rat.installed" />
+ <available classpathref="check.classpath"
classname="javax.persistence.spi.PersistenceProvider"
property="mainlib.installed" />
+ <available classpathref="check.classpath"
classname="org.apache.axis2.Version" property="om.installed" />
+ <available classpathref="check.classpath"
classname="org.junit.Test" property="junit.installed" />
+ <available classpathref="check.classpath"
classname="com.thaiopensource.relaxng.translate.Driver"
property="dtd-generator.installed" />
+ <available classpathref="check.classpath"
classname="org.apache.commons.cli.CommandLine" property="cmdadmin.installed" />
+ <available classpathref="check.anakia.classpath"
classname="org.apache.oro.text.GlobCompiler" property="anakia.installed" />
+ <available classpathref="check.rat.classpath"
classname="org.apache.rat.Report" property="rat.installed" />
<available classpathref="svntask.classpath"
classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed" />
- <available classpathref="compile.classpath"
classname="com.mysql.jdbc.Driver" property="mysql.installed" />
- <available classpathref="compile.classpath"
classname="org.apache.derby.jdbc.ClientDriver" property="derby.installed" />
+ <available classpathref="check.classpath"
classname="com.mysql.jdbc.Driver" property="mysql.installed" />
+ <available classpathref="check.classpath"
classname="org.apache.derby.jdbc.ClientDriver" property="derby.installed" />
<available file="${laszlo.home}/WEB-INF/lib" type="dir"
property="laszlo.installed" />
<available file="${red5.lib}/red5.sh" type="file"
property="red5.installed" />
- <available classpathref="compile.classpath"
classname="org.red5.client.net.rtmp.RTMPClient"
property="red5.client.installed" />
+ <available classpathref="check.classpath"
classname="org.red5.client.net.rtmp.RTMPClient"
property="red5.client.installed" />
</target>
<target name="-retrieve" depends="-install-ivy" description="Retrieves
the libraries if needed">
