Author: solomax
Date: Thu May 24 03:11:14 2012
New Revision: 1342125
URL: http://svn.apache.org/viewvc?rev=1342125&view=rev
Log:
JAudioTagger is removed untill its officially Dual Licensed
Added:
incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1342125&r1=1342124&r2=1342125&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Thu May 24 03:11:14
2012
@@ -49,7 +49,6 @@
<classpathentry kind="lib"
path="build/red5/dist/lib/ehcache-core-2.5.0.jar"/>
<classpathentry kind="lib"
path="build/red5/dist/lib/httpclient-4.1.2.jar"/>
<classpathentry kind="lib"
path="build/red5/dist/lib/httpcore-4.1.3.jar"/>
- <classpathentry kind="lib"
path="build/red5/dist/lib/jaudiotagger-2.0.4-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="build/red5/dist/lib/javaee-api-5.1.2.om.jar"/>
<classpathentry kind="lib"
path="build/red5/dist/lib/jcl-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib"
path="build/red5/dist/lib/jul-to-slf4j-1.6.1.jar"/>
Added: incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl?rev=1342125&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl (added)
+++ incubator/openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl Thu May 24
03:11:14 2012
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:output omit-xml-declaration="no"/>
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="//*[@id='mp4reader.impl']"/>
+ <xsl:template match="//*[@id='mp3reader.impl']"/>
+</xsl:stylesheet>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1342125&r1=1342124&r2=1342125&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu May 24 03:11:14 2012
@@ -13,7 +13,11 @@
limitations under the License.
-->
<!DOCTYPE project>
-<project name="openmeetings" basedir="./" default="dist"
xmlns:rat="antlib:org.apache.rat.anttasks" xmlns="antlib:org.apache.tools.ant"
xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="openmeetings" basedir="./" default="dist"
+ xmlns="antlib:org.apache.tools.ant"
+ xmlns:rat="antlib:org.apache.rat.anttasks"
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ >
<loadproperties srcFile="build.properties" />
<property name="project.distname" value="openmeetings" />
@@ -500,15 +504,14 @@
<path refid="compile.classpath" />
</path>
+ <path id="webservice.classes">
+ <fileset dir="src/org/openmeetings/axis/services">
+ <include name="*WebService.java" />
+ </fileset>
+ </path>
+
<target name="build.webservice.doc" depends="compile.only">
- <javadoc classpathref="build.webservice.classpath"
useexternalfile="true">
- <source
file="src/org/openmeetings/axis/services/CalendarWebService.java" />
- <source
file="src/org/openmeetings/axis/services/FileWebService.java" />
- <source
file="src/org/openmeetings/axis/services/JabberWebService.java" />
- <source
file="src/org/openmeetings/axis/services/RoomWebService.java" />
- <source
file="src/org/openmeetings/axis/services/UserWebService.java" />
- <doclet name="org.openmeetings.doc.WebServiceDoclet"
pathref="build.webservice.classpath" />
- </javadoc>
+ <javadoc classpathref="build.webservice.classpath"
useexternalfile="true" sourcepathref="webservice.classes" />
</target>
<property name="docs.dest" value="docs" />
@@ -519,7 +522,6 @@
<path refid="compile.classpath" />
<fileset dir="${anakia.lib.dir}" includes="*.jar" />
<fileset dir="${mainlibs.lib.dir}"
includes="commons-collections*.jar,commons-lang*.jar,velocity*.jar" />
-
</path>
<target name="anakia"
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-anakia">
@@ -533,29 +535,30 @@
</target>
<target name="build.only.webservice.doc" depends="anakia">
- <javadoc classpathref="build.webservice.classpath"
useexternalfile="true">
- <source
file="src/org/openmeetings/axis/services/CalendarWebService.java" />
- <source
file="src/org/openmeetings/axis/services/FileWebService.java" />
- <source
file="src/org/openmeetings/axis/services/JabberWebService.java" />
- <source
file="src/org/openmeetings/axis/services/RoomWebService.java" />
- <source
file="src/org/openmeetings/axis/services/UserWebService.java" />
+ <javadoc classpathref="build.webservice.classpath"
useexternalfile="true" sourcepathref="webservice.classes">
<doclet name="org.openmeetings.doc.WebServiceDoclet"
pathref="build.webservice.classpath" />
</javadoc>
+ <patternset id="images">
+ <include name="**/*.gif" />
+ <include name="**/*.jpeg" />
+ <include name="**/*.jpg" />
+ <include name="**/*.png" />
+ </patternset>
+ <patternset id="css">
+ <include name="**/*.css" />
+ <include name="**/*.gif" />
+ <include name="**/*.png" />
+ </patternset>
<copy todir="${docs.dest}/images" filtering="no">
<fileset dir="${docs.src}/images">
- <include name="**/*.gif" />
- <include name="**/*.jpeg" />
- <include name="**/*.jpg" />
- <include name="**/*.png" />
+ <patternset refid="images" />
</fileset>
</copy>
<copy todir="${docs.dest}/css" filtering="no">
<fileset dir="${docs.src}/css">
- <include name="**/*.css" />
- <include name="**/*.gif" />
- <include name="**/*.png" />
+ <patternset refid="css" />
</fileset>
</copy>
@@ -567,17 +570,12 @@
</copy>
<copy todir="${dist.webapps.dir}/docs/images">
<fileset dir="${basedir}/docs/images/">
- <include name="**/*.gif" />
- <include name="**/*.jpeg" />
- <include name="**/*.jpg" />
- <include name="**/*.png" />
+ <patternset refid="images" />
</fileset>
</copy>
<copy todir="${dist.webapps.dir}/docs/css">
<fileset dir="${basedir}/docs/css/">
- <include name="**/*.css" />
- <include name="**/*.gif" />
- <include name="**/*.png" />
+ <patternset refid="css" />
</fileset>
</copy>
<copy todir="${dist.webapps.dir}/docs/js">
@@ -738,7 +736,14 @@
<copy todir="${red5.lib}" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/red5"
includes="admin.*" />
</copy>
+ <!-- FIXME need to be removed as soon as JAudioTagger (will be
officially Dual Licensed) -->
+ <xslt in="${red5.lib}/conf/red5-common.xml"
out="${red5.lib}/conf/red5-common1.xml" style="build-jaudiotagger.xsl" />
+ <move file="${red5.lib}/conf/red5-common1.xml"
tofile="${red5.lib}/conf/red5-common.xml" />
+ <delete>
+ <fileset dir="${red5.server.lib}"
includes="jaudiotagger*.jar" />
+ </delete>
</target>
+
<!-- Check for the Top level libraries -->
<target name="-retrieve-mainlibs" unless="mainlib.installed"
description="Retrieves the libraries if needed" depends="-retrieve-red5">
<!-- Ivy configuration -
http://ant.apache.org/ivy/history/trunk/ant.html -->
