Merge pull request #3334 from emberjs/deprecate-active-model-adapter

deprecate ActiveModelAdapter being bundled with core
emberjs · Jun 15, 2015 · 856da2e · 856da2e
2 parents 0fa435f + bb11d58
commit 856da2e
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/packages/ember-data/lib/main.js b/packages/ember-data/lib/main.js
@@ -120,8 +120,27 @@ DS.StringTransform = StringTransform;
 DS.NumberTransform = NumberTransform;
 DS.BooleanTransform = BooleanTransform;
 
-DS.ActiveModelAdapter    = ActiveModelAdapter;
-DS.ActiveModelSerializer = ActiveModelSerializer;
+if (Ember.platform.hasPropertyAccessors) {
+  Ember.defineProperty(DS, 'ActiveModelAdapter', {
+    get: function() {
+      Ember.deprecate('The ActiveModelAdapter has been moved into a plugin. It will not be bundled with Ember Data in 2.0', false, {
+        url: 'https://github.com/ember-data/active-model-adapter'
+      });
+      return ActiveModelAdapter;
+    }
+  });
+  Ember.defineProperty(DS, 'ActiveModelSerializer', {
+    get: function() {
+      Ember.deprecate('The ActiveModelSerializer has been moved into a plugin. It will not be bundled with Ember Data in 2.0', false, {
+        url: 'https://github.com/ember-data/active-model-adapter'
+      });
+      return ActiveModelSerializer;
+    }
+  });
+} else {
+  DS.ActiveModelAdapter    = ActiveModelAdapter;
+  DS.ActiveModelSerializer = ActiveModelSerializer;
+}
 DS.EmbeddedRecordsMixin  = EmbeddedRecordsMixin;
 
 DS.belongsTo = belongsTo;