[Red5devs] [red5 commit] r3070 - in java/server/tags/0_7_0: . lib
codesite-noreply at google.com
codesite-noreply at google.com
Thu Sep 18 22:14:26 PDT 2008
Author: mondain
Date: Thu Sep 18 22:13:15 2008
New Revision: 3070
Added:
java/server/tags/0_7_0/lib/ivy-trunk.jar (contents, props changed)
Modified:
java/server/tags/0_7_0/build.properties
java/server/tags/0_7_0/build.xml
java/server/tags/0_7_0/ivy.xml
java/server/tags/0_7_0/ivysettings.xml
Log:
fixed build problems with this 0.7.0 release
Modified: java/server/tags/0_7_0/build.properties
==============================================================================
--- java/server/tags/0_7_0/build.properties (original)
+++ java/server/tags/0_7_0/build.properties Thu Sep 18 22:13:15 2008
@@ -17,7 +17,7 @@
red5.archive=${red5.filename}.tar.gz
# Ivy
-ivy.version=ivy-2.0.0-beta1
+ivy.version=ivy-trunk
# javac options
# http://ant.apache.org/manual/CoreTasks/javac.html
Modified: java/server/tags/0_7_0/build.xml
==============================================================================
--- java/server/tags/0_7_0/build.xml (original)
+++ java/server/tags/0_7_0/build.xml Thu Sep 18 22:13:15 2008
@@ -37,8 +37,10 @@
http://ant.apache.org/ivy
http://testearly.com/2007/06/24/ivy-in-42-steps
-->
- <taskdef uri="antlib:org.apache.ivy.ant"
resource="org/apache/ivy/ant/antlib.xml"
classpath="${lib.dir}/${ivy.version}.jar"/>
- <property name="ivy.lib.dir" value="${lib.dir}"/>
+ <taskdef uri="antlib:org.apache.ivy.ant"
resource="org/apache/ivy/ant/antlib.xml"
+ classpath="${lib.dir}/${ivy.version}.jar"/>
+ <!-- Latest ivy 9/2008 seems to want absolute path -->
+ <property name="ivy.lib.dir" value="${basedir}/lib"/>
<tstamp prefix="build">
<format property="TODAY" pattern="d-MMMM-yyyy" locale="en"/>
@@ -156,18 +158,21 @@
<target name="retrieve" unless="library.installed" description="Retrieves
the libraries if needed">
<!-- Ivy configuration -->
<ivy:settings file="ivysettings.xml"/>
- <condition property="ivy.conf.name" value="default">
+ <condition property="ivy.conf.name" value="java6">
<not>
<isset property="ivy.conf.name"/>
</not>
</condition>
<echo message="Ivy conf name: ${ivy.conf.name}"/>
- <ivy:resolve conf="${ivy.conf.name}"/>
+ <ivy:resolve file="ivy.xml" conf="${ivy.conf.name}"/>
<ivy:retrieve conf="${ivy.conf.name}"/>
</target>
<target name="ivyclear" description="Clears out the Ivy cache">
- <delete dir="${user.home}/.ivy/cache"/>
+ <!--
+ <delete dir="${user.home}/.ivy/cache"/>
+ -->
+ <delete dir="${user.home}/.ivy2/cache"/>
<delete includeemptydirs="true">
<fileset dir="${lib.dir}" excludes="**/ivy*.jar"/>
</delete>
Modified: java/server/tags/0_7_0/ivy.xml
==============================================================================
--- java/server/tags/0_7_0/ivy.xml (original)
+++ java/server/tags/0_7_0/ivy.xml Thu Sep 18 22:13:15 2008
@@ -1,9 +1,14 @@
-<ivy-module version="1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="red5" module="server" />
<configurations>
<conf name="default"/>
<conf name="java5" extends="default" description="Java 5 dependencies"/>
- <conf name="test" extends="default" description="Unit testing
dependencies"/>
+ <conf name="java6" extends="default" description="Java 6 dependencies"/>
+ <conf name="utest" extends="eclipse" description="Unit testing
dependencies"/>
+ <conf name="eclipse" description="Special dependencies in Eclipse"/>
</configurations>
<dependencies>
<!-- J2EE -->
@@ -30,9 +35,9 @@
<dependency org="tomcat" name="annotations-api" rev="" />
<dependency org="commons" name="commons-modeler" rev="2.0.1" />
<!-- Jetty -->
- <dependency org="jetty" name="jetty" rev="6.1.8" />
- <dependency org="jetty" name="jetty-util" rev="6.1.8" />
- <dependency org="jetty" name="jetty-xbean" rev="6.1.8" />
+ <dependency org="jetty" name="jetty" rev="6.1.9" />
+ <dependency org="jetty" name="jetty-util" rev="6.1.9" />
+ <dependency org="jetty" name="jetty-xbean" rev="6.1.9" />
<!-- Logging -->
<dependency name="slf4j-api" rev="1.4.3" />
<dependency name="jcl104-over-slf4j" rev="1.4.3" />
@@ -41,16 +46,14 @@
<dependency name="logback-classic" rev="0.9.8" />
<!-- General -->
<dependency org="cglib" name="cglib-nodep" rev="2.1_3" />
- <dependency org="commons" name="commons-beanutils"
rev="1.8.0-BETA" />
+ <dependency org="commons" name="commons-beanutils" rev="1.8.0" />
<dependency org="commons" name="commons-codec" rev="1.3" />
<dependency org="commons" name="commons-collections" rev="3.2" />
<dependency org="commons" name="commons-httpclient" rev="3.1" />
<dependency org="commons" name="commons-lang" rev="2.3" />
<dependency org="commons" name="commons-pool" rev="1.3" />
- <dependency org="javax" name="jpda" rev="" />
<dependency name="quartz" rev="1.5.2" />
<dependency org="javax" name="jta" rev="1.0.1B" />
- <dependency name="whirlycache" rev="1.0.1_lite" />
<dependency name="ehcache" rev="1.2.3" />
<dependency name="xercesImpl" rev="2.9.0" />
<dependency name="xml-apis" rev="2.9.0" />
@@ -58,41 +61,41 @@
<dependency org="javax" name="activation" rev="1.1" />
<dependency name="acegi-security" rev="1.0.4" />
<!-- JMX -->
- <dependency org="jmx" name="jmxremote" rev="" />
- <dependency org="jmx" name="jmxtools" rev="" />
- <dependency org="jmx" name="rmissl" rev="" />
+ <dependency org="jmx" name="jmxremote" rev="1.0.1" />
+ <dependency org="jmx" name="jmxtools" rev="1.2.1" />
+ <dependency org="jmx" name="rmissl" rev="1.0.1" />
<!-- Mina -->
- <dependency org="mina" name="mina-core" rev="1.1.6" />
- <dependency org="mina" name="mina-filter-ssl" rev="1.1.6" />
- <dependency org="mina" name="mina-integration-spring" rev="1.1.6"
/>
- <dependency org="mina" name="mina-integration-jmx" rev="1.1.6" />
+ <dependency org="mina" name="mina-core" rev="1.1.7" />
+ <dependency org="mina" name="mina-filter-ssl" rev="1.1.7" />
+ <dependency org="mina" name="mina-integration-spring" rev="1.1.7"
/>
+ <dependency org="mina" name="mina-integration-jmx" rev="1.1.7" />
<!-- Scripting -->
<dependency org="asm" name="asm" rev="2.2.3" />
<dependency org="asm" name="asm-commons" rev="2.2.3" />
<dependency org="antlr" name="antlr" rev="2.7.6" />
<dependency name="bsh" rev="2.0b4" />
<dependency name="groovy" rev="1.0" />
- <dependency name="jruby" rev="1.0.3" />
+ <dependency name="jruby" rev="1.0.3" conf="java6->*"/>
<dependency name="jython" rev="2.2" />
<dependency org="spring" name="spring-support" rev="2.0.8" />
<!-- Admin required jars -->
<dependency org="spring" name="spring-webmvc" rev="2.0.8" />
<dependency org="commons" name="standard" rev="1.1.2" />
- <!-- Testing support -->
- <dependency name="junit" rev="4.0" conf="test->default"/>
- <dependency name="groboutils" rev="" conf="test->default"/>
- <dependency org="spring" name="spring-mock" rev="2.0.8"
conf="test->default"/>
- <dependency name="jython-engine" rev="" conf="test->default"/>
- <dependency name="groovy-engine" rev="" conf="test->default"/>
- <dependency name="jruby-engine" rev="" conf="test->default"/>
<!-- Java5 support -->
- <dependency org="rhino" name="js" rev="1.6R7"
conf="java5->default"/>
- <dependency name="jsr173_1.0_api" rev="" conf="java5->default"/>
- <dependency name="jsr-223" rev="1.0" conf="java5->default"/>
- <dependency name="js-engine" rev="" conf="java5->default"/>
- <dependency name="jython-engine" rev="" conf="java5->default"/>
- <dependency name="groovy-engine" rev="" conf="java5->default"/>
- <dependency name="jruby" rev="1.0.1" conf="java5->default"/>
- <dependency name="jruby-engine" rev="" conf="java5->default"/>
+ <dependency org="rhino" name="js" rev="1.6R7" conf="java5->*"/>
+ <dependency name="jsr173_1.0_api" rev="" conf="java5->*"/>
+ <dependency name="jsr-223" rev="1.0" conf="java5->*"/>
+ <dependency name="js-engine" rev="" conf="java5->*"/>
+ <dependency name="jython-engine" rev="" conf="java5->*"/>
+ <dependency name="groovy-engine" rev="" conf="java5->*"/>
+ <dependency name="jruby" rev="1.0.1" conf="java5->*"/>
+ <dependency name="jruby-engine" rev="" conf="java5->*"/>
+ <!-- Testing support -->
+ <dependency name="junit" rev="4.0" conf="utest->eclipse"/>
+ <dependency name="GroboUtils" rev="4-core" conf="eclipse->*"/>
+ <dependency org="spring" name="spring-mock" rev="2.0.8"
conf="eclipse->*"/>
+ <dependency name="jython-engine" rev="" conf="eclipse->*"/>
+ <dependency name="groovy-engine" rev="" conf="eclipse->*"/>
+ <dependency name="jruby-engine" rev="" conf="eclipse->*"/>
</dependencies>
</ivy-module>
Modified: java/server/tags/0_7_0/ivysettings.xml
==============================================================================
--- java/server/tags/0_7_0/ivysettings.xml (original)
+++ java/server/tags/0_7_0/ivysettings.xml Thu Sep 18 22:13:15 2008
@@ -1,30 +1,15 @@
<ivysettings>
- <settings defaultResolver="local" checkUpToDate="false"/>
+ <settings defaultResolver="local"/>
<resolvers>
- <chain name="local" returnFirst="true">
- <filesystem name="lib_dir">
- <artifact
pattern="${ivy.lib.dir}/[artifact](-[revision]).[type]" />
+ <chain name="local">
+ <filesystem name="default">
+ <ivy
pattern="${user.home}/.ivy2/cache/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${ivy.lib.dir}/[artifact](-[revision]).[ext]"
/>
</filesystem>
- <!-- ivyrep name="local_cache"/ -->
- </chain>
- <chain name="remote" returnFirst="true">
<url name="googlecode">
- <artifact
pattern="http://red5.googlecode.com/svn/trunk/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="http://red5.googlecode.com/svn/trunk/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
- </url>
- <url name="cvsdude">
- <artifact
pattern="https://svn1.cvsdude.com/osflash/red5/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="https://svn1.cvsdude.com/osflash/red5/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
- </url>
+ <artifact
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
+ <artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
+ </url>
</chain>
</resolvers>
- <modules>
- <module organisation="spring" name="*" resolver="googlecode"/>
- <module organisation="tomcat" name="*" resolver="googlecode"/>
- <module organisation="jetty" name="*" resolver="googlecode"/>
- <module organisation="mina" name="*" resolver="googlecode"/>
- <module organisation="jmx" name="*" resolver="googlecode"/>
- <module organisation=".*" name="*" resolver="remote"/>
- </modules>
</ivysettings>
Added: java/server/tags/0_7_0/lib/ivy-trunk.jar
==============================================================================
Binary file. No diff available.
More information about the Red5devs
mailing list