You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/03/01 09:43:33 UTC
svn commit: r1295469 - in /incubator/openmeetings/trunk/singlewebapp:
build.xml ivy.xml src/templates/screenshare.vm
Author: solomax
Date: Thu Mar 1 08:43:33 2012
New Revision: 1295469
URL: http://svn.apache.org/viewvc?rev=1295469&view=rev
Log:
kunststoff library was removed from the project
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1295469&r1=1295468&r2=1295469&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Mar 1 08:43:33 2012
@@ -89,7 +89,6 @@
<property name="red5.lib.dir" value="${project.lib}/red5" />
<property name="om.lib.dir" value="${project.lib}/om" />
<property name="anakia.lib.dir" value="${project.lib}/anakia" />
- <property name="red5-screenshare.lib.dir" value="${project.lib}/red5-screenshare" />
<property name="red5-screenshare.images" value="${basedir}/WebContent/red5-screenshare" />
<property name="junit.lib.dir" value="${project.lib}/junit" />
<property name="rat.lib.dir" value="${project.lib}/rat" />
@@ -112,7 +111,6 @@
<fileset dir="${red5.lib.dir}" includes="*.jar" />
<fileset dir="${om.lib.dir}" includes="*.jar" />
<fileset dir="${red5.lib}" includes="*.jar" />
- <fileset dir="${red5-screenshare.lib.dir}" includes="*.jar" />
<fileset dir="${junit.lib.dir}" includes="*.jar" />
<fileset dir="${project.lib}" includes="*.jar" excludes="ivy*.jar" />
</path>
@@ -179,7 +177,6 @@
<mkdir dir="${red5.lib.dir}" />
<mkdir dir="${om.lib.dir}" />
<mkdir dir="${anakia.lib.dir}" />
- <mkdir dir="${red5-screenshare.lib.dir}" />
<mkdir dir="${junit.lib.dir}" />
<mkdir dir="${rat.lib.dir}" />
<mkdir dir="${dtd-generator.lib.dir}" />
@@ -192,7 +189,6 @@
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
<copy todir="${screenshare.out.dir}" filtering="true">
- <fileset dir="${red5-screenshare.lib.dir}" includes="*.jar" />
<fileset dir="${red5-screenshare.images}" />
<fileset dir="${red5.lib.dir}" includes="commons-codec*.jar" />
<fileset dir="${red5.lib.dir}" includes="httpclient*.jar" />
@@ -477,7 +473,7 @@
</javac>
</target>
- <target name="compile.screen.share" depends="-retrieve-red5-screenshare,clean.classes, prepare.mkdir, resources">
+ <target name="compile.screen.share" depends="clean.classes, prepare.mkdir, resources">
<echo message="Compile screen share to ${screen.out.dir}" />
<!-- compile screen share -->
<javac debug="on" debuglevel="lines,vars,source" srcdir="${screen.src.dir}" destdir="${screen.out.dir}">
@@ -837,13 +833,6 @@
<param name="ivy.lib.location" value="${anakia.lib.dir}"/>
</antcall>
</target>
- <!-- Check for red5-screenshare libraries -->
- <target name="-retrieve-red5-screenshare" unless="red5-screenshare.installed" description="Retrieves the libraries if needed" depends="prepare.mkdir">
- <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
- <param name="ivy.conf.name" value="red5-screenshare"/>
- <param name="ivy.lib.location" value="${red5-screenshare.lib.dir}"/>
- </antcall>
- </target>
<!-- Check for junit libraries -->
<target name="-retrieve-junit" unless="junit.installed" description="Retrieves the libraries if needed" depends="prepare.mkdir">
<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1295469&r1=1295468&r2=1295469&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Thu Mar 1 08:43:33 2012
@@ -22,7 +22,6 @@
<conf name="red5.ext" description="Red5 required libraries with different pattern" />
<conf name="openmeetings" description="Openmeetings required libraries" />
<conf name="anakia" description="Openmeetings required libraries" />
- <conf name="red5-screenshare" description="Red5-screenshare required libraries" />
<conf name="openmeetings.ext" description="Openmeetings required libraries with different pattern" />
<conf name="openmeetings.axis2" description="Axis required libraries with dependencies" />
<conf name="junit" description="Unit testing dependencies" />
@@ -141,13 +140,6 @@
</dependency>
<!-- END OF ANAKIA -->
- <!-- START OF RED5-SCREENSHARE -->
- <dependency org="com.incors.plaf" name="kunststoff" rev="2.0.2" conf="red5-screenshare->*" transitive="false">
- <include type="jar" />
- </dependency>
- <!-- END OF RED5-SCREENSHARE -->
-
-
<!-- START OF OPENMEETINGS -->
<dependency org="org.apache.axis2" name="axis2" rev="1.6.1" conf="openmeetings->*" transitive="false">
<include type="jar" />
Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1295469&r1=1295468&r2=1295469&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Thu Mar 1 08:43:33 2012
@@ -30,7 +30,6 @@ limitations under the License.
<resources>
<j2se version='1.4+'/>
<jar href="commons-codec-1.6.jar"/>
- <jar href="kunststoff.jar"/>
<jar href="logback-classic-0.9.28.jar"/>
<jar href="logback-core-0.9.28.jar"/>
<jar href="red5.jar"/>