Revert "CB-8683 changed plugin-id to pacakge-name"
This reverts commit 0530d90fb0e46128558bbb6579ea44f9832b7b4d.
diff --git a/package.json b/package.json
index 4592171..36421bd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.5.1-dev",
"description": "Cordova File Transfer Plugin",
"cordova": {
- "id": "cordova-plugin-file-transfer",
+ "id": "org.apache.cordova.file-transfer",
"platforms": [
"android",
"amazon-fireos",
diff --git a/plugin.xml b/plugin.xml
index 217d1e5..46868cf 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="cordova-plugin-file-transfer"
+ id="org.apache.cordova.file-transfer"
version="0.5.1-dev">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
diff --git a/src/ubuntu/file-transfer.cpp b/src/ubuntu/file-transfer.cpp
index 5b1adea..9c553eb 100644
--- a/src/ubuntu/file-transfer.cpp
+++ b/src/ubuntu/file-transfer.cpp
@@ -18,7 +18,7 @@
*/
#include "file-transfer.h"
-#include <plugins/cordova-plugin-file/file.h>
+#include <plugins/org.apache.cordova.file/file.h>
#include <cassert>
static void SetHeaders(QNetworkRequest &request, const QVariantMap &headers) {
diff --git a/src/windows/FileTransferProxy.js b/src/windows/FileTransferProxy.js
index 39c7c24..659e5c9 100644
--- a/src/windows/FileTransferProxy.js
+++ b/src/windows/FileTransferProxy.js
@@ -24,10 +24,10 @@
/*global module, require*/
var FTErr = require('./FileTransferError'),
- ProgressEvent = require('cordova-plugin-file.ProgressEvent'),
- FileUploadResult = require('cordova-plugin-file.FileUploadResult'),
- FileProxy = require('cordova-plugin-file.FileProxy'),
- FileEntry = require('cordova-plugin-file.FileEntry');
+ ProgressEvent = require('org.apache.cordova.file.ProgressEvent'),
+ FileUploadResult = require('org.apache.cordova.file.FileUploadResult'),
+ FileProxy = require('org.apache.cordova.file.FileProxy'),
+ FileEntry = require('org.apache.cordova.file.FileEntry');
var appData = Windows.Storage.ApplicationData.current;
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 49d975d..d3c1f8f 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
- id="cordova-plugin-file-transfer-tests"
+ id="org.apache.cordova.file-transfer.tests"
version="0.5.1-dev">
<name>Cordova File Transfer Plugin Tests</name>
<license>Apache 2.0</license>
diff --git a/www/FileTransfer.js b/www/FileTransfer.js
index 0a4c773..17fb782 100644
--- a/www/FileTransfer.js
+++ b/www/FileTransfer.js
@@ -22,7 +22,7 @@
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
FileTransferError = require('./FileTransferError'),
- ProgressEvent = require('cordova-plugin-file.ProgressEvent');
+ ProgressEvent = require('org.apache.cordova.file.ProgressEvent');
function newProgressEvent(result) {
var pe = new ProgressEvent();
@@ -178,10 +178,10 @@
} else if (successCallback) {
var entry = null;
if (result.isDirectory) {
- entry = new (require('cordova-plugin-file.DirectoryEntry'))();
+ entry = new (require('org.apache.cordova.file.DirectoryEntry'))();
}
else if (result.isFile) {
- entry = new (require('cordova-plugin-file.FileEntry'))();
+ entry = new (require('org.apache.cordova.file.FileEntry'))();
}
entry.isDirectory = result.isDirectory;
entry.isFile = result.isFile;
diff --git a/www/blackberry10/FileTransferProxy.js b/www/blackberry10/FileTransferProxy.js
index a363f07..438999a 100644
--- a/www/blackberry10/FileTransferProxy.js
+++ b/www/blackberry10/FileTransferProxy.js
@@ -25,7 +25,7 @@
* Register all FileTransfer exec calls to be handled by proxy
*/
-var xhrFileTransfer = require('cordova-plugin-file-transfer.xhrFileTransfer');
+var xhrFileTransfer = require('org.apache.cordova.file-transfer.xhrFileTransfer');
module.exports = {
abort: xhrFileTransfer.abort,
diff --git a/www/blackberry10/xhrFileTransfer.js b/www/blackberry10/xhrFileTransfer.js
index 7eba7af..87c8ec0 100644
--- a/www/blackberry10/xhrFileTransfer.js
+++ b/www/blackberry10/xhrFileTransfer.js
@@ -21,8 +21,8 @@
/*global Blob:false */
var cordova = require('cordova'),
- resolve = cordova.require('cordova-plugin-file.resolveLocalFileSystemURIProxy'),
- requestAnimationFrame = cordova.require('cordova-plugin-file.bb10RequestAnimationFrame'),
+ resolve = cordova.require('org.apache.cordova.file.resolveLocalFileSystemURIProxy'),
+ requestAnimationFrame = cordova.require('org.apache.cordova.file.bb10RequestAnimationFrame'),
xhr = {};
function getParentPath(filePath) {
