Author: solomax
Date: Thu Jul 26 16:56:01 2012
New Revision: 1366082
URL: http://svn.apache.org/viewvc?rev=1366082&view=rev
Log:
OPENMEETINGS-381 is resolved
Removed:
incubator/openmeetings/trunk/singlewebapp/lib/
Modified:
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1366082&r1=1366081&r2=1366082&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Thu Jul 26
16:56:01 2012
@@ -1,6 +1,6 @@
project.version=2.1.0
project.status=SNAPSHOT
-ivy.jar=ivy-2.3.0-rc1.jar
+ivy.install.version=2.3.0-rc1
red5.server.revision=4388
red5.client.revision=4388
laszlo.proxied=solo
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1366082&r1=1366081&r2=1366082&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Jul 26 16:56:01 2012
@@ -28,9 +28,9 @@
<property name="dist.dir" value="dist" />
- <property name="ivy.lib.dir" value="${basedir}/lib" />
<property name="build.base.dir" value="${basedir}/build" />
<property name="project.lib.dir" value="${build.base.dir}/lib" />
+ <property name="ivy.jar.path"
value="${project.lib.dir}/ivy-${ivy.install.version}.jar" />
<property name="mainlibs.lib.dir" value="${project.lib.dir}/mainlibs" />
<property name="om.lib.dir" value="${project.lib.dir}/om" />
<property name="anakia.lib.dir" value="${project.lib.dir}/anakia" />
@@ -691,9 +691,18 @@
</antcall>
</target>
-
- <taskdef uri="antlib:org.apache.ivy.ant"
resource="org/apache/ivy/ant/antlib.xml" classpath="${ivy.lib.dir}/${ivy.jar}"
/>
-
+ <available file="${ivy.jar.path}" type="file" property="ivy.installed"
/>
+ <target name="-download-ivy" unless="ivy.installed">
+ <mkdir dir="${project.lib.dir}"/>
+ <echo message="Downloading ivy..."/>
+ <get
src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar";
+ dest="${ivy.jar.path}" usetimestamp="true"/>
+ </target>
+
+ <target name="-install-ivy" depends="-download-ivy" description="Check
if we need to download ivy or not">
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.path}"/>
+ </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" />
@@ -710,7 +719,7 @@
<available classpathref="compile.classpath"
classname="org.red5.client.net.rtmp.RTMPClient"
property="red5.client.installed" />
</target>
- <target name="-retrieve" description="Retrieves the libraries if
needed">
+ <target name="-retrieve" depends="-install-ivy" description="Retrieves
the libraries if needed">
<condition property="ivy.conf.name" value="red5">
<not>
<isset property="ivy.conf.name" />
@@ -935,7 +944,7 @@
<target name="clean.all" depends="clean.dist" description="Clean All">
<delete includeemptydirs="true" dir="${build.base.dir}" />
</target>
- <target name="clean.ivy" depends="clean.all" description="Clears out
the Ivy cache">
+ <target name="clean.ivy" depends="-install-ivy,clean.all"
description="Clears out the Ivy cache">
<ivy:cleancache />
</target>
