$http service

angularFiles.js

@@ -9,6 +9,7 @@ angularFiles = {
     'src/jqLite.js',
     'src/apis.js',
     'src/service/browser.js',
+    'src/service/cacheFactory.js',
     'src/service/compiler.js',
     'src/service/cookieStore.js',
     'src/service/cookies.js',
@@ -30,10 +31,8 @@ angularFiles = {
     'src/service/scope.js',
     'src/service/sniffer.js',
     'src/service/window.js',
-    'src/service/xhr.bulk.js',
-    'src/service/xhr.cache.js',
-    'src/service/xhr.error.js',
-    'src/service/xhr.js',
+    'src/service/http.js',
+    'src/service/httpBackend.js',
     'src/service/locale.js',
     'src/directives.js',
     'src/markups.js',

docs/content/cookbook/buzz.ngdoc

@@ -18,8 +18,8 @@ to retrieve Buzz activity and comments.
      this.Activity = $resource(
       'https://www.googleapis.com/buzz/v1/activities/:userId/:visibility/:activityId/:comments',
       {alt: 'json', callback: 'JSON_CALLBACK'},
-      { get:     {method: 'JSON', params: {visibility: '@self'}},
-        replies: {method: 'JSON', params: {visibility: '@self', comments: '@comments'}}
+      { get:     {method: 'JSONP', params: {visibility: '@self'}},
+        replies: {method: 'JSONP', params: {visibility: '@self', comments: '@comments'}}
       });
     }
     BuzzController.prototype = {

src/AngularPublic.js

@@ -67,6 +67,7 @@ function ngModule($provide, $injector) {
   });
 
   $provide.service('$browser', $BrowserProvider);
+  $provide.service('$cacheFactory', $CacheFactoryProvider);
   $provide.service('$compile', $CompileProvider);
   $provide.service('$cookies', $CookiesProvider);
   $provide.service('$cookieStore', $CookieStoreProvider);
@@ -75,6 +76,8 @@ function ngModule($provide, $injector) {
   $provide.service('$exceptionHandler', $ExceptionHandlerProvider);
   $provide.service('$filter', $FilterProvider);
   $provide.service('$formFactory', $FormFactoryProvider);
+  $provide.service('$http', $HttpProvider);
+  $provide.service('$httpBackend', $HttpBackendProvider);
   $provide.service('$location', $LocationProvider);
   $provide.service('$log', $LogProvider);
   $provide.service('$parse', $ParseProvider);
@@ -83,10 +86,7 @@ function ngModule($provide, $injector) {
   $provide.service('$routeParams', $RouteParamsProvider);
   $provide.service('$rootScope', $RootScopeProvider);
   $provide.service('$sniffer', $SnifferProvider);
+  $provide.service('$templateCache', $TemplateCacheProvider);
   $provide.service('$window', $WindowProvider);
-  $provide.service('$xhr.bulk', $XhrBulkProvider);
-  $provide.service('$xhr.cache', $XhrCacheProvider);
-  $provide.service('$xhr.error', $XhrErrorProvider);
-  $provide.service('$xhr', $XhrProvider);
 }
 

src/Resource.js

@@ -36,8 +36,8 @@ Route.prototype = {
   }
 };
 
-function ResourceFactory(xhr) {
-  this.xhr = xhr;
+function ResourceFactory($http) {
+  this.$http = $http;
 }
 
 ResourceFactory.DEFAULT_ACTIONS = {
@@ -107,11 +107,11 @@ ResourceFactory.prototype = {
         }
 
         var value = this instanceof Resource ? this : (action.isArray ? [] : new Resource(data));
-        self.xhr(
-          action.method,
-          route.url(extend({}, extractParams(data), action.params || {}, params)),
-          data,
-          function(status, response) {
+        var future = self.$http({
+          method: action.method,
+          url: route.url(extend({}, extractParams(data), action.params || {}, params)),
+          data: data
+        }).on('success', function(response, status) {
             if (response) {
               if (action.isArray) {
                 value.length = 0;
@@ -123,9 +123,10 @@ ResourceFactory.prototype = {
               }
             }
             (success||noop)(value);
-          },
-          error || action.verifyCache,
-          action.verifyCache);
+          });
+
+        if (error) future.on('error', error);
+
         return value;
       };