Tagging to 2.3.0rc1

And re-enable the JS bridge on 4.2.
https://issues.apache.org/jira/browse/CB-1879

.gitignore

@@ -2,19 +2,31 @@
 default.properties
 gen
 assets/www/cordova.js
+framework/assets/www/.tmp*
 local.properties
-framework/proguard.cfg
-framework/cordova.jar
-framework/cordova-*.jar
-framework/phonegap-*.jar
+framework/lib
+proguard.cfg
+proguard.cfg
+proguard-project.txt
 framework/bin
 framework/test/org/apache/cordova/*.class
 framework/assets/www/.DS_Store
 framework/assets/www/cordova-*.js
 framework/assets/www/phonegap-*.js
+framework/libs
+test/libs
 example
 ./test
-tmp
-*.tmp
-test/libs/*.jar
+test/bin
+test/assets/www/.tmp*
+tmp/**
 bin/node_modules
+.metadata
+tmp/**/*
+Thumbs.db
+Desktop.ini
+*.tmp
+*.bak
+*.swp
+*.class
+*.jar

NOTICE

@@ -1,5 +1,5 @@
-Apache Callback
-Copyright 2011 The Apache Software Foundation
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org)

README.md

@@ -15,11 +15,15 @@ indicate that the project has yet to be fully endorsed by the ASF.
 Requires
 ---
 
-- Java JDK 1.5
-- Apache ANT
+- Java JDK 1.5 or greater
+- Apache ANT 1.8.0 or greater
 - Android SDK [http://developer.android.com](http://developer.android.com)
 - Apache Commons Codec [http://commons.apache.org/codec/](http://commons.apache.org/codec/)
 
+Test Requirements
+---
+- JUnit - [https://github.com/KentBeck/junit](https://github.com/KentBeck/junit)
+ 
 Building
 ---
 
@@ -29,7 +33,7 @@ To create your cordova.jar, copy the commons codec:
 
 then run in the framework directory:
 
-    android update project -p . -t android-15
+    android update project -p . -t android-16
     ant jar
 
 
@@ -57,7 +61,7 @@ Project Commands
 
 These commands live in a generated Cordova Android project.
 
-    ./cordovap/debug [path] ..................... install to first device
+    ./cordova/debug [path] ..................... install to first device
     ./cordova/emulate .......................... start avd (emulator) named default
     ./cordova/log .............................. starts logcat
 
@@ -78,15 +82,10 @@ Start adb logcat (console.log calls output here):
 
     ./cordova/log
 
-Running the [callback/callback-test](http://github.com/callback/callback-test) tests:
----
-
-    ./bin/test
-
 Creating a new Cordova Android Project
 ---
 
-    ./bin/create ~/Desktop/myapp com.phonegap.special MyApp
+    ./bin/create ~/Desktop/myapp com.myapp.special MyApp
 
 Importing a Cordova Android Project into Eclipse
 ----
@@ -98,10 +97,13 @@ Importing a Cordova Android Project into Eclipse
 5. Right click on the project root: Run as > Run Configurations
 6. Click on the Target tab and select Manual (this way you can choose the emulator or device to build to)
 
+Running Tests
+----
+Please see details under test/README.md.
 
 Further Reading
 ---
 
 - [http://developer.android.com](http://developer.android.com)
-- [http://docs.phonegap.com](http://docs.phonegap.com)
-- [http://wiki.phonegap.com](http://wiki.phonegap.com)
+- [http://incubator.apache.org/cordova/](http://incubator.apache.org/cordova/)
+- [http://wiki.apache.org/cordova/](http://wiki.apache.org/cordova/)

VERSION

@@ -1 +1 @@
-1.8.0
+2.3.0rc1

bin/BOOM

@@ -1,21 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-./bin/create
-cd ./example && ./cordova/debug && ./cordova/log

bin/autotest

@@ -1,2 +0,0 @@
-#! /usr/bin/env node
-require('nodeunit').reporters.default.run(['bin/tests'])

bin/bench

@@ -1,47 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-#
-# Creates an app in `./bench` that posts results to http://cordova-bench.heroku.com with current cordova/Android sha.
-#
-# USAGE
-#   ./bin/bench
-#
-
-# clobber any existing bench
-if [ -e ./bench ]
-then
-    rm -rf ./bench
-fi
-
-# create a benching app
-./bin/create ./bench org.apache.cordova.bench cordovaBench
-
-# grab the latest bench www code
-git clone git@github.com:brianleroux/cordova-bench.git
-
-# copy it into the app
-cat ./cordova-bench/www/index.html > ./bench/assets/www/index.html
-#cat ~/Desktop/cordova-bench/www/index.html > ./bench/assets/www/index.html
-
-# clean up
-rm -rf ./cordova-bench
-
-# launch to the first device found
-./bin/debug ./bench

bin/create

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #       Licensed to the Apache Software Foundation (ASF) under one
 #       or more contributor license agreements.  See the NOTICE file
 #       distributed with this work for additional information
@@ -23,52 +23,137 @@
 #
 set -e
 
-PROJECT_PATH=${1:-"./example"}
+if [ -n "$1" ] && [ "$1" == "-h" ]
+then
+    echo 'usage: create path package activity'
+    echo "Make sure the Android SDK tools folder is in your PATH!"
+    exit 0
+fi
+
+BUILD_PATH="$( cd "$( dirname "$0" )/.." && pwd )"
+VERSION=$(cat "$BUILD_PATH"/VERSION)
+
+PROJECT_PATH="${1:-'./example'}"
 PACKAGE=${2:-"org.apache.cordova.example"}
 ACTIVITY=${3:-"cordovaExample"}
-TARGET=$(android list targets | grep 'id: ' | sed 's/id: \([0-9]*\).*/\1/g' | tail -1)
-VERSION=$(cat ./VERSION)
 
 # clobber any existing example
-if [ $# -eq 0 ]
+if [ -d "$PROJECT_PATH" ]
 then
-    rm -rf $PROJECT_PATH
+    echo "Project already exists! Delete and recreate"
+    exit 1
 fi
 
+# cleanup after exit and/or on error
+function on_exit {
+    # [ -f "$BUILD_PATH"/framework/libs/commons-codec-1.6.jar ] && rm "$BUILD_PATH"/framework/libs/commons-codec-1.6.jar
+    # [ -d "$BUILD_PATH"/framework/libs ] && rmdir "$BUILD_PATH"/framework/libs
+    if [ -f "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js ]
+    then
+        rm "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js
+    fi
+    if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
+    then
+        rm "$BUILD_PATH"/framework/cordova-$VERSION.jar
+    fi
+}
+
+function createAppInfoJar {
+    (cd "$BUILD_PATH"/bin/templates/cordova/ApplicationInfo &&
+     javac ApplicationInfo.java &&
+     jar -cfe ../appinfo.jar ApplicationInfo ApplicationInfo.class
+    )
+}
+
+function on_error {
+    echo "An unexpected error occurred: $previous_command exited with $?"
+    echo "Deleting project..."
+    [ -d "$PROJECT_PATH" ] && rm -rf "$PROJECT_PATH"
+    exit "$?"
+}
+
+function replace {
+    local pattern=$1
+    local filename=$2
+    # Mac OS X requires -i argument
+    if [[ "$OSTYPE" =~ "darwin" ]]
+    then
+        /usr/bin/sed -i '' -e $pattern "$filename"
+    elif [[ "$OSTYPE" =~ "linux" ]]
+    then
+        /bin/sed -i -e $pattern "$filename"
+    fi
+}
+
+# we do not want the script to silently fail
+trap 'previous_command=$this_command; this_command=$BASH_COMMAND' DEBUG
+trap on_error ERR
+trap on_exit EXIT
+
+ANDROID_BIN="${ANDROID_BIN:=$( which android )}"
+PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g')
+ACTIVITY_PATH="$PROJECT_PATH"/src/$PACKAGE_AS_PATH/$ACTIVITY.java
+MANIFEST_PATH="$PROJECT_PATH"/AndroidManifest.xml
+
+TARGET=$("$ANDROID_BIN" list targets | grep id: | tail -1 | cut -f 2 -d ' ' )
+API_LEVEL=$("$ANDROID_BIN" list target | grep "API level:" | tail -n 1 | cut -f 2 -d ':' | tr -d ' ')
+
+# if this a distribution release no need to build a jar
+if [ ! -e "$BUILD_PATH"/cordova-$VERSION.jar ] && [ -d "$BUILD_PATH"/framework ]
+then
 # update the cordova-android framework for the desired target
-android update project --target $TARGET --path ./framework
+    "$ANDROID_BIN" update project --target $TARGET --path "$BUILD_PATH"/framework &> /dev/null
 
-if [ ! -e ./framework/libs/commons-codec-1.6.jar ]; then
-    # Use curl to get the jar (TODO: Support Apache Mirrors)
-    curl -OL http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip
-    unzip commons-codec-1.6-bin.zip
-    mkdir -p ./framework/libs
-    cp commons-codec-1.6/commons-codec-1.6.jar ./framework/libs/
-fi
+    if [ ! -e "$BUILD_PATH"/framework/libs/commons-codec-1.7.jar ]; then
+        # Use curl to get the jar (TODO: Support Apache Mirrors)
+        curl -OL http://archive.apache.org/dist/commons/codec/binaries/commons-codec-1.7-bin.zip &> /dev/null
+        unzip commons-codec-1.7-bin.zip &> /dev/null
+        mkdir -p "$BUILD_PATH"/framework/libs
+        cp commons-codec-1.7/commons-codec-1.7.jar "$BUILD_PATH"/framework/libs
+        # cleanup yo
+        rm commons-codec-1.7-bin.zip && rm -rf commons-codec-1.7
+    fi
 
 # compile cordova.js and cordova.jar
-cd ./framework && ant jar && cd ../
+    (cd "$BUILD_PATH"/framework && ant jar &> /dev/null )
+fi
 
-# copy all the bin scripts etc in there
-cp -R ./bin/templates/project/ $PROJECT_PATH
+# create new android project
+"$ANDROID_BIN" create project --target $TARGET --path "$PROJECT_PATH" --package $PACKAGE --activity $ACTIVITY &> /dev/null
 
-# copy in cordova.js
-cp ./framework/assets/www/cordova-$VERSION.js $PROJECT_PATH/.cordova/android/cordova-$VERSION.js
+# copy project template
+cp -r "$BUILD_PATH"/bin/templates/project/assets "$PROJECT_PATH"
+cp -r "$BUILD_PATH"/bin/templates/project/res "$PROJECT_PATH"
 
-# copy in cordova.jar
-cp ./framework/cordova-$VERSION.jar $PROJECT_PATH/.cordova/android/cordova-$VERSION.jar
+# copy cordova.js, cordova.jar and res/xml
+if [ -d "$BUILD_PATH"/framework ]
+then
+    cp -r "$BUILD_PATH"/framework/res/xml "$PROJECT_PATH"/res
+    cp "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/framework/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
+else
+    cp -r "$BUILD_PATH"/xml "$PROJECT_PATH"/res/xml
+    cp "$BUILD_PATH"/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
+fi
 
-# copy in res/xml
-cp ./framework/res/xml/cordova.xml $PROJECT_PATH/.cordova/android/cordova.xml
-cp ./framework/res/xml/plugins.xml $PROJECT_PATH/.cordova/android/plugins.xml
+# interpolate the activity name and package
+cp "$BUILD_PATH"/bin/templates/project/Activity.java "$ACTIVITY_PATH"
+replace "s/__ACTIVITY__/${ACTIVITY}/g" "$ACTIVITY_PATH"
+replace "s/__ID__/${PACKAGE}/g" "$ACTIVITY_PATH"
 
-# app properties
-cat > $PROJECT_PATH/.cordova/config <<eom
-VERSION=$VERSION
-PROJECT_PATH=$PROJECT_PATH
-PACKAGE=$PACKAGE
-ACTIVITY=$ACTIVITY
-TARGET=$TARGET
-eom
+cp "$BUILD_PATH"/bin/templates/project/AndroidManifest.xml "$MANIFEST_PATH"
+replace "s/__ACTIVITY__/${ACTIVITY}/g" "$MANIFEST_PATH"
+replace "s/__PACKAGE__/${PACKAGE}/g" "$MANIFEST_PATH"
+replace "s/__APILEVEL__/${API_LEVEL}/g" "$MANIFEST_PATH"
 
-(cd $PROJECT_PATH && ./cordova/create)
+# creating cordova folder and copying run/build/log/launch scripts
+mkdir "$PROJECT_PATH"/cordova
+createAppInfoJar
+cp "$BUILD_PATH"/bin/templates/cordova/appinfo.jar "$PROJECT_PATH"/cordova/appinfo.jar
+cp "$BUILD_PATH"/bin/templates/cordova/cordova "$PROJECT_PATH"/cordova/cordova
+cp "$BUILD_PATH"/bin/templates/cordova/build "$PROJECT_PATH"/cordova/build
+cp "$BUILD_PATH"/bin/templates/cordova/release "$PROJECT_PATH"/cordova/release
+cp "$BUILD_PATH"/bin/templates/cordova/clean "$PROJECT_PATH"/cordova/clean
+cp "$BUILD_PATH"/bin/templates/cordova/log "$PROJECT_PATH"/cordova/log
+cp "$BUILD_PATH"/bin/templates/cordova/run "$PROJECT_PATH"/cordova/run

bin/create.bat

@@ -1 +1,32 @@
-cscript bin\create.js %*
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+:: 
+:: http://www.apache.org/licenses/LICENSE-2.0
+:: 
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+@ECHO OFF
+IF NOT DEFINED JAVA_HOME GOTO MISSING
+FOR %%X in (java.exe javac.exe ant.bat android.bat) do (
+    SET FOUND=%%~$PATH:X
+    IF NOT DEFINED FOUND GOTO MISSING
+)
+cscript "%~dp0\create.js" %*
+GOTO END
+:MISSING
+ECHO Missing one of the following:
+ECHO JDK: http://java.oracle.com
+ECHO Android SDK: http://developer.android.com
+ECHO Apache ant: http://ant.apache.org
+EXIT /B 1
+:END

bin/create.js

@@ -24,14 +24,23 @@
  *  ./create [path package activity]
  */
 
+var fso = WScript.CreateObject('Scripting.FileSystemObject');
+
 function read(filename) {
-    WScript.Echo('Reading in ' + filename);
     var fso=WScript.CreateObject("Scripting.FileSystemObject");
     var f=fso.OpenTextFile(filename, 1);
     var s=f.ReadAll();
     f.Close();
     return s;
 }
+function setTarget() {
+    var targets = shell.Exec('android.bat list targets').StdOut.ReadAll().match(/id:\s\d+/g);
+    return targets[targets.length - 1].replace(/id: /, ""); // TODO: give users the option to set their target 
+}
+function setApiLevel() {
+    var targets = shell.Exec('android.bat list targets').StdOut.ReadAll().match(/API level:\s\d+/g);
+    return targets[targets.length - 1].replace(/API level: /, "");
+}
 function write(filename, contents) {
     var fso=WScript.CreateObject("Scripting.FileSystemObject");
     var f=fso.OpenTextFile(filename, 2, true);
@@ -41,24 +50,81 @@ function write(filename, contents) {
 function replaceInFile(filename, regexp, replacement) {
     write(filename, read(filename).replace(regexp, replacement));
 }
-function exec(s, output) {
-    WScript.Echo('Executing ' + s);
-    var o=shell.Exec(s);
-    while (o.Status == 0) {
-        WScript.Sleep(100);
+function exec(command) {
+    var oShell=shell.Exec(command);
+    while (oShell.Status == 0) {
+        if(!oShell.StdOut.AtEndOfStream) {
+            var line = oShell.StdOut.ReadLine();
+            // XXX: Change to verbose mode 
+            // WScript.StdOut.WriteLine(line);
+        }
+        WScript.sleep(100);
     }
-    WScript.Echo("Command exited with code " + o.Status);
 }
 
-function fork(s) {
-    WScript.Echo('Executing ' + s);
-    var o=shell.Exec(s);
-    while (o.Status != 1) {
-        WScript.Sleep(100);
+function createAppInfoJar() {
+    if(!fso.FileExists(ROOT+"\\bin\\templates\\cordova\\appinfo.jar")) {
+        WScript.Echo("Creating appinfo.jar...");
+        var cur = shell.CurrentDirectory;
+        shell.CurrentDirectory = ROOT+"\\bin\\templates\\cordova\\ApplicationInfo";
+        exec("javac ApplicationInfo.java");
+        exec("jar -cfe ..\\appinfo.jar ApplicationInfo ApplicationInfo.class");
+        shell.CurrentDirectory = cur;
+    }
+}
+
+function cleanup() {
+    // Cleanup
+//    if(fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
+//        fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
+//        fso.DeleteFolder(ROOT + '\\framework\\libs', true);
+//    }
+    if(fso.FileExists(ROOT + '\\framework\\cordova-'+VERSION+'.jar')) {
+        fso.DeleteFile(ROOT + '\\framework\\cordova-'+VERSION+'.jar');
+    }
+    if(fso.FileExists(ROOT + '\\framework\\assets\\www\\cordova-'+VERSION+'.js')) {
+        fso.DeleteFile(ROOT + '\\framework\\assets\\www\\cordova-'+VERSION+'.js');
+    }
+}
+
+function downloadCommonsCodec() {
+    if (!fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.7.jar')) {
+      // We need the .jar
+      var url = 'http://archive.apache.org/dist/commons/codec/binaries/commons-codec-1.7-bin.zip';
+      var libsPath = ROOT + '\\framework\\libs';
+      var savePath = libsPath + '\\commons-codec-1.7-bin.zip';
+      if (!fso.FileExists(savePath)) {
+        if(!fso.FolderExists(ROOT + '\\framework\\libs')) {
+            fso.CreateFolder(libsPath);
+        }
+        // We need the zip to get the jar
+        var xhr = WScript.CreateObject('MSXML2.XMLHTTP');
+        xhr.open('GET', url, false);
+        xhr.send();
+        if (xhr.status == 200) {
+          var stream = WScript.CreateObject('ADODB.Stream');
+          stream.Open();
+          stream.Type = 1;
+          stream.Write(xhr.ResponseBody);
+          stream.Position = 0;
+          stream.SaveToFile(savePath);
+          stream.Close();
+        } else {
+          WScript.Echo('Could not retrieve the commons-codec. Please download it yourself and put into the framework/libs directory. This process may fail now. Sorry.');
+        }
+      }
+      var app = WScript.CreateObject('Shell.Application');
+      var source = app.NameSpace(savePath).Items();
+      var target = app.NameSpace(ROOT + '\\framework\\libs');
+      target.CopyHere(source, 256);
+      
+      // Move the jar into libs
+      fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.7\\commons-codec-1.7.jar', ROOT + '\\framework\\libs\\commons-codec-1.7.jar');
+      
+      // Clean up
+      fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.7-bin.zip');
+      fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.7', true);
     }
-    WScript.Echo(o.StdOut.ReadAll());
-    WScript.Echo(o.StdErr.ReadAll());
-    WScript.Echo("Command exited with code " + o.Status);
 }
 
 var args = WScript.Arguments, PROJECT_PATH="example", 
@@ -69,106 +135,80 @@ var args = WScript.Arguments, PROJECT_PATH="example",
 var ROOT = WScript.ScriptFullName.split('\\bin\\create.js').join('');
 
 if (args.Count() == 3) {
-    WScript.Echo('Found expected arguments');
     PROJECT_PATH=args(0);
     PACKAGE=args(1);
     ACTIVITY=args(2);
 }
 
+if(fso.FolderExists(PROJECT_PATH)) {
+    WScript.Echo("Project already exists!");
+    WScript.Quit(1);
+}
+
 var PACKAGE_AS_PATH=PACKAGE.replace(/\./g, '\\');
 var ACTIVITY_PATH=PROJECT_PATH+'\\src\\'+PACKAGE_AS_PATH+'\\'+ACTIVITY+'.java';
 var MANIFEST_PATH=PROJECT_PATH+'\\AndroidManifest.xml';
-var TARGET=shell.Exec('android.bat list targets').StdOut.ReadAll().match(/id:\s([0-9]).*/)[1];
-var VERSION=read('VERSION').replace(/\r\n/,'').replace(/\n/,'');
-
-WScript.Echo("Project path: " + PROJECT_PATH);
-WScript.Echo("Package: " + PACKAGE);
-WScript.Echo("Activity: " + ACTIVITY);
-WScript.Echo("Package as path: " + PACKAGE_AS_PATH);
-WScript.Echo("Activity path: " + ACTIVITY_PATH);
-WScript.Echo("Manifest path: " + MANIFEST_PATH);
-WScript.Echo("Cordova version: " + VERSION);
-
-// TODO: clobber any existing example
-
-/*
-if [ $# -eq 0 ]
-then
-    rm -rf $PROJECT_PATH
-fi
-*/
-
+var TARGET=setTarget();
+var API_LEVEL=setApiLevel();
+var VERSION=read(ROOT+'\\VERSION').replace(/\r\n/,'').replace(/\n/,'');
 // create the project
+WScript.Echo("Creating new android project...");
 exec('android.bat create project --target '+TARGET+' --path '+PROJECT_PATH+' --package '+PACKAGE+' --activity '+ACTIVITY);
 
-// update the cordova framework project to a target that exists on this machine
-exec('android.bat update project --target '+TARGET+' --path framework');
-
-// pull down commons codec if necessary
-var fso = WScript.CreateObject('Scripting.FileSystemObject');
-if (!fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
-  // We need the .jar
-  var url = 'http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip';
-  var savePath = ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip';
-  if (!fso.FileExists(savePath)) {
-    // We need the zip to get the jar
-    var xhr = WScript.CreateObject('MSXML2.XMLHTTP');
-    xhr.open('GET', url, false);
-    xhr.send();
-    if (xhr.status == 200) {
-      var stream = WScript.CreateObject('ADODB.Stream');
-      stream.Open();
-      stream.Type = 1;
-      stream.Write(xhr.ResponseBody);
-      stream.Position = 0;
-      stream.SaveToFile(savePath);
-      stream.Close();
-    } else {
-      WScript.Echo('Could not retrieve the commons-codec. Please download it yourself and put into the framework/libs directory. This process may fail now. Sorry.');
-    }
-  }
-  var app = WScript.CreateObject('Shell.Application');
-  var source = app.NameSpace(savePath).Items();
-  var target = app.NameSpace(ROOT + '\\framework\\libs');
-  target.CopyHere(source, 256);
-  
-  // Move the jar into libs
-  fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.6\\commons-codec-1.6.jar', ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
-  
-  // Clean up
-  fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip');
-  fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.6', true);
+// build from source. distro should have these files
+if (!fso.FileExists(ROOT+'\\cordova-'+VERSION+'.jar') &&
+    !fso.FileExists(ROOT+'\\cordova-'+VERSION+'.js')) {
+    WScript.Echo("Building jar and js files...");
+    // update the cordova framework project to a target that exists on this machine
+    exec('android.bat update project --target '+TARGET+' --path '+ROOT+'\\framework');
+    // pull down commons codec if necessary
+    downloadCommonsCodec();
+    exec('ant.bat -f \"'+ ROOT +'\\framework\\build.xml\" jar');
 }
 
-
-// compile cordova.js and cordova.jar
-// if you see an error about "Unable to resolve target" then you may need to 
-// update your android tools or install an additional Android platform version
-exec('ant.bat -f framework\\build.xml jar');
-
 // copy in the project template
-exec('cmd /c xcopy bin\\templates\\project\\* '+PROJECT_PATH+' /S /Y');
+WScript.Echo("Copying template files...");
+exec('%comspec% /c xcopy "'+ ROOT + '"\\bin\\templates\\project\\res '+PROJECT_PATH+'\\res\\ /E /Y');
+exec('%comspec% /c xcopy "'+ ROOT + '"\\bin\\templates\\project\\assets '+PROJECT_PATH+'\\assets\\ /E /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\project\\AndroidManifest.xml ' + PROJECT_PATH + '\\AndroidManifest.xml /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\project\\Activity.java '+ ACTIVITY_PATH +' /Y');
 
-// copy example www assets
-exec('cmd /c xcopy ' + PROJECT_PATH + '\\cordova\\assets ' + PROJECT_PATH + ' /S /Y');
+// check if we have the source or the distro files
+WScript.Echo("Copying js, jar & config.xml files...");
+if(fso.FolderExists(ROOT + '\\framework')) {
+    exec('%comspec% /c copy "'+ROOT+'"\\framework\\assets\\www\\cordova-'+VERSION+'.js '+PROJECT_PATH+'\\assets\\www\\cordova-'+VERSION+'.js /Y');
+    exec('%comspec% /c copy "'+ROOT+'"\\framework\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\libs\\cordova-'+VERSION+'.jar /Y');
+    fso.CreateFolder(PROJECT_PATH + '\\res\\xml');
+    exec('%comspec% /c copy "'+ROOT+'"\\framework\\res\\xml\\config.xml ' + PROJECT_PATH + '\\res\\xml\\config.xml /Y');
+} else {
+    // copy in cordova.js
+    exec('%comspec% /c copy "'+ROOT+'"\\cordova-'+VERSION+'.js '+PROJECT_PATH+'\\assets\\www\\cordova-'+VERSION+'.js /Y');
+    // copy in cordova.jar
+    exec('%comspec% /c copy "'+ROOT+'"\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\libs\\cordova-'+VERSION+'.jar /Y');
+    // copy in xml
+    fso.CreateFolder(PROJECT_PATH + '\\res\\xml');
+    exec('%comspec% /c copy "'+ROOT+'"\\xml\\config.xml ' + PROJECT_PATH + '\\res\\xml\\config.xml /Y');
+}
 
-// copy in cordova.js
-exec('cmd /c copy framework\\assets\\js\\cordova.android.js '+PROJECT_PATH+'\\.cordova\\android\\cordova-'+VERSION+'.js /Y');
+// copy cordova scripts
+fso.CreateFolder(PROJECT_PATH + '\\cordova');
+createAppInfoJar();
+WScript.Echo("Copying cordova command tools...");
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\appinfo.jar ' + PROJECT_PATH + '\\cordova\\appinfo.jar /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\cordova.js ' + PROJECT_PATH + '\\cordova\\cordova.js /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\cordova.bat ' + PROJECT_PATH + '\\cordova\\cordova.bat /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\clean.bat ' + PROJECT_PATH + '\\cordova\\clean.bat /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\build.bat ' + PROJECT_PATH + '\\cordova\\build.bat /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\log.bat ' + PROJECT_PATH + '\\cordova\\log.bat /Y');
+exec('%comspec% /c copy "'+ROOT+'"\\bin\\templates\\cordova\\run.bat ' + PROJECT_PATH + '\\cordova\\run.bat /Y');
 
-// copy in cordova.jar
-exec('cmd /c copy framework\\cordova-'+VERSION+'.jar '+PROJECT_PATH+'\\.cordova\\android\\cordova-'+VERSION+'.jar /Y');
+// interpolate the activity name and package
+WScript.Echo("Updating AndroidManifest.xml and Main Activity...");
+replaceInFile(ACTIVITY_PATH, /__ACTIVITY__/, ACTIVITY);
+replaceInFile(ACTIVITY_PATH, /__ID__/, PACKAGE);
 
-// copy in xml
-exec('cmd /c copy framework\\res\\xml\\cordova.xml ' + PROJECT_PATH + '\\.cordova\\android\\cordova.xml /Y');
-exec('cmd /c copy framework\\res\\xml\\plugins.xml ' + PROJECT_PATH + '\\.cordova\\android\\plugins.xml /Y');
+replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, ACTIVITY);
+replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
+replaceInFile(MANIFEST_PATH, /__APILEVEL__/, API_LEVEL);
 
-// write out config file
-write(PROJECT_PATH + '\\.cordova\\config',
-  'VERSION=' + VERSION + '\r\n' +
-  'PROJECT_PATH=' + PROJECT_PATH + '\r\n' +
-  'PACKAGE=' + PACKAGE + '\r\n' +
-  'ACTIVITY=' + ACTIVITY + '\r\n' +
-  'TARGET=' + TARGET);
-
-// run project-specific create process
-fork('cscript.exe ' + PROJECT_PATH + '\\cordova\\create.js');
+cleanup();

bin/package.json

@@ -18,9 +18,5 @@
   "repository":   {
     "type": "git",
     "url": "http://git-wip-us.apache.org/repos/asf/incubator-cordova-android.git"
-  },
-  "dependencies":{
-    "coffee-script":"1.1.2",
-    "nodeunit":"0.5.3"
   }
 }

bin/templates/cordova/ApplicationInfo/ApplicationInfo.java

@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.xml.sax.SAXException;
+import java.io.IOException;
+
+public class ApplicationInfo {
+    private static void parseAndroidManifest(String path) {
+        // System.out.println(path);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        Document dom;
+        try {
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            dom = db.parse(path);
+
+            // getting package information
+            Element manifest = dom.getDocumentElement();
+            String pakkage = manifest.getAttribute("package");
+
+            // getting activity name
+            String activity = ((Element)dom.getElementsByTagName("activity").item(0)).getAttribute("android:name");
+            System.out.println(String.format("%s/.%s", pakkage, activity.replace(".", "")));
+        } catch(ParserConfigurationException pce) {
+			pce.printStackTrace();
+		} catch(SAXException se) {
+			se.printStackTrace();
+		} catch(IOException ioe) {
+			ioe.printStackTrace();
+		}
+        
+    }
+
+    public static void main(String[] args) {
+        String path;
+        if(args.length > 0) {
+            path = args[0];
+        } else {
+            path = System.getProperty("user.dir") + "/../AndroidManifest.xml";
+        }
+        parseAndroidManifest(path);
+    }
+}

bin/templates/cordova/build

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+set -e
+
+CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
+
+bash "$CORDOVA_PATH"/cordova build

bin/templates/cordova/build.bat

@@ -0,0 +1,18 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+:: 
+:: http://www.apache.org/licenses/LICENSE-2.0
+:: 
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+%~dp0\cordova.bat build

bin/templates/cordova/clean

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+set -e
+
+CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
+
+bash "$CORDOVA_PATH"/cordova clean

bin/templates/cordova/clean.bat

@@ -0,0 +1,18 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+:: 
+:: http://www.apache.org/licenses/LICENSE-2.0
+:: 
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+%~dp0\cordova.bat clean

bin/templates/cordova/cordova

@@ -0,0 +1,159 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+
+PROJECT_PATH=$( cd "$( dirname "$0" )/.." && pwd )
+
+function check_devices {
+# FIXME
+    local devices=`adb devices | awk '/List of devices attached/ { while(getline > 0) { print }}' | grep device`
+    if [ -z "$devices"  ] ; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+function emulate {
+    declare -a avd_list=($(android list avd | grep "Name:" | cut -f 2 -d ":" | xargs))
+    # we need to start adb-server
+    adb start-server 1>/dev/null
+
+    # Do not launch an emulator if there is already one running or if a device is attached
+    if [ $(check_devices) == 0 ] ; then
+        return
+    fi
+
+    local avd_id="1000" #FIXME: hopefully user does not have 1000 AVDs
+    # User has no AVDs
+    if [ ${#avd_list[@]} == 0 ]
+    then
+        echo "You don't have any Android Virtual Devices. Please create at least one AVD."
+        echo "android"
+    fi
+    # User has only one AVD
+    if [ ${#avd_list[@]} == 1 ]
+    then
+        emulator -cpu-delay 0 -no-boot-anim -cache /tmp/cache -avd ${avd_list[0]} 1> /dev/null 2>&1 &
+    # User has more than 1 AVD
+    elif [ ${#avd_list[@]} -gt 1 ]
+    then
+        while [ -z ${avd_list[$avd_id]} ]
+        do
+            echo "Choose from one of the following Android Virtual Devices [0 to $((${#avd_list[@]}-1))]:"
+            for(( i = 0 ; i < ${#avd_list[@]} ; i++ ))
+            do
+                echo "$i) ${avd_list[$i]}"
+            done
+            read -t 5 -p "> " avd_id
+            # default value if input timeout
+            if [ $avd_id -eq 1000 ] ; then avd_id=0 ; fi
+        done
+        emulator -cpu-delay 0 -no-boot-anim -cache /tmp/cache -avd ${avd_list[$avd_id]} 1> /dev/null 2>&1 &
+    fi
+    
+}
+
+function clean {
+    ant clean
+}
+# has to be used independently and not in conjunction with other commands
+function log {
+    adb logcat
+}
+
+function run {
+    clean && emulate && wait_for_device && install && launch 
+}
+
+function install {
+    
+    declare -a devices=($(adb devices | awk '/List of devices attached/ { while(getline > 0) { print }}' | grep device | cut -f 1))
+    local device_id="1000" #FIXME: hopefully user does not have 1000 AVDs
+    
+    if [ ${#devices[@]} == 0 ]
+    then
+        # should not reach here. Emulator should launch or device should be attached
+        echo "Emulator not running or device not attached. Could not install debug package"
+        exit 70
+    fi
+    
+    if [ ${#devices[@]} == 1 ]
+    then
+        export ANDROID_SERIAL=${devices[0]}
+    # User has more than 1 AVD
+    elif [ ${#devices[@]} -gt 1 ]
+    then
+        while [ -z ${devices[$device_id]} ]
+        do
+            echo "Choose from one of the following devices/emulators [0 to $((${#devices[@]}-1))]:"
+            for(( i = 0 ; i < ${#devices[@]} ; i++ ))
+            do
+                echo "$i) ${devices[$i]}"
+            done
+            read -t 5 -p "> " device_id
+            # default value if input timeout
+            if [ $device_id -eq 1000 ] ; then device_id=0 ; fi
+        done
+        export ANDROID_SERIAL=${devices[$device_id]}
+    fi
+
+    ant debug install
+}
+
+function build {
+    ant debug
+}
+
+function release {
+    ant release
+}
+
+function wait_for_device {
+    local i="0"
+    echo -n "Waiting for device..."
+
+    while [ $i -lt 300 ]
+    do
+        if [ $(check_devices) -eq 0 ]
+        then
+            break
+        else
+            sleep 1
+            i=$[i+1]
+            echo -n "."
+        fi
+    done
+    # Device timeout: emulator has not started in time or device not attached
+    if [ $i -eq 300 ]
+    then
+        echo "device timeout!"
+        exit 69
+    else
+        echo "connected!"
+    fi
+}
+
+function launch {
+    local launch_str=$(java -jar "$PROJECT_PATH"/cordova/appinfo.jar "$PROJECT_PATH"/AndroidManifest.xml)
+    adb shell am start -n $launch_str 
+}
+
+# TODO parse arguments
+(cd "$PROJECT_PATH" && $1)

bin/templates/cordova/cordova.bat

@@ -0,0 +1,32 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+:: 
+:: http://www.apache.org/licenses/LICENSE-2.0
+:: 
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+@ECHO OFF
+IF NOT DEFINED JAVA_HOME GOTO MISSING
+FOR %%X in (java.exe ant.bat android.bat) do (
+    SET FOUND=%%~$PATH:X
+    IF NOT DEFINED FOUND GOTO MISSING
+)
+cscript %~dp0\cordova.js %*
+GOTO END
+:MISSING
+ECHO Missing one of the following:
+ECHO JDK: http://java.oracle.com
+ECHO Android SDK: http://developer.android.com
+ECHO Apache ant: http://ant.apache.org
+EXIT /B 1
+:END

bin/templates/cordova/cordova.js

@@ -0,0 +1,137 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+var ROOT = WScript.ScriptFullName.split('\\cordova\\cordova.js').join(''),
+    shell=WScript.CreateObject("WScript.Shell");
+
+function exec(command) {
+    var oExec=shell.Exec(command);
+    var output = new String();
+    while(oExec.Status == 0) {
+        if(!oExec.StdOut.AtEndOfStream) {
+            var line = oExec.StdOut.ReadLine();
+            // XXX: Change to verbose mode 
+            // WScript.StdOut.WriteLine(line);
+            output += line;
+        }
+        WScript.sleep(100);
+    }
+
+    return output;
+}
+
+function device_running() {
+    var local_devices = shell.Exec("%comspec% /c adb devices").StdOut.ReadAll();
+    if(local_devices.match(/\w+\tdevice/)) {
+        WScript.Echo("Yes");
+        return true;
+    }
+    WScript.Echo("No");
+    return false;
+}
+function emulate() {
+    // don't run emulator if a device is plugged in or if emulator is already running
+    if(device_running()) {
+        //WScript.Echo("Device or Emulator already running!");
+        return;
+    }
+    var oExec = shell.Exec("%comspec% /c android.bat list avd");
+    var avd_list = [];
+    var avd_id = -10;
+    while(!oExec.StdOut.AtEndOfStream) {
+        var output = oExec.StdOut.ReadLine();
+        if(output.match(/Name: (.)*/)) {
+            avd_list.push(output.replace(/ *Name:\s/, ""));
+        }
+    }
+    // user has no AVDs
+    if(avd_list.length == 0) {
+        WScript.Echo("You don't have any Android Virtual Devices. Please create at least one AVD.");
+        WScript.Echo("android");
+        WScript.Quit(1);
+    }
+    // user has only one AVD so we launch that one
+    if(avd_list.length == 1) {
+
+        shell.Run("emulator -cpu-delay 0 -no-boot-anim -cache %Temp%\cache -avd "+avd_list[0]);
+    }
+
+    // user has more than one avd so we ask them to choose
+    if(avd_list.length > 1) {
+        while(!avd_list[avd_id]) {
+            WScript.Echo("Choose from one of the following Android Virtual Devices [0 to "+(avd_list.length - 1)+"]:")
+            for(i = 0, j = avd_list.length ; i < j ; i++) {
+                WScript.Echo((i)+") "+avd_list[i]);
+            }
+            WScript.StdOut.Write("> ");
+            avd_id = new Number(WScript.StdIn.ReadLine());
+        }
+
+        shell.Run("emulator -cpu-delay 0 -no-boot-anim -cache %Temp%\\cache -avd "+avd_list[avd_id], 0, false);
+    }
+}
+
+function clean() {
+    WScript.Echo("Cleaning project...");
+    exec("%comspec% /c ant.bat clean -f "+ROOT+"\\build.xml 2>&1");
+}
+
+function build() {
+    WScript.Echo("Building project...");
+    exec("%comspec% /c ant.bat debug -f "+ROOT+"\\build.xml 2>&1");
+}
+
+function install() {
+    WScript.Echo("Building/Installing project...");
+    exec("%comspec% /c ant.bat debug install -f "+ROOT+"\\build.xml 2>&1");
+}
+
+function log() {
+    shell.Run("%comspec% /c adb logcat");
+}
+
+function launch() {
+    WScript.Echo("Launching app...");
+    var launch_str=exec("%comspec% /c java -jar "+ROOT+"\\cordova\\appinfo.jar "+ROOT+"\\AndroidManifest.xml");
+    //WScript.Echo(launch_str);
+    exec("%comspec% /c adb shell am start -n "+launch_str+" 2>&1");
+}
+
+function run() {
+    var i=0;
+   clean();
+   emulate();
+   WScript.Stdout.Write('Waiting for device...');
+   while(!device_running() && i < 300) {
+        WScript.Stdout.Write('.');
+        WScript.sleep(1000);
+        i += 1;
+   }
+   if(i == 300) {
+       WScript.Stderr.WriteLine("device/emulator timeout!"); 
+   } else {
+       WScript.Stdout.WriteLine("connected!");
+   }
+   install();
+   launch();
+}
+var args = WScript.Arguments;
+if(args.count() != 1) {
+    WScript.StdErr.Write("An error has occured!\n");
+    WScript.Quit(1);
+}
+eval(args(0)+"()");

bin/templates/cordova/log

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+set -e
+
+CORDOVA_PATH=$( cd "$( dirname "$0" )/.." && pwd )
+
+bash "$CORDOVA_PATH"/cordova/cordova log

bin/templates/cordova/log.bat

@@ -0,0 +1,18 @@
+:: Licensed to the Apache Software Foundation (ASF) under one
+:: or more contributor license agreements.  See the NOTICE file
+:: distributed with this work for additional information
+:: regarding copyright ownership.  The ASF licenses this file
+:: to you under the Apache License, Version 2.0 (the
+:: "License"); you may not use this file except in compliance
+:: with the License.  You may obtain a copy of the License at
+:: 
+:: http://www.apache.org/licenses/LICENSE-2.0
+:: 
+:: Unless required by applicable law or agreed to in writing,
+:: software distributed under the License is distributed on an
+:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+:: KIND, either express or implied.  See the License for the
+:: specific language governing permissions and limitations
+:: under the License.
+
+%~dp0\cordova.bat log

bin/templates/cordova/release

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+set -e
+
+CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
+
+bash "$CORDOVA_PATH"/cordova release

bin/templates/cordova/run

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#!/bin/bash
+
+set -e
+
+CORDOVA_PATH=$( cd "$( dirname "$0" )" && pwd )
+
+bash "$CORDOVA_PATH"/cordova run

bin/templates/cordova/run.bat

@@ -0,0 +1 @@
+%~dp0\cordova.bat run

bin/templates/project/.cordova/android/readme.md

@@ -1 +0,0 @@
-ok...

bin/templates/project/.cordova/readme.md

@@ -1,3 +0,0 @@
-this is local config for cordova stuff to be eventually moved to
-config.xml ...we think. feedback to @davejohnson/@brianleroux
-appreciated here!

bin/templates/project/AndroidManifest.xml

@@ -18,7 +18,7 @@
        under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
-      package="__PACKAGE__" android:versionName="1.1" android:versionCode="5">
+      package="__PACKAGE__" android:versionName="1.1" android:versionCode="5" android:hardwareAccelerated="true">
     <supports-screens
         android:largeScreens="true"
         android:normalScreens="true"
@@ -47,9 +47,11 @@
 
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
+        android:hardwareAccelerated="true"
         android:debuggable="true">
-        <activity android:name="__ACTIVITY__" android:label="@string/app_name" 
-                  android:configChanges="orientation|keyboardHidden">
+        <activity android:name="__ACTIVITY__" android:label="@string/app_name"
+                android:theme="@android:style/Theme.Black.NoTitleBar"
+                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -57,5 +59,5 @@
         </activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="5" />
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="__APILEVEL__"/>
 </manifest> 

bin/templates/project/assets/www/css/index.css

@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+* {
+    -webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
+}
+
+body {
+    -webkit-touch-callout: none;                /* prevent callout to copy image, etc when tap to hold */
+    -webkit-text-size-adjust: none;             /* prevent webkit from resizing text to fit */
+    -webkit-user-select: none;                  /* prevent copy paste, to allow, change 'none' to 'text' */
+    background-color:#E4E4E4;
+    background-image:linear-gradient(top, #A7A7A7 0%, #E4E4E4 51%);
+    background-image:-webkit-linear-gradient(top, #A7A7A7 0%, #E4E4E4 51%);
+    background-image:-ms-linear-gradient(top, #A7A7A7 0%, #E4E4E4 51%);
+    background-image:-webkit-gradient(
+        linear,
+        left top,
+        left bottom,
+        color-stop(0, #A7A7A7),
+        color-stop(0.51, #E4E4E4)
+    );
+    background-attachment:fixed;
+    font-family:'HelveticaNeue-Light', 'HelveticaNeue', Helvetica, Arial, sans-serif;
+    font-size:12px;
+    height:100%;
+    margin:0px;
+    padding:0px;
+    text-transform:uppercase;
+    width:100%;
+}
+
+/* Portrait layout (default) */
+.app {
+    background:url(../img/logo.png) no-repeat center top; /* 170px x 200px */
+    position:absolute;             /* position in the center of the screen */
+    left:50%;
+    top:50%;
+    height:50px;                   /* text area height */
+    width:225px;                   /* text area width */
+    text-align:center;
+    padding:180px 0px 0px 0px;     /* image height is 200px (bottom 20px are overlapped with text) */
+    margin:-115px 0px 0px -112px;  /* offset vertical: half of image height and text area height */
+                                   /* offset horizontal: half of text area width */
+}
+
+/* Landscape layout (with min-width) */
+@media screen and (min-aspect-ratio: 1/1) and (min-width:400px) {
+    .app {
+        background-position:left center;
+        padding:75px 0px 75px 170px;  /* padding-top + padding-bottom + text area = image height */
+        margin:-90px 0px 0px -198px;  /* offset vertical: half of image height */
+                                      /* offset horizontal: half of image width and text area width */
+    }
+}
+
+h1 {
+    font-size:24px;
+    font-weight:normal;
+    margin:0px;
+    overflow:visible;
+    padding:0px;
+    text-align:center;
+}
+
+.event {
+    border-radius:4px;
+    -webkit-border-radius:4px;
+    color:#FFFFFF;
+    font-size:12px;
+    margin:0px 30px;
+    padding:2px 0px;
+}
+
+.event.listening {
+    background-color:#333333;
+    display:block;
+}
+
+.event.received {
+    background-color:#4B946A;
+    display:none;
+}
+
+@keyframes fade {
+    from { opacity: 1.0; }
+    50% { opacity: 0.4; }
+    to { opacity: 1.0; }
+}
+ 
+@-webkit-keyframes fade {
+    from { opacity: 1.0; }
+    50% { opacity: 0.4; }
+    to { opacity: 1.0; }
+}
+ 
+.blink {
+    animation:fade 3000ms infinite;
+    -webkit-animation:fade 3000ms infinite;
+}

bin/templates/project/assets/www/index.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+     KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <meta name="format-detection" content="telephone=no" />
+        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
+        <link rel="stylesheet" type="text/css" href="css/index.css" />
+        <title>Hello World</title>
+    </head>
+    <body>
+        <div class="app">
+            <h1>Apache Cordova</h1>
+            <div id="deviceready" class="blink">
+                <p class="event listening">Connecting to Device</p>
+                <p class="event received">Device is Ready</p>
+            </div>
+        </div>
+        <script type="text/javascript" src="cordova-2.3.0rc1.js"></script>
+        <script type="text/javascript" src="js/index.js"></script>
+        <script type="text/javascript">
+            app.initialize();
+        </script>
+    </body>
+</html>

bin/templates/project/assets/www/js/index.js

@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+var app = {
+    // Application Constructor
+    initialize: function() {
+        this.bindEvents();
+    },
+    // Bind Event Listeners
+    //
+    // Bind any events that are required on startup. Common events are:
+    // 'load', 'deviceready', 'offline', and 'online'.
+    bindEvents: function() {
+        document.addEventListener('deviceready', this.onDeviceReady, false);
+    },
+    // deviceready Event Handler
+    //
+    // The scope of 'this' is the event. In order to call the 'receivedEvent'
+    // function, we must explicity call 'app.receivedEvent(...);'
+    onDeviceReady: function() {
+        app.receivedEvent('deviceready');
+    },
+    // Update DOM on a Received Event
+    receivedEvent: function(id) {
+        var parentElement = document.getElementById(id);
+        var listeningElement = parentElement.querySelector('.listening');
+        var receivedElement = parentElement.querySelector('.received');
+
+        listeningElement.setAttribute('style', 'display:none;');
+        receivedElement.setAttribute('style', 'display:block;');
+
+        console.log('Received Event: ' + id);
+    }
+};

bin/templates/project/assets/www/spec.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+     KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<html>
+    <head>
+        <title>Jasmine Spec Runner</title>
+
+        <!-- jasmine source -->
+        <link rel="shortcut icon" type="image/png" href="spec/lib/jasmine-1.2.0/jasmine_favicon.png">
+        <link rel="stylesheet" type="text/css" href="spec/lib/jasmine-1.2.0/jasmine.css">
+        <script type="text/javascript" src="spec/lib/jasmine-1.2.0/jasmine.js"></script>
+        <script type="text/javascript" src="spec/lib/jasmine-1.2.0/jasmine-html.js"></script>
+
+        <!-- include source files here... -->
+        <script type="text/javascript" src="js/index.js"></script>
+
+        <!-- include spec files here... -->
+        <script type="text/javascript" src="spec/helper.js"></script>
+        <script type="text/javascript" src="spec/index.js"></script>
+
+        <script type="text/javascript">
+            (function() {
+                var jasmineEnv = jasmine.getEnv();
+                jasmineEnv.updateInterval = 1000;
+
+                var htmlReporter = new jasmine.HtmlReporter();
+
+                jasmineEnv.addReporter(htmlReporter);
+
+                jasmineEnv.specFilter = function(spec) {
+                    return htmlReporter.specFilter(spec);
+                };
+
+                var currentWindowOnload = window.onload;
+
+                window.onload = function() {
+                    if (currentWindowOnload) {
+                        currentWindowOnload();
+                    }
+                    execJasmine();
+                };
+
+                function execJasmine() {
+                    jasmineEnv.execute();
+                }
+            })();
+        </script>
+    </head>
+    <body>
+        <div id="stage" style="display:none;"></div>
+    </body>
+</html>

bin/templates/project/assets/www/spec/helper.js

@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+afterEach(function() {
+    document.getElementById('stage').innerHTML = '';
+});
+
+var helper = {
+    trigger: function(obj, name) {
+        var e = document.createEvent('Event');
+        e.initEvent(name, true, true);
+        obj.dispatchEvent(e);
+    },
+    getComputedStyle: function(querySelector, property) {
+        var element = document.querySelector(querySelector);
+        return window.getComputedStyle(element).getPropertyValue(property);
+    }
+};

bin/templates/project/assets/www/spec/index.js

@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+describe('app', function() {
+    describe('initialize', function() {
+        it('should bind deviceready', function() {
+            runs(function() {
+                spyOn(app, 'onDeviceReady');
+                app.initialize();
+                helper.trigger(window.document, 'deviceready');
+            });
+
+            waitsFor(function() {
+                return (app.onDeviceReady.calls.length > 0);
+            }, 'onDeviceReady should be called once', 500);
+
+            runs(function() {
+                expect(app.onDeviceReady).toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('onDeviceReady', function() {
+        it('should report that it fired', function() {
+            spyOn(app, 'receivedEvent');
+            app.onDeviceReady();
+            expect(app.receivedEvent).toHaveBeenCalledWith('deviceready');
+        });
+    });
+
+    describe('receivedEvent', function() {
+        beforeEach(function() {
+            var el = document.getElementById('stage');
+            el.innerHTML = ['<div id="deviceready">',
+                            '    <p class="event listening">Listening</p>',
+                            '    <p class="event received">Received</p>',
+                            '</div>'].join('\n');
+        });
+
+        it('should hide the listening element', function() {
+            app.receivedEvent('deviceready');
+            var displayStyle = helper.getComputedStyle('#deviceready .listening', 'display');
+            expect(displayStyle).toEqual('none');
+        });
+
+        it('should show the received element', function() {
+            app.receivedEvent('deviceready');
+            var displayStyle = helper.getComputedStyle('#deviceready .received', 'display');
+            expect(displayStyle).toEqual('block');
+        });
+    });
+});

bin/templates/project/assets/www/spec/lib/jasmine-1.2.0/MIT.LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2011 Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bin/templates/project/assets/www/spec/lib/jasmine-1.2.0/jasmine-html.js

@@ -0,0 +1,616 @@
+jasmine.HtmlReporterHelpers = {};
+
+jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
+
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) {
+        el.appendChild(child);
+      }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
+  var results = child.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+
+  return status;
+};
+
+jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
+  var parentDiv = this.dom.summary;
+  var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
+  var parent = child[parentSuite];
+
+  if (parent) {
+    if (typeof this.views.suites[parent.id] == 'undefined') {
+      this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
+    }
+    parentDiv = this.views.suites[parent.id].element;
+  }
+
+  parentDiv.appendChild(childElement);
+};
+
+
+jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
+  for(var fn in jasmine.HtmlReporterHelpers) {
+    ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
+  }
+};
+
+jasmine.HtmlReporter = function(_doc) {
+  var self = this;
+  var doc = _doc || window.document;
+
+  var reporterView;
+
+  var dom = {};
+
+  // Jasmine Reporter Public Interface
+  self.logRunningSpecs = false;
+
+  self.reportRunnerStarting = function(runner) {
+    var specs = runner.specs() || [];
+
+    if (specs.length == 0) {
+      return;
+    }
+
+    createReporterDom(runner.env.versionString());
+    doc.body.appendChild(dom.reporter);
+
+    reporterView = new jasmine.HtmlReporter.ReporterView(dom);
+    reporterView.addSpecs(specs, self.specFilter);
+  };
+
+  self.reportRunnerResults = function(runner) {
+    reporterView && reporterView.complete();
+  };
+
+  self.reportSuiteResults = function(suite) {
+    reporterView.suiteComplete(suite);
+  };
+
+  self.reportSpecStarting = function(spec) {
+    if (self.logRunningSpecs) {
+      self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+    }
+  };
+
+  self.reportSpecResults = function(spec) {
+    reporterView.specComplete(spec);
+  };
+
+  self.log = function() {
+    var console = jasmine.getGlobal().console;
+    if (console && console.log) {
+      if (console.log.apply) {
+        console.log.apply(console, arguments);
+      } else {
+        console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+      }
+    }
+  };
+
+  self.specFilter = function(spec) {
+    if (!focusedSpecName()) {
+      return true;
+    }
+
+    return spec.getFullName().indexOf(focusedSpecName()) === 0;
+  };
+
+  return self;
+
+  function focusedSpecName() {
+    var specName;
+
+    (function memoizeFocusedSpec() {
+      if (specName) {
+        return;
+      }
+
+      var paramMap = [];
+      var params = doc.location.search.substring(1).split('&');
+
+      for (var i = 0; i < params.length; i++) {
+        var p = params[i].split('=');
+        paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+      }
+
+      specName = paramMap.spec;
+    })();
+
+    return specName;
+  }
+
+  function createReporterDom(version) {
+    dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
+      dom.banner = self.createDom('div', { className: 'banner' },
+        self.createDom('span', { className: 'title' }, "Jasmine "),
+        self.createDom('span', { className: 'version' }, version)),
+
+      dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
+      dom.alert = self.createDom('div', {className: 'alert'}),
+      dom.results = self.createDom('div', {className: 'results'},
+        dom.summary = self.createDom('div', { className: 'summary' }),
+        dom.details = self.createDom('div', { id: 'details' }))
+    );
+  }
+};
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporter.ReporterView = function(dom) {
+  this.startedAt = new Date();
+  this.runningSpecCount = 0;
+  this.completeSpecCount = 0;
+  this.passedCount = 0;
+  this.failedCount = 0;
+  this.skippedCount = 0;
+
+  this.createResultsMenu = function() {
+    this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
+      this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'),
+      ' | ',
+      this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing'));
+
+    this.summaryMenuItem.onclick = function() {
+      dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, '');
+    };
+
+    this.detailsMenuItem.onclick = function() {
+      showDetails();
+    };
+  };
+
+  this.addSpecs = function(specs, specFilter) {
+    this.totalSpecCount = specs.length;
+
+    this.views = {
+      specs: {},
+      suites: {}
+    };
+
+    for (var i = 0; i < specs.length; i++) {
+      var spec = specs[i];
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views);
+      if (specFilter(spec)) {
+        this.runningSpecCount++;
+      }
+    }
+  };
+
+  this.specComplete = function(spec) {
+    this.completeSpecCount++;
+
+    if (isUndefined(this.views.specs[spec.id])) {
+      this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom);
+    }
+
+    var specView = this.views.specs[spec.id];
+
+    switch (specView.status()) {
+      case 'passed':
+        this.passedCount++;
+        break;
+
+      case 'failed':
+        this.failedCount++;
+        break;
+
+      case 'skipped':
+        this.skippedCount++;
+        break;
+    }
+
+    specView.refresh();
+    this.refresh();
+  };
+
+  this.suiteComplete = function(suite) {
+    var suiteView = this.views.suites[suite.id];
+    if (isUndefined(suiteView)) {
+      return;
+    }
+    suiteView.refresh();
+  };
+
+  this.refresh = function() {
+
+    if (isUndefined(this.resultsMenu)) {
+      this.createResultsMenu();
+    }
+
+    // currently running UI
+    if (isUndefined(this.runningAlert)) {
+      this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"});
+      dom.alert.appendChild(this.runningAlert);
+    }
+    this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
+
+    // skipped specs UI
+    if (isUndefined(this.skippedAlert)) {
+      this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"});
+    }
+
+    this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.skippedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.skippedAlert);
+    }
+
+    // passing specs UI
+    if (isUndefined(this.passedAlert)) {
+      this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"});
+    }
+    this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
+
+    // failing specs UI
+    if (isUndefined(this.failedAlert)) {
+      this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"});
+    }
+    this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount);
+
+    if (this.failedCount === 1 && isDefined(dom.alert)) {
+      dom.alert.appendChild(this.failedAlert);
+      dom.alert.appendChild(this.resultsMenu);
+    }
+
+    // summary info
+    this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
+    this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
+  };
+
+  this.complete = function() {
+    dom.alert.removeChild(this.runningAlert);
+
+    this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
+
+    if (this.failedCount === 0) {
+      dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount)));
+    } else {
+      showDetails();
+    }
+
+    dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
+  };
+
+  return this;
+
+  function showDetails() {
+    if (dom.reporter.className.search(/showDetails/) === -1) {
+      dom.reporter.className += " showDetails";
+    }
+  }
+
+  function isUndefined(obj) {
+    return typeof obj === 'undefined';
+  }
+
+  function isDefined(obj) {
+    return !isUndefined(obj);
+  }
+
+  function specPluralizedFor(count) {
+    var str = count + " spec";
+    if (count > 1) {
+      str += "s"
+    }
+    return str;
+  }
+
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView);
+
+
+jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
+  this.spec = spec;
+  this.dom = dom;
+  this.views = views;
+
+  this.symbol = this.createDom('li', { className: 'pending' });
+  this.dom.symbolSummary.appendChild(this.symbol);
+
+  this.summary = this.createDom('div', { className: 'specSummary' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.description)
+  );
+
+  this.detail = this.createDom('div', { className: 'specDetail' },
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
+        title: this.spec.getFullName()
+      }, this.spec.getFullName())
+  );
+};
+
+jasmine.HtmlReporter.SpecView.prototype.status = function() {
+  return this.getSpecStatus(this.spec);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.refresh = function() {
+  this.symbol.className = this.status();
+
+  switch (this.status()) {
+    case 'skipped':
+      break;
+
+    case 'passed':
+      this.appendSummaryToSuiteDiv();
+      break;
+
+    case 'failed':
+      this.appendSummaryToSuiteDiv();
+      this.appendFailureDetail();
+      break;
+  }
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
+  this.summary.className += ' ' + this.status();
+  this.appendToSummary(this.spec, this.summary);
+};
+
+jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
+  this.detail.className += ' ' + this.status();
+
+  var resultItems = this.spec.results().getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+      }
+    }
+  }
+
+  if (messagesDiv.childNodes.length > 0) {
+    this.detail.appendChild(messagesDiv);
+    this.dom.details.appendChild(this.detail);
+  }
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
+  this.suite = suite;
+  this.dom = dom;
+  this.views = views;
+
+  this.element = this.createDom('div', { className: 'suite' },
+      this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description)
+  );
+
+  this.appendToSummary(this.suite, this.element);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.status = function() {
+  return this.getSpecStatus(this.suite);
+};
+
+jasmine.HtmlReporter.SuiteView.prototype.refresh = function() {
+  this.element.className += " " + this.status();
+};
+
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView);
+
+/* @deprecated Use jasmine.HtmlReporter instead
+ */
+jasmine.TrivialReporter = function(doc) {
+  this.document = doc || document;
+  this.suiteDivs = {};
+  this.logRunningSpecs = false;
+};
+
+jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
+  var el = document.createElement(type);
+
+  for (var i = 2; i < arguments.length; i++) {
+    var child = arguments[i];
+
+    if (typeof child === 'string') {
+      el.appendChild(document.createTextNode(child));
+    } else {
+      if (child) { el.appendChild(child); }
+    }
+  }
+
+  for (var attr in attrs) {
+    if (attr == "className") {
+      el[attr] = attrs[attr];
+    } else {
+      el.setAttribute(attr, attrs[attr]);
+    }
+  }
+
+  return el;
+};
+
+jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
+  var showPassed, showSkipped;
+
+  this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' },
+      this.createDom('div', { className: 'banner' },
+        this.createDom('div', { className: 'logo' },
+            this.createDom('span', { className: 'title' }, "Jasmine"),
+            this.createDom('span', { className: 'version' }, runner.env.versionString())),
+        this.createDom('div', { className: 'options' },
+            "Show ",
+            showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
+            showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
+            this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
+            )
+          ),
+
+      this.runnerDiv = this.createDom('div', { className: 'runner running' },
+          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
+          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
+          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
+      );
+
+  this.document.body.appendChild(this.outerDiv);
+
+  var suites = runner.suites();
+  for (var i = 0; i < suites.length; i++) {
+    var suite = suites[i];
+    var suiteDiv = this.createDom('div', { className: 'suite' },
+        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
+        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
+    this.suiteDivs[suite.id] = suiteDiv;
+    var parentDiv = this.outerDiv;
+    if (suite.parentSuite) {
+      parentDiv = this.suiteDivs[suite.parentSuite.id];
+    }
+    parentDiv.appendChild(suiteDiv);
+  }
+
+  this.startedAt = new Date();
+
+  var self = this;
+  showPassed.onclick = function(evt) {
+    if (showPassed.checked) {
+      self.outerDiv.className += ' show-passed';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
+    }
+  };
+
+  showSkipped.onclick = function(evt) {
+    if (showSkipped.checked) {
+      self.outerDiv.className += ' show-skipped';
+    } else {
+      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
+    }
+  };
+};
+
+jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
+  var results = runner.results();
+  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
+  this.runnerDiv.setAttribute("class", className);
+  //do it twice for IE
+  this.runnerDiv.setAttribute("className", className);
+  var specs = runner.specs();
+  var specCount = 0;
+  for (var i = 0; i < specs.length; i++) {
+    if (this.specFilter(specs[i])) {
+      specCount++;
+    }
+  }
+  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
+  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
+  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
+
+  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
+};
+
+jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
+  var results = suite.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.totalCount === 0) { // todo: change this to check results.skipped
+    status = 'skipped';
+  }
+  this.suiteDivs[suite.id].className += " " + status;
+};
+
+jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
+  if (this.logRunningSpecs) {
+    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+  }
+};
+
+jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
+  var results = spec.results();
+  var status = results.passed() ? 'passed' : 'failed';
+  if (results.skipped) {
+    status = 'skipped';
+  }
+  var specDiv = this.createDom('div', { className: 'spec '  + status },
+      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
+      this.createDom('a', {
+        className: 'description',
+        href: '?spec=' + encodeURIComponent(spec.getFullName()),
+        title: spec.getFullName()
+      }, spec.description));
+
+
+  var resultItems = results.getItems();
+  var messagesDiv = this.createDom('div', { className: 'messages' });
+  for (var i = 0; i < resultItems.length; i++) {
+    var result = resultItems[i];
+
+    if (result.type == 'log') {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+    } else if (result.type == 'expect' && result.passed && !result.passed()) {
+      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+      if (result.trace.stack) {
+        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+      }
+    }
+  }
+
+  if (messagesDiv.childNodes.length > 0) {
+    specDiv.appendChild(messagesDiv);
+  }
+
+  this.suiteDivs[spec.suite.id].appendChild(specDiv);
+};
+
+jasmine.TrivialReporter.prototype.log = function() {
+  var console = jasmine.getGlobal().console;
+  if (console && console.log) {
+    if (console.log.apply) {
+      console.log.apply(console, arguments);
+    } else {
+      console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+    }
+  }
+};
+
+jasmine.TrivialReporter.prototype.getLocation = function() {
+  return this.document.location;
+};
+
+jasmine.TrivialReporter.prototype.specFilter = function(spec) {
+  var paramMap = {};
+  var params = this.getLocation().search.substring(1).split('&');
+  for (var i = 0; i < params.length; i++) {
+    var p = params[i].split('=');
+    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+  }
+
+  if (!paramMap.spec) {
+    return true;
+  }
+  return spec.getFullName().indexOf(paramMap.spec) === 0;
+};

bin/templates/project/assets/www/spec/lib/jasmine-1.2.0/jasmine.css

@@ -0,0 +1,81 @@
+body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
+
+#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
+#HTMLReporter a { text-decoration: none; }
+#HTMLReporter a:hover { text-decoration: underline; }
+#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
+#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
+#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
+#HTMLReporter .version { color: #aaaaaa; }
+#HTMLReporter .banner { margin-top: 14px; }
+#HTMLReporter .duration { color: #aaaaaa; float: right; }
+#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
+#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
+#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
+#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
+#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
+#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
+#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
+#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
+#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
+#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
+#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
+#HTMLReporter .runningAlert { background-color: #666666; }
+#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
+#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
+#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
+#HTMLReporter .passingAlert { background-color: #a6b779; }
+#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
+#HTMLReporter .failingAlert { background-color: #cf867e; }
+#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
+#HTMLReporter .results { margin-top: 14px; }
+#HTMLReporter #details { display: none; }
+#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
+#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
+#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
+#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter.showDetails .summary { display: none; }
+#HTMLReporter.showDetails #details { display: block; }
+#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
+#HTMLReporter .summary { margin-top: 14px; }
+#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
+#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
+#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
+#HTMLReporter .description + .suite { margin-top: 0; }
+#HTMLReporter .suite { margin-top: 14px; }
+#HTMLReporter .suite a { color: #333333; }
+#HTMLReporter #details .specDetail { margin-bottom: 28px; }
+#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
+#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
+#HTMLReporter .resultMessage span.result { display: block; }
+#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
+
+#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
+#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
+#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
+#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
+#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
+#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
+#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
+#TrivialReporter .runner.running { background-color: yellow; }
+#TrivialReporter .options { text-align: right; font-size: .8em; }
+#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
+#TrivialReporter .suite .suite { margin: 5px; }
+#TrivialReporter .suite.passed { background-color: #dfd; }
+#TrivialReporter .suite.failed { background-color: #fdd; }
+#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
+#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
+#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
+#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
+#TrivialReporter .spec.skipped { background-color: #bbb; }
+#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
+#TrivialReporter .passed { background-color: #cfc; display: none; }
+#TrivialReporter .failed { background-color: #fbb; }
+#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
+#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
+#TrivialReporter .resultMessage .mismatch { color: black; }
+#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
+#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
+#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
+#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
+#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }

bin/templates/project/cordova/create

@@ -1,58 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-# create a cordova/android project
-# 
-# USAGE
-#   ./create [path package activity]
-#
-
-# load up the config
-. ./.cordova/config
-
-PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g')
-ACTIVITY_PATH=./src/$PACKAGE_AS_PATH/$ACTIVITY.java
-MANIFEST_PATH=./AndroidManifest.xml
-
-# create the project
-android create project --target $TARGET --path . --package $PACKAGE --activity $ACTIVITY
-
-# copy all the cordova scripts etc in there
-cp -R ./cordova/templates/project/* .
-
-# copy in cordova.js
-cp ./.cordova/android/cordova-$VERSION.js ./assets/www
-
-# copy in cordova.jar
-cp ./.cordova/android/cordova-$VERSION.jar ./libs
-
-# copy in res/xml
-mkdir ./res/xml
-cp ./.cordova/android/cordova.xml ./res/xml
-cp ./.cordova/android/plugins.xml ./res/xml
-
-# copy in default activity
-cat ./cordova/templates/Activity.java > $ACTIVITY_PATH
-
-# interpolate the acivity name and package
-find "$ACTIVITY_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
-find "$ACTIVITY_PATH" | xargs grep '__ID__' -sl | xargs -L1 sed -i -e "s/__ID__/${PACKAGE}/g"
-
-find "$MANIFEST_PATH" | xargs grep '__ACTIVITY__' -sl | xargs -L1 sed -i -e "s/__ACTIVITY__/${ACTIVITY}/g"
-find "$MANIFEST_PATH" | xargs grep '__PACKAGE__' -sl | xargs -L1 sed -i -e "s/__PACKAGE__/${PACKAGE}/g"

bin/templates/project/cordova/create.bat

@@ -1,2 +0,0 @@
-echo "BALLS"
-cscript cordova\create.js

bin/templates/project/cordova/create.js

@@ -1,69 +0,0 @@
-var shell=WScript.CreateObject("WScript.Shell");
-
-function exec(s, output) {
-    WScript.Echo('Executing ' + s);
-    var o=shell.Exec(s);
-    while (o.Status == 0) {
-        WScript.Sleep(100);
-    }
-    WScript.Echo("Command exited with code " + o.Status);
-}
-function read(filename) {
-    var fso=WScript.CreateObject("Scripting.FileSystemObject");
-    var f=fso.OpenTextFile(filename, 1);
-    var s=f.ReadAll();
-    f.Close();
-    return s;
-}
-function write(filename, contents) {
-    var fso=WScript.CreateObject("Scripting.FileSystemObject");
-    var f=fso.OpenTextFile(filename, 2, true);
-    f.Write(contents);
-    f.Close();
-}
-function replaceInFile(filename, regexp, replacement) {
-    write(filename, read(filename).replace(regexp, replacement));
-}
-
-// working dir
-var PWD = WScript.ScriptFullName.split('\\cordova\\create.js').join('');
-
-var fso=WScript.CreateObject("Scripting.FileSystemObject");
-var f=fso.OpenTextFile(PWD + '\\.cordova\\config', 1);
-while (!f.AtEndOfStream) {
-  var prop = f.ReadLine().split('=');
-  var line = 'var ' + prop[0] + '=' + "'" + prop[1] + "';";
-  eval(line); // hacky shit to load config but whatevs
-}
-
-var PACKAGE_AS_PATH=PACKAGE.replace(/\./g, '\\');
-var ACTIVITY_PATH=PWD+'\\src\\'+PACKAGE_AS_PATH+'\\'+ACTIVITY+'.java';
-var MANIFEST_PATH=PWD+'\\AndroidManifest.xml';
-
-exec('android.bat create project --target ' + TARGET + ' --path ' + PWD + ' --package ' + PACKAGE + ' --activity ' + ACTIVITY);
-
-// copy in activity and other android assets
-exec('cmd /c xcopy ' + PWD + '\\cordova\\templates\\project\\* ' + PWD +' /Y /S');
-
-// copy in cordova.js
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.js ' + PWD + '\\assets\\www /Y');
-
-// copy in cordova.jar
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova-' + VERSION + '.jar ' + PWD + '\\libs /Y');
-
-// copy in res/xml
-exec('cmd /c md ' + PWD + '\\res\\xml');
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\cordova.xml ' + PWD + '\\res\\xml /Y');
-exec('cmd /c copy ' + PWD + '\\.cordova\\android\\plugins.xml ' + PWD + '\\res\\xml /Y');
-
-// copy in default activity
-exec('cmd /c copy ' + PWD + '\\cordova\\templates\\Activity.java ' + ACTIVITY_PATH + ' /Y');
-
-// interpolate the activity name and package
-replaceInFile(ACTIVITY_PATH, /__ACTIVITY__/, ACTIVITY);
-replaceInFile(ACTIVITY_PATH, /__ID__/, PACKAGE);
-
-replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, ACTIVITY);
-replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
-
-WScript.Echo('Create completed successfully.');

bin/templates/project/cordova/debug

@@ -1,27 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-
-. ./.cordova/config
-
-# if there are no devices listed then emulate
-
-ant clean
-ant debug install
-adb shell am start -n $PACKAGE/$PACKAGE.$ACTIVITY

bin/templates/project/cordova/emulate

@@ -1,31 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-
-
-#Available Android Virtual Devices:
-#    Name: default
-#    Path: /Users/davejohnson/.android/avd/default.avd
-#  Target: Android 2.2 (API level 8)
-#    Skin: WVGA800
-#  Sdcard: 100M
-
-# get the name of the first virtual device or use command line arg or use "default"
-
-emulator -cpu-delay 0 -no-boot-anim -cache ./tmp/cache -avd default > /dev/null 2>&1 & # put the avd's chatty ass in the background

bin/templates/project/cordova/log

@@ -1,21 +0,0 @@
-#! /bin/sh 
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-
-adb logcat

bin/templates/project/cordova/templates/project/assets/www/index.html

@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<html>
-  <head>
-    <meta name="viewport" content="width=320; user-scalable=no" />
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>PhoneGap</title>
-      <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title">
-      <script type="text/javascript" charset="utf-8" src="cordova-1.8.0.js"></script>
-      <script type="text/javascript" charset="utf-8" src="main.js"></script>
-
-  </head>
-  <body onload="init();" id="stage" class="theme">
-    <h1>Welcome to Cordova!</h1>
-    <h2>this file is located at assets/www/index.html</h2>
-    <div id="info">
-        <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>
-        <h4>UUID: <span id="uuid"> &nbsp;</span>,   Name: <span id="name">&nbsp;</span></h4>
-        <h4>Width: <span id="width"> &nbsp;</span>,   Height: <span id="height">&nbsp;
-                   </span>, Color Depth: <span id="colorDepth"></span></h4>
-     </div>
-    <dl id="accel-data">
-      <dt>X:</dt><dd id="x">&nbsp;</dd>
-      <dt>Y:</dt><dd id="y">&nbsp;</dd>
-      <dt>Z:</dt><dd id="z">&nbsp;</dd>
-    </dl>
-    <a href="#" class="btn large" onclick="toggleAccel();">Toggle Accelerometer</a>
-    <a href="#" class="btn large" onclick="getLocation();">Get Location</a>
-    <a href="tel:411" class="btn large">Call 411</a>
-    <a href="#" class="btn large" onclick="beep();">Beep</a>
-    <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
-    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
-    <a href="#" class="btn large" onclick="get_contacts();return false;">Get Phone's Contacts</a>
-    <a href="#" class="btn large" onclick="check_network();return false;">Check Network</a>
-    <dl>
-    <dt>Compass Heading:</dt><dd id="h">Off</dd>
-    </dl>
-    <a href="#" class="btn large" onclick="toggleCompass();return false;">Toggle Compass</a>
-    <div id="viewport" class="viewport" style="display: none;">
-      <img style="width:60px;height:60px" id="test_img" src="" />
-    </div>
-  </body>
-</html>

bin/test

@@ -1,44 +0,0 @@
-#! /bin/sh
-#       Licensed to the Apache Software Foundation (ASF) under one
-#       or more contributor license agreements.  See the NOTICE file
-#       distributed with this work for additional information
-#       regarding copyright ownership.  The ASF licenses this file
-#       to you under the Apache License, Version 2.0 (the
-#       "License"); you may not use this file except in compliance
-#       with the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#       Unless required by applicable law or agreed to in writing,
-#       software distributed under the License is distributed on an
-#       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#       KIND, either express or implied.  See the License for the
-#       specific language governing permissions and limitations
-#       under the License.
-#
-#
-set -e
-
-VERSION=$(cat ./VERSION)
-
-# get the latest mobile-spec
-git clone git@github.com:callback/callback-test.git
-
-# clobber test if it exists
-if [ -e ./test ]
-then
-    rm -rf ./test
-fi
-
-# generate a working proj
-./bin/create ./test org.apache.cordova.test CordovaTest
-
-# kill the default app and replace it w/ mobile-spec
-rm -rf ./test/assets/www
-mv ./callback-test ./test/assets/www
-
-# copy in cordova.js since www dir was replaced above
-cp ./framework/assets/www/cordova-$VERSION.js ./test/assets/www/cordova-$VERSION.js
-
-# build it, launch it and start logging on stdout
-cd ./test && ./cordova/debug && ./cordova/log

bin/tests/autotest.coffee

@@ -1,24 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-
-exports['you are sane'] = (test) ->
-  test.expect 1
-  test.ok true, "this assertion should always pass"
-  test.done()

bin/tests/debug.coffee

@@ -1,18 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/

bin/tests/test_create_unix.js

@@ -0,0 +1,152 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+var build_path = __dirname + '/../..',
+    project_path = '/tmp/example',
+    package_name = 'org.apache.cordova.example',
+    package_as_path = 'org/apache/cordova/example',
+    project_name = 'cordovaExample';
+
+var path = require('path'),
+    fs = require('fs'),
+    util = require('util'),
+    assert = require('assert'),
+    spawn = require('child_process').spawn;
+
+var version = fs.readFileSync(build_path + '/VERSION').toString().replace('\n', '');
+
+assert(version !== undefined);
+assert(version !== '');
+
+var create_project = spawn(build_path + '/bin/create',
+                           [project_path,
+                            package_name,
+                            project_name]);
+
+process.on('uncaughtException', function (err) {
+    console.log('Caught exception: ' + err);
+    spawn('rm', ['-rf', project_path], function(code) {
+        if(code != 0) {
+            console.log("Could not delete project directory");
+        }
+    });
+});
+
+create_project.on('exit', function(code) {
+
+    assert.equal(code, 0, 'Project did not get created');
+
+    // make sure the project was created
+    path.exists(project_path, function(exists) {
+        assert(exists, 'Project path does not exist');
+    });
+
+    // make sure the build directory was cleaned up
+//    path.exists(build_path + '/framework/libs', function(exists) {
+//        assert(!exists, 'libs directory did not get cleaned up');
+//    });
+    path.exists(build_path + util.format('/framework/assets/cordova-%s.js', version), function(exists) {
+        assert(!exists, 'javascript file did not get cleaned up');
+    });
+    path.exists(build_path + util.format('/framework/cordova-%s.jar', version), function(exists) {
+        assert(!exists, 'jar file did not get cleaned up');
+    });
+
+    // make sure AndroidManifest.xml was added
+    path.exists(util.format('%s/AndroidManifest.xml', project_path), function(exists) {
+        assert(exists, 'AndroidManifest.xml did not get created');
+        // TODO check that the activity name was properly substituted
+    });
+
+    // make sure main Activity was added 
+    path.exists(util.format('%s/src/%s/%s.java', project_path, package_as_path, project_name), function(exists) {
+        assert(exists, 'Activity did not get created');
+        // TODO check that package name and activity name were substituted properly
+    });
+   
+    // make sure plugins.xml was added
+    path.exists(util.format('%s/res/xml/plugins.xml', project_path), function(exists) {
+        assert(exists, 'plugins.xml did not get created');
+    });
+    
+    // make sure cordova.xml was added
+    path.exists(util.format('%s/res/xml/cordova.xml', project_path), function(exists) {
+        assert(exists, 'plugins.xml did not get created');
+    });
+    
+    // make sure cordova.jar was added
+    path.exists(util.format('%s/libs/cordova-%s.jar', project_path, version), function(exists) {
+        assert(exists, 'cordova.jar did not get added');
+    });
+    
+    // make sure cordova.js was added
+    path.exists(util.format('%s/assets/www/cordova-%s.js', project_path, version), function(exists) {
+        assert(exists, 'cordova.js did not get added');
+    });
+    
+    // make sure cordova master script was added
+    path.exists(util.format('%s/cordova/cordova', project_path), function(exists) {
+        assert(exists, 'cordova script did not get added');
+    });
+    
+    // make sure debug script was added
+    path.exists(util.format('%s/cordova/debug', project_path), function(exists) {
+        assert(exists, 'debug script did not get added');
+    });
+    
+    // make sure BOOM script was added
+    path.exists(util.format('%s/cordova/BOOM', project_path), function(exists) {
+        assert(exists, 'BOOM script did not get added');
+    });
+    
+    // make sure log script was added
+    path.exists(util.format('%s/cordova/log', project_path), function(exists) {
+        assert(exists, 'log script did not get added');
+    });
+    
+    // make sure clean script was added
+    path.exists(util.format('%s/cordova/clean', project_path), function(exists) {
+        assert(exists, 'clean script did not get added');
+    });
+    
+    // make sure emulate script was added
+    path.exists(util.format('%s/cordova/emulate', project_path), function(exists) {
+        assert(exists, 'emulate script did not get added');
+    });
+    
+    // make sure appinfo.jar script was added
+    path.exists(util.format('%s/cordova/appinfo.jar', project_path), function(exists) {
+        assert(exists, 'appinfo.jar script did not get added');
+    });
+
+    // check that project compiles && creates a cordovaExample-debug.apk
+    var compile_project = spawn('ant', ['debug'], {cwd: project_path});
+    
+    compile_project.on('exit', function(code) {
+        assert.equal(code, 0, 'Cordova Android Project does not compile');
+        // make sure cordovaExample-debug.apk was created
+        path.exists(util.format('%s/bin/%s-debug.apk', project_path, project_name), function(exists) {
+            assert(exists, 'Package did not get created');
+            
+            // if project compiles properly just AXE it
+            spawn('rm', ['-rf', project_path], function(code) {
+                assert.equal(code, 0, 'Could not remove project directory');
+            });
+        });
+    });
+
+});

bin/tests/test_create_win.js

@@ -0,0 +1,155 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+var build_path = __dirname + '/../..'
+    project_path = process.env.Temp + '\\example',
+    package_name = 'org.apache.cordova.example',
+    package_as_path = 'org/apache/cordova/example',
+    project_name = 'cordovaExample';
+
+var path = require('path'),
+    fs = require('fs'),
+    util = require('util'),
+    assert = require('assert'),
+    exec = require('child_process').exec,
+    spawn = require('child_process').spawn;
+
+var version = fs.readFileSync(build_path + '/VERSION').toString().replace('\r\n', '');
+
+assert(version !== undefined);
+assert(version !== '');
+
+process.on('uncaughtException', function (err) {
+    console.log('Caught exception: ' + err);
+    exec('rd /s /q ' + project_path);
+});
+
+var create_project = spawn('cscript',
+                           [build_path + '/bin/create.js',
+                            project_path,
+                            package_name,
+                            project_name]
+                          );
+
+create_project.stderr.on('data', function (data) {
+  console.log('ps stderr: ' + data);
+});
+
+create_project.stderr.on('data', function(data) {
+    console.log(data.toString());
+});
+
+create_project.stdout.on('data', function(data) {
+    console.log(data.toString());
+});
+
+create_project.on('exit', function(code) {
+    assert.equal(code, 0, 'Project did not get created');
+
+    // make sure the project was created
+    path.exists(project_path, function(exists) {
+        assert(exists, 'Project path does not exist');
+    });
+
+    // make sure the build directory was cleaned up
+   // path.exists(build_path + '/framework/libs', function(exists) {
+   //     assert(!exists, 'libs directory did not get cleaned up');
+   // });
+    path.exists(build_path + util.format('/framework/assets/cordova-%s.js', version), function(exists) {
+        assert(!exists, 'javascript file did not get cleaned up');
+    });
+    path.exists(build_path + util.format('/framework/cordova-%s.jar', version), function(exists) {
+        assert(!exists, 'jar file did not get cleaned up');
+    });
+
+    // make sure AndroidManifest.xml was added
+    path.exists(util.format('%s/AndroidManifest.xml', project_path), function(exists) {
+        assert(exists, 'AndroidManifest.xml did not get created');
+        // TODO check that the activity name was properly substituted
+    });
+
+    // make sure main Activity was added 
+    path.exists(util.format('%s/src/%s/%s.java', project_path, package_as_path, project_name), function(exists) {
+        assert(exists, 'Activity did not get created');
+        // TODO check that package name and activity name were substituted properly
+    });
+   
+    // make sure config.xml was added
+    path.exists(util.format('%s/res/xml/config.xml', project_path), function(exists) {
+        assert(exists, 'config.xml did not get created');
+    });
+    
+    // make sure cordova.jar was added
+    path.exists(util.format('%s/libs/cordova-%s.jar', project_path, version), function(exists) {
+        assert(exists, 'cordova.jar did not get added');
+    });
+    
+    // make sure cordova.js was added
+    path.exists(util.format('%s/assets/www/cordova-%s.js', project_path, version), function(exists) {
+        assert(exists, 'cordova.js did not get added');
+    });
+    
+    // make sure cordova master script was added
+    path.exists(util.format('%s/cordova/cordova.bat', project_path), function(exists) {
+        assert(exists, 'cordova script did not get added');
+    });
+    
+    // make sure debug script was added
+    path.exists(util.format('%s/cordova/debug.bat', project_path), function(exists) {
+        assert(exists, 'debug script did not get added');
+    });
+    
+    // make sure BOOM script was added
+    path.exists(util.format('%s/cordova/BOOM.bat', project_path), function(exists) {
+        assert(exists, 'BOOM script did not get added');
+    });
+    
+    // make sure log script was added
+    path.exists(util.format('%s/cordova/log.bat', project_path), function(exists) {
+        assert(exists, 'log script did not get added');
+    });
+    
+    // make sure clean script was added
+    path.exists(util.format('%s/cordova/clean.bat', project_path), function(exists) {
+        assert(exists, 'clean script did not get added');
+    });
+    
+    // make sure emulate script was added
+    path.exists(util.format('%s/cordova/emulate.bat', project_path), function(exists) {
+        assert(exists, 'emulate script did not get added');
+    });
+    
+    // make sure appinfo.jar script was added
+    path.exists(util.format('%s/cordova/appinfo.jar', project_path), function(exists) {
+        assert(exists, 'appinfo.jar script did not get added');
+    });
+  
+  // check that project compiles && creates a cordovaExample-debug.apk
+  // XXX: !@##!@# WINDOWS
+    exec('ant debug -f ' + project_path + "\\build.xml", function(error, stdout, stderr) {
+        assert(error == null, "Cordova Android Project does not compile");
+        path.exists(util.format('%s/bin/%s-debug.apk', project_path, project_name), 
+                    function(exists) {
+                        assert(exists, 'Package did not get created');
+                        // if project compiles properly just AXE it
+                        exec('rd /s /q ' + project_path);
+                    });
+    });
+
+
+});
+

framework/.classpath

@@ -3,6 +3,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="libs/commons-codec-1.7.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

framework/.project

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Cordova</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+    <name>Cordova</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
 </projectDescription>

framework/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -39,30 +39,30 @@
     <uses-permission android:name="android.permission.RECORD_VIDEO"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:debuggable="true">
         <activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
-                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
+               android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name" 
+        <activity android:name="org.apache.cordova.DroidGap" android:label="@string/app_name"
                   android:configChanges="orientation|keyboardHidden">
             <intent-filter>
             </intent-filter>
         </activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="2" />
-</manifest> 
+    <uses-sdk android:minSdkVersion="7" />
+</manifest>

framework/assets/www/index.html

@@ -1,4 +1,4 @@
-<!-- 
+<!--
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-1.8.0.js"></script>
+    <script src="cordova-2.3.0rc1.js"></script>
   </head>
   <body>
 

framework/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -26,9 +26,37 @@
         </filterchain>
     </loadfile>
 
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
+    <!-- check that the version of ant is at least 1.8.0, as is needed
+         for the dblQuote property -->
+    <antversion property="thisantversion" atleast="1.8.0" />
+    <fail message="The required minimum version of ant is 1.8.0, you have ${ant.version}"
+          unless="thisantversion" />
+
+    <!-- check that commons codec is available. You should copy the codec jar to
+         framework/libs, as it is not included in the Cordova distribution. 
+         The name of the jar file in framework/libs does not matter. -->
+    <available classname="org.apache.commons.codec.binary.Base64"
+               property="exists.base64"
+               ignoresystemclasses="true">
+        <classpath>
+            <pathelement path="${classpath}" />
+            <fileset dir="libs">
+                <include name="*.jar" />
+            </fileset>
+        </classpath>
+    </available>
+    <fail message="You need to put a copy of Apache Commons Codec jar in the framework/libs directory"
+          unless="exists.base64" />
+
+    <!-- The local.properties file is created and updated by the 'android' 
+         tool. (For example "sdkdir/tools/android update project -p ." inside
+         of this directory where the AndroidManifest.xml file exists. This
+         properties file that gets built contains the path to the SDK. It 
+         should *NOT* be checked into Version Control Systems since it holds
+         data about the local machine. -->
+    <available file="local.properties" property="exists.local.properties" />
+    <fail message="You need to create the file 'local.properties' by running 'android update project -p .' here."
+          unless="exists.local.properties" />
     <loadproperties srcFile="local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
@@ -51,7 +79,7 @@
 
          -->
     <property file="ant.properties" />
-    
+
     <!-- We need to setup the double quote. -->
     <property name="dblQuote">"</property>
 
@@ -66,13 +94,13 @@
          application and should be checked into Version Control Systems. -->
     <loadproperties srcFile="project.properties" />
 
-   <!-- quick check on sdk.dir -->
+    <!-- quick check on sdk.dir -->
     <fail
             message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
             unless="sdk.dir"
     />
 
-   <!-- version-tag: custom -->
+    <!-- version-tag: custom -->
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 <!--
@@ -106,14 +134,14 @@
          In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
-   <import file="${sdk.dir}/tools/ant/build.xml" />
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
     <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
     <target name="build-javascript" depends="clean">
-        
+
       <!-- Clean up existing files -->
       <!--<delete file="assets/www/cordova_${version}.js"/>-->
-        
+
       <!-- Create uncompressed JS file -->
       <concat destfile="assets/www/cordova-${version}.js">
         <filelist dir="assets/js" files="cordova.android.js"/>
@@ -121,8 +149,8 @@
 
       <!-- update project files to reference cordova-x.x.x.min.js -->
       <replaceregexp match="cordova(.*)\.js" replace="cordova-${version}.js" byline="true">
-         <fileset file="assets/www/index.html" /> 
-         <fileset file="../bin/templates/project/cordova/templates/project/assets/www/index.html" /> 
+         <fileset file="assets/www/index.html" />
+         <fileset file="../bin/templates/project/assets/www/index.html" />
       </replaceregexp>
 
       <!-- This is sketchy, but it works, ${dblQuote} does not -->

framework/default.properties

@@ -1,8 +1,8 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
 # "build.properties", and override values to adapt the script to your
 # project structure.

framework/project.properties

@@ -10,5 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:17
 apk-configurations=
+renderscript.opt.level=O0
+android.library=true

framework/res/layout/main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information
@@ -21,9 +21,9 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >    
+    >
             <WebView android:id="@+id/appView"
             android:layout_height="fill_parent"
             android:layout_width="fill_parent"
-            />	
+            />
 </LinearLayout>

framework/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
        Licensed to the Apache Software Foundation (ASF) under one
        or more contributor license agreements.  See the NOTICE file
        distributed with this work for additional information

framework/res/xml/config.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+-->
+<cordova>
+    <!--
+    access elements control the Android whitelist.
+    Domains are assumed blocked unless set otherwise
+     -->
+
+    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+
+    <!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
+    <!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
+    <access origin=".*"/>
+
+    <log level="DEBUG"/>
+    <preference name="useBrowserHistory" value="true" />
+    <preference name="exit-on-suspend" value="false" />
+<plugins>
+    <plugin name="App" value="org.apache.cordova.App"/>
+    <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
+    <plugin name="Device" value="org.apache.cordova.Device"/>
+    <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
+    <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
+    <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
+    <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
+    <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
+    <plugin name="File" value="org.apache.cordova.FileUtils"/>
+    <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
+    <plugin name="Notification" value="org.apache.cordova.Notification"/>
+    <plugin name="Storage" value="org.apache.cordova.Storage"/>
+    <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
+    <plugin name="Capture" value="org.apache.cordova.Capture"/>
+    <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
+    <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
+    <plugin name="Echo" value="org.apache.cordova.Echo" />
+    <plugin name="Globalization" value="org.apache.cordova.Globalization"/>
+    <plugin name="InAppBrowser" value="org.apache.cordova.InAppBrowser"/>
+</plugins>
+</cordova>
+

framework/res/xml/cordova.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<cordova>
-	<!--  
-	access elements control the Android whitelist.  
-	Domains are assumed blocked unless set otherwise
-	 -->
-
-    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
-
-	<!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
-	<!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
-	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
-
-    <log level="DEBUG"/>
-    <preference name="classicRender" value="true" />
-</cordova>
-
-
-

framework/src/com/phonegap/api/IPlugin.java

@@ -1,27 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package com.phonegap.api;
-
-/**
- * Plugin interface must be implemented by any plugin classes.
- *
- * The execute method is called by the PluginManager.
- */
-public interface IPlugin extends org.apache.cordova.api.IPlugin {
-}

framework/src/com/phonegap/api/LOG.java

@@ -1,28 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package com.phonegap.api;
-
-/**
- * Log to Android logging system.
- * 
- * Log message can be a string or a printf formatted string with arguments.
- * See http://developer.android.com/reference/java/util/Formatter.html
- */
-public class LOG extends org.apache.cordova.api.LOG {
-}

framework/src/com/phonegap/api/Plugin.java

@@ -1,27 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package com.phonegap.api;
-
-/**
- * Plugin interface must be implemented by any plugin classes.
- *
- * The execute method is called by the PluginManager.
- */
-public abstract class Plugin extends org.apache.cordova.api.Plugin {
-}

framework/src/org/apache/cordova/AccelListener.java

@@ -18,48 +18,45 @@
 */
 package org.apache.cordova;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
+import org.apache.cordova.api.CallbackContext;
 import org.apache.cordova.api.CordovaInterface;
-import org.apache.cordova.api.Plugin;
+import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
+import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.location.Location;
-import android.util.Log;
-import android.content.Context;
+
+import android.os.Handler;
+import android.os.Looper;
 
 /**
- * This class listens to the accelerometer sensor and stores the latest 
+ * This class listens to the accelerometer sensor and stores the latest
  * acceleration values x,y,z.
  */
-public class AccelListener extends Plugin implements SensorEventListener {
+public class AccelListener extends CordovaPlugin implements SensorEventListener {
 
     public static int STOPPED = 0;
     public static int STARTING = 1;
     public static int RUNNING = 2;
     public static int ERROR_FAILED_TO_START = 3;
-    
-    private float x,y,z;						        // most recent acceleration values
-    private long timestamp;					        // time of most recent value
-    private int status;							        // status of listener
+   
+    private float x,y,z;                                // most recent acceleration values
+    private long timestamp;                         // time of most recent value
+    private int status;                                 // status of listener
     private int accuracy = SensorManager.SENSOR_STATUS_UNRELIABLE;
 
     private SensorManager sensorManager;    // Sensor manager
-    private Sensor mSensor;						      // Acceleration sensor returned by sensor manager
+    private Sensor mSensor;                           // Acceleration sensor returned by sensor manager
 
-    private String callbackId;              // Keeps track of the single "start" callback ID passed in from JS
+    private CallbackContext callbackContext;              // Keeps track of the JS callback context.
 
     /**
      * Create an accelerometer listener.
@@ -71,34 +68,31 @@ public class AccelListener extends Plugin implements SensorEventListener {
         this.timestamp = 0;
         this.setStatus(AccelListener.STOPPED);
      }
-    
+
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
-     * @param ctx The context of the main Activity.
+     *
+     * @param cordova The context of the main Activity.
+     * @param webView The associated CordovaWebView.
      */
-    public void setContext(CordovaInterface ctx) {
-        super.setContext(ctx);
-        this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
+    @Override
+    public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+        super.initialize(cordova, webView);
+        this.sensorManager = (SensorManager) cordova.getActivity().getSystemService(Context.SENSOR_SERVICE);
     }
 
     /**
-     * Executes the request and returns PluginResult.
-     * 
-     * @param action 		The action to execute.
-     * @param args 			JSONArry of arguments for the plugin.
-     * @param callbackId	The callback id used when calling back into JavaScript.
-     * @return 				A PluginResult object with a status and message.
+     * Executes the request.
+     *
+     * @param action        The action to execute.
+     * @param args          The exec() arguments.
+     * @param callbackId    The callback id used when calling back into JavaScript.
+     * @return              Whether the action was valid.
      */
-    public PluginResult execute(String action, JSONArray args, String callbackId) {
-        PluginResult.Status status = PluginResult.Status.NO_RESULT;
-        String message = "";
-        PluginResult result = new PluginResult(status, message);
-        result.setKeepCallback(true);	
-
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
         if (action.equals("start")) {
-            this.callbackId = callbackId;
+            this.callbackContext = callbackContext;
             if (this.status != AccelListener.RUNNING) {
                 // If not running, then this is an async call, so don't worry about waiting
                 // We drop the callback onto our stack, call start, and let start and the sensor callback fire off the callback down the road
@@ -111,11 +105,15 @@ public class AccelListener extends Plugin implements SensorEventListener {
             }
         } else {
           // Unsupported action
-            return new PluginResult(PluginResult.Status.INVALID_ACTION);
+            return false;
         }
-        return result;
+
+        PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT, "");
+        result.setKeepCallback(true);
+        callbackContext.sendPluginResult(result);
+        return true;
     }
-    
+
     /**
      * Called by AccelBroker when listener is to be shut down.
      * Stop listener.
@@ -131,45 +129,39 @@ public class AccelListener extends Plugin implements SensorEventListener {
     /**
      * Start listening for acceleration sensor.
      * 
-     * @return 			status of listener
-     */
+     * @return          status of listener
+    */
     private int start() {
-    	// If already starting or running, then just return
-    	if ((this.status == AccelListener.RUNNING) || (this.status == AccelListener.STARTING)) {
-          return this.status;
-    	}
-    	
-    	this.setStatus(AccelListener.STARTING);
-    	
-    	// Get accelerometer from sensor manager
-    	List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
+        // If already starting or running, then just return
+        if ((this.status == AccelListener.RUNNING) || (this.status == AccelListener.STARTING)) {
+            return this.status;
+        }
 
-    	// If found, then register as listener
-    	if ((list != null) && (list.size() > 0)) {
+        this.setStatus(AccelListener.STARTING);
+
+        // Get accelerometer from sensor manager
+        List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ACCELEROMETER);
+
+        // If found, then register as listener
+        if ((list != null) && (list.size() > 0)) {
           this.mSensor = list.get(0);
           this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_UI);
           this.setStatus(AccelListener.STARTING);
-    	} else {
+        } else {
           this.setStatus(AccelListener.ERROR_FAILED_TO_START);
           this.fail(AccelListener.ERROR_FAILED_TO_START, "No sensors found to register accelerometer listening to.");
           return this.status;
-    	}
-    	
-    	// Wait until running
-    	long timeout = 2000;
-    	while ((this.status == STARTING) && (timeout > 0)) {
-          timeout = timeout - 100;
-          try {
-              Thread.sleep(100);
-          } catch (InterruptedException e) {
-              e.printStackTrace();
-          }
-    	}
-    	if (timeout == 0) {
-          this.setStatus(AccelListener.ERROR_FAILED_TO_START);
-          this.fail(AccelListener.ERROR_FAILED_TO_START, "Accelerometer could not be started.");
-    	}
-    	return this.status;
+        }
+
+        // Set a timeout callback on the main thread.
+        Handler handler = new Handler(Looper.getMainLooper());
+        handler.postDelayed(new Runnable() {
+            public void run() {
+                AccelListener.this.timeout();
+            }
+        }, 2000);
+
+        return this.status;
     }
 
     /**
@@ -183,18 +175,30 @@ public class AccelListener extends Plugin implements SensorEventListener {
         this.accuracy = SensorManager.SENSOR_STATUS_UNRELIABLE;
     }
 
+    /**
+     * Returns an error if the sensor hasn't started.
+     *
+     * Called two seconds after starting the listener.
+     */
+    private void timeout() {
+        if (this.status == AccelListener.STARTING) {
+            this.setStatus(AccelListener.ERROR_FAILED_TO_START);
+            this.fail(AccelListener.ERROR_FAILED_TO_START, "Accelerometer could not be started.");
+        }
+    }
+
     /**
      * Called when the accuracy of the sensor has changed.
-     * 
+     *
      * @param sensor
      * @param accuracy
      */
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
-    	// Only look at accelerometer events
+        // Only look at accelerometer events
         if (sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
             return;
         }
-        
+
         // If not running, then just return
         if (this.status == AccelListener.STOPPED) {
             return;
@@ -204,7 +208,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
 
     /**
      * Sensor listener event.
-     * 
+     *
      * @param SensorEvent event
      */
     public void onSensorChanged(SensorEvent event) {
@@ -212,18 +216,17 @@ public class AccelListener extends Plugin implements SensorEventListener {
         if (event.sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
             return;
         }
-        
+
         // If not running, then just return
         if (this.status == AccelListener.STOPPED) {
             return;
         }
-        
         this.setStatus(AccelListener.RUNNING);
-        
+
         if (this.accuracy >= SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM) {
 
             // Save time that event was received
-            this.timestamp = System.nanoTime();
+            this.timestamp = System.currentTimeMillis();
             this.x = event.values[0];
             this.y = event.values[1];
             this.z = event.values[2];
@@ -232,6 +235,16 @@ public class AccelListener extends Plugin implements SensorEventListener {
         }
     }
 
+    /**
+     * Called when the view navigates.
+     */
+    @Override
+    public void onReset() {
+        if (this.status == AccelListener.RUNNING) {
+            this.stop();
+        }
+    }
+
     // Sends an error back to JS
     private void fail(int code, String message) {
         // Error object
@@ -244,22 +257,19 @@ public class AccelListener extends Plugin implements SensorEventListener {
         }
         PluginResult err = new PluginResult(PluginResult.Status.ERROR, errorObj);
         err.setKeepCallback(true);
-
-        this.error(err, this.callbackId);
+        callbackContext.sendPluginResult(err);
     }
-    
+
     private void win() {
         // Success return object
         PluginResult result = new PluginResult(PluginResult.Status.OK, this.getAccelerationJSON());
         result.setKeepCallback(true);
-
-        this.success(result, this.callbackId);
+        callbackContext.sendPluginResult(result);
     }
 
     private void setStatus(int status) {
         this.status = status;
     }
-	
     private JSONObject getAccelerationJSON() {
         JSONObject r = new JSONObject();
         try {

framework/src/org/apache/cordova/App.java

@@ -19,6 +19,7 @@
 
 package org.apache.cordova;
 
+import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.LOG;
 import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
@@ -30,7 +31,7 @@ import java.util.HashMap;
 /**
  * This class exposes methods in DroidGap that can be called from JavaScript.
  */
-public class App extends Plugin {
+public class App extends CordovaPlugin {
 
     /**
      * Executes the request and returns PluginResult.
@@ -45,30 +46,39 @@ public class App extends Plugin {
         String result = "";
 
         try {
-        	if (action.equals("clearCache")) {
-        		this.clearCache();
-        	}
-        	else if (action.equals("loadUrl")) {
-            	this.loadUrl(args.getString(0), args.optJSONObject(1));
+            if (action.equals("clearCache")) {
+                this.clearCache();
             }
-        	else if (action.equals("cancelLoadUrl")) {
-            	this.cancelLoadUrl();
+            else if (action.equals("show")) {
+                // This gets called from JavaScript onCordovaReady to show the webview.
+                // I recommend we change the name of the Message as spinner/stop is not
+                // indicative of what this actually does (shows the webview).
+                cordova.getActivity().runOnUiThread(new Runnable() {
+                    public void run() {
+                        webView.postMessage("spinner", "stop");
+                    }
+                });
             }
-        	else if (action.equals("clearHistory")) {
-            	this.clearHistory();
+            else if (action.equals("loadUrl")) {
+                this.loadUrl(args.getString(0), args.optJSONObject(1));
+            }
+            else if (action.equals("cancelLoadUrl")) {
+                this.cancelLoadUrl();
+            }
+            else if (action.equals("clearHistory")) {
+                this.clearHistory();
             }
             else if (action.equals("backHistory")) {
                 this.backHistory();
             }
-        	else if (action.equals("overrideBackbutton")) {
-            	this.overrideBackbutton(args.getBoolean(0));
+            else if (action.equals("overrideButton")) {
+                this.overrideButton(args.getString(0), args.getBoolean(1));
             }
-        	else if (action.equals("isBackbuttonOverridden")) {
-            	boolean b = this.isBackbuttonOverridden();
-            	return new PluginResult(status, b);
+            else if (action.equals("overrideBackbutton")) {
+                this.overrideBackbutton(args.getBoolean(0));
             }
-        	else if (action.equals("exitApp")) {
-            	this.exitApp();
+            else if (action.equals("exitApp")) {
+                this.exitApp();
             }
             return new PluginResult(status, result);
         } catch (JSONException e) {
@@ -80,119 +90,137 @@ public class App extends Plugin {
     // LOCAL METHODS
     //--------------------------------------------------------------------------
 
-	/**
-	 * Clear the resource cache.
-	 */
-	public void clearCache() {
-		((DroidGap)this.ctx).clearCache();
-	}
-	
-	/**
-	 * Load the url into the webview.
-	 * 
-	 * @param url
-	 * @param props			Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
-	 * @throws JSONException 
-	 */
-	public void loadUrl(String url, JSONObject props) throws JSONException {
-		LOG.d("App", "App.loadUrl("+url+","+props+")");
-		int wait = 0;
-		boolean openExternal = false;
-		boolean clearHistory = false;
+    /**
+     * Clear the resource cache.
+     */
+    public void clearCache() {
+        this.webView.clearCache(true);
+    }
 
-		// If there are properties, then set them on the Activity
-		HashMap<String, Object> params = new HashMap<String, Object>();
-		if (props != null) {
-			JSONArray keys = props.names();
-			for (int i=0; i<keys.length(); i++) {
-				String key = keys.getString(i); 
-				if (key.equals("wait")) {
-					wait = props.getInt(key);
-				}
-				else if (key.equalsIgnoreCase("openexternal")) {
-					openExternal = props.getBoolean(key);
-				}
-				else if (key.equalsIgnoreCase("clearhistory")) {
-					clearHistory = props.getBoolean(key);
-				}
-				else {
-					Object value = props.get(key);
-					if (value == null) {
+    /**
+     * Load the url into the webview.
+     *
+     * @param url
+     * @param props			Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
+     * @throws JSONException
+     */
+    public void loadUrl(String url, JSONObject props) throws JSONException {
+        LOG.d("App", "App.loadUrl("+url+","+props+")");
+        int wait = 0;
+        boolean openExternal = false;
+        boolean clearHistory = false;
 
-					}
-					else if (value.getClass().equals(String.class)) {
-						params.put(key, (String)value);
-					}
-					else if (value.getClass().equals(Boolean.class)) {
-						params.put(key, (Boolean)value);
-					}
-					else if (value.getClass().equals(Integer.class)) {
-						params.put(key, (Integer)value);
-					}
-				}
-			}
-		}
+        // If there are properties, then set them on the Activity
+        HashMap<String, Object> params = new HashMap<String, Object>();
+        if (props != null) {
+            JSONArray keys = props.names();
+            for (int i = 0; i < keys.length(); i++) {
+                String key = keys.getString(i);
+                if (key.equals("wait")) {
+                    wait = props.getInt(key);
+                }
+                else if (key.equalsIgnoreCase("openexternal")) {
+                    openExternal = props.getBoolean(key);
+                }
+                else if (key.equalsIgnoreCase("clearhistory")) {
+                    clearHistory = props.getBoolean(key);
+                }
+                else {
+                    Object value = props.get(key);
+                    if (value == null) {
 
-		// If wait property, then delay loading
+                    }
+                    else if (value.getClass().equals(String.class)) {
+                        params.put(key, (String)value);
+                    }
+                    else if (value.getClass().equals(Boolean.class)) {
+                        params.put(key, (Boolean)value);
+                    }
+                    else if (value.getClass().equals(Integer.class)) {
+                        params.put(key, (Integer)value);
+                    }
+                }
+            }
+        }
 
-		if (wait > 0) {
-			try {
-				synchronized(this) {
-					this.wait(wait);
-				}
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		((DroidGap)this.ctx).showWebPage(url, openExternal, clearHistory, params);
-	}
+        // If wait property, then delay loading
+
+        if (wait > 0) {
+            try {
+                synchronized(this) {
+                    this.wait(wait);
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        this.webView.showWebPage(url, openExternal, clearHistory, params);
+    }
+
+    /**
+     * Cancel loadUrl before it has been loaded (Only works on a CordovaInterface class)
+     */
+    @Deprecated
+    public void cancelLoadUrl() {
+        this.cordova.cancelLoadUrl();
+    }
 
-	/**
-	 * Cancel loadUrl before it has been loaded.
-	 */
-	public void cancelLoadUrl() {
-		((DroidGap)this.ctx).cancelLoadUrl();
-	}
-	
     /**
      * Clear page history for the app.
      */
     public void clearHistory() {
-    	((DroidGap)this.ctx).clearHistory();
+        this.webView.clearHistory();
     }
-    
+
     /**
      * Go to previous page displayed.
      * This is the same as pressing the backbutton on Android device.
      */
     public void backHistory() {
-        ((DroidGap)this.ctx).backHistory();
+        cordova.getActivity().runOnUiThread(new Runnable() {
+            public void run() {
+                webView.backHistory();
+            }
+        });
     }
 
     /**
      * Override the default behavior of the Android back button.
      * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
-     * 
+     *
      * @param override		T=override, F=cancel override
      */
     public void overrideBackbutton(boolean override) {
-    	LOG.i("DroidGap", "WARNING: Back Button Default Behaviour will be overridden.  The backbutton event will be fired!");
-    	((DroidGap)this.ctx).bound = override;
+        LOG.i("App", "WARNING: Back Button Default Behaviour will be overridden.  The backbutton event will be fired!");
+        webView.bindButton(override);
+    }
+
+    /**
+     * Override the default behavior of the Android volume buttons.
+     * If overridden, when the volume button is pressed, the "volume[up|down]button" JavaScript event will be fired.
+     *
+     * @param button        volumeup, volumedown
+     * @param override      T=override, F=cancel override
+     */
+    public void overrideButton(String button, boolean override) {
+        LOG.i("DroidGap", "WARNING: Volume Button Default Behaviour will be overridden.  The volume event will be fired!");
+        webView.bindButton(button, override);
     }
 
     /**
      * Return whether the Android back button is overridden by the user.
-     * 
+     *
      * @return boolean
      */
     public boolean isBackbuttonOverridden() {
-    	return ((DroidGap)this.ctx).bound;
+        return webView.isBackButtonBound();
     }
 
     /**
      * Exit the Android application.
      */
     public void exitApp() {
-    	((DroidGap)this.ctx).endActivity();
+        this.webView.postMessage("exit", null);
     }
+
 }

framework/src/org/apache/cordova/AudioHandler.java

@@ -18,149 +18,151 @@
 */
 package org.apache.cordova;
 
+import org.apache.cordova.api.CallbackContext;
+import org.apache.cordova.api.CordovaPlugin;
+
 import android.content.Context;
 import android.media.AudioManager;
+
 import java.util.ArrayList;
 
-import org.apache.cordova.api.LOG;
-import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
-
 import java.util.HashMap;
-import java.util.Map.Entry;
 
 /**
- * This class called by CordovaActivity to play and record audio.  
+ * This class called by CordovaActivity to play and record audio.
  * The file can be local or over a network using http.
- * 
+ *
  * Audio formats supported (tested):
  * 	.mp3, .wav
- * 
+ *
  * Local audio files must reside in one of two places:
  * 		android_asset: 		file name must start with /android_asset/sound.mp3
  * 		sdcard:				file name is just sound.mp3
  */
-public class AudioHandler extends Plugin {
+public class AudioHandler extends CordovaPlugin {
 
     public static String TAG = "AudioHandler";
-	HashMap<String,AudioPlayer> players;	// Audio player object
-	ArrayList<AudioPlayer> pausedForPhone;     // Audio players that were paused when phone call came in
-	
-	/**
-	 * Constructor.
-	 */
-	public AudioHandler() {
-		this.players = new HashMap<String,AudioPlayer>();
-		this.pausedForPhone = new ArrayList<AudioPlayer>();
-	}
+    HashMap<String, AudioPlayer> players;	// Audio player object
+    ArrayList<AudioPlayer> pausedForPhone;     // Audio players that were paused when phone call came in
 
-	/**
-	 * Executes the request and returns PluginResult.
-	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
-	 */
-	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
-		try {
-			if (action.equals("startRecordingAudio")) {
-				this.startRecordingAudio(args.getString(0), args.getString(1));
-			}
-			else if (action.equals("stopRecordingAudio")) {
-				this.stopRecordingAudio(args.getString(0));
-			}
-			else if (action.equals("startPlayingAudio")) {
-				this.startPlayingAudio(args.getString(0), args.getString(1));
-			}
-			else if (action.equals("seekToAudio")) {
-				this.seekToAudio(args.getString(0), args.getInt(1));
-			}
-			else if (action.equals("pausePlayingAudio")) {
-				this.pausePlayingAudio(args.getString(0));
-			}
-			else if (action.equals("stopPlayingAudio")) {
-				this.stopPlayingAudio(args.getString(0));
-			} else if (action.equals("setVolume")) {
-			   try {
-				   this.setVolume(args.getString(0), Float.parseFloat(args.getString(1)));
-			   } catch (NumberFormatException nfe) {
-				   //no-op
-			   }
-			} else if (action.equals("getCurrentPositionAudio")) {
-				float f = this.getCurrentPositionAudio(args.getString(0));
-				return new PluginResult(status, f);
-			}
-			else if (action.equals("getDurationAudio")) {
-				float f = this.getDurationAudio(args.getString(0), args.getString(1));
-				return new PluginResult(status, f);
-			}
-			else if (action.equals("release")) {
-				boolean b = this.release(args.getString(0));
-				return new PluginResult(status, b);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			e.printStackTrace();
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
-		}
-	}
+    /**
+     * Constructor.
+     */
+    public AudioHandler() {
+        this.players = new HashMap<String, AudioPlayer>();
+        this.pausedForPhone = new ArrayList<AudioPlayer>();
+    }
 
-	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
-	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
-	 */
-	public boolean isSynch(String action) {
-		if (action.equals("getCurrentPositionAudio")) {
-			return true;
-		}
-		else if (action.equals("getDurationAudio")) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * Executes the request and returns PluginResult.
+     * @param action 		The action to execute.
+     * @param args 			JSONArry of arguments for the plugin.
+     * @param callbackContext		The callback context used when calling back into JavaScript.
+     * @return 				A PluginResult object with a status and message.
+     */
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";
 
-	/**
-	 * Stop all audio players and recorders.
-	 */
-	public void onDestroy() {
+        if (action.equals("startRecordingAudio")) {
+            this.startRecordingAudio(args.getString(0), FileUtils.stripFileProtocol(args.getString(1)));
+        }
+        else if (action.equals("stopRecordingAudio")) {
+            this.stopRecordingAudio(args.getString(0));
+        }
+        else if (action.equals("startPlayingAudio")) {
+            this.startPlayingAudio(args.getString(0), FileUtils.stripFileProtocol(args.getString(1)));
+        }
+        else if (action.equals("seekToAudio")) {
+            this.seekToAudio(args.getString(0), args.getInt(1));
+        }
+        else if (action.equals("pausePlayingAudio")) {
+            this.pausePlayingAudio(args.getString(0));
+        }
+        else if (action.equals("stopPlayingAudio")) {
+            this.stopPlayingAudio(args.getString(0));
+        } else if (action.equals("setVolume")) {
+           try {
+               this.setVolume(args.getString(0), Float.parseFloat(args.getString(1)));
+           } catch (NumberFormatException nfe) {
+               //no-op
+           }
+        } else if (action.equals("getCurrentPositionAudio")) {
+            float f = this.getCurrentPositionAudio(args.getString(0));
+            callbackContext.sendPluginResult(new PluginResult(status, f));
+            return true;
+        }
+        else if (action.equals("getDurationAudio")) {
+            float f = this.getDurationAudio(args.getString(0), args.getString(1));
+            callbackContext.sendPluginResult(new PluginResult(status, f));
+            return true;
+        }
+        else if (action.equals("create")) {
+            String id = args.getString(0);
+            String src = FileUtils.stripFileProtocol(args.getString(1));
+            AudioPlayer audio = new AudioPlayer(this, id, src);
+            this.players.put(id, audio);
+        }
+        else if (action.equals("release")) {
+            boolean b = this.release(args.getString(0));
+            callbackContext.sendPluginResult(new PluginResult(status, b));
+            return true;
+        }
+        else { // Unrecognized action.
+            return false;
+        }
+
+        callbackContext.sendPluginResult(new PluginResult(status, result));
+
+        return true;
+    }
+
+    /**
+     * Stop all audio players and recorders.
+     */
+    public void onDestroy() {
         for (AudioPlayer audio : this.players.values()) {
             audio.destroy();
         }
         this.players.clear();
-	}
-	
+    }
+
     /**
-     * Called when a message is sent to plugin. 
-     * 
+     * Stop all audio players and recorders on navigate.
+     */
+    @Override
+    public void onReset() {
+        onDestroy();
+    }
+
+    /**
+     * Called when a message is sent to plugin.
+     *
      * @param id            The message id
      * @param data          The message data
+     * @return              Object to stop propagation or null
      */
-    public void onMessage(String id, Object data) {
-        
+    public Object onMessage(String id, Object data) {
+
         // If phone message
         if (id.equals("telephone")) {
-            
+
             // If phone ringing, then pause playing
             if ("ringing".equals(data) || "offhook".equals(data)) {
-                
+
                 // Get all audio players and pause them
                 for (AudioPlayer audio : this.players.values()) {
-                    if (audio.getState() == AudioPlayer.MEDIA_RUNNING) {
+                    if (audio.getState() == AudioPlayer.STATE.MEDIA_RUNNING.ordinal()) {
                         this.pausedForPhone.add(audio);
                         audio.pausePlaying();
                     }
                 }
 
             }
-            
+
             // If phone idle, then resume playing those players we paused
             else if ("idle".equals(data)) {
                 for (AudioPlayer audio : this.pausedForPhone) {
@@ -169,182 +171,173 @@ public class AudioHandler extends Plugin {
                 this.pausedForPhone.clear();
             }
         }
+        return null;
     }
 
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
-	
-	/**
-	 * Release the audio player instance to save memory.
-	 * 
-	 * @param id				The id of the audio player
-	 */
-	private boolean release(String id) {
-    	if (!this.players.containsKey(id)) {
-    		return false;
-    	}
-    	AudioPlayer audio = this.players.get(id);
-    	this.players.remove(id);
-    	audio.destroy();
-    	return true;
-	}
 
-	/**
-	 * Start recording and save the specified file.
-	 * 
-	 * @param id				The id of the audio player
-	 * @param file				The name of the file
-	 */
+    /**
+     * Release the audio player instance to save memory.
+     * @param id				The id of the audio player
+     */
+    private boolean release(String id) {
+        if (!this.players.containsKey(id)) {
+            return false;
+        }
+        AudioPlayer audio = this.players.get(id);
+        this.players.remove(id);
+        audio.destroy();
+        return true;
+    }
+
+    /**
+     * Start recording and save the specified file.
+     * @param id				The id of the audio player
+     * @param file				The name of the file
+     */
     public void startRecordingAudio(String id, String file) {
-    	// If already recording, then just return;
-    	if (this.players.containsKey(id)) {
-    		return;
-    	}
-    	AudioPlayer audio = new AudioPlayer(this, id);
-    	this.players.put(id, audio);
-    	audio.startRecording(file);
+        AudioPlayer audio = this.players.get(id);
+        if ( audio == null) {
+            audio = new AudioPlayer(this, id, file);
+            this.players.put(id, audio);
+        }
+        audio.startRecording(file);
     }
 
     /**
      * Stop recording and save to the file specified when recording started.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      */
     public void stopRecordingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.stopRecording();
-    		this.players.remove(id);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.stopRecording();
+        }
     }
-    
+
     /**
      * Start or resume playing audio file.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      * @param file				The name of the audio file.
      */
     public void startPlayingAudio(String id, String file) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio == null) {
-    		audio = new AudioPlayer(this, id);
-    		this.players.put(id, audio);
-    	}
-    	audio.startPlaying(file);
+        AudioPlayer audio = this.players.get(id);
+        if (audio == null) {
+            audio = new AudioPlayer(this, id, file);
+            this.players.put(id, audio);
+        }
+        audio.startPlaying(file);
     }
 
     /**
      * Seek to a location.
-     * 
-     * 
-	 * @param id				The id of the audio player
-	 * @param miliseconds		int: number of milliseconds to skip 1000 = 1 second
+     * @param id				The id of the audio player
+     * @param milliseconds		int: number of milliseconds to skip 1000 = 1 second
      */
     public void seekToAudio(String id, int milliseconds) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.seekToPlaying(milliseconds);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.seekToPlaying(milliseconds);
+        }
     }
-    
+
     /**
      * Pause playing.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      */
     public void pausePlayingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.pausePlaying();
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.pausePlaying();
+        }
     }
 
     /**
      * Stop playing the audio file.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      */
     public void stopPlayingAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		audio.stopPlaying();
-    		//audio.destroy();
-    		//this.players.remove(id);
-    	}
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            audio.stopPlaying();
+            //audio.destroy();
+            //this.players.remove(id);
+        }
     }
-    
+
     /**
      * Get current position of playback.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      * @return 					position in msec
      */
     public float getCurrentPositionAudio(String id) {
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		return(audio.getCurrentPosition()/1000.0f);
-    	}
-    	return -1;
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            return (audio.getCurrentPosition() / 1000.0f);
+        }
+        return -1;
     }
-    
+
     /**
      * Get the duration of the audio file.
-     * 
-	 * @param id				The id of the audio player
+     * @param id				The id of the audio player
      * @param file				The name of the audio file.
      * @return					The duration in msec.
      */
     public float getDurationAudio(String id, String file) {
-    	
-    	// Get audio file
-    	AudioPlayer audio = this.players.get(id);
-    	if (audio != null) {
-    		return(audio.getDuration(file));
-    	}
-    	
-    	// If not already open, then open the file
-    	else {
-    		audio = new AudioPlayer(this, id);
-    		this.players.put(id, audio);
-    		return(audio.getDuration(file));
-    	}
-    }  
-    
+
+        // Get audio file
+        AudioPlayer audio = this.players.get(id);
+        if (audio != null) {
+            return (audio.getDuration(file));
+        }
+
+        // If not already open, then open the file
+        else {
+            audio = new AudioPlayer(this, id, file);
+            this.players.put(id, audio);
+            return (audio.getDuration(file));
+        }
+    }
+
     /**
      * Set the audio device to be used for playback.
-     * 
+     *
      * @param output			1=earpiece, 2=speaker
      */
+    @SuppressWarnings("deprecation")
     public void setAudioOutputDevice(int output) {
-		AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
-		if (output == 2) {
-			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
-		}
-		else if (output == 1) {
-			audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
-		}
-		else {
-			System.out.println("AudioHandler.setAudioOutputDevice() Error: Unknown output device.");
-		}
+        AudioManager audiMgr = (AudioManager) this.cordova.getActivity().getSystemService(Context.AUDIO_SERVICE);
+        if (output == 2) {
+            audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
+        }
+        else if (output == 1) {
+            audiMgr.setRouting(AudioManager.MODE_NORMAL, AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
+        }
+        else {
+            System.out.println("AudioHandler.setAudioOutputDevice() Error: Unknown output device.");
+        }
     }
-    
+
     /**
      * Get the audio device to be used for playback.
-     * 
+     *
      * @return					1=earpiece, 2=speaker
      */
+    @SuppressWarnings("deprecation")
     public int getAudioOutputDevice() {
-		AudioManager audiMgr = (AudioManager) this.ctx.getSystemService(Context.AUDIO_SERVICE);
-		if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE) {
-			return 1;
-		}
-		else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEAKER) {
-			return 2;
-		}
-		else {
-			return -1;
-		}
+        AudioManager audiMgr = (AudioManager) this.cordova.getActivity().getSystemService(Context.AUDIO_SERVICE);
+        if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_EARPIECE) {
+            return 1;
+        }
+        else if (audiMgr.getRouting(AudioManager.MODE_NORMAL) == AudioManager.ROUTE_SPEAKER) {
+            return 2;
+        }
+        else {
+            return -1;
+        }
     }
 
     /**

framework/src/org/apache/cordova/AudioPlayer.java

@@ -35,433 +35,514 @@ import java.io.IOException;
  * This class implements the audio playback and recording capabilities used by Cordova.
  * It is called by the AudioHandler Cordova class.
  * Only one file can be played or recorded per class instance.
- * 
+ *
  * Local audio files must reside in one of two places:
- * 		android_asset: 		file name must start with /android_asset/sound.mp3
- * 		sdcard:				file name is just sound.mp3
+ *      android_asset:      file name must start with /android_asset/sound.mp3
+ *      sdcard:             file name is just sound.mp3
  */
 public class AudioPlayer implements OnCompletionListener, OnPreparedListener, OnErrorListener {
 
-    private static final String LOG_TAG = "AudioPlayer";
+    // AudioPlayer modes
+    public enum MODE { NONE, PLAY, RECORD };
 
     // AudioPlayer states
-	public static int MEDIA_NONE = 0;
-	public static int MEDIA_STARTING = 1;
-	public static int MEDIA_RUNNING = 2;
-	public static int MEDIA_PAUSED = 3;
-	public static int MEDIA_STOPPED = 4;
-	
-	// AudioPlayer message ids
-	private static int MEDIA_STATE = 1;
-	private static int MEDIA_DURATION = 2;
+    public enum STATE { MEDIA_NONE,
+                        MEDIA_STARTING,
+                        MEDIA_RUNNING,
+                        MEDIA_PAUSED,
+                        MEDIA_STOPPED,
+                        MEDIA_LOADING
+                      };
+
+    private static final String LOG_TAG = "AudioPlayer";
+
+    // AudioPlayer message ids
+    private static int MEDIA_STATE = 1;
+    private static int MEDIA_DURATION = 2;
     private static int MEDIA_POSITION = 3;
-	private static int MEDIA_ERROR = 9;
-	
-	// Media error codes
+    private static int MEDIA_ERROR = 9;
+
+    // Media error codes
     private static int MEDIA_ERR_NONE_ACTIVE    = 0;
     private static int MEDIA_ERR_ABORTED        = 1;
     private static int MEDIA_ERR_NETWORK        = 2;
     private static int MEDIA_ERR_DECODE         = 3;
     private static int MEDIA_ERR_NONE_SUPPORTED = 4;
-	
-	private AudioHandler handler;					// The AudioHandler object
-	private String id;								// The id of this player (used to identify Media object in JavaScript)
-	private int state = MEDIA_NONE;					// State of recording or playback
-	private String audioFile = null;				// File name to play or record to
-	private float duration = -1;					// Duration of audio
 
-	private MediaRecorder recorder = null;			// Audio recording object
-	private String tempFile = null;					// Temporary recording file name
-	
-	private MediaPlayer mPlayer = null;				// Audio player object
-	private boolean prepareOnly = false;
+    private AudioHandler handler;           // The AudioHandler object
+    private String id;                      // The id of this player (used to identify Media object in JavaScript)
+    private MODE mode = MODE.NONE;          // Playback or Recording mode
+    private STATE state = STATE.MEDIA_NONE; // State of recording or playback
+
+    private String audioFile = null;        // File name to play or record to
+    private float duration = -1;            // Duration of audio
+
+    private MediaRecorder recorder = null;  // Audio recording object
+    private String tempFile = null;         // Temporary recording file name
+
+    private MediaPlayer player = null;      // Audio player object
+    private boolean prepareOnly = true;     // playback after file prepare flag
+    private int seekOnPrepared = 0;     // seek to this location once media is prepared
+
+    /**
+     * Constructor.
+     *
+     * @param handler           The audio handler object
+     * @param id                The id of this audio player
+     */
+    public AudioPlayer(AudioHandler handler, String id, String file) {
+        this.handler = handler;
+        this.id = id;
+        this.audioFile = file;
+        this.recorder = new MediaRecorder();
 
-	/**
-	 * Constructor.
-	 * 
-	 * @param handler			The audio handler object
-	 * @param id				The id of this audio player
-	 */
-	public AudioPlayer(AudioHandler handler, String id) {
-		this.handler = handler;
-		this.id = id;
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            this.tempFile = Environment.getExternalStorageDirectory().getAbsolutePath() + "/tmprecording.mp3";
+            this.tempFile = Environment.getExternalStorageDirectory().getAbsolutePath() + "/tmprecording.3gp";
         } else {
-            this.tempFile = "/data/data/" + handler.ctx.getPackageName() + "/cache/tmprecording.mp3";
+            this.tempFile = "/data/data/" + handler.cordova.getActivity().getPackageName() + "/cache/tmprecording.3gp";
         }
-	}	
 
-	/**
-	 * Destroy player and stop audio playing or recording.
-	 */
-	public void destroy() {
-		
-		// Stop any play or record
-		if (this.mPlayer != null) {
-	        if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-	            this.mPlayer.stop();
-	            this.setState(MEDIA_STOPPED);
-	        }
-			this.mPlayer.release();
-			this.mPlayer = null;
-		}
-		if (this.recorder != null) {
-			this.stopRecording();
-			this.recorder.release();
-			this.recorder = null;
-		}
-	}
+    }
 
-	/**
-	 * Start recording the specified file.
-	 * 
-	 * @param file				The name of the file
-	 */
-	public void startRecording(String file) {
-		if (this.mPlayer != null) {
-			Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
-		}
-		
-		// Make sure we're not already recording
-		else if (this.recorder == null) {
-			this.audioFile = file;
-			this.recorder = new MediaRecorder();
-			this.recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-			this.recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT); // THREE_GPP);
-			this.recorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT); //AMR_NB);
-			this.recorder.setOutputFile(this.tempFile);
-			try {
-				this.recorder.prepare();
-				this.recorder.start();
-				this.setState(MEDIA_RUNNING);
-				return;
-			} catch (IllegalStateException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-		}
-	}
-	
-	/**
-	 * Save temporary recorded file to specified name
-	 * 
-	 * @param file
-	 */
-	public void moveFile(String file) {	
-		/* this is a hack to save the file as the specified name */
-		File f = new File(this.tempFile);
+    /**
+     * Destroy player and stop audio playing or recording.
+     */
+    public void destroy() {
+        // Stop any play or record
+        if (this.player != null) {
+            if ((this.state == STATE.MEDIA_RUNNING) || (this.state == STATE.MEDIA_PAUSED)) {
+                this.player.stop();
+                this.setState(STATE.MEDIA_STOPPED);
+            }
+            this.player.release();
+            this.player = null;
+        }
+        if (this.recorder != null) {
+            this.stopRecording();
+            this.recorder.release();
+            this.recorder = null;
+        }
+    }
+
+    /**
+     * Start recording the specified file.
+     *
+     * @param file              The name of the file
+     */
+    public void startRecording(String file) {
+        switch (this.mode) {
+        case PLAY:
+            Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+            break;
+        case NONE:
+            this.audioFile = file;
+            this.recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+            this.recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT); // THREE_GPP);
+            this.recorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT); //AMR_NB);
+            this.recorder.setOutputFile(this.tempFile);
+            try {
+                this.recorder.prepare();
+                this.recorder.start();
+                this.setState(STATE.MEDIA_RUNNING);
+                return;
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+            break;
+        case RECORD:
+            Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+        }
+    }
+
+    /**
+     * Save temporary recorded file to specified name
+     *
+     * @param file
+     */
+    public void moveFile(String file) {
+        /* this is a hack to save the file as the specified name */
+        File f = new File(this.tempFile);
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            f.renameTo(new File(Environment.getExternalStorageDirectory().getAbsolutePath() 
+            f.renameTo(new File(Environment.getExternalStorageDirectory().getAbsolutePath()
                     + File.separator + file));
         } else {
-            f.renameTo(new File("/data/data/" + handler.ctx.getPackageName() + "/cache/" + file));
+            f.renameTo(new File("/data/data/" + handler.cordova.getActivity().getPackageName() + "/cache/" + file));
         }
-		
-	}
-	
+
+    }
+
     /**
      * Stop recording and save to the file specified when recording started.
      */
-	public void stopRecording() {
-		if (this.recorder != null) {
-			try{
-				if (this.state == MEDIA_RUNNING) {
-					this.recorder.stop();
-					this.setState(MEDIA_STOPPED);
-				}
-				this.moveFile(this.audioFile);
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}	
-	
+    public void stopRecording() {
+        if (this.recorder != null) {
+            try{
+                if (this.state == STATE.MEDIA_RUNNING) {
+                    this.recorder.stop();
+                    this.setState(STATE.MEDIA_STOPPED);
+                }
+                this.recorder.reset();
+                this.moveFile(this.audioFile);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    //==========================================================================
+    // Playback
+    //==========================================================================
+
     /**
      * Start or resume playing audio file.
-     * 
-     * @param file				The name of the audio file.
+     *
+     * @param file              The name of the audio file.
      */
-	public void startPlaying(String file) {
-		if (this.recorder != null) {
-		    Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
-		}
-		
-		// If this is a new request to play audio, or stopped
-		else if ((this.mPlayer == null) || (this.state == MEDIA_STOPPED)) {
-			try {
-				// If stopped, then reset player
-				if (this.mPlayer != null) {
-					this.mPlayer.reset();
-				}
-				// Otherwise, create a new one
-				else {
-					this.mPlayer = new MediaPlayer();
-				}
-				this.audioFile = file;
-				
-				// If streaming file
-				if (this.isStreaming(file)) {
-					this.mPlayer.setDataSource(file);
-					this.mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);  
-					this.setState(MEDIA_STARTING);
-					this.mPlayer.setOnPreparedListener(this);		
-					this.mPlayer.prepareAsync();
-				}
-				
-				// If local file
-				else {
-					if (file.startsWith("/android_asset/")) {
-						String f = file.substring(15);
-						android.content.res.AssetFileDescriptor fd = this.handler.ctx.getBaseContext().getAssets().openFd(f);
-						this.mPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
-					}
-                    else {
-                        File fp = new File(file);
-                        if (fp.exists()) {
-                            FileInputStream fileInputStream = new FileInputStream(file);
-                            this.mPlayer.setDataSource(fileInputStream.getFD());
-                        } 
-                        else {
-                            this.mPlayer.setDataSource("/sdcard/" + file);
-                        }
-                    }
-					this.setState(MEDIA_STARTING);
-					this.mPlayer.setOnPreparedListener(this);		
-					this.mPlayer.prepare();
+    public void startPlaying(String file) {
+        if (this.readyPlayer(file) && this.player != null) {
+            this.player.start();
+            this.setState(STATE.MEDIA_RUNNING);
+            this.seekOnPrepared = 0; //insures this is always reset
+        } else {
+            this.prepareOnly = false;
+        }
+    }
 
-					// Get duration
-					this.duration = getDurationInSeconds();
-				}
-			} 
-			catch (Exception e) { 
-				e.printStackTrace(); 
-				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-			}
-		}
+    /**
+     * Seek or jump to a new time in the track.
+     */
+    public void seekToPlaying(int milliseconds) {
+        if (this.readyPlayer(this.audioFile)) {
+            this.player.seekTo(milliseconds);
+            Log.d(LOG_TAG, "Send a onStatus update for the new seek");
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_POSITION + ", " + milliseconds / 1000.0f + ");");
+        }
+        else {
+            this.seekOnPrepared = milliseconds;
+        }
+    }
 
-		// If we have already have created an audio player
-		else {
-			
-			// If player has been paused, then resume playback
-			if ((this.state == MEDIA_PAUSED) || (this.state == MEDIA_STARTING)) {
-				this.mPlayer.start();
-				this.setState(MEDIA_RUNNING);
-			}
-			else {
-			    Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
-				this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");			
-			}
-		}
-	} 
+    /**
+     * Pause playing.
+     */
+    public void pausePlaying() {
 
-	/**
-	 * Seek or jump to a new time in the track.
-	 */
-	public void seekToPlaying(int milliseconds) {
-		if (this.mPlayer != null) {
-		    this.mPlayer.seekTo(milliseconds);
-		    Log.d(LOG_TAG, "Send a onStatus update for the new seek");
-		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
-		}
-	}
-	
-	/**
-	 * Pause playing.
-	 */
-	public void pausePlaying() {
-		
-		// If playing, then pause
-		if (this.state == MEDIA_RUNNING) {
-			this.mPlayer.pause();
-			this.setState(MEDIA_PAUSED);
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);			
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");			
-		}
-	}
+        // If playing, then pause
+        if (this.state == STATE.MEDIA_RUNNING && this.player != null) {
+            this.player.pause();
+            this.setState(STATE.MEDIA_PAUSED);
+        }
+        else {
+            Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: " + this.state.ordinal());
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_ERROR + ", { \"code\":" + MEDIA_ERR_NONE_ACTIVE + "});");
+        }
+    }
 
     /**
      * Stop playing the audio file.
      */
-	public void stopPlaying() {
-		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-			this.mPlayer.stop();
-			this.setState(MEDIA_STOPPED);
-		}
-		else {
-		    Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);			
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_NONE_ACTIVE+"});");			
-		}
-	}
-	
-	/**
-	 * Callback to be invoked when playback of a media source has completed.
-	 * 
-	 * @param mPlayer			The MediaPlayer that reached the end of the file 
-	 */
-	public void onCompletion(MediaPlayer mPlayer) {
-		this.setState(MEDIA_STOPPED);
-    } 
-	
+    public void stopPlaying() {
+        if ((this.state == STATE.MEDIA_RUNNING) || (this.state == STATE.MEDIA_PAUSED)) {
+            this.player.pause();
+            this.player.seekTo(0);
+            Log.d(LOG_TAG, "stopPlaying is calling stopped");
+            this.setState(STATE.MEDIA_STOPPED);
+        }
+        else {
+            Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: " + this.state.ordinal());
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_ERROR + ", { \"code\":" + MEDIA_ERR_NONE_ACTIVE + "});");
+        }
+    }
+
+    /**
+     * Callback to be invoked when playback of a media source has completed.
+     *
+     * @param player           The MediaPlayer that reached the end of the file
+     */
+    public void onCompletion(MediaPlayer player) {
+        Log.d(LOG_TAG, "on completion is calling stopped");
+        this.setState(STATE.MEDIA_STOPPED);
+    }
+
     /**
      * Get current position of playback.
-     * 
-     * @return 					position in msec or -1 if not playing
+     *
+     * @return                  position in msec or -1 if not playing
      */
-	public long getCurrentPosition() {
-		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-		    int curPos = this.mPlayer.getCurrentPosition();
-		    this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
-			return curPos;
-		} 
-		else { 
-			return -1; 
-		}
-	}
-	
-	/**
-	 * Determine if playback file is streaming or local.
-	 * It is streaming if file name starts with "http://"
-	 * 
-	 * @param file				The file name
-	 * @return					T=streaming, F=local
-	 */
-	public boolean isStreaming(String file) {
-		if (file.contains("http://") || file.contains("https://")) {
-			return true;
-		} 
-		else {
-			return false;
-		}
-	}
-	
-   /**
-     * Get the duration of the audio file.
-     * 
-     * @param file				The name of the audio file.
-     * @return					The duration in msec.
-     * 							-1=can't be determined
-     * 							-2=not allowed
+    public long getCurrentPosition() {
+        if ((this.state == STATE.MEDIA_RUNNING) || (this.state == STATE.MEDIA_PAUSED)) {
+            int curPos = this.player.getCurrentPosition();
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_POSITION + ", " + curPos / 1000.0f + ");");
+            return curPos;
+        }
+        else {
+            return -1;
+        }
+    }
+
+    /**
+     * Determine if playback file is streaming or local.
+     * It is streaming if file name starts with "http://"
+     *
+     * @param file              The file name
+     * @return                  T=streaming, F=local
      */
-	public float getDuration(String file) {
-		
-		// Can't get duration of recording
-		if (this.recorder != null) {
-			return(-2); // not allowed
-		}
-		
-		// If audio file already loaded and started, then return duration
-		if (this.mPlayer != null) {
-			return this.duration;
-		}
-		
-		// If no player yet, then create one
-		else {
-			this.prepareOnly = true;
-			this.startPlaying(file);
-			
-			// This will only return value for local, since streaming
-			// file hasn't been read yet.
-			return this.duration;
-		}
-	}
+    public boolean isStreaming(String file) {
+        if (file.contains("http://") || file.contains("https://")) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 
-	/**
-	 * Callback to be invoked when the media source is ready for playback. 
-	 * 
-	 * @param mPlayer			The MediaPlayer that is ready for playback 
-	 */
-	public void onPrepared(MediaPlayer mPlayer) {
-		// Listen for playback completion
-		this.mPlayer.setOnCompletionListener(this);
+    /**
+      * Get the duration of the audio file.
+      *
+      * @param file             The name of the audio file.
+      * @return                 The duration in msec.
+      *                             -1=can't be determined
+      *                             -2=not allowed
+      */
+    public float getDuration(String file) {
 
-		// If start playing after prepared
-		if (!this.prepareOnly) {
-			
-			// Start playing
-			this.mPlayer.start();
+        // Can't get duration of recording
+        if (this.recorder != null) {
+            return (-2); // not allowed
+        }
 
-			// Set player init flag
-			this.setState(MEDIA_RUNNING);
-		}
-		
-		// Save off duration
-		this.duration = getDurationInSeconds();	
-		this.prepareOnly = false;
+        // If audio file already loaded and started, then return duration
+        if (this.player != null) {
+            return this.duration;
+        }
 
-		// Send status notification to JavaScript
-		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_DURATION+","+this.duration+");");
-		
-	}
+        // If no player yet, then create one
+        else {
+            this.prepareOnly = true;
+            this.startPlaying(file);
 
-	/**
-	 * By default Android returns the length of audio in mills but we want seconds
-	 * 
-	 * @return length of clip in seconds
-	 */
-	private float getDurationInSeconds() {
-		return (this.mPlayer.getDuration() / 1000.0f);
-	}
+            // This will only return value for local, since streaming
+            // file hasn't been read yet.
+            return this.duration;
+        }
+    }
 
-	/**
-	 * Callback to be invoked when there has been an error during an asynchronous operation
-	 *  (other errors will throw exceptions at method call time).
-	 *  
-	 * @param mPlayer			the MediaPlayer the error pertains to
-	 * @param arg1				the type of error that has occurred: (MEDIA_ERROR_UNKNOWN, MEDIA_ERROR_SERVER_DIED)
-	 * @param arg2				an extra code, specific to the error.
-	 */
-	public boolean onError(MediaPlayer mPlayer, int arg1, int arg2) {
-	    Log.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2+")");
+    /**
+     * Callback to be invoked when the media source is ready for playback.
+     *
+     * @param player           The MediaPlayer that is ready for playback
+     */
+    public void onPrepared(MediaPlayer player) {
+        // Listen for playback completion
+        this.player.setOnCompletionListener(this);
+        // seek to any location received while not prepared
+        this.seekToPlaying(this.seekOnPrepared);
+        // If start playing after prepared
+        if (!this.prepareOnly) {
+            this.player.start();
+            this.setState(STATE.MEDIA_RUNNING);
+            this.seekOnPrepared = 0; //reset only when played
+        } else {
+            this.setState(STATE.MEDIA_STARTING);
+        }
+        // Save off duration
+        this.duration = getDurationInSeconds();
+        // reset prepare only flag
+        this.prepareOnly = true;
 
-		// TODO: Not sure if this needs to be sent?
-		this.mPlayer.stop();
-		this.mPlayer.release();
-		
-		// Send error notification to JavaScript
-		this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', { \"code\":"+arg1+"});");
-		return false;
-	}
-	
-	/**
-	 * Set the state and send it to JavaScript.
-	 * 
-	 * @param state
-	 */
-	private void setState(int state) {
-		if (this.state != state) {
-			this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_STATE+", "+state+");");
-		}
-		
-		this.state = state;
-	}
-	
-	/**
-	 * Get the audio state.
-	 * 
-	 * @return int
-	 */
-	public int getState() {
-	    return this.state;
-	}
+        // Send status notification to JavaScript
+        this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_DURATION + "," + this.duration + ");");
+    }
 
-	/**
-	 * Set the volume for audio player
-	 *
-	 * @param volume
-	 */
+    /**
+     * By default Android returns the length of audio in mills but we want seconds
+     *
+     * @return length of clip in seconds
+     */
+    private float getDurationInSeconds() {
+        return (this.player.getDuration() / 1000.0f);
+    }
+
+    /**
+     * Callback to be invoked when there has been an error during an asynchronous operation
+     *  (other errors will throw exceptions at method call time).
+     *
+     * @param player           the MediaPlayer the error pertains to
+     * @param arg1              the type of error that has occurred: (MEDIA_ERROR_UNKNOWN, MEDIA_ERROR_SERVER_DIED)
+     * @param arg2              an extra code, specific to the error.
+     */
+    public boolean onError(MediaPlayer player, int arg1, int arg2) {
+        Log.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2 + ")");
+
+        // TODO: Not sure if this needs to be sent?
+        this.player.stop();
+        this.player.release();
+
+        // Send error notification to JavaScript
+        this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', { \"code\":" + arg1 + "});");
+        return false;
+    }
+
+    /**
+     * Set the state and send it to JavaScript.
+     *
+     * @param state
+     */
+    private void setState(STATE state) {
+        if (this.state != state) {
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_STATE + ", " + state.ordinal() + ");");
+        }
+        this.state = state;
+    }
+
+    /**
+     * Set the mode and send it to JavaScript.
+     *
+     * @param state
+     */
+    private void setMode(MODE mode) {
+        if (this.mode != mode) {
+            //mode is not part of the expected behavior, so no notification
+            //this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_STATE + ", " + mode + ");");
+        }
+        this.mode = mode;
+    }
+
+    /**
+     * Get the audio state.
+     *
+     * @return int
+     */
+    public int getState() {
+        return this.state.ordinal();
+    }
+
+    /**
+     * Set the volume for audio player
+     *
+     * @param volume
+     */
     public void setVolume(float volume) {
-        this.mPlayer.setVolume(volume, volume);
+        this.player.setVolume(volume, volume);
+    }
+
+    /**
+     * attempts to put the player in play mode
+     * @return true if in playmode, false otherwise
+     */
+    private boolean playMode() {
+        switch(this.mode) {
+        case NONE:
+            this.setMode(MODE.PLAY);
+            break;
+        case PLAY:
+            break;
+        case RECORD:
+            Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
+            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_ERROR + ", { \"code\":" + MEDIA_ERR_ABORTED + "});");
+            return false; //player is not ready
+        }
+        return true;
+    }
+
+    /**
+     * attempts to initialize the media player for playback
+     * @param file the file to play
+     * @return false if player not ready, reports if in wrong mode or state
+     */
+    private boolean readyPlayer(String file) {
+        if (playMode()) {
+            switch (this.state) {
+                case MEDIA_NONE:
+                    if (this.player == null) {
+                        this.player = new MediaPlayer();
+                    }
+                    try {
+                        this.loadAudioFile(file);
+                    } catch (Exception e) {
+                        this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', "+MEDIA_ERROR+", { \"code\":"+MEDIA_ERR_ABORTED+"});");
+                    }
+                    return false;
+                case MEDIA_LOADING:
+                    //cordova js is not aware of MEDIA_LOADING, so we send MEDIA_STARTING instead
+                    Log.d(LOG_TAG, "AudioPlayer Loading: startPlaying() called during media preparation: " + STATE.MEDIA_STARTING.ordinal());
+                    this.prepareOnly = false;
+                    return false;
+                case MEDIA_STARTING:
+                case MEDIA_RUNNING:
+                case MEDIA_PAUSED:
+                    return true;
+                case MEDIA_STOPPED:
+                    //if we are readying the same file
+                    if (this.audioFile.compareTo(file) == 0) {
+                        //reset the audio file
+                        player.seekTo(0);
+                        player.pause();
+                        return true;
+                    } else {
+                        //reset the player
+                        this.player.reset();
+                        try {
+                            this.loadAudioFile(file);
+                        } catch (Exception e) {
+                            this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_ERROR + ", { \"code\":" + MEDIA_ERR_ABORTED + "});");
+                        }
+                        //if we had to prepare= the file, we won't be in the correct state for playback
+                        return false;
+                    }
+                default:
+                    Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: " + this.state);
+                    this.handler.webView.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_ERROR + ", { \"code\":" + MEDIA_ERR_ABORTED + "});");
+            }
+        }
+        return false;
+    }
+
+    /**
+     * load audio file
+     * @throws IOException
+     * @throws IllegalStateException
+     * @throws SecurityException
+     * @throws IllegalArgumentException
+     */
+    private void loadAudioFile(String file) throws IllegalArgumentException, SecurityException, IllegalStateException, IOException {
+        if (this.isStreaming(file)) {
+            this.player.setDataSource(file);
+            this.player.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            //if it's a streaming file, play mode is implied
+            this.setMode(MODE.PLAY);
+            this.setState(STATE.MEDIA_STARTING);
+            this.player.setOnPreparedListener(this);
+            this.player.prepareAsync();
+        }
+        else {
+            if (file.startsWith("/android_asset/")) {
+                String f = file.substring(15);
+                android.content.res.AssetFileDescriptor fd = this.handler.cordova.getActivity().getAssets().openFd(f);
+                this.player.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
+            }
+            else {
+                File fp = new File(file);
+                if (fp.exists()) {
+                    FileInputStream fileInputStream = new FileInputStream(file);
+                    this.player.setDataSource(fileInputStream.getFD());
+                }
+                else {
+                    this.player.setDataSource("/sdcard/" + file);
+                }
+            }
+                this.setState(STATE.MEDIA_STARTING);
+                this.player.setOnPreparedListener(this);
+                this.player.prepare();
+
+                // Get duration
+                this.duration = getDurationInSeconds();
+            }
     }
 }

framework/src/org/apache/cordova/AuthenticationToken.java

@@ -24,46 +24,46 @@ package org.apache.cordova;
 public class AuthenticationToken {
     private String userName;
     private String password;
-    
+
     /**
      * Gets the user name.
-     * 
+     *
      * @return the user name
      */
     public String getUserName() {
         return userName;
     }
-    
+
     /**
      * Sets the user name.
-     * 
+     *
      * @param userName
      *            the new user name
      */
     public void setUserName(String userName) {
         this.userName = userName;
     }
-    
+
     /**
      * Gets the password.
-     * 
+     *
      * @return the password
      */
     public String getPassword() {
         return password;
     }
-    
+
     /**
      * Sets the password.
-     * 
+     *
      * @param password
      *            the new password
      */
     public void setPassword(String password) {
         this.password = password;
     }
-    
-    
-    
-    
+
+
+
+
 }

framework/src/org/apache/cordova/BatteryListener.java

@@ -18,81 +18,81 @@
 */
 package org.apache.cordova;
 
-import org.apache.cordova.api.Plugin;
+import org.apache.cordova.api.CallbackContext;
+import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.util.Log;
 
-public class BatteryListener extends Plugin {
-    
+public class BatteryListener extends CordovaPlugin {
+
     private static final String LOG_TAG = "BatteryManager";
 
     BroadcastReceiver receiver;
 
-    private String batteryCallbackId = null;
-    
+    private CallbackContext batteryCallbackContext = null;
+
     /**
      * Constructor.
      */
     public BatteryListener() {
         this.receiver = null;
     }
-    
+
     /**
-     * Executes the request and returns PluginResult.
-     * 
-     * @param action        The action to execute.
-     * @param args          JSONArry of arguments for the plugin.
-     * @param callbackId    The callback id used when calling back into JavaScript.
-     * @return              A PluginResult object with a status and message.
+     * Executes the request.
+     *
+     * @param action        	The action to execute.
+     * @param args          	JSONArry of arguments for the plugin.
+     * @param callbackContext 	The callback context used when calling back into JavaScript.
+     * @return              	True if the action was valid, false if not.
      */
-    public PluginResult execute(String action, JSONArray args, String callbackId) {
-        PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
-        String result = "Unsupported Operation: " + action; 
-                
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
         if (action.equals("start")) {
-        	if (this.batteryCallbackId != null) {
-        		return new PluginResult(PluginResult.Status.ERROR, "Battery listener already running.");
-        	}
-            this.batteryCallbackId = callbackId;
+            if (this.batteryCallbackContext != null) {
+                callbackContext.error( "Battery listener already running.");
+                return true;
+            }
+            this.batteryCallbackContext = callbackContext;
 
             // We need to listen to power events to update battery status
-            IntentFilter intentFilter = new IntentFilter() ;
+            IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
             if (this.receiver == null) {
                 this.receiver = new BroadcastReceiver() {
                     @Override
-                    public void onReceive(Context context, Intent intent) { 
-                        updateBatteryInfo(intent);              
+                    public void onReceive(Context context, Intent intent) {
+                        updateBatteryInfo(intent);
                     }
                 };
-                ctx.registerReceiver(this.receiver, intentFilter);
+                cordova.getActivity().registerReceiver(this.receiver, intentFilter);
             }
 
-            // Don't return any result now, since status results will be sent when events come in from broadcast receiver 
+            // Don't return any result now, since status results will be sent when events come in from broadcast receiver
             PluginResult pluginResult = new PluginResult(PluginResult.Status.NO_RESULT);
             pluginResult.setKeepCallback(true);
-            return pluginResult;
-        } 
-        
+            callbackContext.sendPluginResult(pluginResult);
+            return true;
+        }
+
         else if (action.equals("stop")) {
             removeBatteryListener();
             this.sendUpdate(new JSONObject(), false); // release status callback in JS side
-            this.batteryCallbackId = null;
-            return new PluginResult(PluginResult.Status.OK);
+            this.batteryCallbackContext = null;
+            callbackContext.success();
+            return true;
         }
-        
-        return new PluginResult(status, result);
+
+        return false;
     }
-    
+
     /**
      * Stop battery receiver.
      */
@@ -100,13 +100,20 @@ public class BatteryListener extends Plugin {
         removeBatteryListener();
     }
 
+    /**
+     * Stop battery receiver.
+     */
+    public void onReset() {
+        removeBatteryListener();
+    }
+
     /**
      * Stop the battery receiver and set it to null.
      */
     private void removeBatteryListener() {
         if (this.receiver != null) {
             try {
-                this.ctx.unregisterReceiver(this.receiver);
+                this.cordova.getActivity().unregisterReceiver(this.receiver);
                 this.receiver = null;
             } catch (Exception e) {
                 Log.e(LOG_TAG, "Error unregistering battery receiver: " + e.getMessage(), e);
@@ -116,7 +123,7 @@ public class BatteryListener extends Plugin {
 
     /**
      * Creates a JSONObject with the current battery information
-     * 
+     *
      * @param batteryIntent the current battery information
      * @return a JSONObject containing the battery status information
      */
@@ -133,24 +140,24 @@ public class BatteryListener extends Plugin {
 
     /**
      * Updates the JavaScript side whenever the battery changes
-     * 
+     *
      * @param batteryIntent the current battery information
      * @return
      */
-    private void updateBatteryInfo(Intent batteryIntent) {    
+    private void updateBatteryInfo(Intent batteryIntent) {
         sendUpdate(this.getBatteryInfo(batteryIntent), true);
     }
-    
+
     /**
      * Create a new plugin result and send it back to JavaScript
-     * 
+     *
      * @param connection the network info to set as navigator.connection
      */
     private void sendUpdate(JSONObject info, boolean keepCallback) {
-    	if (this.batteryCallbackId != null) {
-    		PluginResult result = new PluginResult(PluginResult.Status.OK, info);
-    		result.setKeepCallback(keepCallback);
-    		this.success(result, this.batteryCallbackId);
-    	}
+        if (this.batteryCallbackContext != null) {
+            PluginResult result = new PluginResult(PluginResult.Status.OK, info);
+            result.setKeepCallback(keepCallback);
+            this.batteryCallbackContext.sendPluginResult(result);
+        }
     }
 }

framework/src/org/apache/cordova/CallbackServer.java

@@ -1,431 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-package org.apache.cordova;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URLEncoder;
-import java.util.LinkedList;
-
-import android.util.Log;
-
-/**
- * This class provides a way for Java to run JavaScript in the web page that has loaded Cordova.
- * The CallbackServer class implements an XHR server and a polling server with a list of JavaScript
- * statements that are to be executed on the web page.
- * 
- * The process flow for XHR is:
- * 1. JavaScript makes an async XHR call. 
- * 2. The server holds the connection open until data is available. 
- * 3. The server writes the data to the client and closes the connection. 
- * 4. The server immediately starts listening for the next XHR call. 
- * 5. The client receives this XHR response, processes it.
- * 6. The client sends a new async XHR request.
- *
- * The CallbackServer class requires the following permission in Android manifest file
- * 		<uses-permission android:name="android.permission.INTERNET" />
- * 
- * If the device has a proxy set, then XHR cannot be used, so polling must be used instead.
- * This can be determined by the client by calling CallbackServer.usePolling().  
- * 
- * The process flow for polling is:
- * 1. The client calls CallbackServer.getJavascript() to retrieve next statement.
- * 2. If statement available, then client processes it.
- * 3. The client repeats #1 in loop. 
- */
-public class CallbackServer implements Runnable {
-	
-	private static final String LOG_TAG = "CallbackServer";
-
-	/**
-	 * The list of JavaScript statements to be sent to JavaScript.
-	 */
-	private LinkedList<String> javascript;
-	
-	/**
-	 * The port to listen on.
-	 */
-	private int port;
-	
-	/**
-	 * The server thread.
-	 */
-	private Thread serverThread;
-	
-	/**
-	 * Indicates the server is running.
-	 */
-	private boolean active;
-	
-	/**
-	 * Indicates that the JavaScript statements list is empty
-	 */
-	private boolean empty;
-	
-	/**
-	 * Indicates that polling should be used instead of XHR.
-	 */
-	private boolean usePolling = true;
-	
-	/**
-	 * Security token to prevent other apps from accessing this callback server via XHR
-	 */
-	private String token;
-	
-	/**
-	 * Constructor.
-	 */
-	public CallbackServer() {
-		//System.out.println("CallbackServer()");
-		this.active = false;
-		this.empty = true;
-		this.port = 0;
-		this.javascript = new LinkedList<String>();		
-	}
-	
-	/**
-	 * Init callback server and start XHR if running local app.
-	 * 
-	 * If Cordova app is loaded from file://, then we can use XHR
-	 * otherwise we have to use polling due to cross-domain security restrictions.
-	 * 
-	 * @param url			The URL of the Cordova app being loaded
-	 */
-	public void init(String url) {
-		//System.out.println("CallbackServer.start("+url+")");
-		this.active = false;
-		this.empty = true;
-		this.port = 0;
-		this.javascript = new LinkedList<String>();		
-
-		// Determine if XHR or polling is to be used
-		if ((url != null) && !url.startsWith("file://")) {
-			this.usePolling = true;
-			this.stopServer();
-		}
-		else if (android.net.Proxy.getDefaultHost() != null) {
-			this.usePolling = true;
-			this.stopServer();
-		}
-		else {
-			this.usePolling = false;
-			this.startServer();
-		}
-	}
-	
-    /**
-     * Re-init when loading a new HTML page into webview.
-     * 
-     * @param url           The URL of the Cordova app being loaded
-     */
-	public void reinit(String url) {
-	    this.stopServer();
-	    this.init(url);
-	}
-	
-	/**
-	 * Return if polling is being used instead of XHR.
-	 * 
-	 * @return
-	 */
-	public boolean usePolling() {
-		return this.usePolling;
-	}
-	
-	/**
-	 * Get the port that this server is running on.
-	 * 
-	 * @return
-	 */
-	public int getPort() {
-		return this.port;
-	}
-	
-	/**
-	 * Get the security token that this server requires when calling getJavascript().
-	 * 
-	 * @return
-	 */
-	public String getToken() {
-		return this.token;
-	}
-	
-	/**
-	 * Start the server on a new thread.
-	 */
-	public void startServer() {
-		//System.out.println("CallbackServer.startServer()");
-		this.active = false;
-		
-		// Start server on new thread
-		this.serverThread = new Thread(this);
-		this.serverThread.start();
-	}
-
-	/**
-	 * Restart the server on a new thread.
-	 */
-	public void restartServer() {
-		
-		// Stop server
-		this.stopServer();
-				
-		// Start server again
-		this.startServer();
-	}
-
-	/**
-	 * Start running the server.  
-	 * This is called automatically when the server thread is started.
-	 */
-	public void run() {
-		
-		// Start server
-		try {
-			this.active = true;
-			String request;
-			ServerSocket waitSocket = new ServerSocket(0);
-			this.port = waitSocket.getLocalPort();
-			//System.out.println("CallbackServer -- using port " +this.port);
-			this.token = java.util.UUID.randomUUID().toString();
-			//System.out.println("CallbackServer -- using token "+this.token);
-
-			 while (this.active) {
-				 //System.out.println("CallbackServer: Waiting for data on socket");
-				 Socket connection = waitSocket.accept();
-				 BufferedReader xhrReader = new BufferedReader(new InputStreamReader(connection.getInputStream()),40);
-				 DataOutputStream output = new DataOutputStream(connection.getOutputStream());
-				 request = xhrReader.readLine();
-				 String response = "";
-				 //System.out.println("CallbackServerRequest="+request);
-				 if (this.active && (request != null)) {
-					 if (request.contains("GET")) {
-						 
-						 // Get requested file
-						 String[] requestParts = request.split(" "); 
-						 
-						 // Must have security token
-						 if ((requestParts.length == 3) && (requestParts[1].substring(1).equals(this.token))) {
-							 //System.out.println("CallbackServer -- Processing GET request");
-
-							 // Wait until there is some data to send, or send empty data every 10 sec 
-							 // to prevent XHR timeout on the client 
-							 synchronized (this) { 
-								 while (this.empty) { 
-									 try { 
-										 this.wait(10000); // prevent timeout from happening
-										 //System.out.println("CallbackServer>>> break <<<");
-										 break;
-									 } 
-									 catch (Exception e) { }
-								 } 
-							 }
-
-							 // If server is still running
-							 if (this.active) {
-
-								 // If no data, then send 404 back to client before it times out
-								 if (this.empty) {
-									 //System.out.println("CallbackServer -- sending data 0");
-									 response = "HTTP/1.1 404 NO DATA\r\n\r\n "; // need to send content otherwise some Android devices fail, so send space
-								 }
-								 else {
-									 //System.out.println("CallbackServer -- sending item");
-									 response = "HTTP/1.1 200 OK\r\n\r\n";
-									 String js = this.getJavascript();
-									 if (js != null) {
-										 response += encode(js, "UTF-8");
-									 }
-								 }
-							 }
-							 else {
-								 response = "HTTP/1.1 503 Service Unavailable\r\n\r\n ";							 
-							 }
-						 }
-						 else {
-							 response = "HTTP/1.1 403 Forbidden\r\n\r\n ";						 
-						 }
-					 }
-					 else {
-						 response = "HTTP/1.1 400 Bad Request\r\n\r\n ";
-					 }
-					 //System.out.println("CallbackServer: response="+response);
-					 //System.out.println("CallbackServer: closing output");
-					 output.writeBytes(response);
-					 output.flush();
-				 }
-				 output.close();
-				 xhrReader.close();
-			 }
-		 } catch (IOException e) {
-			 e.printStackTrace();
-		 }
-		 this.active = false;
-		 //System.out.println("CallbackServer.startServer() - EXIT");
-	}
-		
-	/**
-	 * Stop server.  
-	 * This stops the thread that the server is running on.
-	 */
-	public void stopServer() {
-		//System.out.println("CallbackServer.stopServer()");
-		if (this.active) {
-			this.active = false;
-
-			// Break out of server wait
-			synchronized (this) { 
-				this.notify();
-			}
-		}		
-	}
-
-    /**
-     * Destroy
-     */
-    public void destroy() {
-    	this.stopServer();
-    }
-
-	/**
-	 * Get the number of JavaScript statements.
-	 * 
-	 * @return int
-	 */
-	public int getSize() {
-	    synchronized(this) {
-	        int size = this.javascript.size();
-	        return size;
-	    }
-	}
-	
-	/**
-	 * Get the next JavaScript statement and remove from list.
-	 *  
-	 * @return String
-	 */
-	public String getJavascript() {
-	    synchronized(this) {
-	        if (this.javascript.size() == 0) {
-	            return null;
-	        }
-	        String statement = this.javascript.remove(0);
-	        if (this.javascript.size() == 0) { 
-	            this.empty = true;
-	        }
-	        return statement;
-	    }
-	}
-	
-	/**
-	 * Add a JavaScript statement to the list.
-	 * 
-	 * @param statement
-	 */
-	public void sendJavascript(String statement) {
-	    synchronized (this) { 
-	        this.javascript.add(statement);
-	        this.empty = false;
-	        this.notify();
-	    }
-	}
-	
-	/* The Following code has been modified from original implementation of URLEncoder */
-	
-	/* start */
-	
-	/*
-     *  Licensed to the Apache Software Foundation (ASF) under one or more
-     *  contributor license agreements.  See the NOTICE file distributed with
-     *  this work for additional information regarding copyright ownership.
-     *  The ASF licenses this file to You under the Apache License, Version 2.0
-     *  (the "License"); you may not use this file except in compliance with
-     *  the License.  You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     *  Unless required by applicable law or agreed to in writing, software
-     *  distributed under the License is distributed on an "AS IS" BASIS,
-     *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     *  See the License for the specific language governing permissions and
-     *  limitations under the License.
-     */
-	static final String digits = "0123456789ABCDEF";
-
-    /**
-     * This will encode the return value to JavaScript.  We revert the encoding for 
-     * common characters that don't require encoding to reduce the size of the string 
-     * being passed to JavaScript.
-     * 
-     * @param s to be encoded
-     * @param enc encoding type
-     * @return encoded string
-     */
-	public static String encode(String s, String enc) throws UnsupportedEncodingException {
-        if (s == null || enc == null) {
-            throw new NullPointerException();
-        }
-        // check for UnsupportedEncodingException
-        "".getBytes(enc);
-        
-        // Guess a bit bigger for encoded form
-        StringBuilder buf = new StringBuilder(s.length() + 16);
-        int start = -1;
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-            if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
-                    || (ch >= '0' && ch <= '9')
-                    || " .-*_'(),<>=?@[]{}:~\"\\/;!".indexOf(ch) > -1) {
-                if (start >= 0) {
-                    convert(s.substring(start, i), buf, enc);
-                    start = -1;
-                }
-                if (ch != ' ') {
-                    buf.append(ch);
-                } else {
-                    buf.append(' ');
-                }
-            } else {
-                if (start < 0) {
-                    start = i;
-                }
-            }
-        }
-        if (start >= 0) {
-            convert(s.substring(start, s.length()), buf, enc);
-        }
-        return buf.toString();
-    }
-
-    private static void convert(String s, StringBuilder buf, String enc) throws UnsupportedEncodingException {
-        byte[] bytes = s.getBytes(enc);
-        for (int j = 0; j < bytes.length; j++) {
-            buf.append('%');
-            buf.append(digits.charAt((bytes[j] & 0xf0) >> 4));
-            buf.append(digits.charAt(bytes[j] & 0xf));
-        }
-    }
-    
-    /* end */
-}

framework/src/org/apache/cordova/Capture.java

@@ -19,11 +19,13 @@
 package org.apache.cordova;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.apache.cordova.api.CallbackContext;
+import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.LOG;
-import org.apache.cordova.api.Plugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -32,44 +34,54 @@ import org.json.JSONObject;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
-import android.graphics.Bitmap;
+import android.database.Cursor;
 import android.graphics.BitmapFactory;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Environment;
+import android.provider.MediaStore;
 import android.util.Log;
 
-
-public class Capture extends Plugin {
+public class Capture extends CordovaPlugin {
 
     private static final String VIDEO_3GPP = "video/3gpp";
-    private static final String VIDEO_MP4  = "video/mp4";
+    private static final String VIDEO_MP4 = "video/mp4";
     private static final String AUDIO_3GPP = "audio/3gpp";
     private static final String IMAGE_JPEG = "image/jpeg";
-    
+
     private static final int CAPTURE_AUDIO = 0;     // Constant for capture audio
     private static final int CAPTURE_IMAGE = 1;     // Constant for capture image
     private static final int CAPTURE_VIDEO = 2;     // Constant for capture video
     private static final String LOG_TAG = "Capture";
-    
+
     private static final int CAPTURE_INTERNAL_ERR = 0;
-    private static final int CAPTURE_APPLICATION_BUSY = 1;
-    private static final int CAPTURE_INVALID_ARGUMENT = 2;
+//    private static final int CAPTURE_APPLICATION_BUSY = 1;
+//    private static final int CAPTURE_INVALID_ARGUMENT = 2;
     private static final int CAPTURE_NO_MEDIA_FILES = 3;
-    private static final int CAPTURE_NOT_SUPPORTED = 20;
-    
-    private String callbackId;                      // The ID of the callback to be invoked with our result
+
+    private CallbackContext callbackContext;        // The callback context from which we were invoked.
     private long limit;                             // the number of pics/vids/clips to take
     private double duration;                        // optional duration parameter for video recording
     private JSONArray results;                      // The array of results to be returned to the user
-    private Uri imageUri;                           // Uri of captured image 
+    private int numPics;                            // Number of pictures before capture activity
+
+    //private CordovaInterface cordova;
+
+//    public void setContext(Context mCtx)
+//    {
+//        if (CordovaInterface.class.isInstance(mCtx))
+//            cordova = (CordovaInterface) mCtx;
+//        else
+//            LOG.d(LOG_TAG, "ERROR: You must use the CordovaInterface for this to work correctly. Please implement it in your activity");
+//    }
 
     @Override
-    public PluginResult execute(String action, JSONArray args, String callbackId) {
-        this.callbackId = callbackId;
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+        this.callbackContext = callbackContext;
         this.limit = 1;
         this.duration = 0.0f;
         this.results = new JSONArray();
-        
+
         JSONObject options = args.optJSONObject(0);
         if (options != null) {
             limit = options.optLong("limit", 1);
@@ -77,12 +89,9 @@ public class Capture extends Plugin {
         }
 
         if (action.equals("getFormatData")) {
-            try {
-                JSONObject obj = getFormatData(args.getString(0), args.getString(1));
-                return new PluginResult(PluginResult.Status.OK, obj);
-            } catch (JSONException e) {
-                return new PluginResult(PluginResult.Status.ERROR);
-            }
+            JSONObject obj = getFormatData(args.getString(0), args.getString(1));
+            callbackContext.success(obj);
+            return true;
         }
         else if (action.equals("captureAudio")) {
             this.captureAudio();
@@ -91,73 +100,70 @@ public class Capture extends Plugin {
             this.captureImage();
         }
         else if (action.equals("captureVideo")) {
-            this.captureVideo(duration);    
+            this.captureVideo(duration);
         }
-        
-        PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
-        r.setKeepCallback(true);
-        return r;
+        else {
+            return false;
+        }
+
+        return true;
     }
 
     /**
      * Provides the media data file data depending on it's mime type
-     * 
+     *
      * @param filePath path to the file
      * @param mimeType of the file
      * @return a MediaFileData object
      */
-    private JSONObject getFormatData(String filePath, String mimeType) {
+    private JSONObject getFormatData(String filePath, String mimeType) throws JSONException {
         JSONObject obj = new JSONObject();
-        try {
-            // setup defaults
-            obj.put("height", 0);
-            obj.put("width", 0);
-            obj.put("bitrate", 0);
-            obj.put("duration", 0);
-            obj.put("codecs", "");
+        // setup defaults
+        obj.put("height", 0);
+        obj.put("width", 0);
+        obj.put("bitrate", 0);
+        obj.put("duration", 0);
+        obj.put("codecs", "");
 
-            // If the mimeType isn't set the rest will fail
-            // so let's see if we can determine it.
-            if (mimeType == null || mimeType.equals("")) {
-                mimeType = FileUtils.getMimeType(filePath);
-            }
-            Log.d(LOG_TAG, "Mime type = " + mimeType);
-            
-            if (mimeType.equals(IMAGE_JPEG) || filePath.endsWith(".jpg")) {
-                obj = getImageData(filePath, obj);
-            }
-            else if (mimeType.endsWith(AUDIO_3GPP)) {
-                obj = getAudioVideoData(filePath, obj, false);
-            }
-            else if (mimeType.equals(VIDEO_3GPP) || mimeType.equals(VIDEO_MP4)) {
-                obj = getAudioVideoData(filePath, obj, true);
-            }
+        // If the mimeType isn't set the rest will fail
+        // so let's see if we can determine it.
+        if (mimeType == null || mimeType.equals("") || "null".equals(mimeType)) {
+            mimeType = FileUtils.getMimeType(filePath);
         }
-        catch (JSONException e) {
-            Log.d(LOG_TAG, "Error: setting media file data object");
+        Log.d(LOG_TAG, "Mime type = " + mimeType);
+
+        if (mimeType.equals(IMAGE_JPEG) || filePath.endsWith(".jpg")) {
+            obj = getImageData(filePath, obj);
+        }
+        else if (mimeType.endsWith(AUDIO_3GPP)) {
+            obj = getAudioVideoData(filePath, obj, false);
+        }
+        else if (mimeType.equals(VIDEO_3GPP) || mimeType.equals(VIDEO_MP4)) {
+            obj = getAudioVideoData(filePath, obj, true);
         }
         return obj;
     }
 
     /**
      * Get the Image specific attributes
-     * 
+     *
      * @param filePath path to the file
      * @param obj represents the Media File Data
      * @return a JSONObject that represents the Media File Data
      * @throws JSONException
      */
     private JSONObject getImageData(String filePath, JSONObject obj) throws JSONException {
-        Bitmap bitmap = BitmapFactory.decodeFile(FileUtils.stripFileProtocol(filePath));
-        obj.put("height", bitmap.getHeight());
-        obj.put("width", bitmap.getWidth());
-        bitmap.recycle();
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(FileUtils.stripFileProtocol(filePath), options);
+        obj.put("height", options.outHeight);
+        obj.put("width", options.outWidth);
         return obj;
     }
 
     /**
      * Get the Image specific attributes
-     * 
+     *
      * @param filePath path to the file
      * @param obj represents the Media File Data
      * @param video if true get video attributes as well
@@ -169,15 +175,14 @@ public class Capture extends Plugin {
         try {
             player.setDataSource(filePath);
             player.prepare();
-            obj.put("duration", player.getDuration()/1000);
+            obj.put("duration", player.getDuration() / 1000);
             if (video) {
                 obj.put("height", player.getVideoHeight());
                 obj.put("width", player.getVideoWidth());
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             Log.d(LOG_TAG, "Error: loading video file");
-        } 
+        }
         return obj;
     }
 
@@ -187,21 +192,23 @@ public class Capture extends Plugin {
     private void captureAudio() {
         Intent intent = new Intent(android.provider.MediaStore.Audio.Media.RECORD_SOUND_ACTION);
 
-        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_AUDIO);
+        this.cordova.startActivityForResult((CordovaPlugin) this, intent, CAPTURE_AUDIO);
     }
 
     /**
      * Sets up an intent to capture images.  Result handled by onActivityResult()
      */
     private void captureImage() {
+        // Save the number of images currently on disk for later
+        this.numPics = queryImgDB(whichContentStore()).getCount();
+
         Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
 
         // Specify file so that large image is captured and returned
-        File photo = new File(DirectoryManager.getTempDirectoryPath(ctx.getContext()),  "Capture.jpg");
+        File photo = new File(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()), "Capture.jpg");
         intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photo));
-        this.imageUri = Uri.fromFile(photo);
 
-        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_IMAGE);
+        this.cordova.startActivityForResult((CordovaPlugin) this, intent, CAPTURE_IMAGE);
     }
 
     /**
@@ -211,18 +218,18 @@ public class Capture extends Plugin {
         Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE);
         // Introduced in API 8
         //intent.putExtra(android.provider.MediaStore.EXTRA_DURATION_LIMIT, duration);
-        
-        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_VIDEO);
+
+        this.cordova.startActivityForResult((CordovaPlugin) this, intent, CAPTURE_VIDEO);
     }
-    
+
     /**
-     * Called when the video view exits. 
-     * 
-     * @param requestCode       The request code originally supplied to startActivityForResult(), 
+     * Called when the video view exits.
+     *
+     * @param requestCode       The request code originally supplied to startActivityForResult(),
      *                          allowing you to identify who this result came from.
      * @param resultCode        The integer result code returned by the child activity through its setResult().
      * @param intent            An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
-     * @throws JSONException 
+     * @throws JSONException
      */
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
 
@@ -237,7 +244,7 @@ public class Capture extends Plugin {
 
                 if (results.length() >= limit) {
                     // Send Uri back to JavaScript for listening to audio
-                    this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
+                    this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
                 } else {
                     // still need to capture more audio clips
                     captureAudio();
@@ -248,51 +255,42 @@ public class Capture extends Plugin {
                 // It crashes in the emulator and on my phone with a null pointer exception
                 // To work around it I had to grab the code from CameraLauncher.java
                 try {
-                    // Create an ExifHelper to save the exif data that is lost during compression
-                    ExifHelper exif = new ExifHelper();
-                    exif.createInFile(DirectoryManager.getTempDirectoryPath(ctx.getContext()) + "/Capture.jpg");
-                    exif.readExifData();
-                    
-                    // Read in bitmap of captured image
-                    Bitmap bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
-
                     // Create entry in media store for image
                     // (Don't use insertImage() because it uses default compression setting of 50 - no way to change it)
                     ContentValues values = new ContentValues();
                     values.put(android.provider.MediaStore.Images.Media.MIME_TYPE, IMAGE_JPEG);
                     Uri uri = null;
                     try {
-                        uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+                        uri = this.cordova.getActivity().getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
                     } catch (UnsupportedOperationException e) {
                         LOG.d(LOG_TAG, "Can't write to external media storage.");
                         try {
-                            uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
+                            uri = this.cordova.getActivity().getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
                         } catch (UnsupportedOperationException ex) {
-                            LOG.d(LOG_TAG, "Can't write to internal media storage.");                           
+                            LOG.d(LOG_TAG, "Can't write to internal media storage.");
                             this.fail(createErrorObject(CAPTURE_INTERNAL_ERR, "Error capturing image - no media storage found."));
                             return;
                         }
                     }
-
-                    // Add compressed version of captured image to returned media store Uri
-                    OutputStream os  = this.ctx.getContentResolver().openOutputStream(uri);
-                    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os);
+                    FileInputStream fis = new FileInputStream(DirectoryManager.getTempDirectoryPath(this.cordova.getActivity()) + "/Capture.jpg");
+                    OutputStream os = this.cordova.getActivity().getContentResolver().openOutputStream(uri);
+                    byte[] buffer = new byte[4096];
+                    int len;
+                    while ((len = fis.read(buffer)) != -1) {
+                        os.write(buffer, 0, len);
+                    }
+                    os.flush();
                     os.close();
+                    fis.close();
 
-                    bitmap.recycle();
-                    bitmap = null;
-                    System.gc();
-                    
-                    // Restore exif data to file
-                    exif.createOutFile(FileUtils.getRealPathFromURI(uri, this.ctx));
-                    exif.writeExifData();
-                    
                     // Add image to results
                     results.put(createMediaFile(uri));
-                    
+
+                    checkForDuplicateImage();
+
                     if (results.length() >= limit) {
                         // Send Uri back to JavaScript for viewing image
-                        this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
+                        this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
                     } else {
                         // still need to capture more images
                         captureImage();
@@ -309,7 +307,7 @@ public class Capture extends Plugin {
 
                 if (results.length() >= limit) {
                     // Send Uri back to JavaScript for viewing video
-                    this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);
+                    this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
                 } else {
                     // still need to capture more video clips
                     captureVideo(duration);
@@ -320,7 +318,7 @@ public class Capture extends Plugin {
         else if (resultCode == Activity.RESULT_CANCELED) {
             // If we have partial results send them back to the user
             if (results.length() > 0) {
-                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);                
+                this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
             }
             // user canceled the action
             else {
@@ -331,7 +329,7 @@ public class Capture extends Plugin {
         else {
             // If we have partial results send them back to the user
             if (results.length() > 0) {
-                this.success(new PluginResult(PluginResult.Status.OK, results), this.callbackId);                
+                this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
             }
             // something bad happened
             else {
@@ -342,43 +340,42 @@ public class Capture extends Plugin {
 
     /**
      * Creates a JSONObject that represents a File from the Uri
-     *  
+     *
      * @param data the Uri of the audio/image/video
      * @return a JSONObject that represents a File
-     * @throws IOException 
+     * @throws IOException
      */
-    private JSONObject createMediaFile(Uri data){
-        File fp = new File(FileUtils.getRealPathFromURI(data, this.ctx));
+    private JSONObject createMediaFile(Uri data) {
+        File fp = new File(FileUtils.getRealPathFromURI(data, this.cordova));
         JSONObject obj = new JSONObject();
 
-        try {       
+        try {
             // File properties
             obj.put("name", fp.getName());
             obj.put("fullPath", "file://" + fp.getAbsolutePath());
-            
-            // Because of an issue with MimeTypeMap.getMimeTypeFromExtension() all .3gpp files 
-            // are reported as video/3gpp. I'm doing this hacky check of the URI to see if it 
+            // Because of an issue with MimeTypeMap.getMimeTypeFromExtension() all .3gpp files
+            // are reported as video/3gpp. I'm doing this hacky check of the URI to see if it
             // is stored in the audio or video content store.
             if (fp.getAbsoluteFile().toString().endsWith(".3gp") || fp.getAbsoluteFile().toString().endsWith(".3gpp")) {
                 if (data.toString().contains("/audio/")) {
-                    obj.put("type", AUDIO_3GPP);                
+                    obj.put("type", AUDIO_3GPP);
                 } else {
-                    obj.put("type", VIDEO_3GPP);                
-                }               
+                    obj.put("type", VIDEO_3GPP);
+                }
             } else {
-                obj.put("type", FileUtils.getMimeType(fp.getAbsolutePath()));                
+                obj.put("type", FileUtils.getMimeType(fp.getAbsolutePath()));
             }
-            
+
             obj.put("lastModifiedDate", fp.lastModified());
             obj.put("size", fp.length());
         } catch (JSONException e) {
             // this will never happen
             e.printStackTrace();
         }
-        
+
         return obj;
     }
-    
+
     private JSONObject createErrorObject(int code, String message) {
         JSONObject obj = new JSONObject();
         try {
@@ -392,10 +389,55 @@ public class Capture extends Plugin {
 
     /**
      * Send error message to JavaScript.
-     * 
+     *
      * @param err
      */
     public void fail(JSONObject err) {
-        this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
+        this.callbackContext.error(err);
+    }
+
+
+    /**
+     * Creates a cursor that can be used to determine how many images we have.
+     *
+     * @return a cursor
+     */
+    private Cursor queryImgDB(Uri contentStore) {
+        return this.cordova.getActivity().getContentResolver().query(
+            contentStore,
+            new String[] { MediaStore.Images.Media._ID },
+            null,
+            null,
+            null);
+    }
+
+    /**
+     * Used to find out if we are in a situation where the Camera Intent adds to images
+     * to the content store.
+     */
+    private void checkForDuplicateImage() {
+        Uri contentStore = whichContentStore();
+        Cursor cursor = queryImgDB(contentStore);
+        int currentNumOfImages = cursor.getCount();
+
+        // delete the duplicate file if the difference is 2
+        if ((currentNumOfImages - numPics) == 2) {
+            cursor.moveToLast();
+            int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
+            Uri uri = Uri.parse(contentStore + "/" + id);
+            this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+        }
+    }
+
+    /**
+     * Determine if we are storing the images in internal or external storage
+     * @return Uri
+     */
+    private Uri whichContentStore() {
+        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+            return android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+        } else {
+            return android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI;
+        }
     }
 }

framework/src/org/apache/cordova/CompassListener.java

@@ -20,41 +20,46 @@ package org.apache.cordova;
 
 import java.util.List;
 
+import org.apache.cordova.api.CallbackContext;
 import org.apache.cordova.api.CordovaInterface;
-import org.apache.cordova.api.Plugin;
+import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.content.Context;
 
+import android.os.Handler;
+import android.os.Looper;
+
 /**
  * This class listens to the compass sensor and stores the latest heading value.
  */
-public class CompassListener extends Plugin implements SensorEventListener {
+public class CompassListener extends CordovaPlugin implements SensorEventListener {
 
     public static int STOPPED = 0;
     public static int STARTING = 1;
     public static int RUNNING = 2;
     public static int ERROR_FAILED_TO_START = 3;
-    
+
     public long TIMEOUT = 30000;        // Timeout in msec to shut off listener
-    
+
     int status;                         // status of listener
     float heading;                      // most recent heading value
     long timeStamp;                     // time of most recent value
     long lastAccessTime;                // time the value was last retrieved
     int accuracy;                       // accuracy of the sensor
-    
+
     private SensorManager sensorManager;// Sensor manager
     Sensor mSensor;                     // Compass sensor returned by sensor manager
-    
+
+    private CallbackContext callbackContext;
+
     /**
      * Constructor.
      */
@@ -67,99 +72,66 @@ public class CompassListener extends Plugin implements SensorEventListener {
     /**
      * Sets the context of the Command. This can then be used to do things like
      * get file paths associated with the Activity.
-     * 
-     * @param ctx The context of the main Activity.
+     *
+     * @param cordova The context of the main Activity.
+     * @param webView The CordovaWebView Cordova is running in.
      */
-    public void setContext(CordovaInterface ctx) {
-        super.setContext(ctx);
-        this.sensorManager = (SensorManager) ctx.getSystemService(Context.SENSOR_SERVICE);
+    public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+        super.initialize(cordova, webView);
+        this.sensorManager = (SensorManager) cordova.getActivity().getSystemService(Context.SENSOR_SERVICE);
     }
 
     /**
      * Executes the request and returns PluginResult.
-     * 
-     * @param action        The action to execute.
-     * @param args          JSONArry of arguments for the plugin.
-     * @param callbackId    The callback id used when calling back into JavaScript.
-     * @return              A PluginResult object with a status and message.
+     *
+     * @param action                The action to execute.
+     * @param args          	    JSONArry of arguments for the plugin.
+     * @param callbackS=Context     The callback id used when calling back into JavaScript.
+     * @return              	    True if the action was valid.
+     * @throws JSONException 
      */
-    public PluginResult execute(String action, JSONArray args, String callbackId) {
-        PluginResult.Status status = PluginResult.Status.OK;
-        String result = "";     
-        
-        try {
-            if (action.equals("start")) {
-                this.start();
-            }
-            else if (action.equals("stop")) {
-                this.stop();
-            }
-            else if (action.equals("getStatus")) {
-                int i = this.getStatus();
-                return new PluginResult(status, i);
-            }
-            else if (action.equals("getHeading")) {
-                // If not running, then this is an async call, so don't worry about waiting
-                if (this.status != CompassListener.RUNNING) {
-                    int r = this.start();
-                    if (r == CompassListener.ERROR_FAILED_TO_START) {
-                        return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);
-                    }
-                    // Wait until running
-                    long timeout = 2000;
-                    while ((this.status == STARTING) && (timeout > 0)) {
-                        timeout = timeout - 100;
-                        try {
-                            Thread.sleep(100);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (timeout == 0) {
-                        return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);                     
-                    }
-                }
-                return new PluginResult(status, getCompassHeading());
-            }
-            else if (action.equals("setTimeout")) {
-                this.setTimeout(args.getLong(0));
-            }
-            else if (action.equals("getTimeout")) {
-                long l = this.getTimeout();
-                return new PluginResult(status, l);
-            } else {
-                // Unsupported action
-                return new PluginResult(PluginResult.Status.INVALID_ACTION);
-            }
-            return new PluginResult(status, result);
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+        if (action.equals("start")) {
+            this.start();
         }
-    }
-
-    /**
-     * Identifies if action to be executed returns a value and should be run synchronously.
-     * 
-     * @param action    The action to execute
-     * @return          T=returns value
-     */
-    public boolean isSynch(String action) {
-        if (action.equals("getStatus")) {
-            return true;
+        else if (action.equals("stop")) {
+            this.stop();
+        }
+        else if (action.equals("getStatus")) {
+            int i = this.getStatus();
+            callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, i));
         }
         else if (action.equals("getHeading")) {
-            // Can only return value if RUNNING
-            if (this.status == CompassListener.RUNNING) {
-                return true;
+            // If not running, then this is an async call, so don't worry about waiting
+            if (this.status != CompassListener.RUNNING) {
+                int r = this.start();
+                if (r == CompassListener.ERROR_FAILED_TO_START) {
+                    callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START));
+                    return true;
+                }
+                // Set a timeout callback on the main thread.
+                Handler handler = new Handler(Looper.getMainLooper());
+                handler.postDelayed(new Runnable() {
+                    public void run() {
+                        CompassListener.this.timeout();
+                    }
+                }, 2000);
             }
+            callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, getCompassHeading()));
+        }
+        else if (action.equals("setTimeout")) {
+            this.setTimeout(args.getLong(0));
         }
         else if (action.equals("getTimeout")) {
-            return true;
+            long l = this.getTimeout();
+            callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, l));
+        } else {
+            // Unsupported action
+            return false;
         }
-        return false;
+        return true;
     }
-    
+
     /**
      * Called when listener is to be shut down and object is being destroyed.
      */
@@ -167,23 +139,31 @@ public class CompassListener extends Plugin implements SensorEventListener {
         this.stop();
     }
 
+    /**
+     * Called when app has navigated and JS listeners have been destroyed.
+     */
+    public void onReset() {
+        this.stop();
+    }
+
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------
 
     /**
      * Start listening for compass sensor.
-     * 
+     *
      * @return          status of listener
      */
     public int start() {
-        
+
         // If already starting or running, then just return
         if ((this.status == CompassListener.RUNNING) || (this.status == CompassListener.STARTING)) {
             return this.status;
         }
 
         // Get compass sensor from sensor manager
+        @SuppressWarnings("deprecation")
         List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ORIENTATION);
 
         // If found, then register as listener
@@ -198,10 +178,10 @@ public class CompassListener extends Plugin implements SensorEventListener {
         else {
             this.setStatus(CompassListener.ERROR_FAILED_TO_START);
         }
-        
+
         return this.status;
     }
-    
+
     /**
      * Stop listening to compass sensor.
      */
@@ -211,15 +191,26 @@ public class CompassListener extends Plugin implements SensorEventListener {
         }
         this.setStatus(CompassListener.STOPPED);
     }
-    
-    
+
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        // TODO Auto-generated method stub  
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * Called after a delay to time out if the listener has not attached fast enough.
+     */
+    private void timeout() {
+        if (this.status == CompassListener.STARTING) {
+            this.setStatus(CompassListener.ERROR_FAILED_TO_START);
+            if (this.callbackContext != null) {
+                this.callbackContext.error("Compass listener failed to start.");
+            }
+        }
     }
 
     /**
      * Sensor listener event.
-     * 
+     *
      * @param SensorEvent event
      */
     public void onSensorChanged(SensorEvent event) {
@@ -237,38 +228,38 @@ public class CompassListener extends Plugin implements SensorEventListener {
             this.stop();
         }
     }
-    
+
     /**
      * Get status of compass sensor.
-     * 
+     *
      * @return          status
      */
     public int getStatus() {
         return this.status;
     }
-    
+
     /**
      * Get the most recent compass heading.
-     * 
+     *
      * @return          heading
      */
     public float getHeading() {
         this.lastAccessTime = System.currentTimeMillis();
         return this.heading;
     }
-    
+
     /**
      * Set the timeout to turn off compass sensor if getHeading() hasn't been called.
-     * 
+     *
      * @param timeout       Timeout in msec.
      */
     public void setTimeout(long timeout) {
         this.TIMEOUT = timeout;
     }
-    
+
     /**
      * Get the timeout to turn off compass sensor if getHeading() hasn't been called.
-     * 
+     *
      * @return timeout in msec
      */
     public long getTimeout() {
@@ -285,23 +276,19 @@ public class CompassListener extends Plugin implements SensorEventListener {
 
     /**
      * Create the CompassHeading JSON object to be returned to JavaScript
-     * 
+     *
      * @return a compass heading
      */
-    private JSONObject getCompassHeading() {
+    private JSONObject getCompassHeading() throws JSONException {
         JSONObject obj = new JSONObject();
-        
-        try {
-            obj.put("magneticHeading", this.getHeading());
-            obj.put("trueHeading", this.getHeading());
-            // Since the magnetic and true heading are always the same our and accuracy 
-            // is defined as the difference between true and magnetic always return zero
-            obj.put("headingAccuracy", 0);
-            obj.put("timestamp", this.timeStamp);
-        } catch (JSONException e) {
-            // Should never happen
-        }
-        
+
+        obj.put("magneticHeading", this.getHeading());
+        obj.put("trueHeading", this.getHeading());
+        // Since the magnetic and true heading are always the same our and accuracy
+        // is defined as the difference between true and magnetic always return zero
+        obj.put("headingAccuracy", 0);
+        obj.put("timestamp", this.timeStamp);
+
         return obj;
     }