Return-Path: 
 <commits-return-4729-apmail-openmeetings-commits-archive=openmeetings.apache.org@openmeetings.apache.org>
X-Original-To: apmail-openmeetings-commits-archive@www.apache.org
Delivered-To: apmail-openmeetings-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6206BDF96
	for <apmail-openmeetings-commits-archive@www.apache.org>;
 Fri, 15 Feb 2013 11:18:46 +0000 (UTC)
Received: (qmail 78973 invoked by uid 500); 15 Feb 2013 11:18:45 -0000
Delivered-To: apmail-openmeetings-commits-archive@openmeetings.apache.org
Received: (qmail 78921 invoked by uid 500); 15 Feb 2013 11:18:44 -0000
Mailing-List: contact commits-help@openmeetings.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openmeetings.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openmeetings.apache.org>
List-Post: <mailto:commits@openmeetings.apache.org>
List-Id: <commits.openmeetings.apache.org>
Reply-To: dev@openmeetings.apache.org
Delivered-To: mailing list commits@openmeetings.apache.org
Received: (qmail 78890 invoked by uid 99); 15 Feb 2013 11:18:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2013 11:18:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Feb 2013 11:18:40 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5978123888CD;
	Fri, 15 Feb 2013 11:18:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1446514 - in /openmeetings/trunk/singlewebapp: build.xml
 ivy.xml ivysettings.xsd
Date: Fri, 15 Feb 2013 11:18:21 -0000
To: commits@openmeetings.apache.org
From: solomax@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130215111821.5978123888CD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: solomax
Date: Fri Feb 15 11:18:20 2013
New Revision: 1446514

URL: http://svn.apache.org/r1446514
Log:
[OPENMEETINGS-529] AEC: build system is modified to be able to build swf11

Modified:
    openmeetings/trunk/singlewebapp/build.xml
    openmeetings/trunk/singlewebapp/ivy.xml
    openmeetings/trunk/singlewebapp/ivysettings.xsd

Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1446514&r1=1446513&r2=1446514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri Feb 15 11:18:20 2013
@@ -54,6 +54,7 @@
 	<property name="dist.persistence.dir" value="${dist.webapps.dir}/WEB-INF/classes/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" />
@@ -79,6 +80,10 @@
 			fxgutils.jar" />
 	</path>
 
+	<path id="laszlo46.lib">
+		<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
+	</path>
+	
 	<!-- compile classpath -->
 	<path id="check.classpath">
 		<fileset dir="${red5.server.lib}" includes="*.jar" />
@@ -113,6 +118,7 @@
 		<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>
 
@@ -465,8 +471,8 @@
 	<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="classpathref == '${flash.classpath.ref}'" />
+		<echo message="laszlo.home == '${flash.lps.home}'" />
 		<echo message="flash.debug == '${flash.debug}'" />
 		<echo message="laszlo.proxied == '${laszlo.proxied}'" />
 		<echo message="flash.runtime == '${flash.runtime}'" />
@@ -474,8 +480,8 @@
 		<echo message="flash.main.file == '${flash.main.file}'" />
 		<echo message="flash.out.file == '${flash.out.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}" />
+		<java classname="org.openlaszlo.compiler.Main" fork="true" newenvironment="true" failonerror="true" dir="${flash.src.dir}" classpathref="${flash.classpath.ref}">
+			<jvmarg value="-DLPS_HOME=${flash.lps.home}" />
 			<jvmarg value="-Dlzdebug=false" />
 			<jvmarg value="-Dlzproxied=${laszlo.proxied}" />
 			<jvmarg value="-Xms512M" />
@@ -486,7 +492,9 @@
 
 	<target name="compile.laszlo.networktesting" depends="compile.laszlo.networktesting.debug">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf10" />
 			<param name="flash.main.file" value="networktesting.lzx" />
 			<param name="flash.out.file" value="networktesting.swf10.swf" />
@@ -494,9 +502,11 @@
 		</antcall>
 	</target>
 
-	<target name="compile.laszlo.networktesting.debug">
+	<target name="compile.laszlo.networktesting.debug" depends="-retrieve-openlaszlo">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.as3.src.dir}/networkTesting" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf10" />
 			<param name="flash.main.file" value="networktesting.lzx" />
 			<param name="flash.out.file" value="networktestingdebug.swf10.swf" />
@@ -506,7 +516,9 @@
 
 	<target name="compile.laszlo.main.as3" depends="compile.laszlo.main.debug.as3">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf10" />
 			<param name="flash.main.file" value="main.as3.lzx" />
 			<param name="flash.out.file" value="main.as3.swf10.swf" />
@@ -516,7 +528,9 @@
 
 	<target name="compile.laszlo.main.debug.as3" depends="-retrieve-openlaszlo">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.as3.src.dir}" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf10" />
 			<param name="flash.main.file" value="main.as3.lzx" />
 			<param name="flash.out.file" value="maindebug.as3.swf10.swf" />
@@ -526,7 +540,9 @@
 
 	<target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.src.dir}" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf8" />
 			<param name="flash.main.file" value="main.lzx" />
 			<param name="flash.out.file" value="main.swf8.swf" />
@@ -536,7 +552,9 @@
 
 	<target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo">
 		<antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
+			<param name="flash.classpath.ref" value="laszlo.lib" />
 			<param name="flash.src.dir" value="${laszlo.src.dir}" />
+			<param name="flash.lps.home" value="${laszlo.home}" />
 			<param name="flash.runtime" value="swf8" />
 			<param name="flash.main.file" value="main.lzx" />
 			<param name="flash.out.file" value="maindebug.swf8.swf" />
@@ -850,6 +868,7 @@
 		<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" />
 		<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.installed" />
 		<available classpathref="check.classpath" classname="org.red5.client.net.rtmp.RTMPClient" property="red5.client.installed" />
 	</target>
@@ -1051,6 +1070,12 @@
 			<param name="ivy.lib.location" value="${laszlo.home}" />
 		</antcall>
 	</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>
+	</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">
@@ -1118,6 +1143,7 @@
 		<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="-process-db" inheritAll="true" inheritRefs="true" />
 	</target>

Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1446514&r1=1446513&r2=1446514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Fri Feb 15 11:18:20 2013
@@ -30,6 +30,7 @@
 		<conf name="dtd" description="Dtd-generator dependencies" />
 		<conf name="svntask" description="Svn task dependencies" />
 		<conf name="openlaszlo" description="Openlaszlo dependencies" />
+		<conf name="openlaszlo46" description="Openlaszlo with Flex 4.6 dependencies" />
 		<conf name="mysql" description="MySQL JDBC driver" />
 		<conf name="tomcat7" description="Libraries necessary for patching Red5 to use Tomcat7" />
 	</configurations>
@@ -317,6 +318,13 @@
 		</dependency>
 		<!--  END OF openlaszlo -->
 		
+		<!--  START OF openlaszlo46 -->
+		<dependency org="openlaszlo" name="openlaszlo" rev="4.9.5" conf="openlaszlo46->*" transitive="false">
+			<artifact name="openlaszlo" type="tgz"/>
+			<include type="tgz" />
+		</dependency>
+		<!--  END OF openlaszlo46 -->
+		
 		<!--  START OF Command Line Admin -->
 		<dependency org="commons-cli" name="commons-cli" rev="1.2" conf="cmdadmin->*" transitive="false">
 			<include type="jar" />

Modified: openmeetings/trunk/singlewebapp/ivysettings.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivysettings.xsd?rev=1446514&r1=1446513&r2=1446514&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivysettings.xsd (original)
+++ openmeetings/trunk/singlewebapp/ivysettings.xsd Fri Feb 15 11:18:20 2013
@@ -24,7 +24,7 @@
       <xs:sequence>
         <xs:element ref="settings"/>
         <xs:element ref="resolvers"/>
-        <xs:element ref="triggers"/>
+        <xs:element ref="triggers" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>