cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject git commit: Delete obsolete plugins: android-legacy-websql, websql, file-system-roots
Date Wed, 05 Nov 2014 16:12:31 GMT
Repository: cordova-plugins
Updated Branches:
  refs/heads/master 8f9c0bb53 -> bcfeb64b6


Delete obsolete plugins: android-legacy-websql, websql, file-system-roots


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugins/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugins/commit/bcfeb64b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugins/tree/bcfeb64b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugins/diff/bcfeb64b

Branch: refs/heads/master
Commit: bcfeb64b65a8d460a1e0800b79d192966ef1a715
Parents: 8f9c0bb
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Nov 5 11:11:43 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Nov 5 11:11:43 2014 -0500

----------------------------------------------------------------------
 android-legacy-websql/LegacyWebSql.java | 233 --------------------
 android-legacy-websql/README.md         |  11 -
 android-legacy-websql/legacywebsql.js   | 311 ---------------------------
 android-legacy-websql/openDatabase.js   |  47 ----
 android-legacy-websql/plugin.xml        |  25 ---
 file-system-roots/README.md             |   4 -
 websql/README.md                        |  14 --
 websql/WebSQLPlugin.java                |  33 ---
 websql/android_websql.js                |  47 ----
 websql/plugin.xml                       |  25 ---
 10 files changed, 750 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/android-legacy-websql/LegacyWebSql.java
----------------------------------------------------------------------
diff --git a/android-legacy-websql/LegacyWebSql.java b/android-legacy-websql/LegacyWebSql.java
deleted file mode 100644
index 25cfad1..0000000
--- a/android-legacy-websql/LegacyWebSql.java
+++ /dev/null
@@ -1,233 +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.legacywebsql;
-
-import java.io.File;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.*;
-
-public class LegacyWebSql extends CordovaPlugin {
-
-    // Data Definition Language
-    private static final String ALTER = "alter";
-    private static final String CREATE = "create";
-    private static final String DROP = "drop";
-    private static final String TRUNCATE = "truncate";
-
-    SQLiteDatabase myDb = null; // Database object
-    String path = null; // Database path
-    String dbName = null; // Database name
-
-    /**
-     * 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 True if the action was valid, false otherwise.
-     */
-    public boolean execute(String action, JSONArray args, CallbackContext callbackContext)
throws JSONException {
-        if (action.equals("openDatabase")) {
-            this.openDatabase(args.getString(0), args.getString(1),
-                    args.getString(2), args.getLong(3));
-        } else if (action.equals("executeSql")) {
-            String[] s = null;
-            if (args.isNull(1)) {
-                s = new String[0];
-            } else {
-                JSONArray a = args.getJSONArray(1);
-                int len = a.length();
-                s = new String[len];
-                for (int i = 0; i < len; i++) {
-                    s[i] = a.getString(i);
-                }
-            }
-            this.executeSql(args.getString(0), s, args.getString(2));
-        }
-        else {
-            return false;
-        }
-        callbackContext.success();
-        return true;
-    }
-
-    /**
-     * Clean up and close database.
-     */
-    @Override
-    public void onDestroy() {
-        if (this.myDb != null) {
-            this.myDb.close();
-            this.myDb = null;
-        }
-    }
-
-    /**
-     * Clean up on navigation/refresh.
-     */
-    public void onReset() {
-        this.onDestroy();
-    }
-
-    // --------------------------------------------------------------------------
-    // LOCAL METHODS
-    // --------------------------------------------------------------------------
-
-    /**
-     * Open database.
-     *
-     * @param db
-     *            The name of the database
-     * @param version
-     *            The version
-     * @param display_name
-     *            The display name
-     * @param size
-     *            The size in bytes
-     */
-    public void openDatabase(String db, String version, String display_name,
-            long size) {
-
-        // If database is open, then close it
-        if (this.myDb != null) {
-            this.myDb.close();
-        }
-
-        // If no database path, generate from application package
-        if (this.path == null) {
-            this.path = this.cordova.getActivity().getApplicationContext().getDir("database",
Context.MODE_PRIVATE).getPath();
-        }
-
-        this.dbName = this.path + File.separator + db + ".db";
-
-        /*
-         * What is all this nonsense? Well the separator was incorrect so the db was showing
up in the wrong 
-         * directory. This bit of code fixes that issue and moves the db to the correct directory.
-         */
-        File oldDbFile = new File(this.path + File.pathSeparator + db + ".db");
-        if (oldDbFile.exists()) {
-            File dbPath = new File(this.path);
-            File dbFile = new File(dbName);
-            dbPath.mkdirs();
-            oldDbFile.renameTo(dbFile);
-        }
-        
-        this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
-    }
-
-    /**
-     * Execute SQL statement.
-     *
-     * @param query
-     *            The SQL query
-     * @param params
-     *            Parameters for the query
-     * @param tx_id
-     *            Transaction id
-     */
-    public void executeSql(String query, String[] params, String tx_id) {
-        try {
-            if (isDDL(query)) {
-                this.myDb.execSQL(query);
-                this.webView.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('"
+ tx_id + "', '');");
-            }
-            else {
-                Cursor myCursor = this.myDb.rawQuery(query, params);
-                this.processResults(myCursor, tx_id);
-                myCursor.close();
-            }
-        }
-        catch (SQLiteException ex) {
-            ex.printStackTrace();
-            System.out.println("Storage.executeSql(): Error=" +  ex.getMessage());
-
-            // Send error message back to JavaScript
-            this.webView.sendJavascript("cordova.require('cordova/plugin/android/storage').failQuery('"
+ ex.getMessage() + "','" + tx_id + "');");
-        }
-    }
-
-    /**
-     * Checks to see the the query is a Data Definition command
-     *
-     * @param query to be executed
-     * @return true if it is a DDL command, false otherwise
-     */
-    private boolean isDDL(String query) {
-        String cmd = query.toLowerCase();
-        if (cmd.startsWith(DROP) || cmd.startsWith(CREATE) || cmd.startsWith(ALTER) || cmd.startsWith(TRUNCATE))
{
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Process query results.
-     *
-     * @param cur
-     *            Cursor into query results
-     * @param tx_id
-     *            Transaction id
-     */
-    public void processResults(Cursor cur, String tx_id) {
-
-        String result = "[]";
-        // If query result has rows
-
-        if (cur.moveToFirst()) {
-            JSONArray fullresult = new JSONArray();
-            String key = "";
-            String value = "";
-            int colCount = cur.getColumnCount();
-
-            // Build up JSON result object for each row
-            do {
-                JSONObject row = new JSONObject();
-                try {
-                    for (int i = 0; i < colCount; ++i) {
-                        key = cur.getColumnName(i);
-                        value = cur.getString(i);
-                        row.put(key, value);
-                    }
-                    fullresult.put(row);
-
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
-            } while (cur.moveToNext());
-
-            result = fullresult.toString();
-        }
-
-        // Let JavaScript know that there are no more rows
-        this.webView.sendJavascript("cordova.require('cordova/plugin/android/storage').completeQuery('"
+ tx_id + "', " + result + ");");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/android-legacy-websql/README.md
----------------------------------------------------------------------
diff --git a/android-legacy-websql/README.md b/android-legacy-websql/README.md
deleted file mode 100644
index 515d95a..0000000
--- a/android-legacy-websql/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Legacy WebSQL Plugin for Android
----------------------------------
-This plugin provided WebSQL support on Android prior to version 3.0 and is obsoleted by [org.apache.cordova.websql](http://plugins.cordova.io/#/org.apache.cordova.websql).
-
-To transfer data from from the old database to the new one, you need to:
-1. Install both plugins
-2. Open your old database via `cordova.plugins.legacySQL.openDatabase()`
-3. Open your new database via `window.openDatabase()`
-4. Copy data from one to the other by going through JS.
-
-Since this is pretty annoying code to write, you might not want to use the new websql plugin
for existing apps. Instead, continue to use the old one.

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/android-legacy-websql/legacywebsql.js
----------------------------------------------------------------------
diff --git a/android-legacy-websql/legacywebsql.js b/android-legacy-websql/legacywebsql.js
deleted file mode 100644
index 72742c1..0000000
--- a/android-legacy-websql/legacywebsql.js
+++ /dev/null
@@ -1,311 +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.
- *
-*/
-
-var utils = require('cordova/utils'),
-    exec = require('cordova/exec'),
-    channel = require('cordova/channel');
-
-var queryQueue = {};
-
-/**
- * SQL result set object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Rows = function() {
-    this.resultSet = [];    // results array
-    this.length = 0;        // number of rows
-};
-
-/**
- * Get item from SQL result set
- *
- * @param row           The row number to return
- * @return              The row object
- */
-DroidDB_Rows.prototype.item = function(row) {
-    return this.resultSet[row];
-};
-
-/**
- * SQL result set that is returned to user.
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Result = function() {
-    this.rows = new DroidDB_Rows();
-};
-
-/**
- * Callback from native code when query is complete.
- * PRIVATE METHOD
- *
- * @param id   Query id
- */
-function completeQuery(id, data) {
-    var query = queryQueue[id];
-    if (query) {
-        try {
-            delete queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-
-                // Save query results
-                var r = new DroidDB_Result();
-                r.rows.resultSet = data;
-                r.rows.length = data.length;
-                try {
-                    if (typeof query.successCallback === 'function') {
-                        query.successCallback(query.tx, r);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user success callback: "+ex);
-                }
-
-                tx.queryComplete(id);
-            }
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-}
-
-/**
- * Callback from native code when query fails
- * PRIVATE METHOD
- *
- * @param reason            Error message
- * @param id                Query id
- */
-function failQuery(reason, id) {
-    var query = queryQueue[id];
-    if (query) {
-        try {
-            delete queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-                tx.queryList = {};
-
-                try {
-                    if (typeof query.errorCallback === 'function') {
-                        query.errorCallback(query.tx, reason);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user error callback: "+ex);
-                }
-
-                tx.queryFailed(id, reason);
-            }
-
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-}
-
-/**
- * SQL query object
- * PRIVATE METHOD
- *
- * @constructor
- * @param tx                The transaction object that this query belongs to
- */
-var DroidDB_Query = function(tx) {
-
-    // Set the id of the query
-    this.id = utils.createUUID();
-
-    // Add this query to the queue
-    queryQueue[this.id] = this;
-
-    // Init result
-    this.resultSet = [];
-
-    // Set transaction that this query belongs to
-    this.tx = tx;
-
-    // Add this query to transaction list
-    this.tx.queryList[this.id] = this;
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-};
-
-/**
- * Transaction object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Tx = function() {
-
-    // Set the id of the transaction
-    this.id = utils.createUUID();
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-    // Query list
-    this.queryList = {};
-};
-
-/**
- * Mark query in transaction as complete.
- * If all queries are complete, call the user's transaction success callback.
- *
- * @param id                Query id
- */
-DroidDB_Tx.prototype.queryComplete = function(id) {
-    delete this.queryList[id];
-
-    // If no more outstanding queries, then fire transaction success
-    if (this.successCallback) {
-        var count = 0;
-        var i;
-        for (i in this.queryList) {
-            if (this.queryList.hasOwnProperty(i)) {
-                count++;
-            }
-        }
-        if (count === 0) {
-            try {
-                this.successCallback();
-            } catch(e) {
-                console.log("Transaction error calling user success callback: " + e);
-            }
-        }
-    }
-};
-
-/**
- * Mark query in transaction as failed.
- *
- * @param id                Query id
- * @param reason            Error message
- */
-DroidDB_Tx.prototype.queryFailed = function(id, reason) {
-
-    // The sql queries in this transaction have already been run, since
-    // we really don't have a real transaction implemented in native code.
-    // However, the user callbacks for the remaining sql queries in transaction
-    // will not be called.
-    this.queryList = {};
-
-    if (this.errorCallback) {
-        try {
-            this.errorCallback(reason);
-        } catch(e) {
-            console.log("Transaction error calling user error callback: " + e);
-        }
-    }
-};
-
-/**
- * Execute SQL statement
- *
- * @param sql                   SQL statement to execute
- * @param params                Statement parameters
- * @param successCallback       Success callback
- * @param errorCallback         Error callback
- */
-DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {
-
-    // Init params array
-    if (typeof params === 'undefined') {
-        params = [];
-    }
-
-    // Create query and add to queue
-    var query = new DroidDB_Query(this);
-    queryQueue[query.id] = query;
-
-    // Save callbacks
-    query.successCallback = successCallback;
-    query.errorCallback = errorCallback;
-
-    // Call native code
-    exec(null, null, "LegacyWebSql", "executeSql", [sql, params, query.id]);
-};
-
-var DatabaseShell = function() {
-};
-
-/**
- * Start a transaction.
- * Does not support rollback in event of failure.
- *
- * @param process {Function}            The transaction function
- * @param successCallback {Function}
- * @param errorCallback {Function}
- */
-DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
-    var tx = new DroidDB_Tx();
-    tx.successCallback = successCallback;
-    tx.errorCallback = errorCallback;
-    try {
-        process(tx);
-    } catch (e) {
-        console.log("Transaction error: "+e);
-        if (tx.errorCallback) {
-            try {
-                tx.errorCallback(e);
-            } catch (ex) {
-                console.log("Transaction error calling user error callback: "+e);
-            }
-        }
-    }
-};
-
-/**
- * Open database
- *
- * @param name              Database name
- * @param version           Database version
- * @param display_name      Database display name
- * @param size              Database size in bytes
- * @return                  Database object
- */
-var DroidDB_openDatabase = function(name, version, display_name, size) {
-    exec(null, null, "LegacyWebSql", "openDatabase", [name, version, display_name, size]);
-    var db = new DatabaseShell();
-    return db;
-};
-
-
-module.exports = {
-    openDatabase:DroidDB_openDatabase,
-    failQuery:failQuery,
-    completeQuery:completeQuery
-};

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/android-legacy-websql/openDatabase.js
----------------------------------------------------------------------
diff --git a/android-legacy-websql/openDatabase.js b/android-legacy-websql/openDatabase.js
deleted file mode 100644
index 1eb16ae..0000000
--- a/android-legacy-websql/openDatabase.js
+++ /dev/null
@@ -1,47 +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.
- *
-*/
-
-
-var modulemapper = require('cordova/modulemapper'),
-    legacywebsql = require('./legacywebsql');
-
-var originalOpenDatabase = modulemapper.getOriginalSymbol(window, 'openDatabase');
-
-module.exports = function(name, version, desc, size) {
-    // First patch WebSQL if necessary
-    if (!originalOpenDatabase) {
-        // Not defined, create an openDatabase function for all to use!
-        return legacywebsql.openDatabase.apply(this, arguments);
-    }
-
-    // Defined, but some Android devices will throw a SECURITY_ERR -
-    // so we wrap the whole thing in a try-catch and shim in our own
-    // if the device has Android bug 16175.
-    try {
-        return originalOpenDatabase(name, version, desc, size);
-    } catch (ex) {
-        if (ex.code !== 18) {
-            throw ex;
-        }
-    }
-    return legacywebsql.openDatabase(name, version, desc, size);
-};
-
-

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/android-legacy-websql/plugin.xml
----------------------------------------------------------------------
diff --git a/android-legacy-websql/plugin.xml b/android-legacy-websql/plugin.xml
deleted file mode 100644
index b6af32e..0000000
--- a/android-legacy-websql/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
-           id="org.apache.cordova.legacyandroidwebsql"
-      version="0.1.0">
-
-    <name>Legacy Android WebSQL</name>
-
-    <platform name="android">
-        <js-module src="legacywebsql.js" name="legacywebsql" />
-
-        <js-module src="openDatabase.js" name="openDatabase">
-            <clobbers target="openDatabase" />
-            <clobbers target="cordova.plugins.legacySQL.openDatabase" />
-        </js-module>
-
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="LegacyWebSql">
-                <param name="android-package" value="org.apache.cordova.legacywebsql.LegacyWebSql"/>
-            </feature>
-        </config-file>
-
-        <source-file src="LegacyWebSql.java" target-dir="src/org/apache/cordova/legacywebsql"
/>
-    </platform>
-</plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/file-system-roots/README.md
----------------------------------------------------------------------
diff --git a/file-system-roots/README.md b/file-system-roots/README.md
deleted file mode 100644
index fb6f31d..0000000
--- a/file-system-roots/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-org.apache.cordova.file-system-roots plugin
-===========================================
-
-DEPRECATED - the functionality of this plugin is built into org.apache.cordova.file as of
1.2.0.

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/websql/README.md
----------------------------------------------------------------------
diff --git a/websql/README.md b/websql/README.md
deleted file mode 100644
index c568f17..0000000
--- a/websql/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-WebSQL Plugin for Android
--------------------------------
-
-Adds WebSQL support on Android.
-
-* iOS supports WebSQL out of the box.
-* Android supports it as well, but needs a hack (provided by this plugin) for 3.0+
-
-Caveats
-----------------
-* Only a single call to openDatabase is allowed or an exception is thrown.
-* You must never change the name of your database or an exception is thrown.
-* The plugin creates a hidden iframe in the DOM. It must not be removed or the database callbacks
will stop being called.
-

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/websql/WebSQLPlugin.java
----------------------------------------------------------------------
diff --git a/websql/WebSQLPlugin.java b/websql/WebSQLPlugin.java
deleted file mode 100644
index cf2d126..0000000
--- a/websql/WebSQLPlugin.java
+++ /dev/null
@@ -1,33 +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.websql;
-
-import android.net.Uri;
-
-import org.apache.cordova.CordovaPlugin;
-
-public class WebSQLPlugin extends CordovaPlugin {
-    public Uri remapUri(Uri uri) {
-        if ("websql".equals(uri.getScheme())) {
-            // <html></html>
-            return Uri.parse("data:text/html;base64,PGh0bWw+PC9odG1sPg==");
-        }
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/websql/android_websql.js
----------------------------------------------------------------------
diff --git a/websql/android_websql.js b/websql/android_websql.js
deleted file mode 100644
index 1a1fd1c..0000000
--- a/websql/android_websql.js
+++ /dev/null
@@ -1,47 +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.
- *
-*/
-
-// WebSQL is broken only for file: URLs.
-if (location.protocol == 'file:') {
-    var androidVersion = /Android (\d+)/.exec(navigator.userAgent);
-    // Don't apply hack for Android 2 since the native side can't override the URL loading.
-    // The database isn't broken on 2 anyways.
-    if (!androidVersion || +androidVersion[1] > 2) {
-        var channel = require('cordova/channel');
-
-        channel.createSticky('onWebSQLReady');
-        channel.waitForInitialization('onWebSQLReady');
-
-        channel.onCordovaReady.subscribe(function() {
-            var ifr = document.createElement('iframe');
-            ifr.src = "websql://foo";
-            ifr.onload = function() {
-                ifr.onload = null;
-                openDatabase = function() {
-                    return ifr.contentWindow.openDatabase.apply(ifr.contentWindow, arguments);
-                };
-                channel.initializationComplete('onWebSQLReady');
-            };
-            ifr.style.display = 'none';
-            document.body.appendChild(ifr);
-        });
-    }
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugins/blob/bcfeb64b/websql/plugin.xml
----------------------------------------------------------------------
diff --git a/websql/plugin.xml b/websql/plugin.xml
deleted file mode 100644
index 5cfb9b7..0000000
--- a/websql/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
-           id="org.apache.cordova.websql"
-      version="0.1.0">
-
-    <name>Android WebSQL</name>
-
-    <!-- android -->
-    <platform name="android">
-        <js-module src="android_websql.js" name="storage">
-            <runs />
-        </js-module>
-
-        <config-file target="res/xml/config.xml" parent="/*">
-            <access origin="websql://foo" />
-            <feature name="WebSQL">
-                <param name="android-package" value="org.apache.cordova.websql.WebSQLPlugin"
/>
-                <param name="onload" value="true" />
-            </feature>
-        </config-file>
-
-        <source-file src="WebSQLPlugin.java" target-dir="src/org/apache/cordova/websql"
/>
-    </platform>
-</plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message