svn commit: r1458657 - in /openmeetings/trunk/singlewebapp: .classpath build.xml ivy.xml

[solomax]

Author: solomax
Date: Wed Mar 20 07:16:40 2013
New Revision: 1458657

URL: http://svn.apache.org/r1458657
Log:
[OPENMEETINGS-578] junit tests were not working after red5 update

Modified:
    openmeetings/trunk/singlewebapp/.classpath
    openmeetings/trunk/singlewebapp/build.xml
    openmeetings/trunk/singlewebapp/ivy.xml

Modified: openmeetings/trunk/singlewebapp/.classpath
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1458657&r1=1458656&r2=1458657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Wed Mar 20 07:16:40 2013
@@ -26,8 +26,8 @@
        <classpathentry kind="con" 
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
        <classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
        <classpathentry kind="lib" path="WebContent/screensharing"/>
-       <classpathentry kind="lib" 
path="build/red5/client/dist/red5-client-1.0.2-SNAPSHOT.jar"/>
-       <classpathentry kind="lib" 
path="build/red5/server/dist/red5-server.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/client/dist/red5-client-1.0.2-SNAPSHOT.jar" 
sourcepath="build/red5/client/src/main/java"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/red5-server.jar" 
sourcepath="build/red5/server/src/main/java"/>
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/slf4j-api-1.7.2.jar"/>
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-context-3.1.1.RELEASE.jar"/>
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
@@ -39,5 +39,7 @@
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/spring-web-3.1.1.RELEASE.jar"/>
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-beanutils-1.8.3.jar"/>
        <classpathentry kind="lib" 
path="build/red5/server/dist/lib/commons-lang3-3.1.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/logback-core-1.0.9.jar"/>
+       <classpathentry kind="lib" 
path="build/red5/server/dist/lib/logback-classic-1.0.9.jar"/>
        <classpathentry kind="output" path="build/classes/eclipse"/>
 </classpath>

Modified: openmeetings/trunk/singlewebapp/build.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1458657&r1=1458656&r2=1458657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Wed Mar 20 07:16:40 2013
@@ -871,7 +871,7 @@
        <target name="-availability-check" unless="red5.installed" 
description="Check which libraries need to be retrieved" 
depends="prepare.mkdir">
                <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="net.sf.antcontrib.AntContribVersion" 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" />
                <condition property="anakia.installed">

Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1458657&r1=1458656&r2=1458657&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Wed Mar 20 07:16:40 2013
@@ -292,9 +292,6 @@
                <!--  END OF OPENMEETINGS -->
 
                <!--  START OF JUNIT -->
-               <dependency org="junit" name="junit" rev="4.9" conf="junit->*" 
transitive="false">
-                       <include type="jar" />
-               </dependency>
                <dependency org="org.springframework" name="spring-test" 
rev="3.1.1.RELEASE" conf="junit->*" transitive="false">
                        <include type="jar" />
                </dependency>