[Laszlo-checkins] r11743 - in openlaszlo/trunk: WEB-INF/lps/server/src/org/openlaszlo/servlets/responders lps/components/debugger lps/components/debugger/platform/swf8 lps/components/debugger/platform/swf9

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-11-12 17:03:22 -0800 (Wed, 12 Nov 2008)
New Revision: 11743

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSTAT.java
   openlaszlo/trunk/lps/components/debugger/debugger.lzx
   openlaszlo/trunk/lps/components/debugger/platform/swf8/eval.lzs
   openlaszlo/trunk/lps/components/debugger/platform/swf9/eval.lzs
Log:
Change 20081112-hqm-c by hqm at badtzmaru.home on 2008-11-12 18:52:18 EST
    in /Users/hqm/openlaszlo/trunk4
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: fix for debugger SOLO mode operation

New Features:

Bugs Fixed: LPP-7271

Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    
+ fix bug in ResponderSTAT.java which caused debugger probe check to think server was
not there

+ make debugger check for server unconditionally (not just in SOLO mode)

+ add handler for IO Error event on eval loads, to avoid Flash runtime error dialog

+ fix swf8 eval to set SOLO attribute on the correct object

Tests:

grab an app in swf8 and swf9, like this
 
  wget -O bar.swf "http://127.0.0.1:8080/trunk4/test/hello.lzx?lzr=swf9&debug=true&lzt=swf"

 copy to root of Tomcat, so it is not in the same path  as the LPS, and see if it falls back to SOLO mode




Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSTAT.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSTAT.java	2008-11-12 23:56:46 UTC (rev 11742)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSTAT.java	2008-11-13 01:03:22 UTC (rev 11743)
@@ -61,26 +61,17 @@
         throws IOException
     {
         ResponderCache dataResponder = (ResponderCache)getResponder("data");
-        ResponderCache mediaResponder = (ResponderCache)getResponder("media");
-
         if (dataResponder != null) {
             String durl = req.getParameter("durl");
             if (durl != null)
                 dataResponder.mURLStat.doURLCollection(durl.equals("1"));
         }
 
-        if (mediaResponder != null) {
-            String murl = req.getParameter("murl");
-            if (murl != null)
-                mediaResponder.mURLStat.doURLCollection(murl.equals("1"));
-        }
 
         String clear = req.getParameter("clear");
         if (clear != null && clear.equals("1")) {
             if (dataResponder != null)
                 dataResponder.mURLStat.clear();
-            if (mediaResponder != null)
-                mediaResponder.mURLStat.clear();
             Responder.mSTAT_allLoadCount.reset();
             Responder.mSTAT_compileLoadCount.reset();
             Responder.mSTAT_mediaLoadCount.reset();
@@ -115,8 +106,6 @@
             buf.append("<urls>");
             if (dataResponder != null)
                 buf.append(dataResponder.mURLStat.toXML());
-            if (mediaResponder != null)
-                buf.append(mediaResponder.mURLStat.toXML());
             buf.append("</urls>");
         }
         buf.append("</stat>\n");

Modified: openlaszlo/trunk/lps/components/debugger/debugger.lzx
===================================================================
--- openlaszlo/trunk/lps/components/debugger/debugger.lzx	2008-11-12 23:56:46 UTC (rev 11742)
+++ openlaszlo/trunk/lps/components/debugger/debugger.lzx	2008-11-13 01:03:22 UTC (rev 11743)
@@ -900,9 +900,8 @@
         this.scrollToEnd();
 
         // See if the LPS server is present; if not fall back to simpler eval()
-        if (canvas.proxied == false) {
-           this.evalloader.checkServerResponse();
-        }
+        this.evalloader.checkServerResponse();
+
       ]]>
   </method>
 

Modified: openlaszlo/trunk/lps/components/debugger/platform/swf8/eval.lzs
===================================================================
--- openlaszlo/trunk/lps/components/debugger/platform/swf8/eval.lzs	2008-11-12 23:56:46 UTC (rev 11742)
+++ openlaszlo/trunk/lps/components/debugger/platform/swf8/eval.lzs	2008-11-13 01:03:22 UTC (rev 11743)
@@ -32,7 +32,7 @@
       // NB: This is a callback handler, and 'this' will be bound to some LoadVars object, not to Debug
       if (src == undefined) {
         Debug.warn('Debugger cannot contact LPS server, switching to SOLO mode.');
-        Debug.setAttribute('solo_mode', true);
+        Debug.console.setAttribute('solo_mode', true);
       }
     }
 

Modified: openlaszlo/trunk/lps/components/debugger/platform/swf9/eval.lzs
===================================================================
--- openlaszlo/trunk/lps/components/debugger/platform/swf9/eval.lzs	2008-11-12 23:56:46 UTC (rev 11742)
+++ openlaszlo/trunk/lps/components/debugger/platform/swf9/eval.lzs	2008-11-13 01:03:22 UTC (rev 11743)
@@ -19,6 +19,7 @@
     public function LzDebugEvalLoader (view) {
         this.loader = new Loader();
         loader.contentLoaderInfo.addEventListener(Event.INIT, debugEvalListener);
+        loader.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR, evalServerError);
     }
 
     public function doEval(expr:String, seq:int=0) {
@@ -35,6 +36,14 @@
         e.target.loader.unload();
     }
 
+    public function evalServerError (e:Event):void {
+        e.target.loader.unload();
+        Debug.warn('Debugger cannot contact LPS server, switching to SOLO mode.');
+        if (Debug.console is LzDebuggerWindowConsoleBridge) {
+            Debug.console.window.setAttribute('solo_mode', true);
+        }
+    }
+
     private function configureProbeListeners(dispatcher:IEventDispatcher):void {
         dispatcher.addEventListener(Event.COMPLETE, checkServerResponseHandler);
         dispatcher.addEventListener(SecurityErrorEvent.SECURITY_ERROR, checkServerResponseHandler);