git commit: Fix require paths that were broken by plugin id changes

[agrieve]

Updated Branches:
  refs/heads/master f3ea88aff -> 2910e6bd0


Fix require paths that were broken by plugin id changes

Conflicts:
        plugin.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/commit/2910e6bd
Tree: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/tree/2910e6bd
Diff: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/diff/2910e6bd

Branch: refs/heads/master
Commit: 2910e6bd0d12b7a46906dd0d58412e91594eacac
Parents: f3ea88a
Author: Andrew Grieve <agri...@chromium.org>
Authored: Fri Jun 28 19:58:27 2013 -0400
Committer: Andrew Grieve <agri...@chromium.org>
Committed: Fri Jun 28 21:43:27 2013 -0400

----------------------------------------------------------------------
 test/autotest/html/SpecView.js | 2 +-
 www/Position.js                | 2 +-
 www/geolocation.js             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/2910e6bd/test/autotest/html/SpecView.js
----------------------------------------------------------------------
diff --git a/test/autotest/html/SpecView.js b/test/autotest/html/SpecView.js
index 8769bb8..e8a3c23 100644
--- a/test/autotest/html/SpecView.js
+++ b/test/autotest/html/SpecView.js
@@ -76,4 +76,4 @@ jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = 
function() {
   }
 };
 
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);
\ No newline at end of file
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);

http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/2910e6bd/www/Position.js
----------------------------------------------------------------------
diff --git a/www/Position.js b/www/Position.js
index cbddf2e..0a6e5fb 100644
--- a/www/Position.js
+++ b/www/Position.js
@@ -19,7 +19,7 @@
  *
 */
 
-var Coordinates = require('org.apache.cordova.core.GeoBroker.Coordinates');
+var Coordinates = require('org.apache.cordova.core.geolocation.Coordinates');
 
 var Position = function(coords, timestamp) {
     if (coords) {

http://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation/blob/2910e6bd/www/geolocation.js
----------------------------------------------------------------------
diff --git a/www/geolocation.js b/www/geolocation.js
index 0ea7046..62e0e29 100644
--- a/www/geolocation.js
+++ b/www/geolocation.js
@@ -22,8 +22,8 @@
 var argscheck = require('cordova/argscheck'),
     utils = require('cordova/utils'),
     exec = require('cordova/exec'),
-    PositionError = require('org.apache.cordova.core.GeoBroker.PositionError'),
-    Position = require('org.apache.cordova.core.GeoBroker.Position');
+    PositionError = 
require('org.apache.cordova.core.geolocation.PositionError'),
+    Position = require('org.apache.cordova.core.geolocation.Position');
 
 var timers = {};   // list of timers in use