svn commit: r1363669 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/src/main.lzx WebContent/src/maindebug.lzx WebContent/swf10/main.as3.lzx WebContent/swf10/maindebug.as3.lzx build.properties build.xml

[solomax]

Author: solomax
Date: Fri Jul 20 07:13:26 2012
New Revision: 1363669

URL: http://svn.apache.org/viewvc?rev=1363669&view=rev
Log:
Duplicated maindebug*.lzx was replaced with conditional compilation

Removed:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
    incubator/openmeetings/trunk/singlewebapp/build.properties
    incubator/openmeetings/trunk/singlewebapp/build.xml

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1363669&r1=1363668&r2=1363669&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Fri Jul 
20 07:13:26 2012
@@ -19,16 +19,18 @@
   
 -->
 <canvas width="100%" height="100%" title="OpenMeetings">
-    
-<!-- 
-    If you use maindebug.lzx, main.lzx with debug=true is loaded. 
-    h.kuze 2008.3.26
-    I re-arranged it back to the old setup,
-    I see that this information is duplicated here, but I would like to 
-    distribute two versions of OpenMeetings in a binary release: 
-    the normal Client and the Client Including the OpenLaszlo-Debug-Player
-    -swagner 2008.3.28
--->
+<switch>
+       <when property="$debug">
+               <method name="doDebugInit">
+                       canvas.setAttribute('debug', true);
+               </method>
+               <debug fontsize="11" oninit="Debug.showInternalProperties = 
true" width="40%" y="50%" x="0" height="50%" />
+       </when>
+       <otherwise>
+               <method name="doDebugInit">
+               </method>
+       </otherwise>
+</switch>    
      
 <include href="incubator/lzcombobox.lzx" />
 <include href="incubator/shadowbox.lzx" />
@@ -49,7 +51,7 @@
 
 <!-- main colors: 264269 -->
 <handler name="oninit">
-    //this.setAttribute('framerate',12);
+       doDebugInit();
     var cmenu = new LzContextMenu();
     canvas.setDefaultContextMenu(cmenu);
     cmenu.hideBuiltInItems();

Modified: 
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1363669&r1=1363668&r2=1363669&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx 
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Fri 
Jul 20 07:13:26 2012
@@ -20,7 +20,7 @@
 -->
 <canvas width="100%" height="100%" title="OpenMeetings">
        
-    <switch>
+       <switch>
         <when property="$as3">
             <passthrough>
                 import flash.net.*;
@@ -28,6 +28,18 @@
             </passthrough>
         </when>
     </switch>
+       <switch>
+               <when property="$debug">
+                       <method name="doDebugInit">
+                               canvas.setAttribute('debug', true);
+                       </method>
+                       <debug fontsize="11" 
oninit="Debug.showInternalProperties = true" width="40%" y="50%" x="60%" 
height="50%" />
+               </when>
+               <otherwise>
+                       <method name="doDebugInit">
+                       </method>
+               </otherwise>
+    </switch>
     
     <include href="testVideoObject.lzx" />
 
@@ -74,7 +86,6 @@
     <view name="mainComponent" width="${canvas.width}" 
height="${canvas.height}">
         <text id="mainBaseText"> </text>
     </view>
-    <!--<text name="text" y="20" width="100%" height="100%" 
multiline="true"></text>-->
 
     <method name="getLCSID">
         //TODO: fixme
@@ -82,6 +93,7 @@
     </method>
 
     <handler name="oninit"><![CDATA[
+               doDebugInit();
     
         var tInitArgsArry = new 
Array('secureHash','invitationHash','sid','roomid','directRoomId','language','hash','cuser','tAccept','moodleRoom','becomemoderator','wwwroot','user_id','picture','scopeRoomId');
     
@@ -104,7 +116,7 @@
             }
         }
         
-        var tSWFURL = 
"main.swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+        var tSWFURL = "main" + ($debug ? "debug" : "") + 
".swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
         
         if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
         
@@ -120,4 +132,4 @@
 
     <view name="inner"></view>
     
-</canvas>
\ No newline at end of file
+</canvas>

Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1363669&r1=1363668&r2=1363669&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Fri Jul 20 
07:13:26 2012
@@ -3,6 +3,5 @@ project.status=SNAPSHOT
 ivy.jar=ivy-2.3.0-rc1.jar
 red5.server.revision=4388
 red5.client.revision=4388
-laszlo.debug=false
 laszlo.proxied=solo
 db=derby

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1363669&r1=1363668&r2=1363669&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Jul 20 07:13:26 2012
@@ -399,19 +399,20 @@
                <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="flash.debug == '${flash.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}'" />
+               <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}" />
-                       <jvmarg value="-Dlzdebug=${laszlo.debug}" />
+                       <jvmarg value="-Dlzdebug=false" />
                        <jvmarg value="-Dlzproxied=${laszlo.proxied}" />
                        <jvmarg value="-Xms512M" />
                        <jvmarg value="-Xmx512M" />
-                       <arg line="--runtime=${flash.runtime} --dir 
&quot;${out.dir.swf}&quot; --onerror warn ${flash.main.file}" />
+                       <arg line="--runtime=${flash.runtime} ${flash.debug} 
--dir &quot;${out.dir.swf}&quot; --onerror warn ${flash.main.file} -o 
${flash.out.file}" />
                </java>
        </target>
 
@@ -426,6 +427,8 @@
                        <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" />
+                       <param name="flash.out.file" 
value="networktesting.swf10.swf" />
+                       <param name="flash.debug" value="" />
                </antcall>
        </target>
 
@@ -434,6 +437,8 @@
                        <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" />
+                       <param name="flash.out.file" value="main.as3.swf10.swf" 
/>
+                       <param name="flash.debug" value="" />
                </antcall>
        </target>
 
@@ -441,7 +446,9 @@
                <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" 
/>
+                       <param name="flash.main.file" value="main.as3.lzx" />
+                       <param name="flash.out.file" 
value="maindebug.as3.swf10.swf" />
+                       <param name="flash.debug" value="--debug" />
                </antcall>
        </target>
 
@@ -450,6 +457,8 @@
                        <param name="flash.src.dir" value="${laszlo.src.dir}" />
                        <param name="flash.runtime" value="swf8" />
                        <param name="flash.main.file" value="main.lzx" />
+                       <param name="flash.out.file" value="main.swf8.swf" />
+                       <param name="flash.debug" value="" />
                </antcall>
        </target>
 
@@ -457,7 +466,9 @@
                <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" />
+                       <param name="flash.main.file" value="main.lzx" />
+                       <param name="flash.out.file" value="maindebug.swf8.swf" 
/>
+                       <param name="flash.debug" value="--debug" />
                </antcall>
        </target>