Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

45 files changed, 4391 insertions, 5388 deletions

diff --git a/node_modules/montage/data/blueprint.js b/node_modules/montage/data/blueprint.js
index b3a66167..86a99ee7 100755
--- a/node_modules/montage/data/blueprint.js
+++ b/node_modules/montage/data/blueprint.js
@@ -4,94 +4,338 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-        @module montage/data/blueprint
-    @requires montage/core/core
-    @requires montage/data/store
-    @requires montage/data/objectid
-    @requires data/query
-    @requires core/exception
-    @requires data/objectproperty
-    @requires core/promise
-    @requires core/logger
-*/
+ @module montage/data/blueprint
+ @requires montage/core/core
+ @requires montage/data/store
+ @requires montage/data/object-id
+ @requires data/query
+ @requires core/exception
+ @requires data/object-property
+ @requires core/promise
+ @requires core/logger
+ */
 var Montage = require("montage").Montage;
-var Store = require("data/store").Store;
-var TemporaryObjectId = require("data/objectid").TemporaryObjectId;
+var MappingFolder = require("data/mapping").MappingFolder;
+var TemporaryObjectId = require("data/object-id").TemporaryObjectId;
 var Query = require("data/query").Query;
-var Exception = require("core/exception").Exception;
-var ObjectProperty = require("data/objectproperty").ObjectProperty;
+var ObjectProperty = require("data/object-property").ObjectProperty;
 var Promise = require("core/promise").Promise;
+var Exception = require("core/exception").Exception;
 var logger = require("core/logger").logger("blueprint");
-/**
-    @class module:montage/data/blueprint.BlueprintBinder
-    @classdesc A blueprint binder is a collection of of blueprints for a specific access type. It also includes the connection information.
-    @extends module:montage/core/core.Montage
-*/
-var BlueprintBinder = exports.BlueprintBinder = Montage.create(Montage,/** @lends module:montage/data/blueprint.BlueprintBinder# */ {
 
 /**
-  Description TODO
-  @private
-*/
-    _blueprintForPrototypeTable: {
-        value: {},
-        serializable: false,
-        distinct: true,
-        enumerable: false,
-        writable: false
-    },
+ @private
+ */
+var _binderManager = null;
 /**
-        Description TODO
-        @type {Property}
-        @default {Table} {}
-    */
-    restrictionsTable: {
-        value: {},
-        serializable: true,
-        distinct: true,
-        enumerable: false,
-        writable: false
+ @class module:montage/data/blueprint.BlueprintBinderManager
+ @classdesc A blueprint binder manager is a singleton that is responsible for loading and dispaching binders and blueprints.
+ @extends module:montage/core/core.Montage
+ */
+var BlueprintBinderManager = exports.BlueprintBinderManager = Montage.create(Montage, /** @lends module:montage/data/blueprint.BlueprintBinderManager# */ {
+
+    /**
+     Description TODO
+     @function
+     @returns itself
+     */
+    init:{
+        serializable:false,
+        enumerable:false,
+        value:function () {
+            return this;
+        }
     },
-/**
-        Description TODO
-        @type {Property}
-        @default {String} null
-    */
-    name: {
-        value: null,
-        serializable: true
+
+    /**
+     Description TODO
+     @type {Property} Function
+     @default {Array} new Array(10)
+     */
+    blueprintBinders:{
+        serializable:true,
+        writable:false,
+        distinct:true,
+        value:new Array(10)
+    },
+
+    /**
+     Add a new blueprint binder.
+     @function
+     @param {Property} binder TODO
+     */
+    addBlueprintBinder:{
+        value:function (binder) {
+            if (binder !== null) {
+                var index = this.blueprintBinders.indexOf(binder);
+                if (index >= 0) {
+                    this.blueprintBinders.splice(index, 1);
+                }
+                this.blueprintBinders.push(binder);
+            }
+        }
+    },
+
+    /**
+     Description TODO
+     @function
+     @param {Property} binder TODO
+     */
+    removeBlueprintBinder:{
+        value:function (binder) {
+            if (binder !== null) {
+                var index = this.blueprintBinders.indexOf(binder);
+                if (index >= 0) {
+                    this.blueprintBinders.splice(index, 1);
+                }
+            }
+        }
     },
+
+    /**
+     Search through the binders for a blueprint that extends that prototype.
+     @function
+     @param {Property} prototypeName TODO
+     @param {Property} moduleId TODO
+     @returns The requested blueprint or null if this prototype is not managed.
+     */
+    blueprintForPrototype: {
+        value: function(prototypeName, moduleId) {
+            var binder, blueprint, index;
+            for (index = 0; typeof (binder = this.blueprintBinders[index]) !== "undefined"; index++) {
+                blueprint = binder.blueprintForPrototype(prototypeName, moduleId);
+                if (blueprint !== null) {