Merge branch 'master' into old-ID

This reverts commit c85cab15b7.

package.json

@@ -3,7 +3,7 @@
   "version": "0.6.1-dev",
   "description": "Cordova InAppBrowser Plugin",
   "cordova": {
-    "id": "cordova-plugin-inappbrowser",
+    "id": "org.apache.cordova.inappbrowser",
     "platforms": [
       "android",
       "amazon-fireos",

plugin.xml

@@ -19,7 +19,7 @@
 -->
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-           id="cordova-plugin-inappbrowser"
+           id="org.apache.cordova.inappbrowser"
       version="0.6.1-dev">
 
     <name>InAppBrowser</name>

src/browser/InAppBrowserProxy.js

@@ -198,19 +198,19 @@ var IAB = {
     },
 
     injectScriptFile: function (win, fail, args) {
-        var msg = 'Browser cordova-plugin-inappbrowser injectScriptFile is not yet implemented';
+        var msg = 'Browser org.apache.cordova.inappbrowser injectScriptFile is not yet implemented';
         console.warn(msg);
         fail && fail(msg);
     }, 
 
     injectStyleCode: function (win, fail, args) {
-        var msg = 'Browser cordova-plugin-inappbrowser injectStyleCode is not yet implemented';
+        var msg = 'Browser org.apache.cordova.inappbrowser injectStyleCode is not yet implemented';
         console.warn(msg);
         fail && fail(msg);
     },
 
     injectStyleFile: function (win, fail, args) {
-        var msg = 'Browser cordova-plugin-inappbrowser injectStyleFile is not yet implemented';
+        var msg = 'Browser org.apache.cordova.inappbrowser injectStyleFile is not yet implemented';
         console.warn(msg);
         fail && fail(msg);
     }
@@ -218,4 +218,4 @@ var IAB = {
 
 module.exports = IAB;
 
-require("cordova/exec/proxy").add("InAppBrowser", module.exports);
+require("cordova/exec/proxy").add("InAppBrowser", module.exports);

src/wp/InAppBrowser.cs

@@ -159,14 +159,14 @@ namespace WPCordovaClassLib.Cordova.Commands
 
         public void injectScriptFile(string options)
         {
-            Debug.WriteLine("Error : Windows Phone cordova-plugin-inappbrowser does not currently support executeScript");
+            Debug.WriteLine("Error : Windows Phone org.apache.cordova.inappbrowser does not currently support executeScript");
             string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
             // throw new NotImplementedException("Windows Phone does not currently support 'executeScript'");
         }
 
         public void injectStyleCode(string options)
         {
-            Debug.WriteLine("Error : Windows Phone cordova-plugin-inappbrowser does not currently support insertCSS");
+            Debug.WriteLine("Error : Windows Phone org.apache.cordova.inappbrowser does not currently support insertCSS");
             return;
 
             //string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
@@ -199,7 +199,7 @@ namespace WPCordovaClassLib.Cordova.Commands
 
         public void injectStyleFile(string options)
         {
-            Debug.WriteLine("Error : Windows Phone cordova-plugin-inappbrowser does not currently support insertCSS");
+            Debug.WriteLine("Error : Windows Phone org.apache.cordova.inappbrowser does not currently support insertCSS");
             return;
 
             //string[] args = JSON.JsonHelper.Deserialize<string[]>(options);

tests/plugin.xml

@@ -19,7 +19,7 @@
 -->
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    id="cordova-plugin-inappbrowser-tests"
+    id="org.apache.cordova.inappbrowser.tests"
     version="0.6.1-dev">
     <name>Cordova InAppBrowser Plugin Tests</name>
     <license>Apache 2.0</license>