Remove blueprint backwards compatibility

core/core.js

@@ -220,18 +220,10 @@ valuePropertyDescriptor.value = function specialize(prototypeProperties, constru
             Montage.defineProperty(constructor, "objectDescriptor", prototypeProperties.objectDescriptor);
         }
 
-        if ("blueprint" in prototypeProperties) {
-            Montage.defineProperty(constructor, "blueprint", prototypeProperties.blueprint);
-        }
-
         if ("objectDescriptorModuleId" in prototypeProperties) {
             Montage.defineProperty(constructor, "objectDescriptorModuleId", prototypeProperties.objectDescriptorModuleId);
         }
 
-        if ("blueprintModuleId" in prototypeProperties) {
-            Montage.defineProperty(constructor, "blueprintModuleId", prototypeProperties.blueprintModuleId);
-        }
-
         Montage.defineProperties(prototype, prototypeProperties, true);
 
         // needs to be done afterwards so that it overrides any prototype properties
@@ -1638,40 +1630,14 @@ exports._objectDescriptorModuleIdDescriptor = {
     }
 };
 
-/***
- * @deprecated use exports._objectDescriptorModuleIdDescriptor
- */
-exports._blueprintModuleIdDescriptor = {
-    serializable:false,
-    enumerable: false,
-    get:function () {
-        var info = Montage.getInfoForObject(this);
-        var self = (info && !info.isInstance) ? this : this.constructor;
-        if ((!Object.getOwnPropertyDescriptor(self, "_objectDescriptorModuleId")) || (!self._objectDescriptorModuleId)) {
-            info = Montage.getInfoForObject(self);
-            var moduleId = info.moduleId,
-                slashIndex = moduleId.lastIndexOf("/"),
-                dotIndex = moduleId.lastIndexOf(".");
-            slashIndex = ( slashIndex === -1 ? 0 : slashIndex + 1 );
-            dotIndex = ( dotIndex === -1 ? moduleId.length : dotIndex );
-            dotIndex = ( dotIndex < slashIndex ? moduleId.length : dotIndex );
-            Montage.defineProperty(self, "_objectDescriptorModuleId", {
-                enumerable: false,
-                value: moduleId.slice(0, dotIndex) + ".meta"
-            });
-        }
-        return self._objectDescriptorModuleId;
-    }
-};
-
 exports._objectDescriptorDescriptor = {
     serializable:false,
     enumerable: false,
     get:function () {
         var info = Montage.getInfoForObject(this);
         var self = info && !info.isInstance ? this : this.constructor;
         if (!Object.getOwnPropertyDescriptor(self, "_objectDescriptor") || !self._objectDescriptor) {
-            var objectDescriptorModuleId = self.objectDescriptorModuleId || self.blueprintModuleId;
+            var objectDescriptorModuleId = self.objectDescriptorModuleId;
             if (!objectDescriptorModuleId) {
                 throw new TypeError("ObjectDescriptor moduleId undefined for the module '" + JSON.stringify(self) + "'");
             }
@@ -1720,11 +1686,6 @@ exports._objectDescriptorDescriptor = {
     }
 };
 
-/**
- * @deprecated use exports._objectDescriptorDescriptor
- */
-exports._blueprintDescriptor = exports._objectDescriptorDescriptor;
-
 // has to come last since serializer and deserializer depend on logger, which
 // in turn depends on montage running to completion
 require("./serialization/bindings");

core/event/action-event-listener.js

@@ -82,7 +82,7 @@ var ActionEventListener = exports.ActionEventListener = Montage.specialize( /**
     }
 
 }, {
-    blueprintModuleId: require("../core")._blueprintModuleIdDescriptor,
-    blueprint: require("../core")._blueprintDescriptor
+    objectDescriptorModuleId: require("../core")._objectDescriptorModuleIdDescriptor,
+    objectDescriptor: require("../core")._objectDescriptorDescriptor
 });
 

core/event/action-event-listener.meta

@@ -1,26 +1,26 @@
 {
     "actionEventListener_handler": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "handler",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "object"
         }
     },
     "actionEventListener_action": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "action",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "string"
         }
     },
     "root": {
-        "prototype": "core/meta/module-blueprint",
+        "prototype": "core/meta/module-descriptor",
         "values": {
             "name": "ActionEventListener",
             "customPrototype": false,
@@ -32,7 +32,7 @@
                     "@": "actionEventListener_action"
                 }
             ],
-            "propertyBlueprintGroups": {
+            "propertyDescriptorGroups": {
                 "actionEventListener": [
                     {
                         "@": "actionEventListener_handler"
@@ -42,7 +42,7 @@
                     }
                 ]
             },
-            "blueprintModule": {
+            "objectDescriptorModule": {
                 "%": "core/event/action-event-listener.meta"
             },
             "exportName": "ActionEventListener",

core/media-controller.js

@@ -617,8 +617,8 @@ var MediaController = exports.MediaController = Target.specialize(/** @lends Med
 
 }, {
 
-    blueprintModuleId:require("./core")._blueprintModuleIdDescriptor,
+    objectDescriptorModuleId:require("./core")._objectDescriptorModuleIdDescriptor,
 
-    blueprint:require("./core")._blueprintDescriptor
+    objectDescriptor:require("./core")._objectDescriptorDescriptor
 
 });

core/media-controller.meta

@@ -1,9 +1,9 @@
 {
     "mediaController_status": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "status",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -12,10 +12,10 @@
     },
 
     "mediaController_STOPPED": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "STOPPED",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -24,10 +24,10 @@
     },
 
     "mediaController_PLAYING": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "PLAYING",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -36,10 +36,10 @@
     },
 
     "mediaController_PAUSED": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "PAUSED",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -48,10 +48,10 @@
     },
 
     "mediaController_EMPTY": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "EMPTY",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -60,10 +60,10 @@
     },
 
     "mediaController_mediaController": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "mediaController",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "object",
@@ -72,10 +72,10 @@
     },
 
     "mediaController_position": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "position",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -84,10 +84,10 @@
     },
 
     "mediaController_duration": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "duration",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -96,10 +96,10 @@
     },
 
     "mediaController_autoplay": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "autoplay",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "boolean",
@@ -108,10 +108,10 @@
     },
 
     "mediaController_playbackRate": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "playbackRate",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -120,10 +120,10 @@
     },
 
     "mediaController_currentTime": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "currentTime",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -132,10 +132,10 @@
     },
 
     "mediaController_volume": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "volume",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "number",
@@ -144,10 +144,10 @@
     },
 
     "mediaController_mute": {
-        "prototype": "core/meta/property-blueprint",
+        "prototype": "core/meta/property-descriptor",
         "values": {
             "name": "mute",
-            "blueprint": {
+            "objectDescriptor": {
                 "@": "root"
             },
             "valueType": "boolean",
@@ -156,14 +156,14 @@
     },
 
     "root": {
-        "prototype": "core/meta/module-blueprint",
+        "prototype": "core/meta/module-object-descriptor",
         "values": {
             "name": "MediaController",
             "exportName": "MediaController",
             "module": {
                 "%": "core/media-controller"
             },
-            "blueprintModule": {
+            "objectDescriptorModule": {
                 "%": "core/media-controller.meta"
             },
             "prototypeName": "MediaController",