You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/07/11 08:43:13 UTC
svn commit: r1360034 - in /incubator/openmeetings/trunk/singlewebapp:
build.properties build.xml ivy.xml lib/ivy-2.2.0.jar lib/ivy-2.3.0-rc1.jar
src/META-INF/
Author: solomax
Date: Wed Jul 11 06:43:13 2012
New Revision: 1360034
URL: http://svn.apache.org/viewvc?rev=1360034&view=rev
Log:
- Ivy library is update to 2.3.0-rc1 (to be in sync with red5)
- Flash compiling is generalized and made working on the paths with spaces
- svnkit library is updated to 1.7.5
- persistence.xml is added to ignore list
Added:
incubator/openmeetings/trunk/singlewebapp/lib/ivy-2.3.0-rc1.jar (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/lib/ivy-2.2.0.jar
Modified:
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/ (props changed)
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1360034&r1=1360033&r2=1360034&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Wed Jul 11 06:43:13 2012
@@ -1,5 +1,6 @@
project.version=2.1.0
project.status=SNAPSHOT
+ivy.jar=ivy-2.3.0-rc1.jar
red5.server.revision=4388
red5.client.revision=4388
laszlo.debug=false
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1360034&r1=1360033&r2=1360034&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Wed Jul 11 06:43:13 2012
@@ -391,14 +391,24 @@
<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.as3.src.dir}" classpathref="laszlo.lib">
+ <target name="-compile.flash" description="compile flash application">
+ <!-- commented for now
+ <echo message="flash.src.dir == '${flash.src.dir}'" />
+ <echo message="classpathref == '${laszlo.lib}'" />
+ <echo message="laszlo.home == '${laszlo.home}'" />
+ <echo message="laszlo.debug == '${laszlo.debug}'" />
+ <echo message="laszlo.proxied == '${laszlo.proxied}'" />
+ <echo message="flash.runtime == '${flash.runtime}'" />
+ <echo message="out.dir.swf == '${out.dir.swf}'" />
+ <echo message="flash.main.file == '${flash.main.file}'" />
+ -->
+ <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${flash.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" />
+ <arg line="--runtime=${flash.runtime} --dir "${out.dir.swf}" --onerror warn ${flash.main.file}" />
</java>
</target>
@@ -409,47 +419,43 @@
<copy todir="${dist.webapps.dir}/testingTools">
<fileset dir="${webcontent.src.dir}/openmeetings/testingTools" includes="*" />
</copy>
- <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.as3.src.dir}/networkTesting" classpathref="laszlo.lib">
- <jvmarg value="-DLPS_HOME=${laszlo.home}" />
- <jvmarg value="-Dlzdebug=${laszlo.debug}" />
- <jvmarg value="-Dlzproxied=${laszlo.proxied}" />
- <jvmarg value="-Xms512M" />
- <jvmarg value="-Xmx512M" />
- <arg line="--runtime=swf10 --dir ${out.dir.swf} --onerror warn networktesting.lzx" />
- </java>
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
+ <param name="flash.runtime" value="swf10" />
+ <param name="flash.main.file" value="networktesting.lzx" />
+ </antcall>
+ </target>
+
+ <target name="compile.laszlo.main.as3" depends="compile.laszlo.main.debug.as3">
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+ <param name="flash.runtime" value="swf10" />
+ <param name="flash.main.file" value="main.as3.lzx" />
+ </antcall>
</target>
<target name="compile.laszlo.main.debug.as3" depends="-retrieve-openlaszlo">
- <java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${laszlo.as3.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>
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+ <param name="flash.runtime" value="swf10" />
+ <param name="flash.main.file" value="maindebug.as3.lzx" />
+ </antcall>
</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" />
- <arg line="--runtime=swf8 --dir ${out.dir.swf} --mcache on --onerror warn main.lzx" />
- </java>
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.src.dir" value="${laszlo.src.dir}" />
+ <param name="flash.runtime" value="swf8" />
+ <param name="flash.main.file" value="main.lzx" />
+ </antcall>
</target>
<target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo">
- <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>
+ <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+ <param name="flash.src.dir" value="${laszlo.src.dir}" />
+ <param name="flash.runtime" value="swf8" />
+ <param name="flash.main.file" value="maindebug.lzx" />
+ </antcall>
</target>
<target name="compile" depends="compile.only, prepare" />
@@ -671,7 +677,6 @@
</target>
- <property name="ivy.jar" value="ivy-2.2.0.jar" />
<taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpath="${ivy.lib.dir}/${ivy.jar}" />
<!-- Build Targets -->
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1360034&r1=1360033&r2=1360034&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Wed Jul 11 06:43:13 2012
@@ -261,7 +261,7 @@
<!-- END OF DTD -->
<!-- START OF svntask -->
- <dependency org="org.tmatesoft.svnkit" name="svnkit" rev="1.7.4" conf="svntask->*" transitive="true">
+ <dependency org="org.tmatesoft.svnkit" name="svnkit" rev="1.7.5" conf="svntask->*" transitive="true">
<include type="jar" />
</dependency>
<dependency org="svnant" name="svnant" rev="1.3.1" conf="svntask->*" transitive="false">
Added: incubator/openmeetings/trunk/singlewebapp/lib/ivy-2.3.0-rc1.jar
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/lib/ivy-2.3.0-rc1.jar?rev=1360034&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/lib/ivy-2.3.0-rc1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/openmeetings/trunk/singlewebapp/src/META-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 11 06:43:13 2012
@@ -0,0 +1 @@
+persistence.xml