You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/03/28 00:31:25 UTC

[7/7] git commit: renamed blackberry assets

renamed blackberry assets


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

Branch: refs/heads/master
Commit: 0a7b3e3da6cac91437226c6ee27407a6e06456d3
Parents: 16f3b24
Author: Tim Kim <ti...@adobe.com>
Authored: Wed Mar 27 16:29:21 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Mar 27 16:31:04 2013 -0700

----------------------------------------------------------------------
 platforms/bb10.js                                  |  176 --
 platforms/blackberry.js                            |  176 ++
 plugman.js                                         |    4 +-
 test/bb10-install.js                               |  100 -
 test/bb10-uninstall.js                             |  111 -
 test/blackberry-install.js                         |  100 +
 test/blackberry-uninstall.js                       |  111 +
 test/plugins/DummyPlugin/plugin.xml                |    4 +-
 .../plugins/DummyPlugin/src/BlackBerry10/client.js |   19 -
 test/plugins/DummyPlugin/src/BlackBerry10/index.js |   19 -
 test/plugins/DummyPlugin/src/blackberry/client.js  |   19 +
 test/plugins/DummyPlugin/src/blackberry/index.js   |   19 +
 test/plugins/cordova.echo/.gitignore               |    1 +
 test/plugins/cordova.echo/plugin.xml               |   23 +-
 .../cordova.echo/src/BlackBerry10/client.js        |   53 -
 .../src/BlackBerry10/device/echoJnext.so           |  Bin 1291818 -> 0 bytes
 .../plugins/cordova.echo/src/BlackBerry10/index.js |   85 -
 .../cordova.echo/src/BlackBerry10/manifest.json    |    5 -
 .../src/BlackBerry10/public/json/autolink.h        |   38 -
 .../src/BlackBerry10/public/json/config.h          |   62 -
 .../src/BlackBerry10/public/json/features.h        |   61 -
 .../src/BlackBerry10/public/json/forwards.h        |   58 -
 .../src/BlackBerry10/public/json/json.h            |   29 -
 .../src/BlackBerry10/public/json/reader.h          |  215 --
 .../src/BlackBerry10/public/json/value.h           | 1088 ---------
 .../src/BlackBerry10/public/json/writer.h          |  193 --
 .../src/BlackBerry10/public/json_batchallocator.h  |  144 --
 .../src/BlackBerry10/public/json_internalarray.inl |  448 ----
 .../src/BlackBerry10/public/json_internalmap.inl   |  607 -----
 .../src/BlackBerry10/public/json_reader.cpp        |  913 --------
 .../src/BlackBerry10/public/json_value.cpp         | 1745 ---------------
 .../src/BlackBerry10/public/json_valueiterator.inl |  292 ---
 .../src/BlackBerry10/public/json_writer.cpp        |  848 -------
 .../src/BlackBerry10/public/plugin.cpp             |  339 ---
 .../cordova.echo/src/BlackBerry10/public/plugin.h  |   89 -
 .../src/BlackBerry10/public/tokenizer.cpp          |  241 --
 .../src/BlackBerry10/public/tokenizer.h            |   74 -
 .../src/BlackBerry10/simulator/echoJnext.so        |  Bin 231778 -> 0 bytes
 .../cordova.echo/src/BlackBerry10/src/echo.cpp     |  121 -
 .../cordova.echo/src/BlackBerry10/src/echo.hpp     |   45 -
 test/plugins/cordova.echo/src/blackberry/client.js |   53 +
 .../src/blackberry/device/echoJnext.so             |  Bin 0 -> 1291818 bytes
 test/plugins/cordova.echo/src/blackberry/index.js  |   85 +
 .../cordova.echo/src/blackberry/manifest.json      |    5 +
 .../src/blackberry/public/json/autolink.h          |   19 +
 .../src/blackberry/public/json/config.h            |   43 +
 .../src/blackberry/public/json/features.h          |   42 +
 .../src/blackberry/public/json/forwards.h          |   39 +
 .../cordova.echo/src/blackberry/public/json/json.h |   10 +
 .../src/blackberry/public/json/reader.h            |  196 ++
 .../src/blackberry/public/json/value.h             | 1069 +++++++++
 .../src/blackberry/public/json/writer.h            |  174 ++
 .../src/blackberry/public/json_batchallocator.h    |  125 +
 .../src/blackberry/public/json_internalarray.inl   |  448 ++++
 .../src/blackberry/public/json_internalmap.inl     |  607 +++++
 .../src/blackberry/public/json_reader.cpp          |  894 ++++++++
 .../src/blackberry/public/json_value.cpp           | 1726 ++++++++++++++
 .../src/blackberry/public/json_valueiterator.inl   |  292 +++
 .../src/blackberry/public/json_writer.cpp          |  829 +++++++
 .../cordova.echo/src/blackberry/public/plugin.cpp  |  320 +++
 .../cordova.echo/src/blackberry/public/plugin.h    |   70 +
 .../src/blackberry/public/tokenizer.cpp            |  222 ++
 .../cordova.echo/src/blackberry/public/tokenizer.h |   55 +
 .../src/blackberry/simulator/echoJnext.so          |  Bin 0 -> 231778 bytes
 .../cordova.echo/src/blackberry/src/echo.cpp       |  121 +
 .../cordova.echo/src/blackberry/src/echo.hpp       |   45 +
 test/plugins/cordova.echo/src/device/echoJnext.so  |  Bin 0 -> 1291818 bytes
 .../cordova.echo/src/simulator/echoJnext.so        |  Bin 0 -> 231778 bytes
 test/projects/BlackBerry10/www/config.xml          |   97 -
 test/projects/BlackBerry10/www/plugins.xml         |   35 -
 test/projects/blackberry/www/config.xml            |   97 +
 test/projects/blackberry/www/plugins.xml           |   35 +
 72 files changed, 8053 insertions(+), 8375 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/platforms/bb10.js
----------------------------------------------------------------------
diff --git a/platforms/bb10.js b/platforms/bb10.js
deleted file mode 100644
index 5d3f649..0000000
--- a/platforms/bb10.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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 fs = require('fs')  // use existsSync in 0.6.x
-   , path = require('path')
-   , shell = require('shelljs')
-   , et = require('elementtree')
-   , getConfigChanges = require('../util/config-changes')
-   , sourceDir = 'src'
-   , xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
-
-
-exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et) {
-    var plugin_id = plugin_et._root.attrib['id']
-      , version = plugin_et._root.attrib['version']
-      , external_hosts = []
-
-      // look for assets in the plugin 
-      , assets = plugin_et.findall('./asset')
-      , platformTag = plugin_et.find('./platform[@name="BlackBerry10"]')
-      , sourceFiles = platformTag.findall('./source-file')
-      , libFiles = platformTag.findall('./library-file')
-      , configChanges = getConfigChanges(platformTag);
-      
-    // find which config-files we're interested in
-    Object.keys(configChanges).forEach(function (configFile) {
-        if (!fs.existsSync(path.resolve(project_dir, configFile))) {
-            delete configChanges[configFile];
-        }
-    });
-
-    // collision detection 
-    if(action == "install" && pluginInstalled(plugin_et, project_dir)) {
-        throw "Plugin "+plugin_id+" already installed"
-    } else if(action == "uninstall" && !pluginInstalled(plugin_et, project_dir)) {
-        throw "Plugin "+plugin_id+" not installed"
-    }
-    
-    // move asset files
-    assets.forEach(function (asset) {
-        var srcPath = path.resolve(
-                        plugin_dir,
-                        asset.attrib['src']);
-
-        var targetPath = path.resolve(
-                            project_dir,
-                            asset.attrib['target']);
-        var stats = fs.statSync(srcPath);
-        if (action == 'install') {
-            if(stats.isDirectory()) {
-                shell.mkdir('-p', targetPath);
-                shell.cp('-R', srcPath, project_dir);
-            } else {
-                shell.cp(srcPath, targetPath);
-            }
-        } else {
-            shell.rm('-rf', targetPath);
-        }
-    });
-
-    // move source files
-    sourceFiles.forEach(function (sourceFile) {
-        var srcDir = path.resolve(project_dir,
-                                sourceFile.attrib['target-dir'])
-          , destFile = path.resolve(srcDir,
-                                path.basename(sourceFile.attrib['src']));
-
-        if (action == 'install') {
-            shell.mkdir('-p', srcDir);
-            var srcFile = srcPath(plugin_dir, sourceFile.attrib['src']);
-            shell.cp(srcFile, destFile);
-        } else {
-            fs.unlinkSync(destFile);
-            // check if directory is empty
-            var curDir = srcDir;
-            while(curDir !== project_dir + '/src') {
-                if(fs.readdirSync(curDir).length == 0) {
-                    fs.rmdirSync(curDir);
-                    curDir = path.resolve(curDir + '/..');
-                } else {
-                    // directory not empty...do nothing
-                    break;
-                }
-            }
-        }
-    })
-
-    // move library files
-    libFiles.forEach(function (libFile) {
-        var libDir = path.resolve(project_dir,
-                                libFile.attrib['target-dir'])
-
-        if (action == 'install') {
-            shell.mkdir('-p', libDir);
-            var src = path.resolve(plugin_dir, 'src/BlackBerry10',
-                                        libFile.attrib['src']),
-                dest = path.resolve(libDir,
-                                path.basename(libFile.attrib['src']));
-            
-            shell.cp(src, dest);
-        } else {
-            var destFile = path.resolve(libDir,
-                            path.basename(libFile.attrib['src']));
-
-            fs.unlinkSync(destFile);
-            // check if directory is empty
-            var files = fs.readdirSync(libDir);
-            if(files.length == 0) {
-                shell.rm('-rf', libDir);
-            }
-        }
-    })
-
-
-    // edit configuration files
-    Object.keys(configChanges).forEach(function (filename) {
-        var filepath = path.resolve(project_dir, filename),
-            xmlDoc = xml_helpers.parseElementtreeSync(filepath),
-            output;
-
-        configChanges[filename].forEach(function (configNode) {
-            var selector = configNode.attrib["parent"],
-                children = configNode.findall('*');
-
-            if( action == 'install') {
-                if (!xml_helpers.graftXML(xmlDoc, children, selector)) {
-                    throw new Error('failed to add children to ' + filename);
-                }
-            } else {
-                if (!xml_helpers.pruneXML(xmlDoc, children, selector)) {
-                    throw new Error('failed to remove children from' + filename);
-                }
-            }
-        });
-
-        output = xmlDoc.write({indent: 4});
-        fs.writeFileSync(filepath, output);
-    });
-}
-
-
-function srcPath(pluginPath, filename) {
-    var prefix = /^src\/BlackBerry10/;
-
-    if (prefix.test(filename)) {
-        return path.resolve(pluginPath, filename);
-    } else {
-        return path.resolve(pluginPath, 'src/BlackBerry10', filename);
-    }
-}
-
-function pluginInstalled(plugin_et, project_dir) {
-    var config_tag = plugin_et.find('./platform[@name="BlackBerry10"]/config-file[@target="config.xml"]/feature');
-    if (!config_tag) {
-        return false;
-    }
-    var plugin_name = config_tag.attrib.id;
-    return (fs.readFileSync(path.resolve(project_dir, 'config.xml'), 'utf8')
-           .match(new RegExp(plugin_name, "g")) != null);
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/platforms/blackberry.js
----------------------------------------------------------------------
diff --git a/platforms/blackberry.js b/platforms/blackberry.js
new file mode 100644
index 0000000..718e9ff
--- /dev/null
+++ b/platforms/blackberry.js
@@ -0,0 +1,176 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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 fs = require('fs')  // use existsSync in 0.6.x
+   , path = require('path')
+   , shell = require('shelljs')
+   , et = require('elementtree')
+   , getConfigChanges = require('../util/config-changes')
+   , sourceDir = 'src'
+   , xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
+
+
+exports.handlePlugin = function (action, project_dir, plugin_dir, plugin_et) {
+    var plugin_id = plugin_et._root.attrib['id']
+      , version = plugin_et._root.attrib['version']
+      , external_hosts = []
+
+      // look for assets in the plugin 
+      , assets = plugin_et.findall('./asset')
+      , platformTag = plugin_et.find('./platform[@name="blackberry"]')
+      , sourceFiles = platformTag.findall('./source-file')
+      , libFiles = platformTag.findall('./library-file')
+      , configChanges = getConfigChanges(platformTag);
+      
+    // find which config-files we're interested in
+    Object.keys(configChanges).forEach(function (configFile) {
+        if (!fs.existsSync(path.resolve(project_dir, configFile))) {
+            delete configChanges[configFile];
+        }
+    });
+
+    // collision detection 
+    if(action == "install" && pluginInstalled(plugin_et, project_dir)) {
+        throw "Plugin "+plugin_id+" already installed"
+    } else if(action == "uninstall" && !pluginInstalled(plugin_et, project_dir)) {
+        throw "Plugin "+plugin_id+" not installed"
+    }
+    
+    // move asset files
+    assets.forEach(function (asset) {
+        var srcPath = path.resolve(
+                        plugin_dir,
+                        asset.attrib['src']);
+
+        var targetPath = path.resolve(
+                            project_dir,
+                            asset.attrib['target']);
+        var stats = fs.statSync(srcPath);
+        if (action == 'install') {
+            if(stats.isDirectory()) {
+                shell.mkdir('-p', targetPath);
+                shell.cp('-R', srcPath, project_dir);
+            } else {
+                shell.cp(srcPath, targetPath);
+            }
+        } else {
+            shell.rm('-rf', targetPath);
+        }
+    });
+
+    // move source files
+    sourceFiles.forEach(function (sourceFile) {
+        var srcDir = path.resolve(project_dir,
+                                sourceFile.attrib['target-dir'])
+          , destFile = path.resolve(srcDir,
+                                path.basename(sourceFile.attrib['src']));
+
+        if (action == 'install') {
+            shell.mkdir('-p', srcDir);
+            var srcFile = srcPath(plugin_dir, sourceFile.attrib['src']);
+            shell.cp(srcFile, destFile);
+        } else {
+            fs.unlinkSync(destFile);
+            // check if directory is empty
+            var curDir = srcDir;
+            while(curDir !== project_dir + '/src') {
+                if(fs.readdirSync(curDir).length == 0) {
+                    fs.rmdirSync(curDir);
+                    curDir = path.resolve(curDir + '/..');
+                } else {
+                    // directory not empty...do nothing
+                    break;
+                }
+            }
+        }
+    })
+
+    // move library files
+    libFiles.forEach(function (libFile) {
+        var libDir = path.resolve(project_dir,
+                                libFile.attrib['target-dir'])
+
+        if (action == 'install') {
+            shell.mkdir('-p', libDir);
+            var src = path.resolve(plugin_dir, 'src/blackberry',
+                                        libFile.attrib['src']),
+                dest = path.resolve(libDir,
+                                path.basename(libFile.attrib['src']));
+            
+            shell.cp(src, dest);
+        } else {
+            var destFile = path.resolve(libDir,
+                            path.basename(libFile.attrib['src']));
+
+            fs.unlinkSync(destFile);
+            // check if directory is empty
+            var files = fs.readdirSync(libDir);
+            if(files.length == 0) {
+                shell.rm('-rf', libDir);
+            }
+        }
+    })
+
+
+    // edit configuration files
+    Object.keys(configChanges).forEach(function (filename) {
+        var filepath = path.resolve(project_dir, filename),
+            xmlDoc = xml_helpers.parseElementtreeSync(filepath),
+            output;
+
+        configChanges[filename].forEach(function (configNode) {
+            var selector = configNode.attrib["parent"],
+                children = configNode.findall('*');
+
+            if( action == 'install') {
+                if (!xml_helpers.graftXML(xmlDoc, children, selector)) {
+                    throw new Error('failed to add children to ' + filename);
+                }
+            } else {
+                if (!xml_helpers.pruneXML(xmlDoc, children, selector)) {
+                    throw new Error('failed to remove children from' + filename);
+                }
+            }
+        });
+
+        output = xmlDoc.write({indent: 4});
+        fs.writeFileSync(filepath, output);
+    });
+}
+
+
+function srcPath(pluginPath, filename) {
+    var prefix = /^src\/blackberry/;
+
+    if (prefix.test(filename)) {
+        return path.resolve(pluginPath, filename);
+    } else {
+        return path.resolve(pluginPath, 'src/blackberry', filename);
+    }
+}
+
+function pluginInstalled(plugin_et, project_dir) {
+    var config_tag = plugin_et.find('./platform[@name="blackberry"]/config-file[@target="config.xml"]/feature');
+    if (!config_tag) {
+        return false;
+    }
+    var plugin_name = config_tag.attrib.id;
+    return (fs.readFileSync(path.resolve(project_dir, 'config.xml'), 'utf8')
+           .match(new RegExp(plugin_name, "g")) != null);
+}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/plugman.js
----------------------------------------------------------------------
diff --git a/plugman.js b/plugman.js
index b81cedf..a90cc18 100755
--- a/plugman.js
+++ b/plugman.js
@@ -29,11 +29,11 @@ var fs = require('fs')
   , platform_modules = {
         'android': require('./platforms/android'),
         'ios': require('./platforms/ios'),
-        'bb10': require('./platforms/bb10'),
+        'blackberry': require('./platforms/blackberry'),
         'www': require('./platforms/www')
     };
 
-var known_opts = { 'platform' : [ 'ios', 'android', 'bb10' ,'www' ]
+var known_opts = { 'platform' : [ 'ios', 'android', 'blackberry' ,'www' ]
             , 'project' : path
             , 'plugin' : [String, path, url]
             , 'remove' : Boolean

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/bb10-install.js
----------------------------------------------------------------------
diff --git a/test/bb10-install.js b/test/bb10-install.js
deleted file mode 100644
index 96ec4e6..0000000
--- a/test/bb10-install.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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 fs = require('fs')
-  , path = require('path')
-  , shell = require('shelljs')
-  , et = require('elementtree')
-  , osenv = require('osenv')
-  , bb10 = require(path.join(__dirname, '..', 'platforms', 'bb10'))
-  , test_dir = path.join(osenv.tmpdir(), 'test_plugman')
-  , test_project_dir = path.join(test_dir, 'projects', 'BlackBerry10', 'www')
-  , test_plugin_dir = path.join(test_dir, 'plugins', 'cordova.echo')
-  , xml_path     = path.join(test_dir, 'plugins', 'cordova.echo', 'plugin.xml')
-  , xml_text, plugin_et
-  , srcDir = path.resolve(test_project_dir, 'ext-qnx/cordova.echo');
-  
-exports.setUp = function(callback) {
-    shell.mkdir('-p', test_dir);
-    
-    // copy the bb10 test project to a temp directory
-    shell.cp('-r', path.join(__dirname, 'projects'), test_dir);
-
-    // copy the bb10 test plugin to a temp directory
-    shell.cp('-r', path.join(__dirname, 'plugins'), test_dir);
-
-    // parse the plugin.xml into an elementtree object
-    xml_text   = fs.readFileSync(xml_path, 'utf-8')
-    plugin_et  = new et.ElementTree(et.XML(xml_text));
-
-    callback();
-}
-
-exports.tearDown = function(callback) {
-    // remove the temp files (projects and plugins)
-    shell.rm('-rf', test_dir);
-    callback();
-}
-
-exports['should move the source files'] = function (test) {
-    // run the platform-specific function
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-
-    test.ok(fs.existsSync(srcDir + '/client.js'));
-    test.ok(fs.existsSync(srcDir + '/index.js'));
-    test.ok(fs.existsSync(srcDir + '/manifest.json'));
-    test.ok(fs.existsSync(srcDir + '/device/echoJnext.so'));
-    test.ok(fs.existsSync(srcDir + '/simulator/echoJnext.so'));
-    test.done();
-}
-
-exports['should move the js file'] = function (test) {
-    // setting up a DummyPlugin
-    var dummy_plugin_dir = path.join(test_dir, 'plugins', 'DummyPlugin')
-    var dummy_xml_path = path.join(test_dir, 'plugins', 'DummyPlugin', 'plugin.xml')
-    var dummy_plugin_et  = new et.ElementTree(et.XML(fs.readFileSync(dummy_xml_path, 'utf-8')));
-
-    // run the platform-specific function
-    bb10.handlePlugin('install', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
-
-    var jsPath = path.join(test_project_dir, 'dummyplugin.js');
-    test.ok(fs.existsSync(jsPath));
-    test.done();
-}
-
-exports['should edit config.xml'] = function (test) {
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-    
-    var configXmlPath = path.join(test_project_dir, 'config.xml');
-    var pluginsTxt = fs.readFileSync(configXmlPath, 'utf-8'),
-        pluginsDoc = new et.ElementTree(et.XML(pluginsTxt)),
-        expected = 'feature[@id="cordova.echo"]';
-    test.ok(pluginsDoc.find(expected));
-
-    test.done();
-}
-
-exports['should not install a plugin that is already installed'] = function (test) {
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-
-    test.throws(function(){bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et); }, 
-                /already installed/
-               );
-    test.done();
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/bb10-uninstall.js
----------------------------------------------------------------------
diff --git a/test/bb10-uninstall.js b/test/bb10-uninstall.js
deleted file mode 100644
index 4a096be..0000000
--- a/test/bb10-uninstall.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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 fs = require('fs')
-  , path = require('path')
-  , shell = require('shelljs')
-  , et = require('elementtree')
-  , osenv = require('osenv')
-  , bb10 = require(path.join(__dirname, '..', 'platforms', 'bb10'))
-  , test_dir = path.join(osenv.tmpdir(), 'test_plugman')
-  , test_project_dir = path.join(test_dir, 'projects', 'BlackBerry10', 'www')
-  , test_plugin_dir = path.join(test_dir, 'plugins', 'cordova.echo')
-  , xml_path     = path.join(test_dir, 'plugins', 'cordova.echo', 'plugin.xml')
-  , xml_text, plugin_et
-  , srcDir = path.resolve(test_project_dir, 'ext-qnx/cordova.echo');
-  
-exports.setUp = function(callback) {
-    shell.mkdir('-p', test_dir);
-    
-    // copy the bb10 test project to a temp directory
-    shell.cp('-r', path.join(__dirname, 'projects'), test_dir);
-
-    // copy the bb10 test plugin to a temp directory
-    shell.cp('-r', path.join(__dirname, 'plugins'), test_dir);
-
-    // parse the plugin.xml into an elementtree object
-    xml_text   = fs.readFileSync(xml_path, 'utf-8')
-    plugin_et  = new et.ElementTree(et.XML(xml_text));
-
-    callback();
-}
-
-exports.tearDown = function(callback) {
-    // remove the temp files (projects and plugins)
-    shell.rm('-rf', test_dir);
-    callback();
-}
-
-exports['should remove cordova echo plugin'] = function (test) {
-    // run the platform-specific function
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-    bb10.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
-
-    test.done();
-}
-
-
-exports['should remove the js file'] = function (test) {
-
-    var dummy_plugin_dir = path.join(test_dir, 'plugins', 'DummyPlugin')
-    var dummy_xml_path = path.join(test_dir, 'plugins', 'DummyPlugin', 'plugin.xml')
-    var dummy_plugin_et  = new et.ElementTree(et.XML(fs.readFileSync(dummy_xml_path, 'utf-8')));
-
-    bb10.handlePlugin('install', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
-    bb10.handlePlugin('uninstall', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
-    var jsPath = path.join(test_dir, 'projects', 'bb10', 'www', 'dummyplugin.js');
-    test.ok(!fs.existsSync(jsPath))
-    test.done();
-}
-
-
-exports['should remove the source files'] = function (test) {
-    // run the platform-specific function
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-    bb10.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
-
-    test.ok(!fs.existsSync(srcDir + '/index.js'))
-    test.ok(!fs.existsSync(srcDir + '/client.js'))
-    test.ok(!fs.existsSync(srcDir + '/manifest.json'))
-    test.ok(!fs.existsSync(srcDir + '/device/echoJnext.so'))
-    test.ok(!fs.existsSync(srcDir + '/simulator/echoJnext.so'))
-    test.done();
-}
-
-exports['should edit config.xml'] = function (test) {   
-    // run the platform-specific function
-    bb10.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
-    
-    bb10.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
-    
-    var configXmlPath = path.join(test_project_dir, 'config.xml');
-    var pluginsTxt = fs.readFileSync(configXmlPath, 'utf-8'),
-        pluginsDoc = new et.ElementTree(et.XML(pluginsTxt)),
-        expected = 'feature[@id="cordova.echo"]';
-    test.ok(!pluginsDoc.find(expected));
-    
-    test.done();
-}
-
-exports['should not uninstall a plugin that is not installed'] = function (test) {
-    test.throws(function(){bb10.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et); }, 
-                /not installed/
-               );
-    test.done();
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/blackberry-install.js
----------------------------------------------------------------------
diff --git a/test/blackberry-install.js b/test/blackberry-install.js
new file mode 100644
index 0000000..1356738
--- /dev/null
+++ b/test/blackberry-install.js
@@ -0,0 +1,100 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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 fs = require('fs')
+  , path = require('path')
+  , shell = require('shelljs')
+  , et = require('elementtree')
+  , osenv = require('osenv')
+  , blackberry = require(path.join(__dirname, '..', 'platforms', 'blackberry'))
+  , test_dir = path.join(osenv.tmpdir(), 'test_plugman')
+  , test_project_dir = path.join(test_dir, 'projects', 'blackberry', 'www')
+  , test_plugin_dir = path.join(test_dir, 'plugins', 'cordova.echo')
+  , xml_path     = path.join(test_dir, 'plugins', 'cordova.echo', 'plugin.xml')
+  , xml_text, plugin_et
+  , srcDir = path.resolve(test_project_dir, 'ext-qnx/cordova.echo');
+  
+exports.setUp = function(callback) {
+    shell.mkdir('-p', test_dir);
+    
+    // copy the blackberry test project to a temp directory
+    shell.cp('-r', path.join(__dirname, 'projects'), test_dir);
+
+    // copy the blackberry test plugin to a temp directory
+    shell.cp('-r', path.join(__dirname, 'plugins'), test_dir);
+
+    // parse the plugin.xml into an elementtree object
+    xml_text   = fs.readFileSync(xml_path, 'utf-8')
+    plugin_et  = new et.ElementTree(et.XML(xml_text));
+
+    callback();
+}
+
+exports.tearDown = function(callback) {
+    // remove the temp files (projects and plugins)
+    shell.rm('-rf', test_dir);
+    callback();
+}
+
+exports['should move the source files'] = function (test) {
+    // run the platform-specific function
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+
+    test.ok(fs.existsSync(srcDir + '/client.js'));
+    test.ok(fs.existsSync(srcDir + '/index.js'));
+    test.ok(fs.existsSync(srcDir + '/manifest.json'));
+    test.ok(fs.existsSync(srcDir + '/device/echoJnext.so'));
+    test.ok(fs.existsSync(srcDir + '/simulator/echoJnext.so'));
+    test.done();
+}
+
+exports['should move the js file'] = function (test) {
+    // setting up a DummyPlugin
+    var dummy_plugin_dir = path.join(test_dir, 'plugins', 'DummyPlugin')
+    var dummy_xml_path = path.join(test_dir, 'plugins', 'DummyPlugin', 'plugin.xml')
+    var dummy_plugin_et  = new et.ElementTree(et.XML(fs.readFileSync(dummy_xml_path, 'utf-8')));
+
+    // run the platform-specific function
+    blackberry.handlePlugin('install', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
+
+    var jsPath = path.join(test_project_dir, 'dummyplugin.js');
+    test.ok(fs.existsSync(jsPath));
+    test.done();
+}
+
+exports['should edit config.xml'] = function (test) {
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+    
+    var configXmlPath = path.join(test_project_dir, 'config.xml');
+    var pluginsTxt = fs.readFileSync(configXmlPath, 'utf-8'),
+        pluginsDoc = new et.ElementTree(et.XML(pluginsTxt)),
+        expected = 'feature[@id="cordova.echo"]';
+    test.ok(pluginsDoc.find(expected));
+
+    test.done();
+}
+
+exports['should not install a plugin that is already installed'] = function (test) {
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+
+    test.throws(function(){blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et); }, 
+                /already installed/
+               );
+    test.done();
+}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/blackberry-uninstall.js
----------------------------------------------------------------------
diff --git a/test/blackberry-uninstall.js b/test/blackberry-uninstall.js
new file mode 100644
index 0000000..01c246b
--- /dev/null
+++ b/test/blackberry-uninstall.js
@@ -0,0 +1,111 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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 fs = require('fs')
+  , path = require('path')
+  , shell = require('shelljs')
+  , et = require('elementtree')
+  , osenv = require('osenv')
+  , blackberry = require(path.join(__dirname, '..', 'platforms', 'blackberry'))
+  , test_dir = path.join(osenv.tmpdir(), 'test_plugman')
+  , test_project_dir = path.join(test_dir, 'projects', 'blackberry', 'www')
+  , test_plugin_dir = path.join(test_dir, 'plugins', 'cordova.echo')
+  , xml_path     = path.join(test_dir, 'plugins', 'cordova.echo', 'plugin.xml')
+  , xml_text, plugin_et
+  , srcDir = path.resolve(test_project_dir, 'ext-qnx/cordova.echo');
+  
+exports.setUp = function(callback) {
+    shell.mkdir('-p', test_dir);
+    
+    // copy the blackberry test project to a temp directory
+    shell.cp('-r', path.join(__dirname, 'projects'), test_dir);
+
+    // copy the blackberry test plugin to a temp directory
+    shell.cp('-r', path.join(__dirname, 'plugins'), test_dir);
+
+    // parse the plugin.xml into an elementtree object
+    xml_text   = fs.readFileSync(xml_path, 'utf-8')
+    plugin_et  = new et.ElementTree(et.XML(xml_text));
+
+    callback();
+}
+
+exports.tearDown = function(callback) {
+    // remove the temp files (projects and plugins)
+    shell.rm('-rf', test_dir);
+    callback();
+}
+
+exports['should remove cordova echo plugin'] = function (test) {
+    // run the platform-specific function
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+    blackberry.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
+
+    test.done();
+}
+
+
+exports['should remove the js file'] = function (test) {
+
+    var dummy_plugin_dir = path.join(test_dir, 'plugins', 'DummyPlugin')
+    var dummy_xml_path = path.join(test_dir, 'plugins', 'DummyPlugin', 'plugin.xml')
+    var dummy_plugin_et  = new et.ElementTree(et.XML(fs.readFileSync(dummy_xml_path, 'utf-8')));
+
+    blackberry.handlePlugin('install', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
+    blackberry.handlePlugin('uninstall', test_project_dir, dummy_plugin_dir, dummy_plugin_et);
+    var jsPath = path.join(test_dir, 'projects', 'blackberry', 'www', 'dummyplugin.js');
+    test.ok(!fs.existsSync(jsPath))
+    test.done();
+}
+
+
+exports['should remove the source files'] = function (test) {
+    // run the platform-specific function
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+    blackberry.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
+
+    test.ok(!fs.existsSync(srcDir + '/index.js'))
+    test.ok(!fs.existsSync(srcDir + '/client.js'))
+    test.ok(!fs.existsSync(srcDir + '/manifest.json'))
+    test.ok(!fs.existsSync(srcDir + '/device/echoJnext.so'))
+    test.ok(!fs.existsSync(srcDir + '/simulator/echoJnext.so'))
+    test.done();
+}
+
+exports['should edit config.xml'] = function (test) {   
+    // run the platform-specific function
+    blackberry.handlePlugin('install', test_project_dir, test_plugin_dir, plugin_et);
+    
+    blackberry.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et);
+    
+    var configXmlPath = path.join(test_project_dir, 'config.xml');
+    var pluginsTxt = fs.readFileSync(configXmlPath, 'utf-8'),
+        pluginsDoc = new et.ElementTree(et.XML(pluginsTxt)),
+        expected = 'feature[@id="cordova.echo"]';
+    test.ok(!pluginsDoc.find(expected));
+    
+    test.done();
+}
+
+exports['should not uninstall a plugin that is not installed'] = function (test) {
+    test.throws(function(){blackberry.handlePlugin('uninstall', test_project_dir, test_plugin_dir, plugin_et); }, 
+                /not installed/
+               );
+    test.done();
+}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/plugin.xml b/test/plugins/DummyPlugin/plugin.xml
index 7ca1982..3dbd5bd 100644
--- a/test/plugins/DummyPlugin/plugin.xml
+++ b/test/plugins/DummyPlugin/plugin.xml
@@ -57,8 +57,8 @@
                 target-dir="src/com/phonegap/plugins/dummyplugin" />
     </platform>
 
-    <!-- BlackBerry10 -->
-    <platform name="BlackBerry10">
+    <!-- blackberry -->
+    <platform name="blackberry">
         <config-file target="config.xml" parent="/widget">
             <feature id="dummyPlugin" required="true" version="1.0.0.0"/>
         </config-file>

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/BlackBerry10/client.js
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/BlackBerry10/client.js b/test/plugins/DummyPlugin/src/BlackBerry10/client.js
deleted file mode 100644
index 5263b0c..0000000
--- a/test/plugins/DummyPlugin/src/BlackBerry10/client.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/BlackBerry10/index.js
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/BlackBerry10/index.js b/test/plugins/DummyPlugin/src/BlackBerry10/index.js
deleted file mode 100644
index 5263b0c..0000000
--- a/test/plugins/DummyPlugin/src/BlackBerry10/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/BlackBerry10/manifest.json
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/BlackBerry10/manifest.json b/test/plugins/DummyPlugin/src/BlackBerry10/manifest.json
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/blackberry/client.js
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/blackberry/client.js b/test/plugins/DummyPlugin/src/blackberry/client.js
new file mode 100644
index 0000000..5263b0c
--- /dev/null
+++ b/test/plugins/DummyPlugin/src/blackberry/client.js
@@ -0,0 +1,19 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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.
+ *
+*/
+

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/blackberry/index.js
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/blackberry/index.js b/test/plugins/DummyPlugin/src/blackberry/index.js
new file mode 100644
index 0000000..5263b0c
--- /dev/null
+++ b/test/plugins/DummyPlugin/src/blackberry/index.js
@@ -0,0 +1,19 @@
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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.
+ *
+*/
+

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/DummyPlugin/src/blackberry/manifest.json
----------------------------------------------------------------------
diff --git a/test/plugins/DummyPlugin/src/blackberry/manifest.json b/test/plugins/DummyPlugin/src/blackberry/manifest.json
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/.gitignore
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/.gitignore b/test/plugins/cordova.echo/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/test/plugins/cordova.echo/.gitignore
@@ -0,0 +1 @@
+.DS_Store

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/plugin.xml
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/plugin.xml b/test/plugins/cordova.echo/plugin.xml
index 5d0e097..f9fa664 100644
--- a/test/plugins/cordova.echo/plugin.xml
+++ b/test/plugins/cordova.echo/plugin.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2013 Anis Kadri
-
- Licensed 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.
-
--->
-
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     id="com.cordova.echo"
     version="1.0.0">
@@ -29,7 +10,7 @@
     <name>cordova echo</name>
 
     
-    <platform name="BlackBerry10">    
+    <platform name="blackberry">    
         <config-file target="config.xml" parent="/widget">
             <feature id="cordova.echo" required="true" version="1.0.0.0"/>
         </config-file>
@@ -40,4 +21,4 @@
         <source-file src="device/echoJnext.so" target-dir="ext-qnx/cordova.echo/device" />
         <source-file src="simulator/echoJnext.so" target-dir="ext-qnx/cordova.echo/simulator" />
     </platform>
-</plugin>
+</plugin>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/client.js
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/client.js b/test/plugins/cordova.echo/src/BlackBerry10/client.js
deleted file mode 100644
index 4e7a1b3..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/client.js
+++ /dev/null
@@ -1,53 +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 _self = {},
-    _ID = require("./manifest.json").namespace,
-    win = null,
-    fail = null;
-
-function handleCallback(result) {
-    if (result) {
-        if(win){
-            win(result);
-        }
-    } else {
-        if(fail){
-            fail(result);
-        }
-    }
-    win = null;
-    fail = null;
-}
-
-_self.doEcho = function (args, theWin, theFail) {
-    var data = { "message" : args.message || "" };
-    
-    win = theWin;
-    fail = theFail;
-    
-    window.webworks.event.add(_ID, "echoCallback", handleCallback);
-    
-    return window.webworks.execSync(_ID, "doEcho", data);
-};
-
-
-module.exports = _self;

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/device/echoJnext.so
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/device/echoJnext.so b/test/plugins/cordova.echo/src/BlackBerry10/device/echoJnext.so
deleted file mode 100755
index 169714a..0000000
Binary files a/test/plugins/cordova.echo/src/BlackBerry10/device/echoJnext.so and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/index.js
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/index.js b/test/plugins/cordova.echo/src/BlackBerry10/index.js
deleted file mode 100644
index 0759a20..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/index.js
+++ /dev/null
@@ -1,85 +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 echoJNext,
-    _event = require("../../lib/event"),
-    winCallback = null,
-    failCallback = null;
-    
-module.exports = {   
-    doEcho: function (success, fail, args) {
-        var invokeData = { "message" : JSON.parse(decodeURIComponent(args.message)) };
-        try {
-            success(echoJNext.getEchoJNext(invokeData));
-        } catch (e) {
-            fail(-1, e);
-        }
-    }
-};
-
-///////////////////////////////////////////////////////////////////
-// JavaScript wrapper for JNEXT plugin
-///////////////////////////////////////////////////////////////////
-
-JNEXT.EchoJNext = function ()
-{   
-    var _self = this;
-
-    _self.getEchoJNext = function (args) {
-        return JNEXT.invoke(_self._id, "doEcho " + JSON.stringify(args));
-    };
-
-    _self.getId = function () {
-        return _self._id;
-    };
-
-    _self.init = function () {
-        if (!JNEXT.require("echoJnext")) {
-            return false;
-        }
-
-        _self._id = JNEXT.createObject("echoJnext.Echo");
-
-        if (!_self._id || _self._id === "") {
-            return false;
-        }
-
-        JNEXT.registerEvents(_self);
-    };
-
-    _self.onEvent = function (strData) {
-        var arData = strData.split(" "),
-            strEventId = arData[0],
-            args = arData[1],
-            info = {};
-            
-        if (strEventId === "cordova.echo.callback") {
-            _event.trigger("echoCallback", args);
-        }
-                  
-    };
-    
-    _self._id = "";
-    
-    _self.init();
-};
-
-echoJNext = new JNEXT.EchoJNext();

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/manifest.json
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/manifest.json b/test/plugins/cordova.echo/src/BlackBerry10/manifest.json
deleted file mode 100644
index d14e79e..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/manifest.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "global": false,
-    "namespace": "cordova.echo",
-    "dependencies": []
-}

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/autolink.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/autolink.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/autolink.h
deleted file mode 100644
index e0e5eb3..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/autolink.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef JSON_AUTOLINK_H_INCLUDED
-# define JSON_AUTOLINK_H_INCLUDED
-
-# include "config.h"
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/cpptl_autolink.h>
-# endif
-
-# if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
-#  define CPPTL_AUTOLINK_NAME "json"
-#  undef CPPTL_AUTOLINK_DLL
-#  ifdef JSON_DLL
-#   define CPPTL_AUTOLINK_DLL
-#  endif
-#  include "autolink.h"
-# endif
-
-#endif // JSON_AUTOLINK_H_INCLUDED

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/config.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/config.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/config.h
deleted file mode 100644
index c946f30..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/config.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef JSON_CONFIG_H_INCLUDED
-# define JSON_CONFIG_H_INCLUDED
-
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
-/// If defined, indicates that Json specific container should be used
-/// (hash table & simple deque container with customizable allocator).
-/// THIS FEATURE IS STILL EXPERIMENTAL!
-//#  define JSON_VALUE_USE_INTERNAL_MAP 1
-/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
-/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
-/// as if it was a POD) that may cause some validation tool to report errors.
-/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
-//#  define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
-
-/// If defined, indicates that Json use exception to report invalid type manipulation
-/// instead of C assert macro.
-# define JSON_USE_EXCEPTION 1
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/config.h>
-#  ifndef JSON_USE_CPPTL
-#   define JSON_USE_CPPTL 1
-#  endif
-# endif
-
-# ifdef JSON_IN_CPPTL
-#  define JSON_API CPPTL_API
-# elif defined(JSON_DLL_BUILD)
-#  define JSON_API __declspec(dllexport)
-# elif defined(JSON_DLL)
-#  define JSON_API __declspec(dllimport)
-# else
-#  define JSON_API
-# endif
-
-#endif // JSON_CONFIG_H_INCLUDED

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/features.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/features.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/features.h
deleted file mode 100644
index 8ecddb9..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/features.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-# define CPPTL_JSON_FEATURES_H_INCLUDED
-
-# include "forwards.h"
-
-namespace Json {
-
-   /** \brief Configuration passed to reader and writer.
-    * This configuration object can be used to force the Reader or Writer
-    * to behave in a standard conforming way.
-    */
-   class JSON_API Features
-   {
-   public:
-      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
-       * - C & C++ comments are allowed
-       * - Root object can be any JSON value
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features all();
-
-      /** \brief A configuration that is strictly compatible with the JSON specification.
-       * - Comments are forbidden.
-       * - Root object must be either an array or an object value.
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features strictMode();
-
-      /** \brief Initialize the configuration like JsonConfig::allFeatures;
-       */
-      Features();
-
-      /// \c true if comments are allowed. Default: \c true.
-      bool allowComments_;
-
-      /// \c true if root must be either an array or an object value. Default: \c false.
-      bool strictRoot_;
-   };
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/forwards.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/forwards.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/forwards.h
deleted file mode 100644
index b96a134..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/forwards.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef JSON_FORWARDS_H_INCLUDED
-# define JSON_FORWARDS_H_INCLUDED
-
-# include "config.h"
-
-namespace Json {
-
-   // writer.h
-   class FastWriter;
-   class StyledWriter;
-
-   // reader.h
-   class Reader;
-
-   // features.h
-   class Features;
-
-   // value.h
-   typedef int Int;
-   typedef unsigned int UInt;
-   class StaticString;
-   class Path;
-   class PathArgument;
-   class Value;
-   class ValueIteratorBase;
-   class ValueIterator;
-   class ValueConstIterator;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   class ValueAllocator;
-   class ValueMapAllocator;
-   class ValueInternalLink;
-   class ValueInternalArray;
-   class ValueInternalMap;
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-} // namespace Json
-
-
-#endif // JSON_FORWARDS_H_INCLUDED

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/json.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/json.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/json.h
deleted file mode 100644
index b635f8a..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/json.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef JSON_JSON_H_INCLUDED
-# define JSON_JSON_H_INCLUDED
-
-# include "autolink.h"
-# include "value.h"
-# include "reader.h"
-# include "writer.h"
-# include "features.h"
-
-#endif // JSON_JSON_H_INCLUDED

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/0a7b3e3d/test/plugins/cordova.echo/src/BlackBerry10/public/json/reader.h
----------------------------------------------------------------------
diff --git a/test/plugins/cordova.echo/src/BlackBerry10/public/json/reader.h b/test/plugins/cordova.echo/src/BlackBerry10/public/json/reader.h
deleted file mode 100644
index e3f8d0d..0000000
--- a/test/plugins/cordova.echo/src/BlackBerry10/public/json/reader.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- *
- * Copyright 2013 Anis Kadri
- *
- * Licensed 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.
- *
-*/
-
-#ifndef CPPTL_JSON_READER_H_INCLUDED
-# define CPPTL_JSON_READER_H_INCLUDED
-
-# include "features.h"
-# include "value.h"
-# include <deque>
-# include <stack>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
-    *
-    */
-   class JSON_API Reader
-   {
-   public:
-      typedef char Char;
-      typedef const Char *Location;
-
-      /** \brief Constructs a Reader allowing all features
-       * for parsing.
-       */
-      Reader();
-
-      /** \brief Constructs a Reader allowing the specified feature set
-       * for parsing.
-       */
-      Reader( const Features &features );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const std::string &document, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const char *beginDoc, const char *endDoc, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /// \brief Parse from input stream.
-      /// \see Json::operator>>(std::istream&, Json::Value&).
-      bool parse( std::istream &is,
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Returns a user friendly string that list errors in the parsed document.
-       * \return Formatted error message with the list of errors with their location in 
-       *         the parsed document. An empty string is returned if no error occurred
-       *         during parsing.
-       */
-      std::string getFormatedErrorMessages() const;
-
-   private:
-      enum TokenType
-      {
-         tokenEndOfStream = 0,
-         tokenObjectBegin,
-         tokenObjectEnd,
-         tokenArrayBegin,
-         tokenArrayEnd,
-         tokenString,
-         tokenNumber,
-         tokenTrue,
-         tokenFalse,
-         tokenNull,
-         tokenArraySeparator,
-         tokenMemberSeparator,
-         tokenComment,
-         tokenError
-      };
-
-      class Token
-      {
-      public:
-         TokenType type_;
-         Location start_;
-         Location end_;
-      };
-
-      class ErrorInfo
-      {
-      public:
-         Token token_;
-         std::string message_;
-         Location extra_;
-      };
-
-      typedef std::deque<ErrorInfo> Errors;
-
-      bool expectToken( TokenType type, Token &token, const char *message );
-      bool readToken( Token &token );
-      void skipSpaces();
-      bool match( Location pattern, 
-                  int patternLength );
-      bool readComment();
-      bool readCStyleComment();
-      bool readCppStyleComment();
-      bool readString();
-      void readNumber();
-      bool readValue();
-      bool readObject( Token &token );
-      bool readArray( Token &token );
-      bool decodeNumber( Token &token );
-      bool decodeString( Token &token );
-      bool decodeString( Token &token, std::string &decoded );
-      bool decodeDouble( Token &token );
-      bool decodeUnicodeCodePoint( Token &token, 
-                                   Location &current, 
-                                   Location end, 
-                                   unsigned int &unicode );
-      bool decodeUnicodeEscapeSequence( Token &token, 
-                                        Location &current, 
-                                        Location end, 
-                                        unsigned int &unicode );
-      bool addError( const std::string &message, 
-                     Token &token,
-                     Location extra = 0 );
-      bool recoverFromError( TokenType skipUntilToken );
-      bool addErrorAndRecover( const std::string &message, 
-                               Token &token,
-                               TokenType skipUntilToken );
-      void skipUntilSpace();
-      Value &currentValue();
-      Char getNextChar();
-      void getLocationLineAndColumn( Location location,
-                                     int &line,
-                                     int &column ) const;
-      std::string getLocationLineAndColumn( Location location ) const;
-      void addComment( Location begin, 
-                       Location end, 
-                       CommentPlacement placement );
-      void skipCommentTokens( Token &token );
-   
-      typedef std::stack<Value *> Nodes;
-      Nodes nodes_;
-      Errors errors_;
-      std::string document_;
-      Location begin_;
-      Location end_;
-      Location current_;
-      Location lastValueEnd_;
-      Value *lastValue_;
-      std::string commentsBefore_;
-      Features features_;
-      bool collectComments_;
-   };
-
-   /** \brief Read from 'sin' into 'root'.
-
-    Always keep comments from the input JSON.
-
-    This can be used to read a file into a particular sub-object.
-    For example:
-    \code
-    Json::Value root;
-    cin >> root["dir"]["file"];
-    cout << root;
-    \endcode
-    Result:
-    \verbatim
-    {
-	"dir": {
-	    "file": {
-		// The input stream JSON would be nested here.
-	    }
-	}
-    }
-    \endverbatim
-    \throw std::exception on parse error.
-    \see Json::operator<<()
-   */
-   std::istream& operator>>( std::istream&, Value& );
-
-} // namespace Json
-
-#endif // CPPTL_JSON_READER_H_INCLUDED