incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmue...@apache.org
Subject [9/27] git commit: fixes for issue #10, drive-by removal of scoop
Date Tue, 03 Jan 2012 18:39:31 GMT
fixes for issue #10, drive-by removal of scoop


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/commit/18477de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/tree/18477de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/diff/18477de2

Branch: refs/heads/master
Commit: 18477de2fad0ae162007cf1b90e3a7aa28a63540
Parents: 743b108
Author: Patrick Mueller <pmuellr@yahoo.com>
Authored: Thu Oct 20 08:37:33 2011 -0400
Committer: Patrick Mueller <pmuellr@yahoo.com>
Committed: Thu Oct 20 08:37:33 2011 -0400

----------------------------------------------------------------------
 weinre.build/build-continuous.sh                   |    2 +-
 weinre.build/build.xml                             |   21 +-
 weinre.build/get-vendor.xml                        |   11 -
 weinre.build/scripts/build-client-html.py          |    1 -
 weinre.build/scripts/build-target-scripts.py       |   69 ++--
 weinre.build/vendor.properties                     |    7 -
 weinre.doc/License.body.html                       |   31 +-
 weinre.web/demo/weinre-demo-pieces.html            |   83 ---
 weinre.web/index.html                              |    3 +-
 weinre.web/index.js                                |   16 +-
 weinre.web/interfaces/interfaces.html              |    1 -
 .../modules-scoop/weinre/client/Client.scoop       |  161 ------
 .../weinre/client/ConnectorList.scoop              |  157 ------
 .../modules-scoop/weinre/client/DOMTemplates.scoop |   74 ---
 .../weinre/client/ExtensionRegistryImpl.scoop      |   35 --
 .../weinre/client/InspectorBackendImpl.scoop       |   73 ---
 .../weinre/client/InspectorFrontendHostImpl.scoop  |   96 ----
 .../modules-scoop/weinre/client/RemotePanel.scoop  |  255 ----------
 .../weinre/client/WeinreClientEventsImpl.scoop     |  105 ----
 .../client/WeinreExtraTargetEventsImpl.scoop       |   48 --
 .../modules-scoop/weinre/common/Binding.scoop      |   20 -
 .../modules-scoop/weinre/common/Callback.scoop     |   69 ---
 .../weinre/common/EventListeners.scoop             |   56 --
 weinre.web/modules-scoop/weinre/common/Ex.scoop    |   30 --
 .../modules-scoop/weinre/common/IDGenerator.scoop  |   53 --
 .../modules-scoop/weinre/common/IDLTools.scoop     |  123 -----
 .../weinre/common/MessageDispatcher.scoop          |  204 --------
 .../modules-scoop/weinre/common/Native.scoop       |   43 --
 .../modules-scoop/weinre/common/StackTrace.scoop   |   55 --
 .../modules-scoop/weinre/common/WebSocketXhr.scoop |  211 --------
 .../modules-scoop/weinre/common/Weinre.scoop       |   80 ---
 .../modules-scoop/weinre/target/CSSStore.scoop     |  391 ---------------
 .../weinre/target/CheckForProblems.scoop           |   28 -
 .../modules-scoop/weinre/target/Console.scoop      |  169 -------
 .../weinre/target/ElementHighlighter.scoop         |  156 ------
 .../weinre/target/InjectedScriptHostImpl.scoop     |   52 --
 .../modules-scoop/weinre/target/NodeStore.scoop    |  235 ---------
 .../modules-scoop/weinre/target/SqlStepper.scoop   |   92 ----
 .../modules-scoop/weinre/target/Target.scoop       |  212 --------
 .../modules-scoop/weinre/target/Timeline.scoop     |  326 ------------
 .../target/WeinreExtraClientCommandsImpl.scoop     |   24 -
 .../weinre/target/WeinreTargetEventsImpl.scoop     |   39 --
 .../modules-scoop/weinre/target/WiCSSImpl.scoop    |  156 ------
 .../weinre/target/WiConsoleImpl.scoop              |   36 --
 .../modules-scoop/weinre/target/WiDOMImpl.scoop    |  188 -------
 .../weinre/target/WiDOMStorageImpl.scoop           |  170 -------
 .../weinre/target/WiDatabaseImpl.scoop             |  171 -------
 .../weinre/target/WiInspectorImpl.scoop            |   65 ---
 .../weinre/target/WiRuntimeImpl.scoop              |   55 --
 weinre.web/modules/weinre/common/Weinre.coffee     |    9 -
 weinre.web/modules/weinre/target/CSSStore.coffee   |    6 -
 .../weinre/target/ElementHighlighter.coffee        |  126 ++---
 .../weinre/target/ElementHighlighterDivs2.coffee   |   92 ++++
 weinre.web/modules/weinre/target/Target.coffee     |    5 +-
 weinre.web/modules/weinre/target/Timeline.coffee   |   18 +-
 weinre.web/modules/weinre/target/WiCSSImpl.coffee  |    4 -
 .../weinre/unused/ElementHighlighterCanvas.coffee  |   80 +++
 .../weinre/unused/ElementHighlighterDivs4.coffee   |   60 +++
 weinre.web/tests/element-highlighter.html          |   79 +++
 weinre.web/tests/index.html                        |   10 +
 weinre.web/versions.js                             |    3 +-
 61 files changed, 453 insertions(+), 4797 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/build-continuous.sh
----------------------------------------------------------------------
diff --git a/weinre.build/build-continuous.sh b/weinre.build/build-continuous.sh
index 7092b1a..8d451a5 100755
--- a/weinre.build/build-continuous.sh
+++ b/weinre.build/build-continuous.sh
@@ -18,7 +18,7 @@ cd $EWS/weinre.build
 # run-when-changed: https://gist.github.com/240922
 #-------------------------------------------------------------
 
-run-when-changed "ant build-dev" \
+run-when-changed "ant build" \
   ../weinre.application \
   ../weinre.build/*.xml \
   ../weinre.build/*.properties \

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/build.xml
----------------------------------------------------------------------
diff --git a/weinre.build/build.xml b/weinre.build/build.xml
index 290139a..68bfcc5 100644
--- a/weinre.build/build.xml
+++ b/weinre.build/build.xml
@@ -151,16 +151,6 @@
         <delete dir="${TMP}" />
         <mkdir  dir="${TMP}" />
 
-<!--
-        <echo message="compiling scoop modules"/>
-        <exec executable="python" failonerror="true" failifexecutionfails="true">
-            <arg  file="vendor/scooj/scoopc.py"/>
-            <arg value="-o"/>
-            <arg  file="${TMP}/modules"/>
-            <arg  file="../${PROJECT_WEB}/modules"/>
-        </exec>
--->
-
         <echo message="compiling CoffeeScript modules"/>
         <mkdir  dir="${TMP}/modules/weinre/client" />
         <mkdir  dir="${TMP}/modules/weinre/common" />
@@ -184,13 +174,6 @@
             <arg value="node_modules/.bin/coffee --compile --bare --output ${TMP}/modules/weinre/target ../${PROJECT_WEB}/modules/weinre/target/*.coffee"/>
         </exec>
 
-
-<!--
-        <copy todir="${TMP}/modules">
-            <fileset file="${VENDOR}/scooj/scooj.js"/>
-        </copy>
--->
-
         <echo message="transportd-izing modules"/>
         <exec executable="python" failonerror="true" failifexecutionfails="true">
             <arg  file="vendor/modjewel/module2transportd.py"/>
@@ -248,19 +231,20 @@
                 <filter token="WEBKIT_VERSION"             value="${WEBKIT_VERSION}"/>
                 <filter token="SWT_VERSION"                value="${SWT_VERSION}"/>
                 <filter token="JETTY_VERSION"              value="${JETTY_VERSION}"/>
-                <filter token="SCOOJ_VERSION"              value="${SCOOJ_VERSION}"/>
                 <filter token="MODJEWEL_VERSION"           value="${MODJEWEL_VERSION}"/>
                 <filter token="JAVAX_SERVLET_VERSION"      value="${JAVAX_SERVLET_VERSION}"/>
                 <filter token="JAVAX_SERVLET_VERSION_IMPL" value="${JAVAX_SERVLET_VERSION_IMPL}"/>
             </filterset>
         </copy>
 
+<!--
         <echo message="building add-css-properties.js"/>
         <exec executable="python" failonerror="true" failifexecutionfails="true">
             <arg  file="scripts/build-css-properties.py"/>
             <arg value="vendor/webkit/WebCore/CSSPropertyNames.in"/>
             <arg value="${WEB}/add-css-properties.js"/>
         </exec>
+-->
 
     </target>
 
@@ -362,7 +346,6 @@
 
         <exec executable="python" failonerror="true" failifexecutionfails="true">
             <arg file="scripts/build-target-scripts.py"/>
-            <arg file="../${PROJECT_WEB}/demo/weinre-demo-pieces.html"/>
             <arg file="${WEB}"/>
             <arg file="${WEB}/target"/>
         </exec>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/get-vendor.xml
----------------------------------------------------------------------
diff --git a/weinre.build/get-vendor.xml b/weinre.build/get-vendor.xml
index 1b72c85..259dfaf 100644
--- a/weinre.build/get-vendor.xml
+++ b/weinre.build/get-vendor.xml
@@ -25,7 +25,6 @@
         <antcall target="get-cli"/>
         <antcall target="get-json4j"/>
         <antcall target="get-jetty"/>
-        <antcall target="get-scooj"/>
         <antcall target="get-coffeescript"/>
         <antcall target="get-modjewel"/>
         <antcall target="get-web-inspector"/>
@@ -101,16 +100,6 @@
 
     <!-- ============================================================ -->
 
-    <target name="get-scooj">
-        <delete dir="${VENDOR}/scooj"/>
-        <mkdir  dir="${VENDOR}/scooj"/>
-
-        <get src="${SCOOJ_URL_PREFIX}/scooj.js"  dest="${VENDOR}/scooj/scooj.js"  verbose="false"/>
-        <get src="${SCOOJ_URL_PREFIX}/scoopc.py" dest="${VENDOR}/scooj/scoopc.py" verbose="false"/>
-    </target>
-
-    <!-- ============================================================ -->
-
     <target name="get-coffeescript">
         <echo message="coffee-script@${COFFEESCRIPT_VERSION}"/>
         <exec executable="npm">

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/scripts/build-client-html.py
----------------------------------------------------------------------
diff --git a/weinre.build/scripts/build-client-html.py b/weinre.build/scripts/build-client-html.py
index 5186010..a06fc05 100644
--- a/weinre.build/scripts/build-client-html.py
+++ b/weinre.build/scripts/build-client-html.py
@@ -54,7 +54,6 @@ def createIndexFile(iFileName, oFileName, moduleDir):
                 '<script type="text/javascript" src="weinre/hacks.js"></script>\n',
                 '<script type="text/javascript" src="../modjewel-require.js"></script>\n',
                 '<script type="text/javascript">require("modjewel").warnOnRecursiveRequire(true)</script>\n',
-                '<script type="text/javascript" src="../scooj.transportd.js"></script>\n',
             ])
 
             for module in getModules(moduleDir):

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/scripts/build-target-scripts.py
----------------------------------------------------------------------
diff --git a/weinre.build/scripts/build-target-scripts.py b/weinre.build/scripts/build-target-scripts.py
index 367450f..64d1923 100644
--- a/weinre.build/scripts/build-target-scripts.py
+++ b/weinre.build/scripts/build-target-scripts.py
@@ -17,38 +17,41 @@ import optparse
 def main():
 
     #----------------------------------------------------------------
-    if len(sys.argv) < 4:
-        error("expecting parameters piecesHtmlFile srcDir outputDir")
+    if len(sys.argv) < 3:
+        error("expecting parameters srcDir outputDir")
 
-    iFileName   = sys.argv[1]
-    srcDirName  = sys.argv[2]
-    oDirName    = sys.argv[3]
+    srcDirName  = sys.argv[1]
+    oDirName    = sys.argv[2]
 
-    if not os.path.exists(iFileName):   error("input file not found: '" + iFileName + "'")
     if not os.path.exists(srcDirName):  error("source directory not found: '" + srcDirName + "'")
     if not os.path.isdir(srcDirName):   error("source directory not a directory: '" + srcDirName + "'")
     if not os.path.exists(oDirName):    error("output directory not found: '" + oDirName + "'")
     if not os.path.isdir(oDirName):     error("output directory not a directory: '" + oDirName + "'")
 
     #----------------------------------------------------------------
-    with open(iFileName, "r") as iFile:
-        lines = iFile.readlines()
-
-    #----------------------------------------------------------------
     scripts     = []
     scriptNames = {}
     scriptSrc   = {}
     scriptMin   = {}
-    scriptSrcPattern = re.compile(r'.*?<script\s+src\s*=\s*"/(.*?)"\s*>\s*</script>.*')
 
-    for line in lines:
-        match = scriptSrcPattern.match(line)
-        if not match: continue
+    includedFiles = []
+    includedFiles.append("modjewel-require.js")
+
+    entries = os.listdir(os.path.join(srcDirName, "weinre/common"))
+    for entry in entries:
+        includedFiles.append("weinre/common/%s" % entry)
+
+    entries = os.listdir(os.path.join(srcDirName, "weinre/target"))
+    for entry in entries:
+        includedFiles.append("weinre/target/%s" % entry)
 
-        baseScriptFile = match.group(1)
+    includedFiles.append("interfaces/all-json-idls-min.js")
+
+    for includedFile in includedFiles:
+        baseScriptFile = includedFile
         scriptFile = os.path.join(srcDirName, baseScriptFile)
-        if scriptFile == "weinre-demo.js": continue
-        if not os.path.exists(scriptFile):   error("script file not found: '" + scriptFile + "'")
+        if not os.path.exists(scriptFile):
+            error("script file not found: '" + scriptFile + "'")
 
         scripts.append(scriptFile)
         scriptNames[scriptFile] = baseScriptFile
@@ -62,27 +65,35 @@ def main():
 
     #----------------------------------------------------------------
     oFileName = os.path.join(oDirName, "target-script.js")
-    writeMergedFile(oFileName, scripts, scriptNames, scriptSrc)
+    writeMergedFile(oFileName, scripts, scriptNames, scriptSrc, True)
 
     #----------------------------------------------------------------
     oFileName = os.path.join(oDirName, "target-script-min.js")
-    writeMergedFile(oFileName, scripts, scriptNames, scriptMin)
+    writeMergedFile(oFileName, scripts, scriptNames, scriptMin, False)
 
 #--------------------------------------------------------------------
-def writeMergedFile(oFileName, scripts, scriptNames, srcs):
-
+def writeMergedFile(oFileName, scripts, scriptNames, srcs, useEval):
     lines = []
     lines.append(";(function(){")
 
     for script in scripts:
-        lines.append("//==================================================")
-        lines.append("// file: " + scriptNames[script])
-        lines.append("//==================================================")
-        lines.append(srcs[script])
-        lines.append(";")
-        lines.append("")
-
-    lines.append("// require('weinre/common/Weinre').showNotImplemented()")
+
+        src     = srcs[script]
+        srcName = scriptNames[script]
+        if not useEval:
+            lines.append("// %s" % srcName)
+            lines.append(src)
+            lines.append(";")
+        else:
+            src = "%s\n//@ sourceURL=%s" % (src, srcName)
+            lines.append(";eval(%s)" % json.dumps(src))
+
+        if srcName == "modjewel-require.js":
+            lines.append("require('modjewel').warnOnRecursiveRequire(true);")
+            if not useEval:
+                lines.append("")
+
+    lines.append("// require('weinre/common/Weinre').showNotImplemented();")
     lines.append("require('weinre/target/Target').main()")
     lines.append("})();")
     targetScript = "\n".join(lines)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.build/vendor.properties
----------------------------------------------------------------------
diff --git a/weinre.build/vendor.properties b/weinre.build/vendor.properties
index bdb8f72..386e4c8 100644
--- a/weinre.build/vendor.properties
+++ b/weinre.build/vendor.properties
@@ -70,13 +70,6 @@ SWT_VERSION:       ${SWT_VERSION_MAJOR}-201006080911
 SWT_URL_PREFIX:    http://archive.eclipse.org/eclipse/downloads/drops/R-${SWT_VERSION}
 
 #-----------------------------------------------------------
-# location of scooj
-#-----------------------------------------------------------
-
-SCOOJ_VERSION:    8f3534ba5a1b2fb8ea82a24eb0acedfcc6aca7b4
-SCOOJ_URL_PREFIX: https://github.com/pmuellr/scooj/raw/${SCOOJ_VERSION}
-
-#-----------------------------------------------------------
 # location of CoffeeScript
 #-----------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.doc/License.body.html
----------------------------------------------------------------------
diff --git a/weinre.doc/License.body.html b/weinre.doc/License.body.html
index 2884bba..975309d 100644
--- a/weinre.doc/License.body.html
+++ b/weinre.doc/License.body.html
@@ -1,42 +1,39 @@
 <!--
  * weinre is available under *either* the terms of the modified BSD license *or* the
  * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
+ *
  * Copyright (c) 2010, 2011 IBM Corporation
 -->
 
 <p>weinre contains code from the following other projects:
 
-<ul class="spaced"> 
+<ul class="spaced">
 
-<li>Files from <a href="http://webkit.org/">WebKit</a>.  
+<li>Files from <a href="http://webkit.org/">WebKit</a>.
 Web Inspector code.  Although WebKit in general contains both BSD and
 LGPL code, only BSD licensed code is used by weinre.
 
-<li>Files from <a href="http://www.eclipse.org/jetty/">Eclipse Jetty</a>.  
+<li>Files from <a href="http://www.eclipse.org/jetty/">Eclipse Jetty</a>.
 HTTP server.  License: ASLv2 and EPLv1
 
-<li>Files from <a href="http://www.eclipse.org/swt/">Eclipse SWT</a>.  
+<li>Files from <a href="http://www.eclipse.org/swt/">Eclipse SWT</a>.
 Platform UI toolkit.  License: EPLv1
 
-<li>Files from <a href="https://github.com/pmuellr/scooj">scooj</a>.  
-JavaScript OO wrapper.  License: MIT
-
-<li>Files from <a href="https://github.com/pmuellr/modjewel">modjewel</a>.  
+<li>Files from <a href="https://github.com/pmuellr/modjewel">modjewel</a>.
 CommonJS runtime for the browser.  License: MIT
 
-<li>Files from <a href="http://commons.apache.org/cli/">Apache Commons CLI</a>.  
+<li>Files from <a href="http://commons.apache.org/cli/">Apache Commons CLI</a>.
 Command-line parser.  License: ASLv2
 
-<li>Files from <a href="http://incubator.apache.org/wink/">Apache Wink</a>.  
+<li>Files from <a href="http://incubator.apache.org/wink/">Apache Wink</a>.
 JSON codecs.  License: ASLv2
 
 </ul>
 
-<p>The source for weinre itself is available under either 
-the terms of the modified BSD license 
-or 
-the MIT License. 
-See 
-<a href="http://opensource.org/licenses/alphabetical">http://opensource.org/licenses/alphabetical</a> 
+<p>The source for weinre itself is available under either
+the terms of the modified BSD license
+or
+the MIT License.
+See
+<a href="http://opensource.org/licenses/alphabetical">http://opensource.org/licenses/alphabetical</a>
 for full text.

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/demo/weinre-demo-pieces.html
----------------------------------------------------------------------
diff --git a/weinre.web/demo/weinre-demo-pieces.html b/weinre.web/demo/weinre-demo-pieces.html
deleted file mode 100644
index 496790c..0000000
--- a/weinre.web/demo/weinre-demo-pieces.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2010, 2011 IBM Corporation
--->
-
-<html>
-<head>
-<meta name="viewport" content="user-scalable=no, width=device-width, height=device-height">
-<title>weinre demo</title>
-<link rel="stylesheet" href="weinre-demo.css">
-<script>window.WeinreServerURL = location.protocol + "//" + location.hostname + ":" + location.port</script>
-<script>try {window.WeinreServerId = location.hash.split("#")[1]} catch(e) {window.WeinreServerId = "anonymous"}</script>
-<script src="/modjewel-require.js"></script>
-<script type="text/javascript">require("modjewel").warnOnRecursiveRequire(true)</script>
-<script src="/weinre/common/Ex.transportd.js"></script>
-<script src="/weinre/common/StackTrace.transportd.js"></script>
-<script src="/weinre/common/Weinre.transportd.js"></script>
-<script src="/weinre/common/IDLTools.transportd.js"></script>
-<script src="/weinre/common/MessageDispatcher.transportd.js"></script>
-<script src="/weinre/common/WebSocketXhr.transportd.js"></script>
-<script src="/weinre/common/Binding.transportd.js"></script>
-<script src="/weinre/common/Callback.transportd.js"></script>
-<script src="/weinre/common/EventListeners.transportd.js"></script>
-<script src="/weinre/common/IDGenerator.transportd.js"></script>
-<script src="/weinre/common/MethodNamer.transportd.js"></script>
-<script src="/weinre/common/HookLib.transportd.js"></script>
-<script src="/weinre/target/Console.transportd.js"></script>
-<script src="/add-css-properties.js"></script>
-<script src="/weinre/target/CheckForProblems.transportd.js"></script>
-<script src="/weinre/target/WiConsoleImpl.transportd.js"></script>
-<script src="/weinre/target/WiCSSImpl.transportd.js"></script>
-<script src="/weinre/target/WiDatabaseImpl.transportd.js"></script>
-<script src="/weinre/target/WiDOMImpl.transportd.js"></script>
-<script src="/weinre/target/WiDOMStorageImpl.transportd.js"></script>
-<script src="/weinre/target/WiInspectorImpl.transportd.js"></script>
-<script src="/weinre/target/WiRuntimeImpl.transportd.js"></script>
-<script src="/weinre/target/WeinreTargetEventsImpl.transportd.js"></script>
-<script src="/weinre/target/NodeStore.transportd.js"></script>
-<script src="/weinre/target/CSSStore.transportd.js"></script>
-<script src="/weinre/target/InjectedScriptHostImpl.transportd.js"></script>
-<script src="/weinre/target/Target.transportd.js"></script>
-<script src="/weinre/target/ElementHighlighter.transportd.js"></script>
-<script src="/weinre/target/InjectedScript.js"></script>
-<script src="/weinre/target/Timeline.transportd.js"></script>
-<script src="/weinre/target/SqlStepper.transportd.js"></script>
-<script src="/weinre/target/WeinreExtraClientCommandsImpl.transportd.js"></script>
-<script src="/weinre/target/HookSites.transportd.js"></script>
-<script src="/weinre/target/ExceptionalCallbacks.transportd.js"></script>
-<script src="/interfaces/all-json-idls-min.js"></script>
-<script src="weinre-demo.js"></script>
-
-<script type="text/javascript">
-    require("weinre/common/Weinre").showNotImplemented()
-    require('weinre/target/Target').main()
-</script>
-</head>
-
-<body onload="onLoad()">
-<input id="button-start-stuff" type="button" value="start stuff">
-
-<h1>this is a green h1</h1>
-<h1 class="blue">this is a blue h1</h1>
-<h1 style="color:red">this is a red h1</h1>
-<p>Some text, <i>some italic text</i>, and <b>some bold text</b>.
-
-<hr>
-<p>test exceptions in callbacks:
-<div style="margin-left:1em">
-    <input id="button-error-DOM-event"    type="button" value="DOM addEventHandler">
-<br><input id="button-error-window-event" type="button" value="window addEventHandler">
-<br><input id="button-error-XHR-event"    type="button" value="XHR addEventHandler">
-<br><input id="button-error-setTimeout"   type="button" value="setTimeout()">
-<br><input id="button-error-setInterval"  type="button" value="setInterval()">
-</div>
-
-<hr>
-<p><input id="button-clear-output" type="button" value="clear output">
-<div id="output"></div>
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/index.html
----------------------------------------------------------------------
diff --git a/weinre.web/index.html b/weinre.web/index.html
index 05f3e53..778358a 100644
--- a/weinre.web/index.html
+++ b/weinre.web/index.html
@@ -47,7 +47,7 @@ pre, .indent {
 <table>
 <tr><td>debug client user interface: <td> <span id="url-client-ui">???</span>
 <tr><td>documentation:               <td> <span id="url-target-documentation">???</span>
-<tr><td>target demo:                 <td> <span id="url-target-demo-min">???</span> <br><i>(<span id="url-target-demo-pieces"></span>)</i>
+<tr><td>target demo:                 <td> <span id="url-target-demo-min">???</span> <br><span id="url-target-demo"></span>
 </table>
 
 <h2>Target Script</h2>
@@ -96,7 +96,6 @@ web page you are viewing.
 <tr><td>apache cli:     <td> <span id="version-cli">???</span>
 <tr><td>apache json4j:  <td> <span id="version-json4j">???</span>
 <tr><td>json2:          <td> <span id="version-json2">???</span>
-<tr><td>scooj:          <td> <span id="version-scooj">???</span>
 <tr><td>modjewel:       <td> <span id="version-modjewel">???</span>
 </table>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/index.js
----------------------------------------------------------------------
diff --git a/weinre.web/index.js b/weinre.web/index.js
index 3948f97..7e248a6 100644
--- a/weinre.web/index.js
+++ b/weinre.web/index.js
@@ -1,7 +1,7 @@
 /*
  * weinre is available under *either* the terms of the modified BSD license *or* the
  * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
+ *
  * Copyright (c) 2010, 2011 IBM Corporation
  */
 
@@ -20,7 +20,6 @@ replaceURL("url-client-ui",              buildHttpURL("client/#" + weinre_id))
 replaceURL("url-interfaces",             buildHttpURL("interfaces/interfaces.html"))
 replaceURL("url-target-demo",            buildHttpURL("demo/weinre-demo.html#" + weinre_id))
 replaceURL("url-target-demo-min",        buildHttpURL("demo/weinre-demo-min.html#" + weinre_id))
-replaceURL("url-target-demo-pieces",     buildHttpURL("demo/weinre-demo-pieces.html#" + weinre_id), "pieces version")
 replaceURL("url-target-script",          buildHttpURL("target/target-script-min.js#" + weinre_id))
 replaceURL("url-target-bookmarklet",     getTargetBookmarklet(), "weinre target debug")
 replaceURL("url-target-documentation",   buildHttpURL("doc/"))
@@ -36,7 +35,6 @@ replaceText("version-cli",       Weinre.Versions.cli)
 replaceText("version-json4j",    Weinre.Versions.json4j)
 replaceText("version-json2",     Weinre.Versions.json2)
 replaceText("version-swt",       Weinre.Versions.swt)
-replaceText("version-scooj",     Weinre.Versions.scooj)
 replaceText("version-modjewel",  Weinre.Versions.modjewel)
 
 replaceText("target-bookmarklet-src-pre",       getTargetBookmarklet())
@@ -48,19 +46,19 @@ replaceText("url-target-script-raw",  buildHttpURL("target/target-script-min.js#
 function buildHttpURL(uri) {
     var port     = weinre_port
     var pathname = weinre_pathname
-    
+
     if (pathname == "/index.html") pathname = "/"
-        
+
     if (weinre_protocol == "file:") {
         return uri
     }
-    
+
     else if (weinre_protocol == "http:") {
         if (port != "") port = ":" + port
-        
+
         return weinre_protocol + "//" + weinre_host + port + pathname + uri
     }
-    
+
     else if (protocol == "https:") {
         if (port != "") port = ":" + port
 
@@ -98,6 +96,6 @@ function replaceText(id, text) {
 //      alert("error: can't find element with id '" + id + "'")
         return
     }
-    
+
     element.innerHTML = text
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/interfaces/interfaces.html
----------------------------------------------------------------------
diff --git a/weinre.web/interfaces/interfaces.html b/weinre.web/interfaces/interfaces.html
index 3f34487..107df67 100644
--- a/weinre.web/interfaces/interfaces.html
+++ b/weinre.web/interfaces/interfaces.html
@@ -14,7 +14,6 @@
         <link rel="stylesheet" href="interfaces.css">
         <script src="/modjewel-require.js"></script>
         <script type="text/javascript">require("modjewel").warnOnRecursiveRequire(true)</script>
-        <script src="/scooj.transportd.js"></script>
         <script src="/weinre/common/Weinre.transportd.js"></script>
         <script src="/weinre/common/Ex.transportd.js"></script>
         <script src="/weinre/common/StackTrace.transportd.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/Client.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/Client.scoop b/weinre.web/modules-scoop/weinre/client/Client.scoop
deleted file mode 100644
index 73c499a..0000000
--- a/weinre.web/modules-scoop/weinre/client/Client.scoop
+++ /dev/null
@@ -1,161 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Native
-
-requireClass ../common/IDLTools
-requireClass ../common/Callback
-requireClass ../common/Weinre
-requireClass ../common/MessageDispatcher
-requireClass ../common/Binding
-requireClass ../common/IDGenerator
-
-requireClass ./InspectorBackendImpl
-requireClass ./InspectorFrontendHostImpl
-requireClass ./WeinreClientEventsImpl
-requireClass ./WeinreExtraTargetEventsImpl
-requireClass ./RemotePanel
-
-//-----------------------------------------------------------------------------
-class Client
-
-//-----------------------------------------------------------------------------
-init
-    var AutoConnect = true
-    
-    Weinre.showNotImplemented()
-
-//-----------------------------------------------------------------------------
-method initialize
-
-    // validate InspectorFrontendHost against IDL
-    // IDLTools.validateAgainstIDL(InspectorFrontendHostImpl, 'InspectorFrontendHost')
-
-    // add a load handler for the window
-    window.addEventListener("load", Binding(this, "onLoaded"), false)
-
-    // create the socket
-    var messageDispatcher = new MessageDispatcher("../ws/client", this._getId())
-    Weinre.messageDispatcher = messageDispatcher
-
-    // finish setting up InspectorBackend
-    InspectorBackendImpl.setupProxies()
-
-    // create the client commands proxy
-    Weinre.WeinreClientCommands = messageDispatcher.createProxy("WeinreClientCommands")
-    Weinre.WeinreExtraClientCommands = messageDispatcher.createProxy("WeinreExtraClientCommands")
-
-    messageDispatcher.registerInterface("WeinreExtraTargetEvents", new WeinreExtraTargetEventsImpl(), false)
-    
-    // register WebInspector interface
-    messageDispatcher.registerInterface("WebInspector", WebInspector, false)
-    
-    // hack
-    WebInspector.mainResource = {}
-    WebInspector.mainResource.url = location.href
-
-//-----------------------------------------------------------------------------
-method _getId
-    var hash = location.href.split("#")[1]
-    if (hash) return hash
-    return "anonymous"
-
-//-----------------------------------------------------------------------------
-method uiAvailable
-    return WebInspector.panels && WebInspector.panels.remote
-    
-//-----------------------------------------------------------------------------
-method autoConnect(value)
-    if (arguments.length >= 1) {
-        AutoConnect = !!value
-    }
-
-    return AutoConnect
-
-//-----------------------------------------------------------------------------
-method _installRemotePanel
-    WebInspector.panels.remote = new RemotePanel();
-    
-    var panel   = WebInspector.panels.remote;
-    
-    var toolbar = document.getElementById("toolbar")
-    WebInspector.addPanelToolbarIcon(toolbar, panel, toolbar.childNodes[1])
-    WebInspector.panelOrder.unshift(WebInspector.panelOrder.pop())
-    
-    WebInspector.currentPanel = panel
-    
-    var toolButtonsToHide = ["scripts"]
-    toolButtonsToHide.forEach(function(toolButtonToHide){
-        if (!WebInspector.panels[toolButtonToHide]) return
-        if (!WebInspector.panels[toolButtonToHide].toolbarItem) return
-        WebInspector.panels[toolButtonToHide].toolbarItem.style.display = "none"
-    })
-    
-    var button = document.getElementById("dock-status-bar-item")
-    if (button) button.style.display = "none"
-
-//-----------------------------------------------------------------------------
-method onLoaded
-
-    Weinre.WeinreClientCommands.registerClient(Binding(this, this.cb_registerClient))
-
-    this._installRemotePanel()
-
-    var messageDispatcher = Weinre.messageDispatcher
-    
-//  Weinre.Socket.verbose(true)
-    
-    messageDispatcher.registerInterface("WeinreClientEvents",    new WeinreClientEventsImpl(this), false)
-    messageDispatcher.registerInterface("InspectorFrontendHost", InspectorFrontendHost, false)
-
-//-----------------------------------------------------------------------------
-method cb_registerClient(clientDescription)
-    Weinre.clientDescription = clientDescription
-    
-    if (this.uiAvailable()) {
-        WebInspector.panels.remote.setCurrentClient(clientDescription.channel)
-        WebInspector.panels.remote.afterInitialConnection()
-    }
-    
-    Weinre.messageDispatcher.getWebSocket().addEventListener("close", Binding(this, this.cb_webSocketClosed))
-
-//-----------------------------------------------------------------------------
-method cb_webSocketClosed
-    
-    // use a delay, otherwise reloading will cause this stuff to flash
-    // before page is actually reloaded
-    Native.setTimeout(function() {
-        WebInspector.panels.remote.connectionClosed()
-        WebInspector.currentPanel = WebInspector.panels.remote 
-    }, 1000)
-
-//-----------------------------------------------------------------------------
-function installWebInspectorAPIsource
-
-    if ("webInspector" in window) return
-    
-    var extensionAPI = window.parent.InspectorFrontendHost.getExtensionAPI()
-    extensionAPI = extensionAPI.replace("location.hostname + location.port", "location.hostname + ':' + location.port")
-    
-    // parms are: InjectedScriptHost, inspectedWindow, injectedScriptId
-    // InjectedScriptHost is not directly referenced
-    // inspectedWindow is not directly referenced
-    // injectedScriptId is used to scope object references, appears that
-    //     each extension should have a unique value for this
-    
-    var id = IDGenerator.next()
-    console.log("installing webInspector with injectedScriptId: " + id)
-    extensionAPI += "(null,null," + id + ")"
-    return extensionAPI
-
-//-----------------------------------------------------------------------------
-static method main
-    Weinre.client = new Client()
-    Weinre.client.initialize()
-
-    window.installWebInspectorAPIsource = installWebInspectorAPIsource
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/ConnectorList.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/ConnectorList.scoop b/weinre.web/modules-scoop/weinre/client/ConnectorList.scoop
deleted file mode 100644
index b2ad6a5..0000000
--- a/weinre.web/modules-scoop/weinre/client/ConnectorList.scoop
+++ /dev/null
@@ -1,157 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./DOMTemplates as dt
-
-//-----------------------------------------------------------------------------
-class ConnectorList(title)
-    this.connectors   = {}
-    this.noneItem     = dt.LI("none")
-    this.ulConnectors = dt.UL(this.noneItem)
-    this.div          = dt.DIV(dt.H1(title), this.ulConnectors)
-    
-    this.noneItem.addStyleClass("weinre-connector-item")
-
-//-----------------------------------------------------------------------------
-method getElement
-    return this.div
-
-//-----------------------------------------------------------------------------
-method add(connector)
-    if (this.connectors[connector.channel]) return
-    
-    this.connectors[connector.channel] = connector
-    
-    var li = this.getListItem(connector)
-
-    if (this.noneItem.style.display != "none") {
-        this.noneItem.style.display = "none"
-    }
-    
-    li.addStyleClass("weinre-fadeable")
-    
-    var insertionPoint = this.getConnectorInsertionPoint(connector)
-    if (!insertionPoint) {
-        this.ulConnectors.appendChild(li)
-    }
-    else {
-        this.ulConnectors.insertBefore(li, insertionPoint)
-    }
-
-//-----------------------------------------------------------------------------
-method get(channel)
-    return this.connectors[channel]
-
-//-----------------------------------------------------------------------------
-method getNewestConnectorChannel(ignoring)
-    var newest = 0
-    
-    for (var connectorChannel in this.connectors) {
-        if (connectorChannel == ignoring) continue
-        if (connectorChannel > newest) newest = connectorChannel
-    }
-    
-    if (newest == 0) return null
-    return newest
-
-//-----------------------------------------------------------------------------
-method getConnectorInsertionPoint(connector)
-    for (var i=0; i<this.ulConnectors.childNodes.length; i++) {
-        var childNode = this.ulConnectors.childNodes[i]
-        if (null == childNode.connectorChannel) continue
-        if (childNode.connectorChannel < connector.channel) {
-            return childNode
-        }
-    }
-    
-    return null
-
-//-----------------------------------------------------------------------------
-method remove(channel, fast)
-    var self = this
-    var element = this.getConnectorElement(channel)
-    if (!element) return
-
-    var connector = this.connectors[channel]
-    if (connector) {
-        connector.closed = true
-    }
-    
-    delete this.connectors[channel]
-    
-    if (fast) {
-        this._remove(element)
-    }
-
-    else {
-        this.setState(element, "closed")
-        element.addStyleClass("weinre-fade")
-
-        window.setTimeout(function() {
-            self._remove(element)
-        }, 5000)
-    }
-
-//-----------------------------------------------------------------------------
-method _remove(element)
-    this.ulConnectors.removeChild(element)
-    if (this.getConnectors().length == 0) {
-        this.noneItem.style.display = "list-item"
-    }
-
-//-----------------------------------------------------------------------------
-method removeAll()
-    this.getConnectors().forEach(function(connector) {
-        this.remove(connector.channel, true)
-    }, this)
-
-//-----------------------------------------------------------------------------
-method getConnectors()
-    var result = []
-    for (var channel in this.connectors) {
-        if (!this.connectors.hasOwnProperty(channel)) continue
-        
-        result.push(this.connectors[channel])
-    }
-    
-    return result
-
-//-----------------------------------------------------------------------------
-method getConnectorElement(channel)
-    var connector = this.connectors[channel]
-    if (!connector) return null
-    
-    return connector.element
-
-//-----------------------------------------------------------------------------
-method setCurrent(channel)
-    this.getConnectors().forEach(function(connector) {
-        connector.element.removeStyleClass("current")
-    })
-    
-    var element = this.getConnectorElement(channel)
-    if (null == element) return
-    
-    element.addStyleClass("current")
-
-//-----------------------------------------------------------------------------
-method setState(channel, state)
-    if (typeof channel == "string") {
-        var element = this.getConnectorElement(channel)
-    }
-    else {
-        element = channel
-    }
-    
-    if (!element) return
-    
-    element.removeStyleClass("error")
-    element.removeStyleClass("closed")
-    element.removeStyleClass("connected")
-    element.removeStyleClass("not-connected")
-    element.addStyleClass(state)

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/DOMTemplates.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/DOMTemplates.scoop b/weinre.web/modules-scoop/weinre/client/DOMTemplates.scoop
deleted file mode 100644
index 566c1b4..0000000
--- a/weinre.web/modules-scoop/weinre/client/DOMTemplates.scoop
+++ /dev/null
@@ -1,74 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-// creates functions of the form H1, H2, etc, as static methods that create a new element
-// of the specified name.  The function can take a variable number of arguments,
-// which are either child elements, strings, attributes, or properties of the element.
-//
-// - arguments which are nodes become children
-// - arguments which are strings become text node children
-// - arguments which are objects have the object's properties added as:
-//    - attributes if the property name does not begin with "$"
-//    - properties if the property name begins with "$" 
-//      (the resulting property name doesn't include "$")
-//-----------------------------------------------------------------------------
-
-requireClass ../common/Ex
-
-//-----------------------------------------------------------------------------
-class DOMTemplates
-
-//-----------------------------------------------------------------------------
-function getElementFunction(elementName)
-    return function() {
-        var element = document.createElement(elementName)
-        
-        var args = [].slice.call(arguments)
-        args.forEach(function(argument) {
-            if      (argument.nodeType)           addToElement_Node(   element, argument )
-            else if (typeof argument == "string") addToElement_String( element, argument )
-            else if (typeof argument == "object") addToElement_Object( element, argument )
-            else throw new Ex(arguments, "invalid value passed to  DOMTemplates." + elementName + "(): " + argument)
-        })
-        
-        return element
-    }
-
-//-----------------------------------------------------------------------------
-function addToElement_String(element, aString)
-    addToElement_Node(element, document.createTextNode(aString))
-
-//-----------------------------------------------------------------------------
-function addToElement_Node(element, anElement)
-    element.appendChild(anElement)
-
-//-----------------------------------------------------------------------------
-function addToElement_Object(element, anObject)
-    for (var key in anObject) {
-        if (!anObject.hasOwnProperty(key)) continue
-        
-        var val = anObject[key]
-        
-        if (key.substr(0,1) == "$") {
-            var actualKey = key.substr(1)
-            element[actualKey] = val
-        }
-        else {
-            element.setAttribute(key, val)
-        }
-    }
-
-//-----------------------------------------------------------------------------
-init 
-    var elementNames = "H1 H2 H3 H4 H5 H6 UL OL DL LI DT DD SPAN DIV A B I TT P HR BR PRE IMG CANVAS TABLE TR TD FORM INPUT BUTTON SELECT OPTGROUP OPTION TEXTAREA"
-    elementNames = elementNames.split(" ")
-    
-    elementNames.forEach(function(elementName) {
-        DOMTemplates[elementName] = getElementFunction(elementName)
-    })

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/ExtensionRegistryImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/ExtensionRegistryImpl.scoop b/weinre.web/modules-scoop/weinre/client/ExtensionRegistryImpl.scoop
deleted file mode 100644
index bee7c42..0000000
--- a/weinre.web/modules-scoop/weinre/client/ExtensionRegistryImpl.scoop
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-requireClass ../common/Ex
-requireClass ../common/Binding
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class ExtensionRegistryImpl
-
-//-----------------------------------------------------------------------------
-init
-    var extensions = []
-
-//-----------------------------------------------------------------------------
-method getExtensionsAsync
-    if (extensions.length) return
-    
-    Weinre.WeinreClientCommands.getExtensions(Binding(this, this._cb_getExtensions))
-        
-//-----------------------------------------------------------------------------
-method _cb_getExtensions(extensionsResult)
-    extensions = extensionsResult
-    this._installExtensions()
-    
-//-----------------------------------------------------------------------------
-method _installExtensions    
-    WebInspector.addExtensions(extensions)
-    
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/InspectorBackendImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/InspectorBackendImpl.scoop b/weinre.web/modules-scoop/weinre/client/InspectorBackendImpl.scoop
deleted file mode 100644
index a39ee09..0000000
--- a/weinre.web/modules-scoop/weinre/client/InspectorBackendImpl.scoop
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Ex
-requireClass ../common/IDLTools
-requireClass ../common/MessageDispatcher
-requireClass ../common/Weinre
-
-//-----------------------------------------------------------------------------
-class InspectorBackendImpl
-    this.registeredDomainDispatchers = {}
-    MessageDispatcher.setInspectorBackend(this)
-
-//-----------------------------------------------------------------------------
-static method setupProxies
-
-    var intfNames = [
-        "ApplicationCache",
-        "BrowserDebugger",
-        "CSS",
-        "Console",
-        "DOM",
-        "DOMStorage",
-        "Database",
-        "Debugger",
-        "InjectedScript",
-        "Inspector",
-        "Network",
-        "Profiler",
-        "Runtime"
-    ]
-
-    intfNames.forEach(function(intfName) {
-        var proxy = Weinre.messageDispatcher.createProxy(intfName)
-        if (window[intfName]) {
-            throw new Ex(arguments, "backend interface '" + intfName + "' already created")
-        }
-        
-        var intf = IDLTools.getIDL(intfName)
-        if (!intf) {
-            throw new Ex(arguments, "interface not registered: '" + intfName + "'")
-        }
-
-        window[intfName] = {}
-        
-        intf.methods.forEach(function(method) {
-            var proxyMethod = InspectorBackendImpl.getProxyMethod(proxy, method)
-            InspectorBackendImpl.prototype[method.name] = proxyMethod
-            window[intfName][method.name] = proxyMethod
-        })
-    })
-    
-
-//-----------------------------------------------------------------------------
-static method getProxyMethod(proxy, method)
-    return function() {
-        return proxy[method.name].apply(proxy, arguments)
-    }
-
-//-----------------------------------------------------------------------------
-method registerDomainDispatcher(name, intf)
-    this.registeredDomainDispatchers[name] = intf
-    
-//-----------------------------------------------------------------------------
-method getRegisteredDomainDispatcher(name)
-    if (!this.registeredDomainDispatchers.hasOwnProperty(name)) return null
-    
-    return this.registeredDomainDispatchers[name]

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/InspectorFrontendHostImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/InspectorFrontendHostImpl.scoop b/weinre.web/modules-scoop/weinre/client/InspectorFrontendHostImpl.scoop
deleted file mode 100644
index cbdb6c1..0000000
--- a/weinre.web/modules-scoop/weinre/client/InspectorFrontendHostImpl.scoop
+++ /dev/null
@@ -1,96 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Weinre
-requireClass ../common/IDLTools
-
-//-----------------------------------------------------------------------------
-class InspectorFrontendHostImpl
-        
-    this._getPlatformAndPort()
-
-//-----------------------------------------------------------------------------
-init
-    var _extensionAPI
-    
-//-----------------------------------------------------------------------------
-method loaded
-
-//-----------------------------------------------------------------------------
-method localizedStringsURL
-    return "nls/English.lproj/localizedStrings.js";
-
-//-----------------------------------------------------------------------------
-method hiddenPanels
-//    return "audits,profiles,resources,network"
-    return "audits,profiles,network"
-//    return "audits,profiles,resources,scripts,timeline,network"
-
-//-----------------------------------------------------------------------------
-method platform
-    return "weinre"
-
-//-----------------------------------------------------------------------------
-method port
-    return "weinre"
-
-//-----------------------------------------------------------------------------
-method sendMessageToBackend(message)
-    var object = JSON.parse(message)
-    if (object[0] == "setInjectedScriptSource") {
-        object[1] = "<long script elided>"
-    }
-    Weinre.logInfo(arguments.callee.signature + "(" + JSON.stringify(object,null,4) + ")")
-
-//-----------------------------------------------------------------------------
-method setExtensionAPI(extensionAPI)
-    _extensionAPI = extensionAPI
-
-//-----------------------------------------------------------------------------
-method getExtensionAPI
-    return _extensionAPI
-
-//-----------------------------------------------------------------------------
-method inspectedURLChanged
-
-//-----------------------------------------------------------------------------
-method _getPlatformAndPort
-    this._platform       = "weinre"
-    this._platformFlavor = "weinre"
-    this._port           = "weinre"
-        
-    if (true) return
-    
-    // get values from user agent
-    var uas = navigator.userAgent
-    if      (uas.match(/mac os x/i))  this._platform = "mac"
-    else if (uas.match(/macintosh/i)) this._platform = "mac"
-    else if (uas.match(/linux/i))     this._platform = "linux"
-    else if (uas.match(/windows/i))   this._platform = "windows"
-        
-    // get values from hash value
-    var url = window.location.href
-    
-    var splits = url.split("#",2)
-    if (splits.length > 1) {
-        var properties = splits[1]
-        properties = properties.split("&")
-        
-        properties.forEach(function(property) {
-            var pieces = property.split("=")
-            if (pieces.length > 1) {
-                var key = pieces[0]
-                var val = pieces[1]
-                
-                if      (key == "platform")       this._platform       = val
-                else if (key == "platformFlavor") this._platformFlavor = val
-                else if (key == "port")           this._port           = val
-            }
-        })
-        
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/RemotePanel.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/RemotePanel.scoop b/weinre.web/modules-scoop/weinre/client/RemotePanel.scoop
deleted file mode 100644
index fe7c5b8..0000000
--- a/weinre.web/modules-scoop/weinre/client/RemotePanel.scoop
+++ /dev/null
@@ -1,255 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Binding
-requireClass ../common/Weinre
-
-requireClass ./ConnectorList
-requireClass ./DOMTemplates as dt
-
-//-----------------------------------------------------------------------------
-class RemotePanel < WebInspector.Panel
-    super("remote")
-
-    this.initialize()
-
-//-----------------------------------------------------------------------------
-method initialize()
-    
-    // main div
-    var div = dt.DIV()
-    div.style.position = "absolute"
-    div.style.top      = "1em"
-    div.style.right    = "1em"
-    div.style.left     = "1em"
-    div.style.bottom   = "1em"
-    div.style.overflow = "auto"
-
-    // create icon
-    var icon = dt.IMG({
-        src: "../images/weinre-icon-128x128.png"
-    })
-    
-    icon.style.float = "right"
-    div.appendChild(icon)
-        
-    // create target and client lists
-    this.targetList = new TargetList()
-    this.clientList = new ClientList()
-    
-    div.appendChild(this.targetList.getElement())
-    div.appendChild(this.clientList.getElement())
-    
-    // create server properties
-    this.serverProperties = dt.DIV({
-        $className: "weinreServerProperties"
-    })
-        
-    div.appendChild(dt.H1("Server Properties"))
-    div.appendChild(this.serverProperties)
-    
-    // add main div to page
-    this.element.appendChild(div)
-    this.reset();
-
-//-----------------------------------------------------------------------------
-method addClient(client) 
-    this.clientList.add(client)
-    
-method addTarget(target) 
-    this.targetList.add(target)
-
-method getTarget(channel)
-    return this.targetList.get(channel)
-    
-method removeClient(channel) 
-    this.clientList.remove(channel)
-    
-method removeTarget(channel) 
-    this.targetList.remove(channel)
-
-method setCurrentClient(channel) 
-    this.clientList.setCurrent(channel)
-    
-method setCurrentTarget(channel) 
-    this.targetList.setCurrent(channel)
-
-method setClientState(channel, state) 
-    this.clientList.setState(channel, state)
-    
-method setTargetState(channel, state) 
-    this.targetList.setState(channel, state)
-
-//-----------------------------------------------------------------------------
-method getNewestTargetChannel(ignoring)
-    return this.targetList.getNewestConnectorChannel(ignoring)
-
-//-----------------------------------------------------------------------------
-method afterInitialConnection
-    this.clientList.afterInitialConnection()
-
-//-----------------------------------------------------------------------------
-method reset
-    this.clientList.removeAll()
-    this.targetList.removeAll()
-    
-    Weinre.WeinreClientCommands.getTargets(Binding(this, "cb_getTargets"))
-    Weinre.WeinreClientCommands.getClients(Binding(this, "cb_getClients"))
-
-//-----------------------------------------------------------------------------
-method connectionClosed
-    this.clientList.removeAll()
-    this.targetList.removeAll()
-
-//-----------------------------------------------------------------------------
-method cb_getTargets(targets)
-    targets.forEach(function(target) {
-        this.addTarget(target)
-    }, this)
-   
-    if (!Weinre.client.autoConnect()) return
-    
-    var newestTargetChannel = this.getNewestTargetChannel()
-    if (!newestTargetChannel) return
-    if (!Weinre.messageDispatcher) return
-
-    Weinre.WeinreClientCommands.connectTarget(Weinre.messageDispatcher.channel, newestTargetChannel)
-    
-    
-//-----------------------------------------------------------------------------
-method cb_getClients(clients)
-    clients.forEach(function(client) {
-        this.addClient(client)
-    }, this)
-
-//-----------------------------------------------------------------------------
-getter toolbarItemClass
-    return "remote"
-
-//-----------------------------------------------------------------------------
-getter toolbarItemLabel
-    return "Remote"
-
-//-----------------------------------------------------------------------------
-getter statusBarItems
-    return []
-
-//-----------------------------------------------------------------------------
-getter defaultFocusedElement
-    return this.contentElement
-
-//-----------------------------------------------------------------------------
-method show
-    super()
-
-//-----------------------------------------------------------------------------
-method hide()
-    super()
-
-//-----------------------------------------------------------------------------
-method setServerProperties(properties)
-    var table = "<table>"
-    var keys = []
-    for (var key in properties) {
-        keys.push(key)
-    }
-    
-    keys = keys.sort()
-    keys.forEach(function(key) {
-        val = properties[key]
-        if (typeof val == "string") {
-            val = val.escapeHTML()
-        }
-        else {
-            var finalVal = ""
-            val.forEach(function(aVal){
-                finalVal += "<li>" + aVal.escapeHTML()
-            })
-            val = "<ul>" + finalVal + "</ul>"
-        }
-        table += "<tr class='weinre-normal-text-size'><td valign='top'>" + key.escapeHTML() + ": <td>" + val
-    })
-    table += "</table>"
-    this.serverProperties.innerHTML = table
-
-//=============================================================================
-//=============================================================================
-    
-//-----------------------------------------------------------------------------
-class TargetList < ConnectorList
-    super("Targets")
-
-//-----------------------------------------------------------------------------
-method getListItem(target)
-    var self = this
-    var text = target.hostName + " [channel: " + target.channel + " id: " + target.id + "]" + " - " + target.url 
-
-    var item = dt.LI(
-        { $connectorChannel: target.channel },
-        text
-    )
-    
-    item.addStyleClass("weinre-connector-item")
-    item.addStyleClass("target")
-    
-    item.addEventListener("click", function(e) {self.connectToTarget(target.channel, e)}, false)
-
-    target.element = item
-
-    return item
-
-//-----------------------------------------------------------------------------
-method connectToTarget(targetChannel, event)
-    if (event) {
-        event.preventDefault()
-        event.stopPropagation()
-    }
-    
-    var target = this.connectors[targetChannel]
-    if (!target) return false
-    if (target.closed) return false
-    
-    Weinre.WeinreClientCommands.connectTarget(Weinre.messageDispatcher.channel, targetChannel)
-    
-    return false
-
-//=============================================================================
-//=============================================================================
-
-//-----------------------------------------------------------------------------
-class ClientList < ConnectorList
-    super("Clients")
-
-    this.noneItem.innerHTML = "Waiting for connection..."
-
-//-----------------------------------------------------------------------------
-method afterInitialConnection()
-    this.noneItem.innerHTML = "Connection lost, reload this page to reconnect."
-    this.noneItem.addStyleClass("error")
-
-//-----------------------------------------------------------------------------
-method getListItem(client)
-    var text = client.hostName + " [channel: " + client.channel + " id: " + client.id  + "]"
-    
-    var item = dt.LI(
-        { $connectorChannel: client.channel },
-        text
-    )
-
-    item.addStyleClass("weinre-connector-item")
-    item.addStyleClass("client")
-    
-    if (Weinre.messageDispatcher) {
-        if (client.channel == Weinre.messageDispatcher.channel) {
-            item.addStyleClass("current")
-        }
-    }
-
-    client.element = item
-    
-    return item

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/WeinreClientEventsImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/WeinreClientEventsImpl.scoop b/weinre.web/modules-scoop/weinre/client/WeinreClientEventsImpl.scoop
deleted file mode 100644
index 7fd6a65..0000000
--- a/weinre.web/modules-scoop/weinre/client/WeinreClientEventsImpl.scoop
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ../common/Callback
-requireClass ../common/Weinre
-
-requireClass ./WeinreExtraTargetEventsImpl
-
-//-----------------------------------------------------------------------------
-class WeinreClientEventsImpl(client)
-    this.client = client
-
-//-----------------------------------------------------------------------------
-init
-    var titleNotConnected    = "weinre: target not connected"
-    var titleConnectedPrefix = "weinre: "
-    
-    document.title = titleNotConnected
-     
-//-----------------------------------------------------------------------------
-method clientRegistered(clientDescription)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.addClient(clientDescription)
-    }
-
-//-----------------------------------------------------------------------------
-method targetRegistered(targetDescription)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.addTarget(targetDescription)
-    }
-    
-    if (!Weinre.client.autoConnect()) return
-    if (!Weinre.messageDispatcher) return
-    
-    Weinre.WeinreClientCommands.connectTarget(Weinre.messageDispatcher.channel, targetDescription.channel)
-
-//-----------------------------------------------------------------------------
-method clientUnregistered(/*int*/ clientChannel)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.removeClient(clientChannel)
-    }
-
-//-----------------------------------------------------------------------------
-method targetUnregistered(/*int*/ targetChannel)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.removeTarget(targetChannel)
-    }
-
-//-----------------------------------------------------------------------------
-method connectionCreated(/*int*/ clientChannel, /*int*/ targetChannel)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.setClientState(clientChannel, "connected") 
-        WebInspector.panels.remote.setTargetState(targetChannel, "connected")
-    }
-    
-    if (clientChannel != Weinre.messageDispatcher.channel) return
-
-    WebInspector.panels.elements.reset()
-    WebInspector.panels.timeline._clearPanel()
-    WebInspector.panels.resources.reset()
-    
-    var target = WebInspector.panels.remote.getTarget(targetChannel)
-    document.title = titleConnectedPrefix + target.url
-    
-    WebInspector.inspectedURLChanged(target.url)
-
-    Weinre.WeinreExtraClientCommands.getDatabases(function(databaseRecords) {
-        WeinreExtraTargetEventsImpl.addDatabaseRecords(databaseRecords)
-    })
-    
-//-----------------------------------------------------------------------------
-method connectionDestroyed(/*int*/ clientChannel, /*int*/ targetChannel)
-
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.setClientState(clientChannel, "not-connected") 
-        WebInspector.panels.remote.setTargetState(targetChannel, "not-connected")
-    }
-    
-    if (clientChannel != Weinre.messageDispatcher.channel) return
-
-    document.title = titleNotConnected
-    
-    if (!Weinre.client.autoConnect()) return
-    if (!this.client.uiAvailable()) return
-    
-    var nextTargetChannel = WebInspector.panels.remote.getNewestTargetChannel(targetChannel)
-    if (!nextTargetChannel) return
-    
-    Weinre.WeinreClientCommands.connectTarget(Weinre.messageDispatcher.channel, nextTargetChannel)
-    Weinre.logInfo("autoconnecting to " + nextTargetChannel)
-
-//-----------------------------------------------------------------------------
-method sendCallback(/*int*/ callbackId, /*any*/ result)
-    Callback.invoke(callbackId, result)
-
-//-----------------------------------------------------------------------------
-method serverProperties(/*any*/ properties)
-    if (this.client.uiAvailable()) {
-        WebInspector.panels.remote.setServerProperties(properties)
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/client/WeinreExtraTargetEventsImpl.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/client/WeinreExtraTargetEventsImpl.scoop b/weinre.web/modules-scoop/weinre/client/WeinreExtraTargetEventsImpl.scoop
deleted file mode 100644
index 76abaad..0000000
--- a/weinre.web/modules-scoop/weinre/client/WeinreExtraTargetEventsImpl.scoop
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-class WeinreExtraTargetEventsImpl
-
-//-----------------------------------------------------------------------------
-method databaseOpened(databaseRecord)
-    WeinreExtraTargetEventsImpl.addDatabaseRecords([databaseRecord])
-    
-//-----------------------------------------------------------------------------
-static method addDatabaseRecords(databaseRecords)
-    // databaseRecord.id
-    // databaseRecord.domain
-    // databaseRecord.name
-    // databaseRecord.version
-    
-    if (!WebInspector.panels) return
-    if (!WebInspector.panels.resources) return
-    if (!WebInspector.panels.resources._databases) return
-    
-    var existingDbs = WebInspector.panels.resources._databases
-    var existingDbNames = {}
-    
-    for (var i=0; i<existingDbs.length; i++) {
-        existingDbNames[existingDbs[i].name] = existingDbs[i]
-    }
-    
-    for (var i=0; i<databaseRecords.length; i++) {
-        if (existingDbNames[databaseRecords[i].name]) continue
-        
-        var databaseRecord = databaseRecords[i]
-        var database = new WebInspector.Database(
-            databaseRecord.id,
-            databaseRecord.domain,
-            databaseRecord.name,
-            databaseRecord.version
-            )
-        
-        WebInspector.panels.resources.addDatabase(database)
-    }
-    
-    

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/Binding.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/Binding.scoop b/weinre.web/modules-scoop/weinre/common/Binding.scoop
deleted file mode 100644
index 9db156b..0000000
--- a/weinre.web/modules-scoop/weinre/common/Binding.scoop
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-
-//-----------------------------------------------------------------------------
-class Binding(receiver, method)
-
-    if (receiver == null) throw new Ex(arguments, "receiver argument for Binding constructor was null")
-    if (typeof(method) == "string") method = receiver[method]
-    if (typeof(method) != "function") throw new Ex(arguments, "method argument didn't specify a function")
-
-    return function() {
-        return method.apply(receiver, [].slice.call(arguments))
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/Callback.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/Callback.scoop b/weinre.web/modules-scoop/weinre/common/Callback.scoop
deleted file mode 100644
index b2edba1..0000000
--- a/weinre.web/modules-scoop/weinre/common/Callback.scoop
+++ /dev/null
@@ -1,69 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-
-//-----------------------------------------------------------------------------
-class Callback
-    throw new Ex(arguments, "this class is not intended to be instantiated")
-
-//-----------------------------------------------------------------------------
-init 
-    var CallbackTable    = {}
-    var CallbackIndex    = 1
-    var ConnectorChannel = "???"
-
-//-----------------------------------------------------------------------------
-static method setConnectorChannel(connectorChannel)
-    ConnectorChannel = ""  + connectorChannel
-
-//-----------------------------------------------------------------------------
-static method register(callback)
-    if (typeof callback == "function") callback = [null, callback]
-    if (typeof callback.slice != "function") throw new Ex(arguments, "callback must be an array or function")
-    
-    var receiver = callback[0]
-    var func     = callback[1]
-    var data     = callback.slice(2)
-    
-    if (typeof func == "string") func = receiver.func
-    if (typeof func != "function") throw new Ex(arguments, "callback function was null or not found")
-
-    var index = ConnectorChannel + "::" + CallbackIndex
-    
-    CallbackIndex++
-    if (CallbackIndex >= 65536 * 65536) CallbackIndex = 1
-    
-    CallbackTable[index] = [receiver, func, data]
-    
-    return index
-
-//-----------------------------------------------------------------------------
-static method deregister(index)
-    delete CallbackTable[index]
-
-//-----------------------------------------------------------------------------
-static method invoke(index, args)
-    var callback = CallbackTable[index]
-    if (!callback) throw new Ex(arguments, "callback " + index + " not registered or already invoked")
-    
-    var receiver = callback[0]
-    var func     = callback[1]
-    var args     = callback[2].concat(args)
-    
-    try {
-        func.apply(receiver,args)
-    }
-    catch (e) {
-        var funcName = func.name
-        if (!funcName) funcName = "<unnamed>"
-        require("./Weinre").getClass().logError(arguments.callee.signature + " exception invoking callback: " + funcName + "(" + args.join(",") + "): " + e)
-    }
-    finally {
-        Callback.deregister(index)
-    }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/EventListeners.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/EventListeners.scoop b/weinre.web/modules-scoop/weinre/common/EventListeners.scoop
deleted file mode 100644
index 0c9d987..0000000
--- a/weinre.web/modules-scoop/weinre/common/EventListeners.scoop
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-requireClass ./Weinre
-
-//-----------------------------------------------------------------------------
-class EventListeners
-    this._listeners = []
-
-//-----------------------------------------------------------------------------
-method add(listener, useCapture)
-    this._listeners.push([listener, useCapture])
-
-//-----------------------------------------------------------------------------
-method remove(listener, useCapture)
-    for (var i=0; i<this._listeners.length; i++) {
-        var listener = this._listeners[i]
-        if (listener[0] != listener) continue;
-        if (listener[1] != useCapture) continue;
-        
-        this._listeners.splice(i,1)
-        return
-    }
-
-//-----------------------------------------------------------------------------
-method fire(event)
-    this._listeners.slice().forEach(function(listener) {
-        var listener = listener[0]
-        
-        if (typeof listener == "function") {
-            try {
-                listener.call(null, event)
-            }
-            catch(e) {
-                Weinre.logError(arguments.callee.signature + " invocation exception: " + e)
-            }
-            return
-        }
-        
-        if (typeof listener.handleEvent != "function") {
-            throw new Ex(arguments, "listener does not implement the handleEvent() method")
-        }
-        
-        try {
-            listener.handleEvent.call(listener, event)
-        }
-        catch(e) {
-            Weinre.logError(arguments.callee.signature + " invocation exception: " + e)
-        }
-    })

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/Ex.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/Ex.scoop b/weinre.web/modules-scoop/weinre/common/Ex.scoop
deleted file mode 100644
index e6d0bf7..0000000
--- a/weinre.web/modules-scoop/weinre/common/Ex.scoop
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./StackTrace
-
-//-----------------------------------------------------------------------------
-class Ex(args, message)
-    if (!args || !args.callee) {
-        throw Ex(arguments, "first parameter must be an Arguments object") 
-    }
-    
-    StackTrace.dump(args)
-    
-    if (message instanceof Error) {
-        message = "threw error: " + message
-    }
-    
-    return new Error(prefix(args, message))
-    
-//-----------------------------------------------------------------------------
-function prefix(args, string)
-    if (args.callee.signature)   return args.callee.signature +   ": " + string
-    if (args.callee.displayName) return args.callee.displayName + ": " + string
-    if (args.callee.name)        return args.callee.name +        ": " + string
-    return "<anonymous>" +                                        ": " + string

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/IDGenerator.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/IDGenerator.scoop b/weinre.web/modules-scoop/weinre/common/IDGenerator.scoop
deleted file mode 100644
index 5af26cd..0000000
--- a/weinre.web/modules-scoop/weinre/common/IDGenerator.scoop
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2011 IBM Corporation
- */
-
-//-----------------------------------------------------------------------------
-class IDGenerator
-
-//-----------------------------------------------------------------------------
-init
-    var nextIdValue = 1
-    var idName      = "__weinre__id"
-
-//-----------------------------------------------------------------------------
-static method checkId(object)
-    return object[idName]
-    
-//-----------------------------------------------------------------------------
-static method getId(object, map)
-    var id = IDGenerator.checkId(object)
-    
-    if (!id) {
-        id = nextId()
-        
-        // note:
-        // attempted to use Object.defineProperty() to make
-        // the id property non-enumerable, etc, but doesn't 
-        // work in JSC (TypeError), and still shows up in
-        // Web Inspector property views anyway.
-        object[idName] = id
-    }
-    
-    if (map) {
-        if (map[id] != object) {
-            map[id] = object
-        }
-    }
-    
-    return id
-
-//-----------------------------------------------------------------------------
-static method next
-    return nextId()
-
-//-----------------------------------------------------------------------------
-function nextId
-    var result = nextIdValue
-    nextIdValue += 1
-    return result
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/IDLTools.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/IDLTools.scoop b/weinre.web/modules-scoop/weinre/common/IDLTools.scoop
deleted file mode 100644
index 9dcbe7a..0000000
--- a/weinre.web/modules-scoop/weinre/common/IDLTools.scoop
+++ /dev/null
@@ -1,123 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Ex
-requireClass ./Callback
-
-//-----------------------------------------------------------------------------
-class IDLTools
-    throw new Ex(arguments, "this class is not intended to be instantiated")
-
-//-----------------------------------------------------------------------------
-init
-    var IDLs = {}
-    IDLTools._idls = IDLs
-
-//-----------------------------------------------------------------------------
-static method addIDLs(idls)
-    idls.forEach(function(idl){
-        idl.interfaces.forEach(function(intf){
-            IDLs[intf.name] = intf
-            intf.module = idl.name
-        })
-    })
-
-//-----------------------------------------------------------------------------
-static method getIDL(name)
-    return IDLs[name]
-
-//-----------------------------------------------------------------------------
-static method getIDLsMatching(regex)
-    var results = []
-    
-    for (var intfName in IDLs) {
-        var intf = IDLs[intfName]
-        if (intfName.match(regex)) {
-            results.push(intf)
-        }
-    }
-    return results
-
-//-----------------------------------------------------------------------------
-static method validateAgainstIDL(klass, interfaceName)
-    var intf = IDLTools.getIDL(interfaceName)
-    var messagePrefix = "IDL validation for " + interfaceName + ": "
-    if (null == intf) throw new Ex(arguments, messagePrefix + "idl not found: '" + interfaceName + "'")
-    
-    var errors = []
-    // check that class implements all the methods
-    intf.methods.forEach(function(intfMethod) {
-        var classMethod  = klass.prototype[intfMethod.name]
-        var printName    = klass.name + "::" + intfMethod.name
-        
-        if (null == classMethod) {
-            errors.push(messagePrefix + "method not implemented: '" + printName + "'")
-            return
-        }
-
-        if (classMethod.length != intfMethod.parameters.length) {
-            if (classMethod.length != intfMethod.parameters.length + 1) {
-                errors.push(messagePrefix + "wrong number of parameters: '" + printName + "'")
-                return
-            }
-        }
-    })
-    
-    // check that class doesn't implement extra methods
-    for (var propertyName in klass.prototype) {
-        if (klass.prototype.hasOwnProperty(propertyName)) continue
-        if (propertyName.match(/^_.*/)) continue
-        
-        var printName = klass.name + "::" + propertyName
-        
-        if (!intf.methods[propertyName]) {
-            errors.push(messagePrefix + "method should not be implemented: '" + printName + "'")
-            continue
-        }
-    }
-    
-    if (!errors.length) return
-    
-    errors.forEach(function(error){
-        require("./Weinre").getClass().logError(error)
-    })
-
-//-----------------------------------------------------------------------------
-static method buildProxyForIDL(proxyObject, interfaceName)
-    var intf = IDLTools.getIDL(interfaceName)
-    var messagePrefix = "building proxy for IDL " + interfaceName + ": "
-    if (null == intf) throw new Ex(arguments, messagePrefix + "idl not found: '" + interfaceName + "'")
-    
-    intf.methods.forEach(function(intfMethod) {
-        proxyObject[intfMethod.name] = getProxyMethod(intf, intfMethod)
-    })
-
-//-----------------------------------------------------------------------------
-function getProxyMethod(intf, method)
-    var result = function proxyMethod() {
-        var callbackId = null
-        var args       = [].slice.call(arguments)
-        
-        if (args.length > 0) {
-            if (typeof args[args.length-1] == "function") {
-                callbackId   = Callback.register(args[args.length-1])
-                args         = args.slice(0, args.length-1)
-            }
-        }
-        
-        while (args.length < method.parameters.length) {
-            args.push(null)
-        }
-        
-        args.push(callbackId)
-
-        this.__invoke(intf.name, method.name, args)
-    }
-    
-    result.displayName = intf.name + "__" + method.name
-    return result

http://git-wip-us.apache.org/repos/asf/incubator-cordova-weinre/blob/18477de2/weinre.web/modules-scoop/weinre/common/MessageDispatcher.scoop
----------------------------------------------------------------------
diff --git a/weinre.web/modules-scoop/weinre/common/MessageDispatcher.scoop b/weinre.web/modules-scoop/weinre/common/MessageDispatcher.scoop
deleted file mode 100644
index c207e01..0000000
--- a/weinre.web/modules-scoop/weinre/common/MessageDispatcher.scoop
+++ /dev/null
@@ -1,204 +0,0 @@
-
-/*
- * weinre is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2010, 2011 IBM Corporation
- */
-
-requireClass ./Weinre
-requireClass ./WebSocketXhr
-requireClass ./IDLTools
-requireClass ./Binding
-requireClass ./Ex
-requireClass ./Callback
-
-//-----------------------------------------------------------------------------
-class MessageDispatcher(url, id)
-    if (!id) {
-        id = "anonymous"
-    }
-
-    this._url        = url
-    this._id         = id
-    
-    this.error       = null
-    this._opening    = false
-    this._opened     = false
-    this._closed     = false
-    this._interfaces = {}
-    
-    this._open()
-
-//-----------------------------------------------------------------------------
-init
-    var Verbose = false
-    var InspectorBackend
-
-//-----------------------------------------------------------------------------
-static method setInspectorBackend(inspectorBackend)
-    InspectorBackend = inspectorBackend
-    
-//-----------------------------------------------------------------------------
-static method verbose(value)
-    if (arguments.length >= 1) {
-        Verbose = !!value
-    }
-    
-    return Verbose
-
-//-----------------------------------------------------------------------------
-method _open
-    if (this._opened || this._opening) return
-    if (this._closed) throw new Ex(arguments, "socket has already been closed")
-    
-    this._opening = true 
-    this._socket = new WebSocketXhr(this._url, this._id)
-    this._socket.addEventListener("open",    Binding(this, "_handleOpen"))
-    this._socket.addEventListener("error",   Binding(this, "_handleError"))
-    this._socket.addEventListener("message", Binding(this, "_handleMessage"))
-    this._socket.addEventListener("close",   Binding(this, "_handleClose"))
-
-//-----------------------------------------------------------------------------
-method close
-    if (this._closed) return
-    
-    this._opened = false
-    this._closed = true
-    
-    this._socket.close()
-
-//-----------------------------------------------------------------------------
-method send(data)
-    this._socket.send(data)
-
-//-----------------------------------------------------------------------------
-method getWebSocket
-    return this._socket
-
-//-----------------------------------------------------------------------------
-method registerInterface(intfName, intf, validate)
-    if (validate) IDLTools.validateAgainstIDL(intf.constructor, intfName)
-    
-    if (this._interfaces[intfName]) throw new Ex(arguments, "interface " + intfName + " has already been registered")
-    
-    this._interfaces[intfName] = intf
-
-//-----------------------------------------------------------------------------
-method createProxy(intfName)
-    var proxy = {}
-    
-    IDLTools.buildProxyForIDL(proxy, intfName)
-
-    var self = this
-    proxy.__invoke = function __invoke(intfName, methodName, args) {
-        self._sendMethodInvocation(intfName, methodName, args)
-    }
-    
-    return proxy
-
-//-----------------------------------------------------------------------------
-method _sendMethodInvocation(intfName, methodName, args)
-    if (typeof intfName   != "string") throw new Ex(arguments, "expecting intf parameter to be a string")
-    if (typeof methodName != "string") throw new Ex(arguments, "expecting method parameter to be a string")
-    
-    var data = {
-            "interface": intfName,
-            "method":    methodName,
-            "args":      args
-    }
-    
-    data = JSON.stringify(data)
-    
-    this._socket.send(data)
-    
-    if (Verbose) {
-        Weinre.logDebug(this.constructor.name + "[" + this._url + "]: send " + intfName + "." + methodName + "(" + JSON.stringify(args) + ")")
-    }
-
-//-----------------------------------------------------------------------------
-method getState
-    if (this._opening) return "opening"
-    if (this._opened)  return "opened"
-    if (this._closed)  return "closed"
-    return "unknown"
-
-//-----------------------------------------------------------------------------
-method isOpen
-    return this._opened == true
-
-//-----------------------------------------------------------------------------
-method _handleOpen(event)
-    this._opening = false
-    this._opened  = true
-    this.channel  = event.channel
-    
-    Callback.setConnectorChannel(this.channel)
-    
-    if (Verbose) {
-        Weinre.logDebug(this.constructor.name + "[" + this._url + "]: opened")
-    }
-
-//-----------------------------------------------------------------------------
-method _handleError(message)
-    this.error = message
-    this.close()
-
-    if (Verbose) {
-        Weinre.logDebug(this.constructor.name + "[" + this._url + "]: error: " + message)
-    }
-
-//-----------------------------------------------------------------------------
-method _handleMessage(message)
-    var data
-    
-    try {
-        data = JSON.parse(message.data)
-    }
-    catch (e) {
-        throw new Ex(arguments, "invalid JSON data received: " + e + ": '" + message.data + "'")
-    }
-
-    var intfName   = data["interface"]
-    var methodName = data.method
-    var args       = data.args
-
-    var methodSignature = intfName + "." + methodName + "()"
-    
-    var intf = this._interfaces.hasOwnProperty(intfName) && this._interfaces[intfName]
-    
-    if (!intf && InspectorBackend && intfName.match(/.*Notify/)) {
-        intf = InspectorBackend.getRegisteredDomainDispatcher(intfName.substr(0,intfName.length-6))
-    }
-    
-    if (!intf) {
-        Weinre.logWarning("weinre: request for non-registered interface:" + methodSignature)
-        return
-    }
-    
-    methodSignature = intf.constructor.name + "." + methodName + "()"
-    
-    var method = intf[methodName]
-    if (typeof method != "function") {
-        Weinre.notImplemented(methodSignature)
-        return
-    }
-    
-    try {
-        method.apply(intf, args)
-    }
-    catch (e) {
-        Weinre.logError("weinre: invocation exception on " + methodSignature + ": " + e)
-    }
-    
-    if (Verbose) {
-        Weinre.logDebug(this.constructor.name + "[" + this._url + "]: recv " + intfName + "." + methodName + "(" + JSON.stringify(args) + ")")
-    }
-
-//-----------------------------------------------------------------------------
-method _handleClose
-    this._reallyClosed = true
-    
-    if (Verbose) {
-        Weinre.logDebug(this.constructor.name + "[" + this._url + "]: closed")
-    }


Mime
View raw message