From a025cdd4e6837cea55bc4a8956e5144bbc50326f Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Fri, 28 Jun 2013 18:35:55 -0400
Subject: [PATCH 1/3] Remove xmlns:android, fix plugin id

---
 plugin.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 80e4c34..591f6c1 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
-xmlns:android="http://schemas.android.com/apk/res/android"
-id="org.apache.cordova.core.CameraLauncher"
-    version="0.1.0">
+           id="org.apache.cordova.core.camera"
+      version="0.1.0">
     <name>Camera</name>
    
     <js-module src="www/CameraConstants.js" name="Camera">

From ff587d400e704fab28931f9e82db39863ef9c63f Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Fri, 28 Jun 2013 19:46:10 -0400
Subject: [PATCH 2/3] Fix require paths that were broken by plugin id changes

---
 docs/parameter/cameraError.md   | 2 +-
 docs/parameter/cameraSuccess.md | 2 +-
 test/camera/index.html          | 2 +-
 www/Camera.js                   | 4 ++--
 www/CameraPopoverOptions.js     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/parameter/cameraError.md b/docs/parameter/cameraError.md
index 7ee091b..f36840f 100644
--- a/docs/parameter/cameraError.md
+++ b/docs/parameter/cameraError.md
@@ -29,4 +29,4 @@ onError callback function that provides an error message.
 Parameters
 ----------
 
-- __message:__ The message is provided by the device's native code. (`String`)
\ No newline at end of file
+- __message:__ The message is provided by the device's native code. (`String`)
diff --git a/docs/parameter/cameraSuccess.md b/docs/parameter/cameraSuccess.md
index 773fba4..e57b296 100644
--- a/docs/parameter/cameraSuccess.md
+++ b/docs/parameter/cameraSuccess.md
@@ -39,4 +39,4 @@ Example
     function cameraCallback(imageData) {
         var image = document.getElementById('myImage');
         image.src = "data:image/jpeg;base64," + imageData;
-    }
\ No newline at end of file
+    }
diff --git a/test/camera/index.html b/test/camera/index.html
index f761fbf..83285e7 100644
--- a/test/camera/index.html
+++ b/test/camera/index.html
@@ -340,7 +340,7 @@
         document.addEventListener("deviceready", function() {
             deviceReady = true;
             platformId = cordova.require('cordova/platform').id;
-            CameraPopoverOptions = cordova.require('org.apache.cordova.core.CameraLauncher.CameraPopoverOptions');
+            CameraPopoverOptions = cordova.require('org.apache.cordova.core.camera.CameraPopoverOptions');
             console.log("Device="+device.platform+" "+device.version);
             createOptionsEl('sourceType', Camera.PictureSourceType, camPictureSourceTypeDefault);
             createOptionsEl('destinationType', Camera.DestinationType, camDestinationTypeDefault);
diff --git a/www/Camera.js b/www/Camera.js
index d6af1e9..db34bb9 100644
--- a/www/Camera.js
+++ b/www/Camera.js
@@ -21,8 +21,8 @@
 
 var argscheck = require('cordova/argscheck'),
     exec = require('cordova/exec'),
-    Camera = require('org.apache.cordova.core.CameraLauncher.Camera'),
-    CameraPopoverHandle = require('org.apache.cordova.core.CameraLauncher.CameraPopoverHandle');
+    Camera = require('org.apache.cordova.core.camera.Camera'),
+    CameraPopoverHandle = require('org.apache.cordova.core.camera.CameraPopoverHandle');
 
 var cameraExport = {};
 
diff --git a/www/CameraPopoverOptions.js b/www/CameraPopoverOptions.js
index 36858a9..3d80930 100644
--- a/www/CameraPopoverOptions.js
+++ b/www/CameraPopoverOptions.js
@@ -19,7 +19,7 @@
  *
 */
 
-var Camera = require('org.apache.cordova.core.CameraLauncher.Camera');
+var Camera = require('org.apache.cordova.core.camera.Camera');
 
 /**
  * Encapsulates options for iOS Popover image picker

From ea7bddac52a78f1bea6f5030e7e58f6048fc2237 Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Fri, 28 Jun 2013 20:24:53 -0400
Subject: [PATCH 3/3] Fix CameraPopoverHandle module defined multiple times on
 iOS

---
 plugin.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 591f6c1..07f4e3b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -11,9 +11,6 @@
 
     <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"></js-module>
 
-    <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
-    </js-module>
-      
     <js-module src="www/Camera.js" name="camera">
         <clobbers target="navigator.camera" />
     </js-module>
@@ -30,6 +27,10 @@
         </config-file>
 
         <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/core" />
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
+      
      </platform>
      
      <!-- ios -->
@@ -56,6 +57,9 @@
         <config-file target="www/config.xml" parent="/widget">
             <feature name="Camera" value="Camera"/>
         </config-file>
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
     </platform>
 
      <!-- wp7 -->
@@ -71,6 +75,9 @@
         </config-file>
 
         <source-file src="src/wp7/Camera.cs" />
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
     </platform>
 
     <!-- wp8 -->
@@ -86,6 +93,9 @@
         </config-file>
 
         <source-file src="src/wp8/Camera.cs" />
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
     </platform>
           
 </plugin>