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 2014/04/25 21:20:55 UTC

svn commit: r1590111 - in /openmeetings/trunk/singlewebapp: build-jaudiotagger.xsl build.properties build.xml ivy.xml ivysettings.xml ivysettings.xsd openlaszlo.xml openmeetings-flash/pom.xml openmeetings-web/pom.xml pom.xml

Author: solomax
Date: Fri Apr 25 19:20:55 2014
New Revision: 1590111

URL: http://svn.apache.org/r1590111
Log:
[OPENMEETINGS-940] building of flash clients moved to maven

Added:
    openmeetings/trunk/singlewebapp/openlaszlo.xml
      - copied, changed from r1590060, openmeetings/trunk/singlewebapp/build.xml
Removed:
    openmeetings/trunk/singlewebapp/build-jaudiotagger.xsl
    openmeetings/trunk/singlewebapp/build.properties
    openmeetings/trunk/singlewebapp/build.xml
    openmeetings/trunk/singlewebapp/ivy.xml
    openmeetings/trunk/singlewebapp/ivysettings.xml
    openmeetings/trunk/singlewebapp/ivysettings.xsd
Modified:
    openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
    openmeetings/trunk/singlewebapp/pom.xml

Copied: openmeetings/trunk/singlewebapp/openlaszlo.xml (from r1590060, openmeetings/trunk/singlewebapp/build.xml)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openlaszlo.xml?p2=openmeetings/trunk/singlewebapp/openlaszlo.xml&p1=openmeetings/trunk/singlewebapp/build.xml&r1=1590060&r2=1590111&rev=1590111&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/openlaszlo.xml Fri Apr 25 19:20:55 2014
@@ -18,74 +18,18 @@
   under the License.
  -->
 <!DOCTYPE project>
-<project name="openmeetings" basedir="./" default="dist"
+<project name="openmeetings" basedir="./" default="client.only"
 	xmlns="antlib:org.apache.tools.ant"
 	xmlns:rat="antlib:org.apache.rat.anttasks"
 	xmlns:ivy="antlib:org.apache.ivy.ant"
 	xmlns:artifact="antlib:org.apache.maven.artifact.ant"
 	>
-	<loadproperties srcFile="build.properties" />
-
-	<property name="jar.suffix" value="${project.version}-${project.status}" />
-	<property environment="env" />
-
-	<property name="src.base.dir" value="${basedir}/src" />
-
-	<property name="dist.dir" value="${basedir}/dist" />
-
-	<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" />
-	<property name="webcontent.base.dir" value="${basedir}/WebContent" />
-	
-	<property name="screenshare.resources.dir" value="${basedir}/openmeetings-screenshare/src/main/resources" />
-	
-	<property name="webapp.dir" value="${basedir}/openmeetings-web/src/main/webapp" />
-	<property name="junit.lib.dir" value="${project.lib.dir}/junit" />
-	<property name="junit.backups.dir" value="${junit.lib.dir}/backups" />
-	<property name="rat.lib.dir" value="${project.lib.dir}/rat" />
-	<property name="dtd-generator.lib.dir" value="${project.lib.dir}/dtd-generator" />
-	<property name="svntask.lib.dir" value="${project.lib.dir}/svntask" />
-	<property name="docs.dest" value="docs" />
-	<property name="docs.src" value="xdocs" />
-
-	<property name="red5.server.dir" value="${build.base.dir}/red5/server" />
-	<property name="red5.lib" value="${red5.server.dir}/dist" />
-	<property name="red5.server.lib" value="${red5.lib}/lib" />
-	<property name="red5.root" value="${dist.dir}/red5" />
-	<property name="dist.webapps.dir" value="${red5.root}/webapps/${project.distname}" />
-	<property name="dist.classes.dir" value="${dist.webapps.dir}/WEB-INF/classes" />
-	<property name="dist.persistence.dir" value="${dist.classes.dir}/META-INF/" />
-
-	<property name="laszlo.home" value="${build.base.dir}/openlaszlo" />
-	<property name="laszlo46.home" value="${build.base.dir}/openlaszlo46" />
-
-	<!-- screenshare.out.dir -->
-	<property name="screenshare.out.dir" value="${dist.webapps.dir}/screensharing" />
-	
-	<condition property="junit.run.selenium" value="true" else="false">
-		<isset property="selenium" />
-	</condition>
-
-	<property name="main.out.dir" value="${build.base.dir}/classes/openmeetings" />
-
+	<property name="laszlo.home" value="${basedir}/openlaszlo" />
+	<property name="laszlo46.home" value="${basedir}/openlaszlo46" />
 	<!-- LPS Properties -->
 	<property name="out.dir.swf" value="${dist.webapps.dir}/public" />
 	<property name="laszlo.as3.src.dir" value="${webcontent.base.dir}/swf10" />
-	<property name="laszlo.src.dir" value="${webcontent.base.dir}/src" />
-
-	<property name="keystore.file" value="${build.base.dir}/screensharing_sign.keystore" />
-
-	<property name="junit.base.dir" value="${build.base.dir}/junit" />
-	<property name="junit.report.dir" value="${junit.base.dir}/report" />
-	<property name="om.dist.webapp" value="${red5.root}/webapps/${project.distname}" />
-	<tstamp prefix="build">
-		<format property="TODAY" pattern="d-MMMM-yyyy" locale="en" />
-	</tstamp>
-
+	<property name="laszlo.src.dir" value="${webcontent.base.dir}/swf8" />
 	<path id="laszlo.lib">
 		<!-- swf8 -->
 		<fileset dir="${laszlo.home}/WEB-INF/lib" includes="saxon-6.5.3-lz-p1.jar jakarta-regexp-1.2.jar
@@ -98,466 +42,6 @@
 	<path id="laszlo46.lib">
 		<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
 	</path>
-	
-	<!-- compile classpath -->
-	<path id="check.classpath">
-		<fileset dir="${red5.lib}" includes="*.jar" />
-		<fileset dir="${red5.server.lib}" includes="*.jar" />
-		<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
-		<fileset dir="${om.lib.dir}" includes="*.jar" />
-		<fileset dir="${junit.lib.dir}" includes="*.jar" />
-		<fileset dir="${dtd-generator.lib.dir}" includes="*.jar" />
-		<fileset dir="${project.lib.dir}" includes="*.jar" />
-	</path>
-	<path id="compile.classpath">
-		<fileset dir="${red5.lib}/plugins" includes="*.jar" />
-		<fileset dir="${red5.server.dir}/target/lib" includes="junit*.jar" />
-		<path refid="check.classpath"/>
-	</path>
-	<path id="junit.classpath">
-		<fileset dir="${junit.lib.dir}" includes="*.jar" />
-		<fileset dir="${om.dist.webapp}/WEB-INF/lib">
-			<include name="*.jar" />
-			<exclude name="openmeetings*.jar" />
-		</fileset>
-		<fileset dir="${red5.root}" includes="*.jar" />
-		<fileset dir="${red5.root}/lib" includes="*.jar" />
-		<fileset dir="${red5.root}/plugins" includes="*.jar" />
-		<pathelement path="${dist.classes.dir}" />
-		<pathelement path="${main.out.dir}" />
-	</path>
-
-	<target name="info" unless="java6.installed">
-		<echo>Ant version is ${ant.version}</echo> <!-- output Ant version -->
-	</target>
-
-	<target name="prepare.mkdir" depends="-java6or7.check">
-		<mkdir dir="${red5.server.lib}" />
-		<mkdir dir="${red5.lib}/log" />
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${main.out.dir}" />
-		<mkdir dir="${mainlibs.lib.dir}" />
-		<mkdir dir="${om.lib.dir}" />
-		<mkdir dir="${anakia.lib.dir}" />
-		<mkdir dir="${junit.backups.dir}" />
-		<mkdir dir="${junit.report.dir}" />
-		<mkdir dir="${rat.lib.dir}" />
-		<mkdir dir="${dtd-generator.lib.dir}" />
-		<mkdir dir="${svntask.lib.dir}" />
-		<mkdir dir="${laszlo.home}" />
-		<mkdir dir="${laszlo46.home}" />
-		<echo file="${build.base.dir}/velocity.properties" append="false">runtime.log = ${build.base.dir}/velocity.log${line.separator}output.encoding=UTF-8${line.separator}</echo>
-	</target>
-
-	<!-- perform nightly build with tests -->
-	<target name="dist-bin-nightly" description="perform nightly build with tests" depends="dist-bin, test" />
-
-	<!-- build artefacts -->
-	<target name="dist-bin" description="pack binary distribution" depends="clean.all, dist">
-		<tstamp>
-			<format property="build.time" pattern="dd-MM-yyyy_HHmm" />
-		</tstamp>
-		<property name="archive.file.name" value="${dist.dir}/apache-${project.distname}-${project.version}.r${svn.info.rev}-${build.time}" />
-
-		<move file="${dist.dir}/red5/license.txt" tofile="${dist.dir}/red5/red5-license.txt" />
-		<copy file="build.properties" tofile="${build.base.dir}/build.properties" overwrite="true" />
-		<copy file="LICENSE" tofile="${dist.dir}/red5/LICENSE" overwrite="true" />
-		<copy file="NOTICE" tofile="${dist.dir}/red5/NOTICE" overwrite="true" />
-		<copy file="README" tofile="${dist.dir}/red5/README" overwrite="true" />
-		<copy file="CHANGELOG" tofile="${dist.dir}/red5/CHANGELOG" overwrite="true" />
-
-		<echo file="${build.base.dir}/build.properties" append="true">svn.info.rev=${svn.info.rev}${line.separator}</echo>
-		<tar longfile="gnu" compression="gzip" destfile="${archive.file.name}-src.tar.gz">
-			<tarfileset dir="${basedir}">
-				<exclude name="build/**" />
-				<exclude name="dist/**" />
-				<exclude name="build.properties" />
-			</tarfileset>
-			<tarfileset dir="${build.base.dir}">
-				<include name="build.properties" />
-			</tarfileset>
-		</tar>
-		<tar longfile="gnu" compression="gzip" destfile="${archive.file.name}-docs.tar.gz">
-			<tarfileset dir="${basedir}/docs"/>
-		</tar>
-		<tar longfile="gnu" compression="gzip" destfile="${archive.file.name}.tar.gz">
-			<tarfileset dir="${dist.dir}/red5">
-				<include name="**" />
-				<exclude name="*.sh" />
-			</tarfileset>
-			<tarfileset dir="${dist.dir}/red5" filemode="755">
-				<include name="*.sh" />
-			</tarfileset>
-		</tar>
-	</target>
-	
-	<!-- build artefacts -->
-	<target name="dist-release" description="pack binary distribution">
-		<property name="archive.file.name" value="${dist.dir}/apache-${project.distname}-${project.version}" />
-		<antcall target="dist-bin" />
-		<zip destfile="${archive.file.name}.zip">	
-			<zipfileset dir="${dist.dir}/red5">
-				<include name="**" />
-				<exclude name="*.sh" />
-			</zipfileset>
-			<zipfileset dir="${dist.dir}/red5" filemode="755">
-				<include name="*.sh" />
-			</zipfileset>
-		</zip>
-		<zip destfile="${archive.file.name}-src.zip">
-			<zipfileset dir="${basedir}">
-				<exclude name="build/**" />
-				<exclude name="dist/**" />
-				<exclude name="build.properties" />
-			</zipfileset>
-			<zipfileset dir="${build.base.dir}">
-				<include name="build.properties" />
-			</zipfileset>
-		</zip>
-		<zip destfile="${archive.file.name}-docs.zip">
-			<zipfileset dir="${basedir}/docs"/>
-		</zip>
-	</target>
-
-	<!-- build webapp -->
-	<target name="-copy-libraries" description="All jars downloaded by ivy copied to appropriate places">
-		<copy todir="${red5.root}/lib">
-			<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
-		</copy>
-		<copy todir="${dist.webapps.dir}/WEB-INF/lib">
-			<fileset dir="${om.lib.dir}" includes="*.jar" />
-		</copy>
-		<chmod dir="${dist.webapps.dir}/WEB-INF/lib" perm="755" includes="**/*.sh" />
-	</target>
-
-	<target name="dist" description="binary distribution of OpenMeetings" depends="clean, jar, client.only, enhance, -copy-libraries, signWebStartJars" />
-
-	<!-- compiles the sources without openlaszlo client -->
-	<target name="dist-test" description="binary distribution of OpenMeetings" depends="clean, -dist-test-no-clean, signWebStartJars" />
-
-	<!-- compiles the sources without openlaszlo client and clean -->
-	<target name="-dist-test-no-clean" description="binary distribution of OpenMeetings" depends="jar, -copy-libraries" />
-
-	<!-- compiles the sources only with laszlo debug client -->
-	<target name="dist-debug" description="binary distribution of OpenMeetings" depends="clean, jar, client.debug.only, -copy-libraries, signWebStartJars" />
-
-	<target name="-cleanup-jrebel" unless="jrebel.enabled">
-		<delete>
-			<fileset dir="${dist.classes.dir}" includes="rebel*.xml" />
-		</delete>
-	</target>
-	
-	<target name="web.copy" depends="-process-db">
-		<copy todir="${dist.webapps.dir}" overwrite="true" force="true">
-			<fileset dir="${webapp.dir}" />
-		</copy>
-		<filter token="wicket.mode" value="${wicket.mode}" />
-		<copy todir="${dist.webapps.dir}/WEB-INF" filtering="true" overwrite="true" force="true">
-			<fileset file="${webapp.dir}/WEB-INF/web.xml" />
-		</copy>
-		<copy todir="${dist.classes.dir}">
-			<fileset dir="${basedir}/openmeetings-web/src/main/java">
-				<include name="**/*.html" />
-				<include name="**/*.xml" />
-				<include name="**/*.js" />
-				<include name="**/*.css" />
-			</fileset>
-		</copy>
-	</target>
-	
-	<!-- Check timestamp on files -->
-	<target name="prepare" depends="prepare.mkdir,web.copy">
-		<copy todir="${red5.root}">
-			<fileset dir="${red5.lib}">
-				<exclude name="**/*.fla" />
-			</fileset>
-		</copy>
-
-		<antcall target="-cleanup-jrebel" />
-		<chmod dir="${red5.root}" perm="755" includes="**/*.sh" />
-		<tstamp />
-	</target>
-
-	<!-- Copy any resource or configuration files -->
-	<target name="vmresources">
-		<copy todir="${main.out.dir}" includeEmptyDirs="yes">
-			<fileset dir="${src.base.dir}">
-				<include name="**/*.vm" />
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="resources" depends="vmresources">
-		<patternset id="xmlpng">
-			<include name="**/*.xml" />
-			<include name="**/*.png" />
-		</patternset>
-		<patternset id="xmlpngconf">
-			<patternset refid="xmlpng" />
-			<include name="**/*.conf" />
-			<include name="**/*.properties" />
-		</patternset>
-
-		<!-- Main Applications -->
-		<copy todir="${main.out.dir}" includeEmptyDirs="yes">
-			<fileset dir="${src.base.dir}">
-				<patternset refid="xmlpngconf" />
-			</fileset>
-		</copy>
-		<!-- Screen Share resources -->
-		<copy todir="${main.out.dir}">
-			<fileset dir="${basedir}/openmeetings-screenshare/src/main/java">
-				<include name="**/*.png" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="web.only" depends="jar.web.only, web.copy"/>
-	
-	<target name="jar.web.only" depends="enhance.only.norefresh, current_revision, vmresources">
-		<manifestclasspath property="jar.classpath" jarfile="${project.distname}-${jar.suffix}.jar">
-			<classpath refid="compile.classpath" />
-		</manifestclasspath>
-		
-		<!-- Core/main -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-core-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/**" />
-				<include name="*.vm" />
-				<include name="META-INF/*" />
-				<exclude name="META-INF/*.xml" />
-				<exclude name="org/apache/openmeetings/util/**" />
-				<exclude name="org/apache/openmeetings/test/**" />
-				<exclude name="org/apache/openmeetings/webservice/**" />
-				<exclude name="org/apache/openmeetings/db/**" />
-				<exclude name="org/apache/openmeetings/cli/**" />
-				<exclude name="org/apache/openmeetings/backup/**" />
-				<exclude name="org/apache/openmeetings/installation/**" />
-				<exclude name="org/apache/openmeetings/screen/**" />
-				<exclude name="org/apache/openmeetings/doc/**" />
-				<exclude name="org/apache/openmeetings/web/**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar.classpath}" />
-				<attribute name="Svn-Revision" value="${svn.info.rev}" />
-				<attribute name="Product-Version" value="${project.version}-${project.status}" />
-			</manifest>
-		</jar>
-		
-		<!-- DB package -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-db-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/db/**" />
-				<include name="META-INF/*" />
-				<exclude name="META-INF/*.xml" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar.classpath}" />
-				<attribute name="Svn-Revision" value="${svn.info.rev}" />
-				<attribute name="Product-Version" value="${project.version}-${project.status}" />
-			</manifest>
-		</jar>
-		
-		<!-- Install / CLI package -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-cli-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/cli/**" />
-				<include name="org/apache/openmeetings/backup/**" />
-				<include name="org/apache/openmeetings/installation/**" />
-				<include name="META-INF/*" />
-				<exclude name="META-INF/*.xml" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar.classpath}" />
-				<attribute name="Svn-Revision" value="${svn.info.rev}" />
-				<attribute name="Product-Version" value="${project.version}-${project.status}" />
-			</manifest>
-		</jar>
-		
-		<!-- Util package -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-util-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/util/**" />
-				<include name="META-INF/*" />
-				<exclude name="META-INF/*.xml" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar.classpath}" />
-				<attribute name="Svn-Revision" value="${svn.info.rev}" />
-				<attribute name="Product-Version" value="${project.version}-${project.status}" />
-			</manifest>
-		</jar>
-		
-		<!-- web package -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-web-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/web/**" />
-				<exclude name="*.xml" />
-				<exclude name="*.html" />
-				<include name="META-INF/*" />
-				<exclude name="META-INF/*.xml" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar.classpath}" />
-				<attribute name="Svn-Revision" value="${svn.info.rev}" />
-				<attribute name="Product-Version" value="${project.version}-${project.status}" />
-			</manifest>
-		</jar>
-
-		<!-- Build WebServices -->
-		<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-webservice-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="**/apache/openmeetings/webservice/**" />
-				<include name="META-INF/LICENSE" />
-				<include name="META-INF/NOTICE" />
-			</fileset>
-		</jar>
-	</target>
-
-	<target name="jar.only" depends="buildJavaDocs, enhance.only, jar.web.only"/>
-
-	<target name="dist.screen.share" description="Make Screen Share Archive" depends="signWebStartJars" />
-
-	<tstamp prefix="screensharing.build">
-		<format property="TODAY" pattern="d-MMMM-yyyy" locale="en" />
-	</tstamp>
-	<target name="jar.screen.share" description="Make Screen Share Archive" depends="compile.only">
-		<manifestclasspath property="jar2.classpath" jarfile="${project.distname}.jar">
-			<classpath refid="compile.classpath" />
-		</manifestclasspath>
-		<!-- Screen Share -->
-		<jar destfile="${screenshare.out.dir}/${project.distname}-screenshare-${jar.suffix}.jar">
-			<fileset dir="${main.out.dir}">
-				<include name="org/apache/openmeetings/screen/**" />
-				<include name="META-INF/LICENSE" />
-				<include name="META-INF/NOTICE" />
-			</fileset>
-			<fileset file="${screenshare.resources.dir}/logback.xml" />
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${screensharing.build.TODAY}" />
-				<attribute name="Class-Path" value="conf/ ${jar2.classpath}" />
-				<attribute name="Permissions" value="all-permissions" />
-				<attribute name="Codebase" value="*" />
-				<attribute name="Application-Library-Allowable-Codebase" value="*" />
-				<attribute name="Caller-Allowable-Codebase" value="*" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<target name="buildJavaDocs">
-		<tstamp prefix="doc">
-			<format property="TODAY_YEAR" pattern="yyyy" locale="en" />
-		</tstamp>
-	    <javadoc packagenames="org.apache.openmeetings.core.remote.*"
-	           sourcepath="${basedir}/openmeetings-webservice/src/main/java:${basedir}/openmeetings-db/src/main/java:${src.base.dir}/doc/java:${basedir}/openmeetings-install/src/main/java:${basedir}/openmeetings-core/src/main/java:${basedir}/openmeetings-screenshare/src/main/java:${basedir}/openmeetings-util/src/main/java:${basedir}/openmeetings-web/src/main/java:${basedir}/openmeetings-service/src/main/java"
-	           excludepackagenames="org.apache.openmeetings.test.*"
-	           defaultexcludes="yes"
-	           destdir="build/api"
-	           author="true"
-	           version="true"
-	           use="true"
-	           windowtitle="Apache OpenMeetings API">
-	    	<classpath refid="compile.classpath"></classpath>
-	        <doctitle><![CDATA[<h1>Apache OpenMeetings API</h1>]]></doctitle>
-	    	<bottom><![CDATA[<i>Copyright &copy; 2000-${doc.TODAY_YEAR} The Apache Software Foundation. All rights Reserved.</i>]]></bottom>
-	  	</javadoc>
-	</target>
-
-	<!-- Compile JAR -->
-	<target name="jar" description="Make Archive" depends="enhance, build.only.webservice.doc, jar.only, jar.screen.share">
-		<tstamp prefix="build">
-			<format property="TODAY" pattern="d-MMMM-yyyy" locale="en" />
-		</tstamp>
-	</target>
-
-	<target name="generateSignKey"  unless="skip.sign.key.generation">
-		<delete file="${keystore.file}" />
-		<genkey alias="${screensharing.keystore.alias}" storepass="${screensharing.keystore.password}" keystore="${keystore.file}"
-			verbose="true" sigalg="MD5withRSA" keyalg="RSA" >
-			<dname>
-				<param name="CN" value="Sebastian Wagner" />
-				<param name="OU" value="technology" />
-				<param name="O" value="openmeetings.apache.org" />
-				<param name="C" value="DE" />
-			</dname>
-		</genkey>
-	</target>
-	
-	<target name="signWebStartJars" depends="generateSignKey,jar.screen.share">
-		<copy todir="${screenshare.out.dir}" overwrite="true" force="true">
-			<fileset dir="${red5.server.lib}" includes="commons-codec*.jar" />
-			<fileset dir="${red5.server.lib}" includes="commons-beanutils*.jar" />
-			<fileset dir="${red5.server.lib}" includes="commons-collections*.jar" />
-			<fileset dir="${red5.server.lib}" includes="commons-lang3*.jar" />
-			<fileset dir="${red5.server.lib}" includes="httpclient*.jar" />
-			<fileset dir="${red5.server.lib}" includes="httpcore*.jar" />
-			<fileset dir="${red5.server.lib}" includes="bcprov*.jar" />
-			<fileset dir="${red5.server.lib}" includes="ehcache-core*.jar" />
-			<fileset dir="${red5.server.lib}" includes="slf4j-api*.jar" />
-			<fileset dir="${red5.server.lib}" includes="jcl-over-slf4j*.jar" />
-			<fileset dir="${red5.server.lib}" includes="spring-context-4*.jar" />
-			<fileset dir="${red5.server.lib}" includes="spring-core-*.jar" />
-			<fileset dir="${red5.server.lib}" includes="spring-beans-*.jar" />
-			<fileset dir="${red5.server.lib}" includes="logback*.jar" />
-			<fileset dir="${red5.server.lib}" includes="mina-core*.jar" />
-			<fileset dir="${red5.server.lib}" includes="com.springsource.slf4j.api*.jar" />
-			<fileset dir="${red5.server.lib}" includes="red5-io*.jar" />
-			<fileset dir="${red5.lib}" includes="red5-server.jar" />
-			<fileset dir="${mainlibs.lib.dir}" includes="red5-client*.jar" />
-		</copy>
-		<taskdef resource="net/sf/antcontrib/antlib.xml">
-			<classpath refid="check.classpath" />
-		</taskdef>
-		<foreach target="-repack-jar" param="theJar">
-			<fileset dir="${screenshare.out.dir}" casesensitive="yes">
-				<include name="*.jar"/>
-				<exclude name="*openmeetings*.jar"/>
-			</fileset>
-		</foreach>
-		<signjar alias="${screensharing.keystore.alias}" keystore="${keystore.file}" storepass="${screensharing.keystore.password}"
-			lazy="false" sigalg="MD5withRSA" digestalg="SHA1">
-			<path>
-				<fileset dir="${screenshare.out.dir}">
-					<include name="**/*.jar" />
-				</fileset>
-			</path>
-		</signjar>
-	</target>
-
-	<target name="-repack-jar">
-		<echo message="${theJar}"/>
-		<delete dir="${screenshare.out.dir}/1" />
-		<mkdir dir="${screenshare.out.dir}/1" />
-		<unjar src="${theJar}" dest="${screenshare.out.dir}/1"/>
-		<delete dir="${screenshare.out.dir}/1/META-INF" includes="*"/>
-		<delete file="${theJar}" />
-		<jar destfile="${theJar}">
-			<fileset dir="${screenshare.out.dir}/1">
-				<include name="**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="OpenMeetings - http://openmeetings.apache.org" />
-				<attribute name="Built-On" value="${screensharing.build.TODAY}" />
-				<attribute name="Permissions" value="all-permissions" />
-				<attribute name="Codebase" value="*" />
-				<attribute name="Application-Library-Allowable-Codebase" value="*" />
-				<attribute name="Caller-Allowable-Codebase" value="*" />
-			</manifest>
-		</jar>
-		<delete dir="${screenshare.out.dir}/1" />
-	</target>
-	
 	<target name="client.only" depends="compile.laszlo.main.as3,compile.laszlo.main,compile.laszlo.networktesting" />
 
 	<target name="client.debug.only" depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug" />
@@ -667,767 +151,28 @@
 			<param name="flash.debug" value="--debug" />
 		</antcall>
 	</target>
-
-	<target name="compile" depends="compile.only, prepare" />
-
-	<target name="compile.only"
-		depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,compile.only.nocheck,resources"/>
-	
-	<target name="compile.only.nocheck" depends="clean.classes">
-		<antcall target="prepare.mkdir" inheritAll="true" inheritRefs="true"/>
-		<echo message="Compile main to ${main.out.dir}" />
-		<javac debug="on" debuglevel="lines,vars,source" destdir="${main.out.dir}" includeantruntime="false"
-			source="1.6" target="1.6">
-			<src path="${basedir}/openmeetings-webservice/src/main/java" />
-			<src path="${basedir}/openmeetings-db/src/main/java" />
-			<src path="${src.base.dir}/doc/java" />
-			<src path="${basedir}/openmeetings-install/src/main/java" />
-			<src path="${basedir}/openmeetings-core/src/main/java" />
-			<src path="${basedir}/openmeetings-core/src/test/java" />
-			<src path="${basedir}/openmeetings-screenshare/src/main/java" />
-			<src path="${basedir}/openmeetings-util/src/main/java" />
-			<src path="${basedir}/openmeetings-web/src/main/java" />
-			<src path="${basedir}/openmeetings-web/src/test/java" />
-			<src path="${basedir}/openmeetings-service/src/main/java" />
-			<classpath refid="compile.classpath" />
-			<compilerarg value="-Aopenjpa.metamodel=true" />
-			<!-- compilerarg value="-Xlint:deprecation"/ -->
-		</javac>
-		<copy todir="${main.out.dir}">
-			<fileset dir="${basedir}/openmeetings-core/src/main/java">
-				<include name="**/*.*" />
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-		<copy file="LICENSE" tofile="${main.out.dir}/META-INF/LICENSE" overwrite="true" />
-		<copy file="NOTICE" tofile="${main.out.dir}/META-INF/NOTICE" overwrite="true" />
-	</target>
-
-	<path id="jpa.enhancement.classpath">
-		<pathelement path="${main.out.dir}" />
-		<path refid="compile.classpath" />
-	</path>
-
-	<target name="enhance" depends="compile, enhance.only" />
-
-	<target name="enhance.only" depends="compile.only">
-		<!-- define the openjpac task -->
-		<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-			<classpath refid="jpa.enhancement.classpath" />
-		</taskdef>
-
-		<!-- invoke the enhancer -->
-		<openjpac>
-			<classpath refid="jpa.enhancement.classpath" />
-			<config propertiesFile="${dist.persistence.dir}/${db}_persistence.xml" />
-		</openjpac>
-		<echo message="Enhancing complete." />
-	</target>
-	
-	<target name="enhance.only.norefresh" depends="compile.only.nocheck">
-		<!-- define the openjpac task -->
-		<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-			<classpath refid="jpa.enhancement.classpath" />
-		</taskdef>
-
-		<!-- invoke the enhancer -->
-		<openjpac>
-			<classpath refid="jpa.enhancement.classpath" />
-			<config propertiesFile="${dist.persistence.dir}/${db}_persistence.xml" />
-		</openjpac>
-		<echo message="Enhancing complete." />
-	</target>
-
-	<path id="svntask.classpath">
-		<fileset dir="${svntask.lib.dir}" includes="*.jar" />
-	</path>
-	<target name="-ant-task" depends="-retrieve-svntask">
-		<typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
-			<classpath>
-				<path refid="svntask.classpath" />
-			</classpath>
-		</typedef>
-		<svnSetting svnkit="false" javahl="false" id="svn.settings" />
-		<!-- native svn in the path-->
-	</target>
-	<target name="current_revision" depends="-ant-task" unless="svn.info.rev">
-		<svn refid="svn.settings">
-			<info target="." />
-		</svn>
-		<echo>Current revision: ${svn.info.rev}</echo>
-	</target>
-
-	<!-- Build entire project -->
-	<target name="build project" depends="clean, prepare, compile" />
-
-	<path id="check.rat.classpath">
-		<fileset dir="${rat.lib.dir}" includes="*.jar" />
-	</path>
-	<path id="rat.classpath">
-		<path refid="compile.classpath" />
-		<path refid="check.rat.classpath" />
-	</path>
-	<target name="report_rat" depends="-retrieve-rat">
-		<!-- define the RAT task -->
-		<taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml">
-			<classpath>
-				<path refid="rat.classpath" />
-			</classpath>
-		</taskdef>
-
-		<rat:report>
-			<rat:substringMatcher licenseFamilyCategory="JQUERY_MIT" licenseFamilyName="jQuery UI CSS MIT">
-				<pattern substring="Copyright 2014 jQuery Foundation and other contributors; Licensed MIT"/>
-			</rat:substringMatcher>
-			<rat:substringMatcher licenseFamilyCategory="JQUERY_MIT" licenseFamilyName="jQuery UI Menubar MIT">
-				<pattern substring="Dual licensed under the MIT or GPL Version 2"/>
-			</rat:substringMatcher>
-			<rat:approvedLicense familyName="jQuery UI CSS MIT"/>
-			<rat:approvedLicense familyName="jQuery UI Menubar MIT"/>
-			<fileset dir="${src.base.dir}" />
-			<fileset dir="${webcontent.base.dir}" excludes="**/*.swf" />
-			<fileset dir="${docs.src}" />
-		</rat:report>
-	</target>
-
-	<path id="build.webservice.classpath">
-		<pathelement path="${main.out.dir}" />
-		<path refid="compile.classpath" />
-	</path>
-
-	<target name="build.webservice.doc" depends="compile.only, build.only.webservice.doc"/>
-
-	<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>
-
-	<!-- Anakia Build classpath -->
-	<path id="check.anakia.classpath">
-		<fileset dir="${anakia.lib.dir}" includes="*.jar" />
-		<fileset dir="${mainlibs.lib.dir}" includes="commons-collections*.jar,commons-lang*.jar,velocity*.jar" />
-	</path>
-	
-	<path id="anakia.classpath">
-		<path refid="compile.classpath" />
-		<path refid="check.anakia.classpath" />
-	</path>
-
-	<target name="anakia" depends="-retrieve-mainlibs,-retrieve-om,-retrieve-anakia">
-		<taskdef name="anakia" classname="org.apache.anakia.AnakiaTask">
-			<classpath>
-				<path refid="anakia.classpath" />
-			</classpath>
-		</taskdef>
-
-		<xslt in="${webapp.dir}/languages/errorvalues.xml" out="${docs.src}/ErrorsTable.xml" style="${docs.src}/stylesheets/errortable.xsl" />
-		<anakia basedir="${docs.src}" destdir="${docs.dest}/" extension=".html" style="./site.vsl" projectFile="stylesheets/project.xml" excludes="**/stylesheets/** empty.xml" includes="**/*.xml" lastModifiedCheck="true" templatePath="xdocs/stylesheets" velocityPropertiesFile="${build.base.dir}/velocity.properties" />
-		<copy todir="${docs.dest}/images">
-			<fileset dir="${docs.src}/images">
-				<patternset refid="images" />
-			</fileset>
-		</copy>
-
-		<copy todir="${docs.dest}/css">
-			<fileset dir="${docs.src}/css">
-				<patternset refid="css" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.only.webservice.doc" depends="anakia">
-		<javadoc classpathref="build.webservice.classpath" useexternalfile="true" destdir="${basedir}/docs">
-			<fileset dir="${basedir}/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice">
-				<include name="*WebService.java" />
-				<exclude name="BaseWebService.java" />
-			</fileset>
-			<doclet name="org.apache.openmeetings.doc.WebServiceDoclet" pathref="build.webservice.classpath" />
-		</javadoc>
-
-		<copy todir="${dist.webapps.dir}/docs">
-			<fileset dir="${basedir}/docs/">
-				<include name="*.html" />
-				<include name="*.css" />
-			</fileset>
-		</copy>
-		<copy todir="${dist.webapps.dir}/docs/images">
-			<fileset dir="${basedir}/docs/images/">
-				<patternset refid="images" />
-			</fileset>
-		</copy>
-		<copy todir="${dist.webapps.dir}/docs/css">
-			<fileset dir="${basedir}/docs/css/">
-				<patternset refid="css" />
-			</fileset>
-		</copy>
-		<copy todir="${dist.webapps.dir}/docs/js">
-			<fileset dir="${basedir}/docs/js/">
-				<include name="**/*.js" />
-			</fileset>
-		</copy>
-	</target>
 	
-	<!-- 
-		Prepare selenium tests by starting up an OpenMeetings instance
-		
-		makes a stop command before starting up to make sure no other is running
-	 -->
-	
-	<target name="prepare-selenium-start-openmeetings" description="Prepare selenium tests by starting up an OpenMeetings instance" 
-		depends="-prepare-selenium-port-properties, prepare-selenium-stop-openmeetings" >
-		<exec dir="${dist.dir}/testred5" executable="red5-highperf.bat" osfamily="windows" output="${dist.dir}/testred5/red5_system.log">
-		</exec>
-		<!--this does only make sense if the unix executable is run obviously, however we do it for all -->
-		<chmod dir="${dist.dir}/testred5" perm="755" includes="**/*.sh" />
-		<exec dir="${dist.dir}/testred5" executable="/bin/bash" osfamily="unix" output="${dist.dir}/testred5/red5_system.log">
-			<arg value="red5-highperf.sh"/> 
-		</exec>
-		<!-- start up does take some time -->
-		<sleep seconds="30" />
-	</target>
-	
-	<target name="prepare-selenium-stop-openmeetings" description="Prepare selenium tests by starting up an OpenMeetings instance" >
-		<exec dir="${dist.dir}/testred5" executable="red5-shutdown.bat" osfamily="windows" output="${dist.dir}/testred5/red5_system.log">
-		</exec>
-		<!--this does only make sense if executed on unix(Linux or OSX are both unix style) is run obviously, 
-			however we do it for all for now -->
-		<chmod dir="${dist.dir}/testred5" perm="755" includes="**/*.sh" />
-		<exec dir="${dist.dir}/testred5" executable="/bin/bash" osfamily="unix" output="${dist.dir}/testred5/red5_system.log">
-			<arg value="red5-shutdown.sh"/> 
-		</exec>
-		<!-- stop up does take a bit of time -->
-		<sleep seconds="10" />
-	</target>
-	
-	<target name="prepare-selenium-test-database" description="Prepare selenium database script">
-		<java classname="org.apache.openmeetings.test.derby.PrepareSystemFiles">
-			<!-- the home directory of the test instance of red5 -->
-	        <arg value="${dist.dir}/testred5/webapps/openmeetings"/>
-			<!-- the directory where the openmeetings database is created by derby -->
-			<arg value="${dist.dir}/testred5/"/>
-			<!-- the persistance file to patch -->
-			<arg value="${basedir}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml"/>
-			<classpath refid="junit.classpath" />
-		</java>
-	</target>
-
-	<target name="debug-prepare-selenium-copy-test-instance" depends="-prepare-selenium-copy-test-instance"/>
-	
-	<target name="-prepare-selenium-copy-test-instance" description="Prepare selenium tests by starting up an OpenMeetings instance">
-		<copy todir="${dist.dir}/testred5">
-			<fileset dir="${dist.dir}/red5">
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="-prepare-selenium-port-properties" description="Set the http port to some exotic numbers so that we don't conflict with anything" 
-			depends="-prepare-selenium-copy-test-instance">
-		<replace dir="${dist.dir}/testred5/conf" value="http.port=20080">
-		  <include name="**/red5.properties"/>
-		  <replacetoken>http.port=5080</replacetoken>
-		</replace>
-		<replace dir="${dist.dir}/testred5/conf" value="https.port=20443">
-		  <include name="**/red5.properties"/>
-		  <replacetoken>https.port=5443</replacetoken>
-		</replace>
-		<replace dir="${dist.dir}/testred5/conf" value="rtmp.port=20935">
-		  <include name="**/red5.properties"/>
-		  <replacetoken>rtmp.port=1935</replacetoken>
-		</replace>
-		<replace dir="${dist.dir}/testred5/conf" value="rtmps.port=20443">
-		  <include name="**/red5.properties"/>
-		  <replacetoken>rtmps.port=8443</replacetoken>
-		</replace>
-		<replace dir="${dist.dir}/testred5/conf" value="rtmpt.port=20088">
-		  <include name="**/red5.properties"/>
-		  <replacetoken>rtmpt.port=8088</replacetoken>
-		</replace>
-	</target>
-	
-	<target name="run-selenium" depends="-dist-test-no-clean, -run-selenium-junit"/>
-	
-	<target name="-run-selenium" if="${junit.run.selenium}" >
-		<antcall target="-run-selenium-junit"></antcall>
-	</target>
-	
-	<target name="-run-selenium-junit" depends="prepare-selenium-start-openmeetings" 
-			description="Will run all selenium tests unless -Dtestcases=_file_name_pattern_ will be passed">
-		<taskdef resource="net/sf/antcontrib/antlib.xml">
-			<classpath refid="junit.classpath" />
-		</taskdef>
-		<mkdir dir="${junit.report.dir}" />
-		
-		<junit maxmemory="1024m" printsummary="yes" dir="${junit.base.dir}" tempdir="${junit.base.dir}" fork="yes" 
-			forkmode="perBatch" failureproperty="junit.failed" errorproperty="junit.error">
-			<classpath refid="junit.classpath" />
-			<jvmarg value="-Dom.home=${om.dist.webapp}" />
-			<jvmarg value="-Dlanguages.home=${webapp.dir}/languages" />
-			<jvmarg value="-Dred5.root=${red5.root}" />
-			<jvmarg value="-Dbasedir=${basedir}" />
-			<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
-			<jvmarg value="-Dbackups.dir=${junit.backups.dir}" />
-			<formatter type="${junit.test.formatter}" />
-			<batchtest todir="${junit.report.dir}">
-				<fileset dir="${main.out.dir}">
-					<include name="org/apache/openmeetings/test/selenium/${junit.test.pattern}.class" />
-					<exclude name="**/*$$*.class" />
-				</fileset>
-			</batchtest>
-		</junit>
-		
-		<junitreport todir="${junit.report.dir}">
-			<fileset dir="${junit.report.dir}">
-				<include name="TEST-*.xml" />
-			</fileset>
-			<report todir="${junit.report.dir}" />
-		</junitreport>
-		<fail message="Errors/failures in JUnit tests.">
-			<condition>
-				<or>
-					<isset property="junit.failed"/>
-					<isset property="junit.error"/>
-				</or>
-			</condition>
-		</fail>
-	</target>
-
-	<!-- Unit Tests -->
-	<condition property="junit.test.pattern" value="${testcases}" else="Test*">
-		<isset property="testcases" />
-	</condition>
-
-	<condition property="junit.test.formatter" value="${test.formatter}" else="xml">
-		<isset property="test.formatter" />
-	</condition>
-
-	<target name="test" depends="-dist-test-no-clean, -run-selenium" 
-			description="Will run all tests except selenium unless -Dtestcases=_file_name_pattern_ will be passed">
-		<taskdef resource="net/sf/antcontrib/antlib.xml">
-			<classpath refid="junit.classpath" />
-		</taskdef>
-		<for list="${backup.file.list}" param="prop">
-			<sequential>
-				<if>
-					<not>
-						<available file="${junit.backups.dir}/@{prop}" type="file" />
-					</not>
-					<then>
-						<echo message="Backup file @{prop} does not exists. Downloading ..." />
-						<get src="http://openmeetings.googlecode.com/svn/repository/@{prop}" dest="${junit.backups.dir}" usetimestamp="true"/>
-					</then>
-				</if>
-			</sequential>
-		</for>
-		<mkdir dir="${junit.report.dir}" />
-		<!-- property name="myclsp" refid="junit.classpath" />
-		<echo message="${myclsp}" /-->
-		<junit maxmemory="1024m" printsummary="yes" dir="${junit.base.dir}" tempdir="${junit.base.dir}" fork="yes" 
-			forkmode="perBatch" failureproperty="junit.failed" errorproperty="junit.error">
-			<classpath refid="junit.classpath" />
-			<jvmarg value="-Dom.home=${om.dist.webapp}" />
-			<jvmarg value="-Dlanguages.home=${webapp.dir}/languages" />
-			<jvmarg value="-Dred5.root=${red5.root}" />
-			<jvmarg value="-Dbasedir=${basedir}" />
-			<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
-			<jvmarg value="-Dbackups.dir=${junit.backups.dir}" />
-			<!--jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" /-->
-			<formatter type="${junit.test.formatter}" />
-			<batchtest todir="${junit.report.dir}">
-				<fileset dir="${main.out.dir}">
-					<include name="org/apache/openmeetings/test/**/${junit.test.pattern}.class" />
-					<exclude name="org/apache/openmeetings/test/selenium/${junit.test.pattern}.class" />
-					<exclude name="**/*$$*.class" />
-				</fileset>
-			</batchtest>
-		</junit>
-		
-		<junitreport todir="${junit.report.dir}">
-			<fileset dir="${junit.report.dir}">
-				<include name="TEST-*.xml" />
-			</fileset>
-			<report todir="${junit.report.dir}" />
-		</junitreport>
-		<fail message="Errors/failures in JUnit tests.">
-			<condition>
-				<or>
-					<isset property="junit.failed"/>
-					<isset property="junit.error"/>
-				</or>
-			</condition>
-		</fail>
-	</target>
-	<target name="smoke.test" depends="dist" description="Will run 'Smoke' subset of tests">
-		<antcall target="test">
-			<param name="junit.test.pattern" value="TestSmoke*" />
-		</antcall>
-	</target>
-
-	<target name="-check-ivy-installed">
-		<available file="${ivy.jar.path}" type="file" property="ivy.installed" />
-	</target>
-	<target name="-download-ivy" depends="-check-ivy-installed" 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="check.classpath" classname="javax.persistence.spi.PersistenceProvider" property="mainlib.installed" />
-		<available classpathref="check.classpath" classname="org.apache.wicket.Application" property="om.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">
-			<and>
-				<available classpathref="check.anakia.classpath" classname="org.apache.oro.text.GlobCompiler" />
-				<available classpathref="check.anakia.classpath" classname="org.jdom.JDOMException" />
-			</and>
-		</condition> 
-		<available classpathref="check.anakia.classpath" classname="org.apache.oro.text.GlobCompiler" property="anakia.installed" />
-		<available classpathref="check.rat.classpath" classname="org.apache.rat.Report" property="rat.installed" />
-		<available classpathref="svntask.classpath" classname="org.tmatesoft.svn.core.SVNCommitInfo" property="svntask.installed" />
-		<available classpathref="check.classpath" classname="com.mysql.jdbc.Driver" property="mysql.installed" />
-		<available classpathref="check.classpath" classname="org.apache.derby.jdbc.ClientDriver" property="derby.installed" />
+	<target name="-availability-check" description="Check which libraries need to be retrieved">
 		<available file="${laszlo.home}/WEB-INF/lib" type="dir" property="laszlo.installed" />
 		<available file="${laszlo46.home}/WEB-INF/lib" type="dir" property="laszlo46.installed" />
-		<available file="${red5.lib}/red5.sh" type="file" property="red5.server.installed" />
-	</target>
-
-	<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" />
-			</not>
-		</condition>
-		<condition property="ivy.lib.location" value="${mainlibs.lib.dir}">
-			<not>
-				<isset property="ivy.lib.location" />
-			</not>
-		</condition>
-		<condition property="ivy.transitive" value="false">
-			<not>
-				<isset property="ivy.transitive" />
-			</not>
-		</condition>
-		<echo message="Ivy conf name: ${ivy.conf.name}, destination: ${ivy.lib.location}" />
-		<ivy:resolve file="ivy.xml" conf="${ivy.conf.name}" checkIfChanged="false" transitive="${ivy.transitive}" />
-		<ivy:retrieve conf="${ivy.conf.name}" pattern="${ivy.lib.location}/[artifact]-[type]-[revision].[ext]" />
-	</target>
-	
-	<target name="-patch-red5-server-start-script" if="jrebel.home">
-		<echo>Going to patch red5-debug.* with ${jrebel.home}</echo>
-		<filter token="jrebel.home" value="${jrebel.home}" />
-		<filter token="project.home" value="${user.dir}" />
-		<copy todir="${red5.lib}" filtering="true" overwrite="true" force="true">
-			<fileset dir="${webcontent.base.dir}/jrebel" includes="red5-debug.*"/>
-		</copy>
-	</target>
-	
-	<target name="-maven-task" unless="maven.installed">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="mvn" />
-			<param name="ivy.lib.location" value="${project.lib.dir}" />
-		</antcall>
-		<path id="maven-ant-tasks.classpath">
-			<fileset dir="${project.lib.dir}" includes="maven-ant-tasks*.jar" />
-		</path>
-		<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
-				uri="antlib:org.apache.maven.artifact.ant"
-				classpathref="maven-ant-tasks.classpath" />
-		<property name="maven.installed" value="true" />
-	</target>
-
-	<target name="-jgit-task" unless="jgit.installed">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="jgit" />
-			<param name="ivy.lib.location" value="${project.lib.dir}" />
-			<param name="ivy.transitive" value="true" />
-		</antcall>
-		<path id="jgit-ant-tasks.classpath">
-			<fileset dir="${project.lib.dir}" includes="org.eclipse.jgit*.jar" />
-			<fileset dir="${project.lib.dir}" includes="jsch*.jar" />
-		</path>
-		<taskdef resource="org/eclipse/jgit/ant/ant-tasks.properties" classpathref="jgit-ant-tasks.classpath"/>
-		<property name="jgit.installed" value="true" />
-	</target>
-	
-	<!-- Check for the Red5 server libraries -->
-	<target name="-retrieve-red5-server" unless="red5.server.installed" description="Retrieves the libraries if needed" depends="-ant-task,-maven-task,-jgit-task">
-		<!-- Needs an empty dir to checkout to -->
-		<delete dir="${red5.server.dir}"></delete>
-		<git-clone uri="https://github.com/Red5/red5-server.git" dest="${red5.server.dir}" branch="v${red5.server.version}"/>
-		<artifact:mvn pom="${red5.server.dir}/pom.xml" mavenVersion="${maven.version}" fork="true" dir="${red5.server.dir}">
-			<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
-			<!--jvmarg value="-Dassembly.skipAssembly=true" /-->
-			<arg value="clean"/>
-			<arg value="install"/>
-			<jvmarg value="-Dmaven.test.skip=true" />
-		</artifact:mvn>
-		<untar src="${red5.server.dir}/target/red5-server-${red5.server.version}-server.tar.gz" dest="${red5.server.dir}/target" compression="gzip"/>
-		<move todir="${red5.lib}">
-			<fileset dir="${red5.server.dir}/target/red5-server-${red5.server.version}">
-				<include name="**/*"/>
-			</fileset>
-		</move>
-	
-		<delete dir="${red5.lib}/webapps/installer" />
-		<delete dir="${red5.lib}/webapps/live" />
-		<delete dir="${red5.lib}/webapps/vod" />
-		<copy file="${webcontent.base.dir}/red5/index.html" todir="${red5.lib}/webapps/root" overwrite="true" force="true" />
-		<copy todir="${red5.lib}" overwrite="true" force="true">
-			<fileset dir="${webcontent.base.dir}/red5" includes="red5*,admin.*,network_test.sh" />
-		</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>
-		<antcall target="-patch-red5-server-start-script"/> 
-	</target>
-	
-	<!-- Check for the Top level libraries -->
-	<target name="-retrieve-mainlibs" unless="mainlib.installed" description="Retrieves the libraries if needed" depends="-retrieve-red5-server">
-		<!-- Ivy configuration - http://ant.apache.org/ivy/history/trunk/ant.html -->
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="mainlib" />
-			<param name="ivy.lib.location" value="${mainlibs.lib.dir}" />
-		</antcall>
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="mainlib.ext" />
-			<param name="ivy.lib.location" value="${mainlibs.lib.dir}" />
-			<param name="ivy.transitive" value="true" />
-		</antcall>
-		<delete>
-			<fileset dir="${mainlibs.lib.dir}" includes="*-source*.jar" />
-			<fileset dir="${mainlibs.lib.dir}" includes="*-javadoc*.jar" />
-		</delete>
-	</target>
-	<!-- Check for the OM libraries -->
-	<target name="-retrieve-om" unless="om.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="openmeetings" />
-			<param name="ivy.lib.location" value="${om.lib.dir}" />
-		</antcall>
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="openmeetings.ext" />
-			<param name="ivy.lib.location" value="${om.lib.dir}" />
-			<param name="ivy.transitive" value="true" />
-		</antcall>
-		<delete>
-			<fileset dir="${om.lib.dir}" includes="commons-logging*.jar" />
-			<fileset dir="${om.lib.dir}" includes="commons-codec*.jar" />
-			<fileset dir="${om.lib.dir}" includes="commons-fileupload*.jar" />
-			<fileset dir="${om.lib.dir}" includes="commons-io*.jar" />
-			<fileset dir="${om.lib.dir}" includes="httpcore-jar*.jar" />
-			<fileset dir="${om.lib.dir}" includes="httpclient-jar*.jar" />
-			<fileset dir="${om.lib.dir}" includes="slf4j-api*.jar" />
-			<fileset dir="${om.lib.dir}" includes="*-source*.jar" />
-			<fileset dir="${om.lib.dir}" includes="*-javadoc*.jar" />
-		</delete>
-	</target>
-	<!-- Check for the Anakia libraries -->
-	<target name="-retrieve-anakia" unless="anakia.installed" description="Retrieves the libraries if needed" depends="-retrieve-mainlibs">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="anakia" />
-			<param name="ivy.lib.location" value="${anakia.lib.dir}" />
-		</antcall>
-	</target>
-	<!-- Check for junit libraries -->
-	<target name="-retrieve-junit" unless="junit.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="junit" />
-			<param name="ivy.lib.location" value="${junit.lib.dir}" />
-		</antcall>
-	</target>
-	<!-- Check for rat libraries -->
-	<target name="-retrieve-rat" unless="rat.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="rat" />
-			<param name="ivy.lib.location" value="${rat.lib.dir}" />
-		</antcall>
-	</target>
-	<!-- Check for dtd-generator libraries -->
-	<target name="-retrieve-dtd-generator" unless="dtd-generator.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="dtd" />
-			<param name="ivy.lib.location" value="${dtd-generator.lib.dir}" />
-		</antcall>
-	</target>
-	<!-- Check for svntask libraries -->
-	<target name="-retrieve-svntask" unless="svntask.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="svntask" />
-			<param name="ivy.lib.location" value="${svntask.lib.dir}" />
-			<param name="ivy.transitive" value="true" />
-		</antcall>
-	</target>
-	<!-- Check for JDK 1.6 tools.jar libraries -->
-	<target name="-retrieve-tools.jar" unless="tools.jar.installed" description="Retrieves the libraries if needed">
-		<available file="${java.home}/Classes/classes.jar" type="file" property="tools.jar.path" value="${java.home}/Classes/classes.jar" />
-		<available file="${java.home}/../Classes/classes.jar" type="file" property="tools.jar.path" value="${java.home}/../Classes/classes.jar" />
-		<available file="${java.home}/lib/tools.jar" type="file" property="tools.jar.path" value="${java.home}/lib/tools.jar" />
-		<available file="${java.home}/../lib/tools.jar" type="file" property="tools.jar.path" value="${java.home}/../lib/tools.jar" />
-		<available file="${tools.jar.path}" type="file" property="tools.jar.installed" />
-
-		<copy file="${tools.jar.path}" tofile="${project.lib.dir}/java_16_tools.jar" />
-	</target>
-	<!-- Check for Openlaszlo -->
-	<target name="-extract-tgz" description="Extracts given tar into ${build.base.dir} folder">
-		<echo message="Going to extract ${dep.file} to the ${build.base.dir}" />
-		<untar src="${dep.file}" dest="${build.base.dir}" compression="gzip" />
 	</target>
 	<target name="-retrieve-openlaszlo" unless="laszlo.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="openlaszlo" />
-			<param name="ivy.lib.location" value="${laszlo.home}" />
-		</antcall>
+		<mkdir dir="${openlaszlo}"/>
+		<get src="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/openlaszlo-4.9.tgz"
+			dest="${openlaszlo}" usetimestamp="true"/>
+		<untar src="${openlaszlo}/openlaszlo-4.9.tgz" dest="${openlaszlo}" compression="gzip" />
 		<delete>
-			<fileset dir="${laszlo.home}" includes="openlaszlo*.tgz"/>
+			<fileset dir="${openlaszlo}" includes="openlaszlo*.tgz"/>
 		</delete>
 	</target>
 	<target name="-retrieve-openlaszlo46" unless="laszlo46.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="openlaszlo46" />
-			<param name="ivy.lib.location" value="${laszlo46.home}" />
-		</antcall>
+		<mkdir dir="${openlaszlo}"/>
+		<get src="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/openlaszlo-4.9.5.tgz"
+			dest="${openlaszlo}" usetimestamp="true"/>
+		<untar src="${openlaszlo}/openlaszlo-4.9.5.tgz" dest="${openlaszlo}" compression="gzip" />
 		<chmod dir="${laszlo46.home}/WEB-INF/flexsdk" perm="755" includes="**/mxmlc*" />
 		<delete>
-			<fileset dir="${laszlo46.home}" includes="openlaszlo*.tgz"/>
+			<fileset dir="${openlaszlo}" includes="openlaszlo*.tgz"/>
 		</delete>
 	</target>
-	<!-- Check for Command line admin depandencies -->
-	<target name="-retrieve-cmdadmin" unless="cmdadmin.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="cmdadmin" />
-			<param name="ivy.lib.location" value="${red5.lib}" />
-		</antcall>
-	</target>
-
-	<target name="-retrieve-db2" unless="db2.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<!-- empty -->
-	</target>
-
-	<target name="-retrieve-mssql" unless="mssql.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<!-- empty -->
-	</target>
-		
-	<target name="-retrieve-derby" unless="derby.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<!-- retrieved automatically, added for compatibility -->
-	</target>
-
-	<target name="-retrieve-mysql" unless="mysql.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
-			<param name="ivy.conf.name" value="mysql" />
-			<param name="ivy.lib.location" value="${om.lib.dir}" />
-		</antcall>
-	</target>
-
-	<target name="-retrieve-oracle" unless="oracle.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<!-- empty -->
-	</target>
-
-	<target name="-retrieve-postgresql" unless="postgresql.installed" description="Retrieves the libraries if needed" depends="-availability-check">
-		<!-- retrieved automatically, added for compatibility -->
-	</target>
-
-	<target name="-process-db" description="performs DB related tasks based on passed DB type">
-		<echo message="db.provider == ${db}" />
-		<antcall target="-retrieve-${db}" inheritAll="true" inheritRefs="true" />
-		<copy file="${webapp.dir}/WEB-INF/classes/META-INF/${db}_persistence.xml" tofile="${webapp.dir}/WEB-INF/classes/META-INF/persistence.xml" overwrite="true" />
-	</target>
-
-	<!-- Clean targets -->
-	<!-- Remove classes directory for clean build -->
-	<target name="clean.classes" description="Clean Classes">
-		<delete includeemptydirs="true" dir="${main.out.dir}" />
-	</target>
-
-	<target name="clean.dist" description="Clean Dist dir">
-		<delete includeemptydirs="true" dir="${dist.dir}" />
-	</target>
-
-	<target name="clean" depends="clean.classes, clean.dist" description="Clean For Binary">
-		<delete includeemptydirs="true" dir="${junit.base.dir}" />
-		<delete file="${keystore.file}" />
-	</target>
-
-	<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,-install-ivy" description="Clears out Ivy cache and build folder">
-		<ivy:cleancache />
-	</target>
-
-	<target name="prepare-eclipse" if="java6.installed" description="Layout various files necessary for development" depends="-java6or7.check">
-		<antcall target="-retrieve-mainlibs" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-om" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-junit" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-dtd-generator" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-tools.jar" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-openlaszlo" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-openlaszlo46" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-cmdadmin" inheritAll="true" inheritRefs="true" />
-		<antcall target="-retrieve-anakia" inheritAll="true" inheritRefs="true" />
-		<antcall target="-process-db" inheritAll="true" inheritRefs="true" />
-	</target>
-	
-	<target name="-java6or7.check" unless="java6.installed" depends="info">
-		<condition property="java6.installed" value="true">
-			<and>
-				<or>
-					<equals arg1="${java.specification.version}" arg2="1.6" />
-					<equals arg1="${java.specification.version}" arg2="1.7" />
-					<equals arg1="${java.specification.version}" arg2="1.8" />
-				</or>
-				<matches string="${java.vm.specification.vendor}" pattern=".*[sun,oracle].*" casesensitive="false" singleline="true" />
-			</and>
-		</condition>
-		<echo message="Using Java ${java.version} specification: ${java.specification.version}" />
-		<fail message="Unsupported Java version - detected: ${java.version} Only Sun/Oracle Java compiler version 6 or 7 supported.">
-			<condition>
-				<not>
-					<equals arg1="${java6.installed}" arg2="true" />
-				</not>
-			</condition>
-		</fail>
-	</target>
-	
-	<path id="loadtest.classpath">
-		<fileset dir="${om.dist.webapp}/screensharing">
-			<include name="*.jar" />
-			<exclude name="openmeetings*.jar" />
-		</fileset>
-		<pathelement path="${resources.dir}" />
-		<pathelement path="${main.out.dir}" />
-	</path>
-	
-	<property name="runTestHost" value="192.168.1.7" />
-	<property name="numberOfClient" value="50" />
-	<property name="runTestPort" value="1935" />
-	<property name="runTestContext" value="openmeetings/1" />
-	
-	<target name="doRunClientTest">
-		<parallel>
-			<java classname="org.apache.openmeetings.test.rtmp.SimulateLoadTest">
-				<arg value="${runTestHost}"/>
-				<arg value="${numberOfClient}"/>
-				<classpath refid="loadtest.classpath" />
-			</java>
-		</parallel>
-	</target>
-	
 </project>

Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1590111&r1=1590110&r2=1590111&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Fri Apr 25 19:20:55 2014
@@ -26,23 +26,26 @@
 	</parent>
 	<groupId>org.apache.openmeetings</groupId>
 	<artifactId>openmeetings-flash</artifactId>
-    <packaging>swf</packaging>
+	<!-- packaging>swf</packaging -->
 	<name>Openmeetings Flash</name>
 	<description>TODO</description>
-	
+	<properties>
+		<openlaszlo>${project.build.directory}/openlaszlo</openlaszlo>
+		<laszlo.home>${openlaszlo}/openlaszlo</laszlo.home>
+		<laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
+		<out.dir.swf>${project.build.directory}</out.dir.swf>
+		<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
 				<executions>
 					<execution>
-						<phase>process-resources</phase>
+						<phase>compile</phase>
 						<configuration>
 							<target>
-								<copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml"
-									tofile="${project.build.directory}/${project.build.finalName}/WEB-INF/classes/META-INF/persistence.xml" 
-									overwrite="true"/>
+								<ant antfile="${basedir}/../openlaszlo.xml" target="client.only"/>
 							</target>
 						</configuration>
 						<goals>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1590111&r1=1590110&r2=1590111&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Fri Apr 25 19:20:55 2014
@@ -63,7 +63,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
 				<configuration>
 					<archiveClasses>true</archiveClasses>
 					<packagingExcludes>**/*.class</packagingExcludes>
@@ -73,7 +72,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
 				<executions>
 					<execution>
 						<id>copy-web-templates</id>
@@ -112,8 +110,8 @@
 				</executions>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
 				<executions>
 					<execution>
 						<phase>process-resources</phase>
@@ -151,7 +149,6 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
-				<version>1.0-beta-5</version>
 				<executions>
 					<execution>
 						<id>download-test-data</id>
@@ -206,6 +203,11 @@
 			<version>${openmeetings.version}</version>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.openmeetings</groupId>
+			<artifactId>openmeetings-flash</artifactId>
+			<version>${openmeetings.version}</version>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 			<version>${spring.version}</version>

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1590111&r1=1590110&r2=1590111&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Fri Apr 25 19:20:55 2014
@@ -45,6 +45,7 @@
 	<modules>
 		<module>openmeetings-core</module>
 		<module>openmeetings-db</module>
+		<module>openmeetings-flash</module>
 		<module>openmeetings-install</module>
 		<module>openmeetings-screenshare</module>
 		<module>openmeetings-service</module>
@@ -347,6 +348,31 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>wagon-maven-plugin</artifactId>
+					<version>1.0-beta-5</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.7</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>truezip-maven-plugin</artifactId>
+					<version>1.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>