Modified: incubator/openmeetings/branches/video-components/build.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/build.xml?rev=1220435&r1=1220434&r2=1220435&view=diff ============================================================================== --- incubator/openmeetings/branches/video-components/build.xml (original) +++ incubator/openmeetings/branches/video-components/build.xml Sun Dec 18 15:39:40 2011 @@ -3,22 +3,22 @@ <project name="openmeetings" basedir="./" default="dist"> <!-- Sources and output dirs --> - <property name="main.src.dir" value="${basedir}/src/app"/> - <property name="webstart.src.dir" value="${basedir}/src/screenviewer"/> - <property name="templates.src.dir" value="${basedir}/src/templates"/> - <property name="test.src.dir" value="${basedir}/src/test"/> - <property name="server.src.dir" value="${basedir}/src/server"/> - <property name="client.src.dir" value="${basedir}/src/client"/> - <property name="main.out.dir" value="${basedir}/bin"/> - + <property name="main.src.dir" value="${basedir}/src/app" /> + <property name="webstart.src.dir" value="${basedir}/src/screenviewer" /> + <property name="templates.src.dir" value="${basedir}/src/templates" /> + <property name="test.src.dir" value="${basedir}/src/test" /> + <property name="server.src.dir" value="${basedir}/src/server" /> + <property name="client.src.dir" value="${basedir}/src/client" /> + <property name="main.out.dir" value="${basedir}/bin" /> + <!-- Red5 dir --> - <property name="red5.server.dir" value="red5-1.0.0-RC1"/> + <property name="red5.server.dir" value="red5-1.0.0-RC1" /> <!-- screen.out.dir --> <property name="screen.out.dir" value="${basedir}/screen_compile" /> <!-- screen.src.dir --> <property name="screen.src.dir" value="${basedir}/src/red5-screenshare" /> - + <!-- hudson config --> <property environment="env" /> @@ -27,47 +27,47 @@ <property name="build.target" value="/home/swagner/apache-tomcat-6.0.18/webapps/openmeetings/builds/" /> <!-- Axis2 Services --> - <property name="fileservice.src.dir" value="${basedir}/src/fileservice"/> - <property name="roomservice.src.dir" value="${basedir}/src/roomservice"/> - <property name="userservice.src.dir" value="${basedir}/src/userservice"/> - - <property name="classes.dir" value="${basedir}/bin"/> - <property name="dist.dir" value="dist"/> - <property name="red5.root" value="${dist.dir}/red5"/> - <property name="report.dir" value="${basedir}/junitreport"/> - <property name="derbydb.dir" value="${basedir}/openmeetings"/> + <property name="fileservice.src.dir" value="${basedir}/src/fileservice" /> + <property name="roomservice.src.dir" value="${basedir}/src/roomservice" /> + <property name="userservice.src.dir" value="${basedir}/src/userservice" /> + + <property name="classes.dir" value="${basedir}/bin" /> + <property name="dist.dir" value="dist" /> + <property name="red5.root" value="${dist.dir}/red5" /> + <property name="report.dir" value="${basedir}/junitreport" /> + <property name="derbydb.dir" value="${basedir}/openmeetings" /> <!-- Conf dirs --> - <property name="conf.dir" value="${basedir}/conf"/> + <property name="conf.dir" value="${basedir}/conf" /> <!-- Distribution properties --> - <property name="project.distname" value="openmeetings"/> + <property name="project.distname" value="openmeetings" /> <!-- screenshare.out.dir --> <property name="screenshare.out.dir" value="${dist.dir}/red5/webapps/${project.distname}/red5-screenshare" /> - + <!-- libraries --> - <property name="project.lib" value="${basedir}/lib"/> + <property name="project.lib" value="${basedir}/lib" /> <!-- LPS Properties --> - <property name="out.dir.swf" value = "${basedir}/${dist.dir}/red5/webapps/${project.distname}/" /> - <property name="laszlo.home" value="${basedir}/openlaszlo"/> - <property name="webcontent.src.dir" value="${basedir}/WebContent"/> - <property name="laszlo.src.dir" value="${webcontent.src.dir}/${project.distname}"/> - <property name="laszlo.debug" value="false"/> - <property name="laszlo.proxied" value = "solo"/> + <property name="out.dir.swf" value="${basedir}/${dist.dir}/red5/webapps/${project.distname}/" /> + <property name="laszlo.home" value="${basedir}/openlaszlo" /> + <property name="webcontent.src.dir" value="${basedir}/WebContent" /> + <property name="laszlo.src.dir" value="${webcontent.src.dir}/${project.distname}" /> + <property name="laszlo.debug" value="false" /> + <property name="laszlo.proxied" value="solo" /> - <path id = "laszlo.lib"> + <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 - commons-collections.jar jdom.jar log4j-1.2.6.jar lps-4.9.0.jar batik-all-flex.jar velocity-dep-1.4-flex.jar"/> + <fileset dir="${laszlo.home}/WEB-INF/lib" includes="saxon-6.5.3-lz-p1.jar jakarta-regexp-1.2.jar + commons-collections.jar jdom.jar log4j-1.2.6.jar lps-4.9.0.jar batik-all-flex.jar velocity-dep-1.4-flex.jar" /> <!-- swf10 --> - <fileset dir = "${laszlo.home}/WEB-INF/lib" includes="mxmlc*.jar flex-messaging-common.jar swfutils.jar asc.jar - fxgutils.jar"/> + <fileset dir="${laszlo.home}/WEB-INF/lib" includes="mxmlc*.jar flex-messaging-common.jar swfutils.jar asc.jar + fxgutils.jar" /> </path> <!-- Open JPA --> - <property name="openjpa.lib" value="${project.lib}/openjpa2"/> + <property name="openjpa.lib" value="${project.lib}/openjpa2" /> <!--JDBC Drivers--> <property name="database.lib" value="${project.lib}/database" /> <property name="red5.lib" value="${basedir}/${red5.server.dir}/red5" /> @@ -91,54 +91,51 @@ <!-- Junit --> <property name="junit.lib" value="${project.lib}/junit" /> <!-- Svn Task --> - <property name="svntask.lib" value="${project.lib}/svntask-1.0.8"/> + <property name="svntask.lib" value="${project.lib}/svntask-1.0.8" /> <!-- screenshare.lib --> <property name="screenshare.lib" value="${basedir}/WebContent/red5-screenshare" /> <!-- compile classpath --> <path id="compile.classpath"> - <fileset dir="${openjpa.lib}" includes="*.jar"/> - <fileset dir="${spring.lib}" includes="*.jar"/> - <fileset dir="${project.lib}" includes="*.jar"/> - <fileset dir="${red5.lib}" includes="*.jar"/> - <fileset dir="${red5.server.lib}" includes="*.jar"/> - <fileset dir="${upload.lib}" includes="*.jar"/> - <fileset dir="${xstream.lib}" includes="*.jar"/> - <fileset dir="${junit.lib}" includes="*.jar" excludes="red5.jar"/> - <fileset dir="${web.lib}" includes="*.jar"/> - <fileset dir="${slf4j.lib}" includes="*.jar"/> - <fileset dir="${axis2.lib}" includes="*.jar"/> - <fileset dir="${velocity.lib}" includes="*.jar"/> - <fileset dir="${batik.lib}" includes="*.jar"/> - <fileset dir="${ical.lib}" includes="*.jar"/> - <fileset dir="${java2swf.lib}" includes="*.jar"/> - <fileset dir="${jmf.lib}" includes="*.jar"/> - <fileset dir="${junit.lib}" includes="*.jar"/> - <fileset dir="${screenshare.lib}" includes="*kunststoff.jar"/> + <fileset dir="${openjpa.lib}" includes="*.jar" /> + <fileset dir="${spring.lib}" includes="*.jar" /> + <fileset dir="${project.lib}" includes="*.jar" /> + <fileset dir="${red5.lib}" includes="*.jar" /> + <fileset dir="${red5.server.lib}" includes="*.jar" /> + <fileset dir="${upload.lib}" includes="*.jar" /> + <fileset dir="${xstream.lib}" includes="*.jar" /> + <fileset dir="${junit.lib}" includes="*.jar" excludes="red5.jar" /> + <fileset dir="${web.lib}" includes="*.jar" /> + <fileset dir="${slf4j.lib}" includes="*.jar" /> + <fileset dir="${axis2.lib}" includes="*.jar" /> + <fileset dir="${velocity.lib}" includes="*.jar" /> + <fileset dir="${batik.lib}" includes="*.jar" /> + <fileset dir="${ical.lib}" includes="*.jar" /> + <fileset dir="${java2swf.lib}" includes="*.jar" /> + <fileset dir="${jmf.lib}" includes="*.jar" /> + <fileset dir="${junit.lib}" includes="*.jar" /> + <fileset dir="${screenshare.lib}" includes="*kunststoff.jar" /> </path> <!-- screenshare classpath --> <path id="screenshare.classpath"> - <fileset dir="${screenshare.lib}" includes="*.jar"/> + <fileset dir="${screenshare.lib}" includes="*.jar" /> </path> <!-- build webapp --> - <target name="dist" description="binary distribution of OpenMeetings" - depends="cleanForBinary, jar, compile.laszlo.main, compile.laszlo.main.as3, enhance, signWebStartJars"> + <target name="dist" description="binary distribution of OpenMeetings" depends="cleanForBinary, jar, compile.laszlo.main, compile.laszlo.main.as3, enhance, signWebStartJars"> </target> <!-- compiles the sources without the laszlo client --> - <target name="dist-test" description="binary distribution of OpenMeetings" - depends="cleanForBinary, jar, signWebStartJars"> + <target name="dist-test" description="binary distribution of OpenMeetings" depends="cleanForBinary, jar, signWebStartJars"> </target> <!-- compiles the sources only with laszlo debug client --> - <target name="dist-debug" description="binary distribution of OpenMeetings" - depends="cleanForBinary, jar, compile.laszlo.main.debug, compile.laszlo.main.debug.as3, signWebStartJars"> + <target name="dist-debug" description="binary distribution of OpenMeetings" depends="cleanForBinary, jar, compile.laszlo.main.debug, compile.laszlo.main.debug.as3, signWebStartJars"> </target> @@ -147,7 +144,7 @@ <mkdir dir="${dist.dir}" /> <mkdir dir="${main.out.dir}" /> </target> - + <!-- Check timestamp on files --> <target name="prepare" depends="prepare.mkdir"> <copy todir="${screenshare.out.dir}" filtering="true"> @@ -155,67 +152,67 @@ </copy> <copy todir="${dist.dir}" filtering="true"> <fileset dir="${red5.server.dir}"> - <exclude name="**/*.fla"/> + <exclude name="**/*.fla" /> </fileset> </copy> <copy todir="${dist.dir}/red5/lib"> - <fileset dir="${spring.lib}"/> + <fileset dir="${spring.lib}" /> </copy> <!-- this package contains the javax.persistance.* API of JAVA-EE-6 --> - <copy file="${openjpa.lib}/geronimo-jpa_2.0_spec-1.1.jar" todir="${dist.dir}/red5/lib"/> + <copy file="${openjpa.lib}/geronimo-jpa_2.0_spec-1.1.jar" todir="${dist.dir}/red5/lib" /> <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib"> <fileset dir="${openjpa.lib}"> - <include name="*.jar"/> - <exclude name="commons-collections-3.2.1.jar"/> + <include name="*.jar" /> + <exclude name="commons-collections-3.2.1.jar" /> <!-- this jar is already in the servers-lib --> - <exclude name="geronimo-jpa_2.0_spec-1.1.jar"/> + <exclude name="geronimo-jpa_2.0_spec-1.1.jar" /> </fileset> </copy> <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/red5-services"> - <fileset dir="${webcontent.src.dir}/WEB-INF/red5-services" includes="*.xml"/> + <fileset dir="${webcontent.src.dir}/WEB-INF/red5-services" includes="*.xml" /> </copy> <copy todir="${dist.dir}/red5/webapps/${project.distname}"> <fileset dir="${webcontent.src.dir}"> - <include name="*.html"/> + <include name="*.html" /> </fileset> </copy> <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF"> <fileset dir="${webcontent.src.dir}/WEB-INF"> - <include name="*.xml"/> - <include name="*.properties"/> - <exclude name="root-*.xml"/> + <include name="*.xml" /> + <include name="*.properties" /> + <exclude name="root-*.xml" /> </fileset> </copy> - <chmod dir="${dist.dir}/red5" perm="755" includes="**/*.sh"/> - <chmod dir="${dist.dir}/red5/webapps/${project.distname}/screen" perm="755" includes="**/*.sh"/> - <chmod dir="${dist.dir}/red5/webapps/${project.distname}/jod" perm="755" includes="**/*.sh"/> + <chmod dir="${dist.dir}/red5" perm="755" includes="**/*.sh" /> + <chmod dir="${dist.dir}/red5/webapps/${project.distname}/screen" perm="755" includes="**/*.sh" /> + <chmod dir="${dist.dir}/red5/webapps/${project.distname}/jod" perm="755" includes="**/*.sh" /> <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib"> <fileset dir="${axis2.lib}"> - <include name="*.jar"/> - <exclude name="commons-codec-1.3.jar"/> + <include name="*.jar" /> + <exclude name="commons-codec-1.3.jar" /> </fileset> - <fileset dir="${velocity.lib}"/> - <fileset dir="${batik.lib}"/> - <fileset dir="${upload.lib}"/> - <fileset dir="${xstream.lib}"/> - <fileset dir="${database.lib}"/> - <fileset dir="${ical.lib}"/> - <fileset dir="${java2swf.lib}"/> - <fileset dir="${jmf.lib}" includes="*.jar"/> + <fileset dir="${velocity.lib}" /> + <fileset dir="${batik.lib}" /> + <fileset dir="${upload.lib}" /> + <fileset dir="${xstream.lib}" /> + <fileset dir="${database.lib}" /> + <fileset dir="${ical.lib}" /> + <fileset dir="${java2swf.lib}" /> + <fileset dir="${jmf.lib}" includes="*.jar" /> </copy> <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/classes/META-INF"> <fileset file="src/META-INF/*.xml"> - <exclude name="services.xml"/> + <exclude name="services.xml" /> </fileset> </copy> - <chmod dir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib" perm="755" includes="**/*.sh"/> + <chmod dir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib" perm="755" includes="**/*.sh" /> <!-- add language files from .war version --> <copy todir="${dist.dir}/red5/webapps/${project.distname}/languages"> @@ -233,7 +230,7 @@ </copy> --> - <tstamp/> + <tstamp /> </target> @@ -244,30 +241,30 @@ <copy todir="${main.out.dir}" includeEmptyDirs="yes"> <fileset dir="${main.src.dir}"> <patternset> - <include name="**/*.conf"/> - <include name="**/*.properties"/> - <include name="**/*.xml"/> - <include name="**/*.png"/> - <include name="**/*.vm"/> + <include name="**/*.conf" /> + <include name="**/*.properties" /> + <include name="**/*.xml" /> + <include name="**/*.png" /> + <include name="**/*.vm" /> </patternset> </fileset> <fileset dir="${webstart.src.dir}"> <patternset> - <include name="**/*.conf"/> - <include name="**/*.properties"/> - <include name="**/*.xml"/> - <include name="**/*.png"/> - <include name="**/*.vm"/> + <include name="**/*.conf" /> + <include name="**/*.properties" /> + <include name="**/*.xml" /> + <include name="**/*.png" /> + <include name="**/*.vm" /> </patternset> </fileset> <fileset dir="${templates.src.dir}"> <patternset> - <include name="**/*.conf"/> - <include name="**/*.properties"/> - <include name="**/*.xml"/> - <include name="**/*.png"/> - <include name="**/*.vm"/> + <include name="**/*.conf" /> + <include name="**/*.properties" /> + <include name="**/*.xml" /> + <include name="**/*.png" /> + <include name="**/*.vm" /> </patternset> </fileset> </copy> @@ -276,8 +273,8 @@ <copy todir="${screen.out.dir}" includeEmptyDirs="yes"> <fileset dir="${screen.src.dir}"> <patternset> - <include name="**/*.xml"/> - <include name="**/*.png"/> + <include name="**/*.xml" /> + <include name="**/*.png" /> </patternset> </fileset> </copy> @@ -286,303 +283,277 @@ <target name="jar.only" depends="enhance.only, current_revision"> <tstamp prefix="build"> - <format property="TODAY" pattern="d-MMMM-yyyy" locale="en"/> + <format property="TODAY" pattern="d-MMMM-yyyy" locale="en" /> </tstamp> <manifestclasspath property="jar.classpath" jarfile="${project.distname}.jar"> - <classpath refid="compile.classpath"/> + <classpath refid="compile.classpath" /> </manifestclasspath> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/${project.distname}.jar"> <fileset dir="${classes.dir}"> - <include name="**"/> - <exclude name="**/test/**"/> - <exclude name="**/axis/**"/> - <exclude name="**/webstart/**"/> - <exclude name="**/client/**"/> - <exclude name="**/*.png"/> - <exclude name="**/*.vm"/> - <exclude name="log4j.properties"/> + <include name="**" /> + <exclude name="**/test/**" /> + <exclude name="**/axis/**" /> + <exclude name="**/webstart/**" /> + <exclude name="**/client/**" /> + <exclude name="**/*.png" /> + <exclude name="**/*.vm" /> + <exclude name="log4j.properties" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> <attribute name="Svn-Revision" value="${svn.version}" /> </manifest> </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/${project.distname}-templates.jar"> - <fileset dir="${classes.dir}"> - <include name="**"/> - <exclude name="**/org/**"/> - <exclude name="**/*.png"/> - <exclude name="**/*.properties"/> - </fileset> - <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> - </manifest> - </jar> + <fileset dir="${classes.dir}"> + <include name="**" /> + <exclude name="**/org/**" /> + <exclude name="**/*.png" /> + <exclude name="**/*.properties" /> + </fileset> + <manifest> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> + </manifest> + </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/screen/screenviewer.jar"> <fileset dir="${classes.dir}"> - <include name="**/webstart/**"/> - <include name="**/*png"/> + <include name="**/webstart/**" /> + <include name="**/*png" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> </manifest> </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/screen/${project.distname}-client.jar"> <fileset dir="${classes.dir}"> <include name="log4j.properties" /> - <include name="**/client/**"/> - <include name="**/*png"/> + <include name="**/client/**" /> + <include name="**/*png" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> </manifest> </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/screen/viewer.jar"> <fileset dir="${classes.dir}"> - <include name="**/jrdesktop/**"/> - <include name="**/*png"/> + <include name="**/jrdesktop/**" /> + <include name="**/*png" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> </manifest> </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/screen/rtpviewer.jar"> <fileset dir="${classes.dir}"> <include name="log4j.properties" /> - <include name="**/de/**"/> - <exclude name="**/applet/**"/> + <include name="**/de/**" /> + <exclude name="**/applet/**" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> </manifest> </jar> <!-- Build WebServices --> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/services/OpenMeetingsService.aar"> <fileset dir="src/"> - <include name="META-INF/services.xml"/> + <include name="META-INF/services.xml" /> </fileset> </jar> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/openmeetings-WebService.jar"> <fileset dir="${classes.dir}"> - <include name="**/openmeetings/axis/**"/> + <include name="**/openmeetings/axis/**" /> </fileset> </jar> </target> - + <target name="dist.screen.share" description="Make Screen Share Archive" depends="jar.screen.share, signWebStartJars" /> - + <target name="jar.screen.share" description="Make Screen Share Archive" depends="compile.screen.share"> - <tstamp prefix="build"> - <format property="TODAY" pattern="d-MMMM-yyyy" locale="en"/> - </tstamp> - <manifestclasspath property="jar2.classpath" jarfile="${project.distname}.jar"> - <classpath refid="screenshare.classpath"/> - </manifestclasspath> + <tstamp prefix="build"> + <format property="TODAY" pattern="d-MMMM-yyyy" locale="en" /> + </tstamp> + <manifestclasspath property="jar2.classpath" jarfile="${project.distname}.jar"> + <classpath refid="screenshare.classpath" /> + </manifestclasspath> <!-- Screen Share --> <jar destfile="${screenshare.out.dir}/red5-screenshare.jar"> <fileset dir="${screen.out.dir}"> - <include name="**/**"/> + <include name="**/**" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar2.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar2.classpath}" /> </manifest> </jar> </target> - + <!-- Compile JAR --> <target name="jar" description="Make Archive" depends="enhance, jar.only, jar.screen.share"> - <tstamp prefix="build"> - <format property="TODAY" pattern="d-MMMM-yyyy" locale="en"/> - </tstamp> + <tstamp prefix="build"> + <format property="TODAY" pattern="d-MMMM-yyyy" locale="en" /> + </tstamp> <jar destfile="${dist.dir}/red5/webapps/${project.distname}/screen/rtpapplet.jar"> <fileset dir="${classes.dir}"> - <include name="**/applet/**"/> + <include name="**/applet/**" /> </fileset> <manifest> - <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"/> - <attribute name="Built-On" value="${build.TODAY}"/> - <attribute name="Class-Path" value="conf/ ${jar.classpath}"/> + <attribute name="Built-By" value="OpenMeetings - http://openmeetings.googlecode.com"; /> + <attribute name="Built-On" value="${build.TODAY}" /> + <attribute name="Class-Path" value="conf/ ${jar.classpath}" /> </manifest> </jar> </target> <target name="signWebStartJars"> <delete file="filetest.keystore" /> - <genkey alias="filetest" - storepass="secret" - keystore="filetest.keystore" - verbose="true"> + <genkey alias="filetest" storepass="secret" keystore="filetest.keystore" verbose="true"> <dname> - <param name="CN" value="Sebastian Wagner"/> - <param name="OU" value="technology"/> - <param name="O" value="openmeetings.googlecode.com"/> - <param name="C" value="DE"/> + <param name="CN" value="Sebastian Wagner" /> + <param name="OU" value="technology" /> + <param name="O" value="openmeetings.googlecode.com" /> + <param name="C" value="DE" /> </dname> </genkey> - <signjar - alias="filetest" keystore="filetest.keystore" - storepass="secret" - lazy="false" - > + <signjar alias="filetest" keystore="filetest.keystore" storepass="secret" lazy="false"> <path> - <fileset dir="${dist.dir}/red5/webapps/${project.distname}/screen" > + <fileset dir="${dist.dir}/red5/webapps/${project.distname}/screen"> <include name="**/*.jar" /> </fileset> - <fileset dir="${screenshare.out.dir}" > + <fileset dir="${screenshare.out.dir}"> <include name="**/*.jar" /> </fileset> </path> </signjar> </target> - <target name = "compile.laszlo.main.as3" depends="compile.laszlo.main.debug.as3"> - <java classname = "org.openlaszlo.compiler.Main" fork = "true" - newenvironment="true" - failonerror="true" - dir = "${laszlo.src.dir}" - classpathref="laszlo.lib" - > - <jvmarg value = "-DLPS_HOME=${laszlo.home}"/> - <jvmarg value = "-Dlzdebug=${laszlo.debug}"/> - <jvmarg value = "-Dlzproxied=${laszlo.proxied}"/> - <jvmarg value = "-Xms1024M"/> - <jvmarg value = "-Xmx1024M"/> - <arg line="--runtime=swf10 --dir ${out.dir.swf} --onerror warn main.as3.lzx" /> + <target name="client.debug.only" depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug" /> + + <target name="compile.laszlo.main.as3" depends="compile.laszlo.main.debug.as3"> + <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.src.dir}" classpathref="laszlo.lib"> + <jvmarg value="-DLPS_HOME=${laszlo.home}" /> + <jvmarg value="-Dlzdebug=${laszlo.debug}" /> + <jvmarg value="-Dlzproxied=${laszlo.proxied}" /> + <jvmarg value="-Xms1024M" /> + <jvmarg value="-Xmx1024M" /> + <arg line="--runtime=swf10 --dir ${out.dir.swf} --onerror warn main.as3.lzx" /> </java> </target> - <target name = "compile.laszlo.main.debug.as3"> - <java classname = "org.openlaszlo.compiler.Main" fork = "true" - newenvironment="true" - failonerror="true" - dir = "${laszlo.src.dir}" - classpathref="laszlo.lib" - > - <jvmarg value = "-DLPS_HOME=${laszlo.home}"/> - <jvmarg value = "-Dlzdebug=${laszlo.debug}"/> - <jvmarg value = "-Dlzproxied=${laszlo.proxied}"/> - <jvmarg value = "-Xms1024M"/> - <jvmarg value = "-Xmx1024M"/> - <arg line="--runtime=swf10 --dir ${out.dir.swf} --onerror warn maindebug.as3.lzx" /> + <target name="compile.laszlo.main.debug.as3"> + <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.src.dir}" classpathref="laszlo.lib"> + <jvmarg value="-DLPS_HOME=${laszlo.home}" /> + <jvmarg value="-Dlzdebug=${laszlo.debug}" /> + <jvmarg value="-Dlzproxied=${laszlo.proxied}" /> + <jvmarg value="-Xms1024M" /> + <jvmarg value="-Xmx1024M" /> + <arg line="--runtime=swf10 --dir ${out.dir.swf} --onerror warn maindebug.as3.lzx" /> </java> </target> - <target name = "compile.laszlo.main" depends="compile.laszlo.main.debug"> - <java classname = "org.openlaszlo.compiler.Main" fork = "true" - newenvironment="true" - failonerror="true" - dir = "${laszlo.src.dir}" - classpathref="laszlo.lib" - > - <jvmarg value = "-DLPS_HOME=${laszlo.home}"/> - <jvmarg value = "-Dlzdebug=${laszlo.debug}"/> - <jvmarg value = "-Dlzproxied=${laszlo.proxied}"/> - <jvmarg value = "-Xms1024M"/> - <jvmarg value = "-Xmx1024M"/> + <target name="compile.laszlo.main" depends="compile.laszlo.main.debug"> + <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.src.dir}" classpathref="laszlo.lib"> + <jvmarg value="-DLPS_HOME=${laszlo.home}" /> + <jvmarg value="-Dlzdebug=${laszlo.debug}" /> + <jvmarg value="-Dlzproxied=${laszlo.proxied}" /> + <jvmarg value="-Xms1024M" /> + <jvmarg value="-Xmx1024M" /> <arg line="--runtime=swf8 --dir ${out.dir.swf} --mcache on --onerror warn main.lzx" /> </java> </target> - <target name = "compile.laszlo.main.debug"> - <java classname = "org.openlaszlo.compiler.Main" fork = "true" - newenvironment="true" - failonerror="true" - dir = "${laszlo.src.dir}" - classpathref="laszlo.lib" - > - <jvmarg value = "-DLPS_HOME=${laszlo.home}"/> - <jvmarg value = "-Dlzdebug=${laszlo.debug}"/> - <jvmarg value = "-Dlzproxied=${laszlo.proxied}"/> - <jvmarg value = "-Xms1024M"/> - <jvmarg value = "-Xmx1024M"/> + <target name="compile.laszlo.main.debug"> + <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.src.dir}" classpathref="laszlo.lib"> + <jvmarg value="-DLPS_HOME=${laszlo.home}" /> + <jvmarg value="-Dlzdebug=${laszlo.debug}" /> + <jvmarg value="-Dlzproxied=${laszlo.proxied}" /> + <jvmarg value="-Xms1024M" /> + <jvmarg value="-Xmx1024M" /> <arg line="--runtime=swf8 --dir ${out.dir.swf} --mcache on --onerror warn maindebug.lzx" /> </java> </target> - <target name="compile" depends="prepare, resources, compile.only"/> - + <target name="compile" depends="prepare, resources, compile.only" /> + <!-- Normal build of application compiler="org.eclipse.jdt.core.JDTCompilerAdapter" --> <target name="compile.only" depends="compile.screen.share"> <echo message="Compile main to ${main.out.dir}"> </echo> - <javac debug="on" debuglevel="lines,vars,source" destdir="${main.out.dir}" > + <javac debug="on" debuglevel="lines,vars,source" destdir="${main.out.dir}"> <src path="${server.src.dir}" /> <src path="${main.src.dir}" /> - <classpath refid="compile.classpath"/> - <compilerarg value="-Aopenjpa.metamodel=true"/> + <classpath refid="compile.classpath" /> + <compilerarg value="-Aopenjpa.metamodel=true" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${webstart.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${webstart.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${templates.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${templates.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${client.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${client.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${test.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${test.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${fileservice.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${fileservice.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${roomservice.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${roomservice.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> - <javac debug="on" debuglevel="lines,vars,source" srcdir="${userservice.src.dir}" destdir="${main.out.dir}" > - <classpath refid="compile.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${userservice.src.dir}" destdir="${main.out.dir}"> + <classpath refid="compile.classpath" /> </javac> </target> <target name="compile.screen.share" depends="prepare.mkdir"> <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}" > - <classpath refid="screenshare.classpath"/> + <javac debug="on" debuglevel="lines,vars,source" srcdir="${screen.src.dir}" destdir="${screen.out.dir}"> + <classpath refid="screenshare.classpath" /> </javac> </target> - + <target name="doStartServer" depends="compile"> <junit> - <classpath refid="compile.classpath"/> - <formatter type="plain"/> + <classpath refid="compile.classpath" /> + <formatter type="plain" /> <test name="org.openmeetings.server.TestSocket" /> </junit> </target> <target name="hudson" depends="dist"> - <mkdir dir="${build.target}${build.number.hudson}"/> - <zip destfile="${build.target}${build.number.hudson}/openmeetings_r${build.svn.hudson}.zip" - basedir="${dist.dir}/red5" /> + <mkdir dir="${build.target}${build.number.hudson}" /> + <zip destfile="${build.target}${build.number.hudson}/openmeetings_r${build.svn.hudson}.zip" basedir="${dist.dir}/red5" /> </target> <!-- Remove classes directory for clean build --> <target name="clean" depends="cleanForBinary" description="Prepare for clean build" /> <target name="cleanForBinary" description="Clean For Binary"> - <delete dir="${dist.dir}"/> - <delete dir="${screen.out.dir}"/> - <delete dir="${main.out.dir}"/> - <delete dir="${report.dir}"/> + <delete dir="${dist.dir}" /> + <delete dir="${screen.out.dir}" /> + <delete dir="${main.out.dir}" /> + <delete dir="${report.dir}" /> <delete dir="${derbydb.dir}" /> <delete dir="${basedir}/log" /> <delete file="filetest.keystore" /> @@ -590,7 +561,7 @@ </target> <path id="jpa.enhancement.classpath"> - <pathelement path="${classes.dir}"/> + <pathelement path="${classes.dir}" /> <!-- lib contains all of the jars that came with the OpenJPA binary download --> <fileset dir="${openjpa.lib}" includes="*.jar" /> <fileset dir="${openjpa.lib}" includes="*.jar" /> @@ -598,44 +569,47 @@ <!-- define the openjpac task --> <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"> - <classpath refid="jpa.enhancement.classpath"/> + <classpath refid="jpa.enhancement.classpath" /> </taskdef> <target name="enhance" depends="compile, enhance.only" /> - + <target name="enhance.only" depends="compile.only"> <!-- invoke the enhancer --> <openjpac> - <classpath refid="jpa.enhancement.classpath"/> - <config propertiesFile="src/META-INF/persistence.xml"/> + <classpath refid="jpa.enhancement.classpath" /> + <config propertiesFile="src/META-INF/persistence.xml" /> </openjpac> - <echo message="Enhancing complete."/> + <echo message="Enhancing complete." /> </target> <target name="current_revision"> <typedef resource="com/googlecode/svntask/svntask.xml"> <classpath> - <fileset dir="${svntask.lib}" includes="*.jar"/> + <fileset dir="${svntask.lib}" includes="*.jar" /> </classpath> </typedef> - - <svn><info path="." revisionProperty="svn.version" /></svn> - + + <svn> + <info path="." revisionProperty="svn.version" /> + </svn> + <!-- Display svn revision number --> <echo>Current revision: ${svn.version}</echo> </target> - + <!-- Build entire project --> - <target name="build project" depends="clean, prepare, compile"/> + <target name="build project" depends="clean, prepare, compile" /> <!-- Unit Tests --> - <property name="om.dist.webapp" value="${red5.root}/webapps/${project.distname}"/> + <property name="om.dist.webapp" value="${red5.root}/webapps/${project.distname}" /> <condition property="junit.test.pattern" value="${testcases}" else="Test*"> <isset property="testcases" /> </condition> - <condition property="junit.test.formatter" value="${test.formatter}" else="xml"> <!-- plain --> + <condition property="junit.test.formatter" value="${test.formatter}" else="xml"> + <!-- plain --> <isset property="test.formatter" /> </condition> @@ -652,18 +626,18 @@ <pathelement path="${basedir}/WebContent/WEB-INF" /> </path> <target name="test" depends="enhance" description="Will run all tests unless -Dtestcases=_file_name_pattern_ will be passed"> - <mkdir dir="${report.dir}"/> + <mkdir dir="${report.dir}" /> <property name="myclsp" refid="junit.classpath" /> <!-- <echo message="${myclsp}" /> --> <junit printsummary="yes"> - <classpath refid="junit.classpath"/> - <jvmarg value="-Dred5.root=${red5.root}"/> - <jvmarg value="-Dred5.config_root=${red5.root}/conf"/> - <jvmarg value="-Dwebapps.root=${basedir}/${om.dist.webapp}"/> + <classpath refid="junit.classpath" /> + <jvmarg value="-Dred5.root=${red5.root}" /> + <jvmarg value="-Dred5.config_root=${red5.root}/conf" /> + <jvmarg value="-Dwebapps.root=${basedir}/${om.dist.webapp}" /> <formatter type="${junit.test.formatter}" /> <batchtest fork="yes" todir="${report.dir}"> <fileset dir="${main.out.dir}"> - <include name="org/openmeetings/test/**/${junit.test.pattern}"/> + <include name="org/openmeetings/test/**/${junit.test.pattern}" /> </fileset> </batchtest> </junit> @@ -674,9 +648,9 @@ <report todir="${report.dir}" /> </junitreport> </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 name="smoke.test" depends="dist" description="Will run 'Smoke' subset of tests"> + <antcall target="test"> + <param name="junit.test.pattern" value="TestSmoke*" /> + </antcall> </target> </project>
