Fixing more broken links

[Conductor] Added support for new style registration of formats tolegacy services
Fixing broken links
2017-03-09 16:25:52 +00:00 · 2017-03-09 16:25:35 +00:00 · 2017-03-09 16:07:08 +00:00 · 2017-03-09 16:06:35 +00:00 · 2017-03-09 15:48:05 +00:00 · 2017-03-09 15:47:41 +00:00
184 changed files with 3267 additions and 3990 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)

-Open MCT is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
+Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.

 Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)

--- a/docs/src/architecture/framework.md
+++ b/docs/src/architecture/framework.md
@@ -131,7 +131,7 @@ Keeping that in mind, there are a few useful patterns supported by the
 framework that are useful to keep in mind.

 The specific service infrastructure provided by the platform is described
-in the [Platform Architecture](Platform.md).
+in the [Platform Architecture](platform.md).

 ## Extension Categories

--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@@ -2261,10 +2261,7 @@ The platform understands the following policy categories (specifiable as the

 * `action`: Determines whether or not a given action is allowable. The candidate 
 argument here is an Action; the context is its action context object.
-* `composition`: Determines whether or not domain objects of a given type are 
-allowed to contain domain objects of another type. The candidate argument here 
-is the container's `Type`; the context argument is the `Type` of the object to be 
-contained.
+* `composition`: Determines whether or not domain objects of a given type (first argument, `parentType`) can contain a given object (second argument, `child`).
 * `view`: Determines whether or not a view is applicable for a domain object. 
 The candidate argument is the view's extension definition; the context argument 
 is the `DomainObject` to be viewed.
--- a/docs/src/tutorials/index.md
+++ b/docs/src/tutorials/index.md
@@ -320,7 +320,7 @@ define([
 +          {
 +              "key": "example.todo",
 +              "name": "To-Do List",
-+              "cssclass": "icon-check",
+              "cssClass": "icon-check",
 +              "description": "A list of things that need to be done.",
 +              "features": ["creation"]
 +          }
@@ -340,8 +340,9 @@ Going through the properties we've defined:
 domain objects of this type.
 * The `name` of "To-Do List" is the human-readable name for this type, and will 
 be shown to users.
-* The `glyph` refers to a special character in Open MCT's custom font set; 
-this will be used as an icon.
+* The `cssClass` maps to an icon that will be shown for each To-Do List. The icons 
+are defined in our [custom open MCT icon set](https://github.com/nasa/openmct/blob/master/platform/commonUI/general/res/sass/_glyphs.scss). 
+A complete list of available icons will be provided in the future.
 * The `description` is also human-readable, and will be used whenever a longer 
 explanation of what this type is should be shown.
 * Finally, the `features` property describes some special features of objects of 
@@ -415,7 +416,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"]
            }
@@ -424,7 +425,7 @@ define([
 +           {
 +               "key": "example.todo",
 +               "type": "example.todo",
-+               "cssclass": "icon-check",
+               "cssClass": "icon-check",
 +               "name": "List",
 +               "templateUrl": "templates/todo.html",
 +               "editable": true
@@ -446,7 +447,7 @@ the domain object type, but could have chosen any unique name.
 domain objects of that type. This means that we'll see this view for To-do Lists 
 that we create, but not for other domain objects (such as Folders.)

-* The `glyph` and `name` properties describe the icon and human-readable name 
+* The `cssClass` and `name` properties describe the icon and human-readable name 
 for this view to display in the UI where needed (if multiple views are available 
 for To-do Lists, the user will be able to choose one.)

@@ -472,7 +473,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"],
 +               "model": {
@@ -487,7 +488,7 @@ define([
            {
                "key": "example.todo",
                "type": "example.todo",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "name": "List",
                "templateUrl": "templates/todo.html",
                "editable": true
@@ -646,7 +647,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"],
                "model": {
@@ -661,7 +662,7 @@ define([
            {
                "key": "example.todo",
                "type": "example.todo",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "name": "List",
                "templateUrl": "templates/todo.html",
                "editable": true
@@ -740,7 +741,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"],
                "model": {
@@ -755,7 +756,7 @@ define([
            {
                "key": "example.todo",
                "type": "example.todo",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "name": "List",
                "templateUrl": "templates/todo.html",
                "editable": true,
@@ -765,7 +766,7 @@ define([
 +                           "items": [
 +                               {
 +                                   "text": "Add Task",
-+                                   "cssclass": "icon-plus",
+                                   "cssClass": "icon-plus",
 +                                   "method": "addTask",
 +                                   "control": "button"
 +                               }
@@ -774,7 +775,7 @@ define([
 +                       {
 +                           "items": [
 +                               {
-+                                   "cssclass": "icon-trash",
+                                   "cssClass": "icon-trash",
 +                                   "method": "removeTask",
 +                                   "control": "button"
 +                               }
@@ -970,7 +971,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"],
                "model": {
@@ -985,7 +986,7 @@ define([
            {
                "key": "example.todo",
                "type": "example.todo",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "name": "List",
                "templateUrl": "templates/todo.html",
                "editable": true,
@@ -995,7 +996,7 @@ define([
                            "items": [
                                {
                                    "text": "Add Task",
-                                    "cssclass": "icon-plus",
+                                    "cssClass": "icon-plus",
                                    "method": "addTask",
                                    "control": "button"
                                }
@@ -1004,7 +1005,7 @@ define([
                        {
                            "items": [
                                {
-                                    "cssclass": "icon-trash",
+                                    "cssClass": "icon-trash",
                                    "method": "removeTask",
                                    "control": "button"
                                }
@@ -1235,7 +1236,7 @@ define([
            {
                "key": "example.todo",
                "name": "To-Do List",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "description": "A list of things that need to be done.",
                "features": ["creation"],
                "model": {
@@ -1247,7 +1248,7 @@ define([
            {
                "key": "example.todo",
                "type": "example.todo",
-                "cssclass": "icon-check",
+                "cssClass": "icon-check",
                "name": "List",
                "templateUrl": "templates/todo.html",
                "editable": true,
@@ -1257,7 +1258,7 @@ define([
                            "items": [
                                {
                                    "text": "Add Task",
-                                    "cssclass": "icon-plus",
+                                    "cssClass": "icon-plus",
                                    "method": "addTask",
                                    "control": "button"
                                }
@@ -1266,7 +1267,7 @@ define([
                        {
                            "items": [
                                {
-                                    "cssclass": "icon-trash",
+                                    "cssClass": "icon-trash",
                                    "method": "removeTask",
                                    "control": "button"
                                }
@@ -1373,7 +1374,7 @@ define([
            {
                "name": "Bar Graph",
                "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "cssClass": "icon-autoflow-tabular",
                "templateUrl": "templates/bargraph.html",
                "needs": [ "telemetry" ],
                "delegation": true
@@ -1676,7 +1677,7 @@ define([
            {
                "name": "Bar Graph",
                "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "cssClass": "icon-autoflow-tabular",
                "templateUrl": "templates/bargraph.html",
                "needs": [ "telemetry" ],
                "delegation": true
@@ -1842,7 +1843,7 @@ define([
            {
                "name": "Bar Graph",
                "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "cssClass": "icon-autoflow-tabular",
                "templateUrl": "templates/bargraph.html",
                "needs": [ "telemetry" ],
                "delegation": true,
@@ -2319,7 +2320,7 @@ define([
                {
                    "name": "Spacecraft",
                    "key": "example.spacecraft",
-                    "cssclass": "icon-object"
+                    "cssClass": "icon-object"
                }
            ],
            "roots": [
@@ -2705,18 +2706,18 @@ define([
            {
                "name": "Spacecraft",
                "key": "example.spacecraft",
-                "cssclass": "icon-object"
+                "cssClass": "icon-object"
            },
 +           {
 +               "name": "Subsystem",
 +               "key": "example.subsystem",
-+               "cssclass": "icon-object",
+               "cssClass": "icon-object",
 +               "model": { "composition": [] }
 +           },
 +           {
 +               "name": "Measurement",
 +               "key": "example.measurement",
-+               "cssclass": "icon-telemetry",
+               "cssClass": "icon-telemetry",
 +               "model": { "telemetry": {} },
 +               "telemetry": {
 +                   "source": "example.source",
@@ -3030,18 +3031,18 @@ define([
            {
                "name": "Spacecraft",
                "key": "example.spacecraft",
-                "cssclass": "icon-object"
+                "cssClass": "icon-object"
            },
            {
                "name": "Subsystem",
                "key": "example.subsystem",
-                "cssclass": "icon-object",
+                "cssClass": "icon-object",
                "model": { "composition": [] }
            },
            {
                "name": "Measurement",
                "key": "example.measurement",
-                "cssclass": "icon-telemetry",
+                "cssClass": "icon-telemetry",
                "model": { "telemetry": {} },
                "telemetry": {
                    "source": "example.source",
--- a/example/eventGenerator/bundle.js
+++ b/example/eventGenerator/bundle.js
@@ -49,7 +49,7 @@ define([
                {
                    "key": "eventGenerator",
                    "name": "Event Message Generator",
-                    "cssclass": "icon-folder-new",
+                    "cssClass": "icon-folder-new",
                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
                    "priority": 10,
                    "features": "creation",
--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@@ -36,7 +36,7 @@ define([
                    "name": "Export Telemetry as CSV",
                    "implementation": ExportTelemetryAsCSVAction,
                    "category": "contextual",
-                    "cssclass": "icon-download",
+                    "cssClass": "icon-download",
                    "depends": [ "exportService" ]
                }
            ]
--- a/example/generator/src/GeneratorProvider.js
+++ b/example/generator/src/GeneratorProvider.js
@@ -41,6 +41,10 @@ define([
        return domainObject.type === 'generator';
    };

+    GeneratorProvider.prototype.supportsRequest =
+        GeneratorProvider.prototype.supportsSubscribe =
+            GeneratorProvider.prototype.canProvideTelemetry;
+
    GeneratorProvider.prototype.makeWorkerRequest = function (domainObject, request) {
        var props = [
            'amplitude',
--- a/example/generator/src/SinewaveConstants.js
+++ b/example/generator/src/SinewaveConstants.js
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,Promise*/
+/*global define*/

 define({
    START_TIME: Date.now() - 24 * 60 * 60 * 1000 // Now minus a day.
--- a/example/generator/src/SinewaveDeltaFormat.js
+++ b/example/generator/src/SinewaveDeltaFormat.js
@@ -19,12 +19,11 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global define,Promise*/
+/*global define*/

 define(
    ['./SinewaveConstants', 'moment'],
    function (SinewaveConstants, moment) {
-        "use strict";

        var START_TIME = SinewaveConstants.START_TIME,
            FORMAT_REGEX = /^-?\d+:\d+:\d+$/,
--- a/example/generator/src/SinewaveLimitCapability.js
+++ b/example/generator/src/SinewaveLimitCapability.js
--- a/example/generator/src/SinewaveTelemetryProvider.js
+++ b/example/generator/src/SinewaveTelemetryProvider.js
--- a/example/generator/src/SinewaveTelemetrySeries.js
+++ b/example/generator/src/SinewaveTelemetrySeries.js
--- a/example/generator/src/WorkerInterface.js
+++ b/example/generator/src/WorkerInterface.js
--- a/example/generator/bundle.js
+++ b/example/generator/bundle.js
@@ -1,183 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    "./src/SinewaveTelemetryProvider",
-    "./src/SinewaveLimitCapability",
-    "./src/SinewaveDeltaFormat",
-    'legacyRegistry'
-], function (
-    SinewaveTelemetryProvider,
-    SinewaveLimitCapability,
-    SinewaveDeltaFormat,
-    legacyRegistry
-) {
-    "use strict";
-
-    legacyRegistry.register("example/generator", {
-        "name": "Sine Wave Generator",
-        "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-        "extensions": {
-            "components": [
-                {
-                    "implementation": SinewaveTelemetryProvider,
-                    "type": "provider",
-                    "provides": "telemetryService",
-                    "depends": [
-                        "$q",
-                        "$timeout"
-                    ]
-                }
-            ],
-            "capabilities": [
-                {
-                    "key": "limit",
-                    "implementation": SinewaveLimitCapability
-                }
-            ],
-            "formats": [
-                {
-                    "key": "example.delta",
-                    "implementation": SinewaveDeltaFormat
-                }
-            ],
-            "constants": [
-                {
-                    "key": "TIME_CONDUCTOR_DOMAINS",
-                    "value": [
-                        {
-                            "key": "time",
-                            "name": "Time"
-                        },
-                        {
-                            "key": "yesterday",
-                            "name": "Yesterday"
-                        },
-                        {
-                            "key": "delta",
-                            "name": "Delta",
-                            "format": "example.delta"
-                        }
-                    ],
-                    "priority": -1
-                }
-            ],
-            "types": [
-                {
-                    "key": "generator",
-                    "name": "Sine Wave Generator",
-                    "cssclass": "icon-telemetry",
-                    "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-                    "priority": 10,
-                    "features": "creation",
-                    "model": {
-                        "telemetry": {
-                            "period": 10,
-                            "amplitude": 1,
-                            "offset": 0,
-                            "dataRateInHz": 1
-                        }
-                    },
-                    "telemetry": {
-                        "source": "generator",
-                        "domains": [
-                            {
-                                "key": "utc",
-                                "name": "Time"
-                            },
-                            {
-                                "key": "yesterday",
-                                "name": "Yesterday"
-                            },
-                            {
-                                "key": "delta",
-                                "name": "Delta",
-                                "format": "example.delta"
-                            }
-                        ],
-                        "ranges": [
-                            {
-                                "key": "sin",
-                                "name": "Sine"
-                            },
-                            {
-                                "key": "cos",
-                                "name": "Cosine"
-                            }
-                        ]
-                    },
-                    "properties": [
-                        {
-                            "name": "Period",
-                            "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
-                            "key": "period",
-                            "required": true,
-                            "property": [
-                                "telemetry",
-                                "period"
-                            ],
-                            "pattern": "^\\d*(\\.\\d*)?$"
-                        },
-                        {
-                            "name": "Amplitude",
-                            "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
-                            "key": "amplitude",
-                            "required": true,
-                            "property": [
-                                "telemetry",
-                                "amplitude"
-                            ],
-                            "pattern": "^\\d*(\\.\\d*)?$"
-                        },
-                        {
-                            "name": "Offset",
-                            "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
-                            "key": "offset",
-                            "required": true,
-                            "property": [
-                                "telemetry",
-                                "offset"
-                            ],
-                            "pattern": "^\\d*(\\.\\d*)?$"
-                        },
-                        {
-                            "name": "Data Rate (hz)",
-                            "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
-                            "key": "dataRateInHz",
-                            "required": true,
-                            "property": [
-                                "telemetry",
-                                "dataRateInHz"
-                            ],
-                            "pattern": "^\\d*(\\.\\d*)?$"
-                        }
-                    ]
-                }
-            ]
-        }
-    });
-});
--- a/example/generator/src/generatorWorker.js
+++ b/example/generator/src/generatorWorker.js
@@ -24,6 +24,7 @@

 (function () {

+    var FIFTEEN_MINUTES = 15 * 60 * 1000;

    var handlers = {
        subscribe: onSubscribe,
@@ -51,6 +52,7 @@
    function onSubscribe(message) {
        var data = message.data;

+        // Keep
        var start = Date.now();
        var step = 1000 / data.dataRateInHz;
        var nextStep = start - (start % step) + step;
@@ -82,8 +84,11 @@

    function onRequest(message) {
        var data = message.data;
-        if (!data.start || !data.end) {
-            throw new Error('missing start and end!');
+        if (data.end == undefined) {
+            data.end = Date.now();
+        }
+        if (data.start == undefined){
+            data.start = data.end - FIFTEEN_MINUTES;
        }

        var now = Date.now();
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@@ -0,0 +1,171 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./GeneratorProvider",
+    "./SinewaveLimitCapability",
+    "./SinewaveDeltaFormat"
+], function (
+    GeneratorProvider,
+    SinewaveLimitCapability,
+    SinewaveDeltaFormat
+) {
+
+    var legacyExtensions = {
+        "capabilities": [
+            {
+                "key": "limit",
+                "implementation": SinewaveLimitCapability
+            }
+        ],
+        "formats": [
+            {
+                "key": "example.delta",
+                "implementation": SinewaveDeltaFormat
+            }
+        ],
+        "constants": [
+            {
+                "key": "TIME_CONDUCTOR_DOMAINS",
+                "value": [
+                    {
+                        "key": "time",
+                        "name": "Time"
+                    },
+                    {
+                        "key": "yesterday",
+                        "name": "Yesterday"
+                    },
+                    {
+                        "key": "delta",
+                        "name": "Delta"
+                    }
+                ],
+                "priority": -1
+            }
+        ]
+    }
+
+    return function(openmct){
+        //Register legacy extensions for things not yet supported by the new API
+        Object.keys(legacyExtensions).forEach(function (type){
+            var extensionsOfType = legacyExtensions[type];
+            extensionsOfType.forEach(function (extension) {
+                openmct.legacyExtension(type, extension)
+            })
+        });
+        openmct.types.addType("generator", {
+            label: "Sine Wave Generator",
+            description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+            cssClass: "icon-telemetry",
+            creatable: true,
+            form: [
+                {
+                    name: "Period",
+                    control: "textfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "period",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "period"
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
+                },
+                {
+                    name: "Amplitude",
+                    control: "textfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "amplitude",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "amplitude"
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
+                },
+                {
+                    name: "Offset",
+                    control: "textfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "offset",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "offset"
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
+                },
+                {
+                    name: "Data Rate (hz)",
+                    control: "textfield",
+                    cssClass: "l-input-sm l-numeric",
+                    key: "dataRateInHz",
+                    required: true,
+                    property: [
+                        "telemetry",
+                        "dataRateInHz"
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
+                }
+            ],
+            initialize: function (object) {
+                object.telemetry = {
+                    period: 10,
+                    amplitude: 1,
+                    offset: 0,
+                    dataRateInHz: 1,
+                    domains: [
+                        {
+                            key: "utc",
+                            name: "Time",
+                            format: "utc"
+                        },
+                        {
+                            key: "yesterday",
+                            name: "Yesterday",
+                            format: "utc"
+                        },
+                        {
+                            key: "delta",
+                            name: "Delta",
+                            format: "example.delta"
+                        }
+                    ],
+                    ranges: [
+                        {
+                            key: "sin",
+                            name: "Sine"
+                        },
+                        {
+                            key: "cos",
+                            name: "Cosine"
+                        }
+                    ]
+                };
+            }
+        });
+        openmct.telemetry.addProvider(new GeneratorProvider());
+    };
+
+});
--- a/example/imagery/bundle.js
+++ b/example/imagery/bundle.js
@@ -49,7 +49,7 @@ define([
                {
                    "key": "imagery",
                    "name": "Example Imagery",
-                    "cssclass": "icon-image",
+                    "cssClass": "icon-image",
                    "features": "creation",
                    "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
                    "priority": 10,
--- a/example/localTimeSystem/bundle.js
+++ b/example/localTimeSystem/bundle.js
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    "./src/LocalTimeSystem",
-    "./src/LocalTimeFormat",
-    'legacyRegistry'
-], function (
-    LocalTimeSystem,
-    LocalTimeFormat,
-    legacyRegistry
-) {
-    legacyRegistry.register("example/localTimeSystem", {
-        "extensions": {
-            "formats": [
-                {
-                    "key": "local-format",
-                    "implementation": LocalTimeFormat
-                }
-            ],
-            "timeSystems": [
-                {
-                    "implementation": LocalTimeSystem,
-                    "depends": ["$timeout"]
-                }
-            ]
-        }
-    });
-});
--- a/example/localTimeSystem/src/LADTickSource.js
+++ b/example/localTimeSystem/src/LADTickSource.js
@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(['../../../platform/features/conductor/core/src/timeSystems/LocalClock'], function (LocalClock) {
-    /**
-     * @implements TickSource
-     * @constructor
-     */
-    function LADTickSource ($timeout, period) {
-        LocalClock.call(this, $timeout, period);
-
-        this.metadata = {
-            key: 'test-lad',
-            mode: 'lad',
-            cssclass: 'icon-clock',
-            label: 'Latest Available Data',
-            name: 'Latest available data',
-            description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
-        };
-    }
-    LADTickSource.prototype = Object.create(LocalClock.prototype);
-
-    return LADTickSource;
-});
--- a/example/localTimeSystem/src/LocalTimeFormat.js
+++ b/example/localTimeSystem/src/LocalTimeFormat.js
@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'moment'
-], function (
-    moment
-) {
-
-    var DATE_FORMAT = "YYYY-MM-DD h:mm:ss.SSS a",
-        DATE_FORMATS = [
-            DATE_FORMAT,
-            "YYYY-MM-DD h:mm:ss a",
-            "YYYY-MM-DD h:mm a",
-            "YYYY-MM-DD"
-        ];
-
-    /**
-     * @typedef Scale
-     * @property {number} min the minimum scale value, in ms
-     * @property {number} max the maximum scale value, in ms
-     */
-
-    /**
-     * Formatter for UTC timestamps. Interprets numeric values as
-     * milliseconds since the start of 1970.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function LocalTimeFormat() {
-    }
-
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat (d) {
-        var m = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        return [
-            [".SSS", function(m) { return m.milliseconds(); }],
-            [":ss", function(m) { return m.seconds(); }],
-            ["hh:mma", function(m) { return m.minutes(); }],
-            ["hha", function(m) { return m.hours(); }],
-            ["ddd DD", function(m) {
-                return m.days() &&
-                    m.date() != 1;
-            }],
-            ["MMM DD", function(m) { return m.date() != 1; }],
-            ["MMMM", function(m) {
-                return m.month();
-            }],
-            ["YYYY", function() { return true; }]
-        ].filter(function (row){
-            return row[1](m);
-        })[0][0];
-    };
-
-    /**
-     *
-     * @param value
-     * @param {Scale} [scale] Optionally provides context to the
-     * format request, allowing for scale-appropriate formatting.
-     * @returns {string} the formatted date
-     */
-    LocalTimeFormat.prototype.format = function (value, scale) {
-        if (scale !== undefined){
-            var scaledFormat = getScaledFormat(value, scale);
-            if (scaledFormat) {
-                return moment.utc(value).format(scaledFormat);
-            }
-        }
-        return moment(value).format(DATE_FORMAT);
-    };
-
-    LocalTimeFormat.prototype.parse = function (text) {
-        return moment(text, DATE_FORMATS).valueOf();
-    };
-
-    LocalTimeFormat.prototype.validate = function (text) {
-        return moment(text, DATE_FORMATS).isValid();
-    };
-
-    return LocalTimeFormat;
-});
--- a/example/localTimeSystem/src/LocalTimeSystem.js
+++ b/example/localTimeSystem/src/LocalTimeSystem.js
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    '../../../platform/features/conductor/core/src/timeSystems/TimeSystem',
-    '../../../platform/features/conductor/core/src/timeSystems/LocalClock',
-    './LADTickSource'
-], function (TimeSystem, LocalClock, LADTickSource) {
-    var THIRTY_MINUTES = 30 * 60 * 1000,
-        DEFAULT_PERIOD = 1000;
-
-    /**
-     * This time system supports UTC dates and provides a ticking clock source.
-     * @implements TimeSystem
-     * @constructor
-     */
-    function LocalTimeSystem ($timeout) {
-        TimeSystem.call(this);
-
-        /**
-         * Some metadata, which will be used to identify the time system in
-         * the UI
-         * @type {{key: string, name: string, glyph: string}}
-         */
-        this.metadata = {
-            'key': 'local',
-            'name': 'Local',
-            'glyph': '\u0043'
-        };
-
-        this.fmts = ['local-format'];
-        this.sources = [new LocalClock($timeout, DEFAULT_PERIOD), new LADTickSource($timeout, DEFAULT_PERIOD)];
-    }
-
-    LocalTimeSystem.prototype = Object.create(TimeSystem.prototype);
-
-    LocalTimeSystem.prototype.formats = function () {
-        return this.fmts;
-    };
-
-    LocalTimeSystem.prototype.deltaFormat = function () {
-        return 'duration';
-    };
-
-    LocalTimeSystem.prototype.tickSources = function () {
-        return this.sources;
-    };
-
-    LocalTimeSystem.prototype.defaults = function (key) {
-        var now = Math.ceil(Date.now() / 1000) * 1000;
-        return {
-            key: 'local-default',
-            name: 'Local 12 hour time system defaults',
-            deltas: {start: THIRTY_MINUTES, end: 0},
-            bounds: {start: now - THIRTY_MINUTES, end: now}
-        };
-    };
-
-    return LocalTimeSystem;
-});
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@@ -41,18 +41,18 @@ define([
                {
                    "name":"Mars Science Laboratory",
                    "key": "msl.curiosity",
-                    "cssclass": "icon-object"
+                    "cssClass": "icon-object"
                },
                {
                    "name": "Instrument",
                    "key": "msl.instrument",
-                    "cssclass": "icon-object",
+                    "cssClass": "icon-object",
                    "model": {"composition": []}
                },
                {
                    "name": "Measurement",
                    "key": "msl.measurement",
-                    "cssclass": "icon-telemetry",
+                    "cssClass": "icon-telemetry",
                    "model": {"telemetry": {}},
                    "telemetry": {
                        "source": "rems.source",
--- a/example/plotOptions/bundle.js
+++ b/example/plotOptions/bundle.js
@@ -81,7 +81,7 @@ define([
                {
                    "key": "plot",
                    "name": "Example Telemetry Plot",
-                    "cssclass": "icon-telemetry-panel",
+                    "cssClass": "icon-telemetry-panel",
                    "description": "For development use. A plot for displaying telemetry.",
                    "priority": 10,
                    "delegates": [
@@ -129,7 +129,7 @@ define([
                        {
                            "name": "Period",
                            "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
+                            "cssClass": "l-input-sm l-numeric",
                            "key": "period",
                            "required": true,
                            "property": [
--- a/example/profiling/src/DigestIndicator.js
+++ b/example/profiling/src/DigestIndicator.js
@@ -63,7 +63,7 @@ define(
                 * Get the CSS class that defines the icon
                 * to display in this indicator. This will appear
                 * as a dataflow icon.
-                 * @returns {string} the cssclass of the dataflow icon
+                 * @returns {string} the cssClass of the dataflow icon
                 */
                getCssClass: function () {
                    return "icon-connectivity";
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -69,6 +69,11 @@ var gulp = require('gulp'),
        }
    };

+if (process.env.NODE_ENV === 'development') {
+    options.requirejsOptimize.optimize = 'none';
+}
+
+
 gulp.task('scripts', function () {
    var requirejsOptimize = require('gulp-requirejs-optimize');
    var replace = require('gulp-replace-task');
--- a/index.html
+++ b/index.html
@@ -28,17 +28,43 @@
    <script src="bower_components/requirejs/require.js">
    </script>
    <script>
-        require(['openmct'], function (openmct) {
+        require([
+            'openmct',
+            'src/plugins/conductor/plugin'
+        ], function (
+            openmct,
+            ConductorService
+        ) {
            [
                'example/imagery',
-                'example/eventGenerator',
-                'example/generator'
+                'example/eventGenerator'
            ].forEach(
                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
            );
-            openmct.install(openmct.plugins.myItems);
-            openmct.install(openmct.plugins.localStorage);
-            openmct.install(openmct.plugins.espresso);
+            openmct.install(openmct.plugins.MyItems());
+            openmct.install(openmct.plugins.LocalStorage());
+            openmct.install(openmct.plugins.Espresso());
+            openmct.install(openmct.plugins.Generator());
+            openmct.install(openmct.plugins.UTCTimeSystem());
+
+            /*
+                Will be installed by default...somehow
+             */
+            openmct.install(ConductorService());
+
+            var ONE_MINUTE = 60 * 1000;
+            var ONE_YEAR = 365 * 24 * 60 * 60 * 1000;
+
+            // Will also provide a default configuration based on enabled time
+            // systems and tick sources.
+            openmct.install(openmct.plugins.Conductor({
+                menuOptions: [
+                    // Default 'fixed' configuration shows last 30 mins of data. May also provide specific bounds.
+                    {timeSystems: ['utc'], defaultOffsets: {start: 30 * ONE_MINUTE, end: 0}, zoomOutLimit: ONE_YEAR, zoomInLimit: ONE_MINUTE},
+                    {tickSource: 'localClock', timeSystems: ['utc'], defaultOffsets: {start: 15 * ONE_MINUTE, end: 0}, zoomOut: ONE_YEAR, zoomIn: ONE_MINUTE},
+                    {tickSource: 'latestAvailable', timeSystems: ['utc'], defaultOffsets: {start: 15 * 60 * 1000, end: 0}}
+                ]
+            }));
            openmct.start();
        });
    </script>
--- a/openmct.js
+++ b/openmct.js
@@ -84,5 +84,11 @@ define([
        return new Main().run(defaultRegistry);
    });

+    // For now, install conductor by default
+    openmct.install(openmct.plugins.Conductor({
+        showConductor: false
+    }));
+
+
    return openmct;
 });
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -226,7 +226,7 @@ define([
                        "$window"
                    ],
                    "group": "windowing",
-                    "cssclass": "icon-new-window",
+                    "cssClass": "icon-new-window",
                    "priority": "preferred"
                },
                {
@@ -241,7 +241,7 @@ define([
                {
                    "key": "items",
                    "name": "Items",
-                    "cssclass": "icon-thumbs-strip",
+                    "cssClass": "icon-thumbs-strip",
                    "description": "Grid of available items",
                    "template": itemsTemplate,
                    "uses": [
--- a/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
+++ b/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
@@ -43,24 +43,24 @@ define([], function () {
            return context.getParent();
        }

-        function isOrphan(domainObject) {
-            var parent = getParent(domainObject),
-                composition = parent.getModel().composition,
-                id = domainObject.getId();
-            return !composition || (composition.indexOf(id) === -1);
-        }
-
-        function navigateToParent(domainObject) {
+        function preventOrphanNavigation(domainObject) {
            var parent = getParent(domainObject);
-            return parent.getCapability('action').perform('navigate');
+            parent.useCapability('composition')
+                .then(function (composees) {
+                    var isOrphan = composees.every(function (c) {
+                        return c.getId() !== domainObject.getId();
+                    });
+                    if (isOrphan) {
+                        parent.getCapability('action').perform('navigate');
+                    }
+                });
        }

        function checkNavigation() {
            var navigatedObject = navigationService.getNavigation();
-            if (navigatedObject.hasCapability('context') &&
-                isOrphan(navigatedObject)) {
+            if (navigatedObject.hasCapability('context')) {
                if (!navigatedObject.getCapability('editor').isEditContextRoot()) {
-                    navigateToParent(navigatedObject);
+                    preventOrphanNavigation(navigatedObject);
                }
            }
        }
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@@ -46,12 +46,12 @@ define(
        };

        FullscreenAction.prototype.getMetadata = function () {
-            // We override getMetadata, because the icon cssclass and
+            // We override getMetadata, because the icon cssClass and
            // description need to be determined at run-time
            // based on whether or not we are currently
            // full screen.
            var metadata = Object.create(FullscreenAction);
-            metadata.cssclass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
+            metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
            metadata.description = screenfull.isFullscreen ?
                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
            metadata.group = "windowing";
--- a/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
+++ b/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
@@ -33,7 +33,7 @@ define([
            mockContext,
            mockActionCapability,
            mockEditor,
-            testParentModel,
+            testParentComposition,
            testId,
            mockThrottledFns;

@@ -41,7 +41,6 @@ define([
            testId = 'some-identifier';

            mockThrottledFns = [];
-            testParentModel = {};

            mockTopic = jasmine.createSpy('topic');
            mockThrottle = jasmine.createSpy('throttle');
@@ -55,14 +54,12 @@ define([
            mockDomainObject = jasmine.createSpyObj('domainObject', [
                'getId',
                'getCapability',
-                'getModel',
                'hasCapability'
            ]);
            mockParentObject = jasmine.createSpyObj('domainObject', [
                'getId',
                'getCapability',
-                'getModel',
-                'hasCapability'
+                'useCapability'
            ]);
            mockContext = jasmine.createSpyObj('context', ['getParent']);
            mockActionCapability = jasmine.createSpyObj('action', ['perform']);
@@ -75,9 +72,7 @@ define([
                mockThrottledFns.push(mockThrottledFn);
                return mockThrottledFn;
            });
-            mockTopic.andCallFake(function (k) {
-                return k === 'mutation' && mockMutationTopic;
-            });
+            mockTopic.andReturn(mockMutationTopic);
            mockDomainObject.getId.andReturn(testId);
            mockDomainObject.getCapability.andCallFake(function (c) {
                return {
@@ -88,12 +83,13 @@ define([
            mockDomainObject.hasCapability.andCallFake(function (c) {
                return !!mockDomainObject.getCapability(c);
            });
-            mockParentObject.getModel.andReturn(testParentModel);
            mockParentObject.getCapability.andCallFake(function (c) {
                return {
                    action: mockActionCapability
                }[c];
            });
+            testParentComposition = [];
+            mockParentObject.useCapability.andReturn(Promise.resolve(testParentComposition));
            mockContext.getParent.andReturn(mockParentObject);
            mockNavigationService.getNavigation.andReturn(mockDomainObject);
            mockEditor.isEditContextRoot.andReturn(false);
@@ -126,7 +122,9 @@ define([
            var prefix = isOrphan ? "" : "non-";
            describe("for " + prefix + "orphan objects", function () {
                beforeEach(function () {
-                    testParentModel.composition = isOrphan ? [] : [testId];
+                    if (!isOrphan) {
+                        testParentComposition.push(mockDomainObject);
+                    }
                });

                [false, true].forEach(function (isEditRoot) {
@@ -136,13 +134,31 @@ define([
                    function itNavigatesAsExpected() {
                        if (isOrphan && !isEditRoot) {
                            it("navigates to the parent", function () {
-                                expect(mockActionCapability.perform)
-                                    .toHaveBeenCalledWith('navigate');
+                                var done = false;
+                                waitsFor(function () {
+                                    return done;
+                                });
+                                setTimeout(function () {
+                                    done = true;
+                                }, 5);
+                                runs(function () {
+                                    expect(mockActionCapability.perform)
+                                        .toHaveBeenCalledWith('navigate');
+                                });
                            });
                        } else {
                            it("does nothing", function () {
-                                expect(mockActionCapability.perform)
-                                    .not.toHaveBeenCalled();
+                                var done = false;
+                                waitsFor(function () {
+                                    return done;
+                                });
+                                setTimeout(function () {
+                                    done = true;
+                                }, 5);
+                                runs(function () {
+                                    expect(mockActionCapability.perform)
+                                        .not.toHaveBeenCalled();
+                                });
                            });
                        }
                    }
@@ -157,7 +173,6 @@ define([
                                mockNavigationService.addListener.mostRecentCall
                                    .args[0](mockDomainObject);
                            });
-
                            itNavigatesAsExpected();
                        });

--- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
@@ -51,7 +51,7 @@ define(
            });

            it("provides displayable metadata", function () {
-                expect(action.getMetadata().cssclass).toBeDefined();
+                expect(action.getMetadata().cssClass).toBeDefined();
            });

        });
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -163,7 +163,7 @@ define([
                    ],
                    "description": "Edit",
                    "category": "view-control",
-                    "cssclass": "major icon-pencil"
+                    "cssClass": "major icon-pencil"
                },
                {
                    "key": "properties",
@@ -172,7 +172,7 @@ define([
                        "view-control"
                    ],
                    "implementation": PropertiesAction,
-                    "cssclass": "major icon-pencil",
+                    "cssClass": "major icon-pencil",
                    "name": "Edit Properties...",
                    "description": "Edit properties of this object.",
                    "depends": [
@@ -183,7 +183,7 @@ define([
                    "key": "remove",
                    "category": "contextual",
                    "implementation": RemoveAction,
-                    "cssclass": "icon-trash",
+                    "cssClass": "icon-trash",
                    "name": "Remove",
                    "description": "Remove this object from its containing object.",
                    "depends": [
@@ -195,7 +195,7 @@ define([
                    "category": "save",
                    "implementation": SaveAndStopEditingAction,
                    "name": "Save and Finish Editing",
-                    "cssclass": "icon-save labeled",
+                    "cssClass": "icon-save labeled",
                    "description": "Save changes made to these objects.",
                    "depends": [
                        "dialogService",
@@ -207,7 +207,7 @@ define([
                    "category": "save",
                    "implementation": SaveAction,
                    "name": "Save and Continue Editing",
-                    "cssclass": "icon-save labeled",
+                    "cssClass": "icon-save labeled",
                    "description": "Save changes made to these objects.",
                    "depends": [
                        "dialogService",
@@ -219,7 +219,7 @@ define([
                    "category": "save",
                    "implementation": SaveAsAction,
                    "name": "Save As...",
-                    "cssclass": "icon-save labeled",
+                    "cssClass": "icon-save labeled",
                    "description": "Save changes made to these objects.",
                    "depends": [
                        "$injector",
@@ -237,7 +237,7 @@ define([
                    // Because we use the name as label for edit buttons and mct-control buttons need
                    // the label to be set to undefined in order to not apply the labeled CSS rule.
                    "name": undefined,
-                    "cssclass": "icon-x no-label",
+                    "cssClass": "icon-x no-label",
                    "description": "Discard changes made to these objects.",
                    "depends": []
                }
--- a/platform/commonUI/edit/res/templates/create/create-menu.html
+++ b/platform/commonUI/edit/res/templates/create/create-menu.html
@@ -25,14 +25,14 @@
            <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
                <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
                   ng-mouseleave="representation.activeMetadata = undefined"
-                   class="menu-item-a {{ createAction.getMetadata().cssclass }}">
+                   class="menu-item-a {{ createAction.getMetadata().cssClass }}">
                    {{createAction.getMetadata().name}}
                </a>
            </li>
        </ul>
    </div>
    <div class="pane right menu-item-description">
-        <div class="desc-area icon {{ representation.activeMetadata.cssclass }}"></div>
+        <div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
        <div class="desc-area title">
            {{representation.activeMetadata.name}}
        </div>
--- a/platform/commonUI/edit/res/templates/edit-action-buttons.html
+++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html
@@ -26,7 +26,7 @@
                     structure="{
                        text: saveActions[0].getMetadata().name,
                        click: actionPerformer(saveActions[0]),
-                        cssclass: 'major ' + saveActions[0].getMetadata().cssclass
+                        cssClass: 'major ' + saveActions[0].getMetadata().cssClass
                     }">
        </mct-control>
    </span>
@@ -36,7 +36,7 @@
                     structure="{
                        options: saveActionsAsMenuOptions,
                        click: saveActionMenuClickHandler,
-                        cssclass: 'btn-bar right icon-save no-label major'
+                        cssClass: 'btn-bar right icon-save no-label major'
                     }">
        </mct-control>
    </span>
@@ -46,7 +46,7 @@
                     structure="{
                        text: currentAction.getMetadata().name,
                        click: actionPerformer(currentAction),
-                        cssclass: currentAction.getMetadata().cssclass
+                        cssClass: currentAction.getMetadata().cssClass
                     }">
        </mct-control>
    </span>
--- a/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
@@ -48,9 +48,10 @@ define(
         * Decorate PersistenceCapability to queue persistence calls when a
         * transaction is in progress.
         */
-        TransactionCapabilityDecorator.prototype.getCapabilities = function (model) {
+        TransactionCapabilityDecorator.prototype.getCapabilities = function () {
            var self = this,
-                capabilities = this.capabilityService.getCapabilities(model),
+                capabilities = this.capabilityService.getCapabilities
+                    .apply(this.capabilityService, arguments),
                persistenceCapability = capabilities.persistence;

            capabilities.persistence = function (domainObject) {
--- a/platform/commonUI/edit/src/controllers/EditActionController.js
+++ b/platform/commonUI/edit/src/controllers/EditActionController.js
@@ -41,7 +41,7 @@ define(
                return {
                    key: action,
                    name: action.getMetadata().name,
-                    cssclass: action.getMetadata().cssclass
+                    cssClass: action.getMetadata().cssClass
                };
            }

--- a/platform/commonUI/edit/src/creation/AddAction.js
+++ b/platform/commonUI/edit/src/creation/AddAction.js
@@ -51,7 +51,7 @@ define(
        function AddAction(type, parent, context, $q, dialogService, policyService) {
            this.metadata = {
                key: 'add',
-                cssclass: type.getCssClass(),
+                cssClass: type.getCssClass(),
                name: type.getName(),
                type: type.getKey(),
                description: type.getDescription(),
--- a/platform/commonUI/edit/src/creation/AddActionProvider.js
+++ b/platform/commonUI/edit/src/creation/AddActionProvider.js
@@ -54,8 +54,7 @@ define(
        AddActionProvider.prototype.getActions = function (actionContext) {
            var context = actionContext || {},
                key = context.key,
-                destination = context.domainObject,
-                self = this;
+                destination = context.domainObject;

            // We only provide Add actions, and we need a
            // domain object to serve as the container for the
@@ -66,18 +65,16 @@ define(
            }

            // Introduce one create action per type
-            return this.typeService.listTypes().filter(function (type) {
-                return self.policyService.allow("creation", type) && self.policyService.allow("composition", destination.getCapability('type'), type);
-            }).map(function (type) {
+            return ['timeline', 'activity'].map(function (type) {
                return new AddAction(
-                    type,
+                    this.typeService.getType(type),
                    destination,
                    context,
-                    self.$q,
-                    self.dialogService,
-                    self.policyService
+                    this.$q,
+                    this.dialogService,
+                    this.policyService
                );
-            });
+            }, this);
        };

        return AddActionProvider;
--- a/platform/commonUI/edit/src/creation/CreateAction.js
+++ b/platform/commonUI/edit/src/creation/CreateAction.js
@@ -47,7 +47,7 @@ define(
        function CreateAction(type, parent, context) {
            this.metadata = {
                key: 'create',
-                cssclass: type.getCssClass(),
+                cssClass: type.getCssClass(),
                name: type.getName(),
                type: type.getKey(),
                description: type.getDescription(),
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@@ -56,16 +56,16 @@ define(
         */
        CreateWizard.prototype.getFormStructure = function (includeLocation) {
            var sections = [],
-                type = this.type,
+                domainObject = this.domainObject,
                policyService = this.policyService;

-            function validateLocation(locatingObject) {
-                var locatingType = locatingObject &&
-                    locatingObject.getCapability('type');
-                return locatingType && policyService.allow(
+            function validateLocation(parent) {
+                var parentType = parent &&
+                    parent.getCapability('type');
+                return parentType && policyService.allow(
                    "composition",
-                    locatingType,
-                    type
+                    parentType,
+                    domainObject
                );
            }

@@ -91,7 +91,7 @@ define(
            if (includeLocation) {
                sections.push({
                    name: 'Location',
-                    cssclass: "grows",
+                    cssClass: "grows",
                    rows: [{
                        name: "Save In",
                        control: "locator",
--- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
+++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
@@ -28,7 +28,7 @@ define(
        describe("The Edit Action controller", function () {
            var mockSaveActionMetadata = {
                name: "mocked-save-action",
-                cssclass: "mocked-save-action-css"
+                cssClass: "mocked-save-action-css"
            };

            function fakeGetActions(actionContext) {
@@ -86,7 +86,7 @@ define(
                expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]);
                menuOptions.forEach(function (option) {
                    expect(option.name).toEqual(mockSaveActionMetadata.name);
-                    expect(option.cssclass).toEqual(mockSaveActionMetadata.cssclass);
+                    expect(option.cssClass).toEqual(mockSaveActionMetadata.cssClass);
                });
            });

--- a/platform/commonUI/edit/test/creation/AddActionProviderSpec.js
+++ b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js
@@ -31,9 +31,7 @@ define(
            var mockTypeService,
                mockDialogService,
                mockPolicyService,
-                mockCreationPolicy,
-                mockCompositionPolicy,
-                mockPolicyMap = {},
+                mockTypeMap,
                mockTypes,
                mockDomainObject,
                mockQ,
@@ -55,49 +53,33 @@ define(
                );
                mockType.hasFeature.andReturn(true);
                mockType.getName.andReturn(name);
+                mockType.getKey.andReturn(name);
                return mockType;
            }

            beforeEach(function () {
                mockTypeService = jasmine.createSpyObj(
                    "typeService",
-                    ["listTypes"]
-                );
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    ["getUserInput"]
-                );
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    ["allow"]
+                    ["getType"]
                );
+                mockDialogService = {};
+                mockPolicyService = {};
+                mockDomainObject = {};

-                mockDomainObject = jasmine.createSpyObj(
-                    "domainObject",
-                    ["getCapability"]
-                );
-
-                //Mocking getCapability because AddActionProvider uses the
-                // type capability of the destination object.
-                mockDomainObject.getCapability.andReturn({});
-
-                mockTypes = ["A", "B", "C"].map(createMockType);
+                mockTypes = [
+                    "timeline",
+                    "activity",
+                    "other"
+                ].map(createMockType);
+                mockTypeMap = {};

                mockTypes.forEach(function (type) {
-                    mockPolicyMap[type.getName()] = true;
+                    mockTypeMap[type.getKey()] = type;
                });

-                mockCreationPolicy = function (type) {
-                    return mockPolicyMap[type.getName()];
-                };
-
-                mockCompositionPolicy = function () {
-                    return true;
-                };
-
-                mockPolicyService.allow.andReturn(true);
-
-                mockTypeService.listTypes.andReturn(mockTypes);
+                mockTypeService.getType.andCallFake(function (key) {
+                    return mockTypeMap[key];
+                });

                provider = new AddActionProvider(
                    mockQ,
@@ -107,29 +89,16 @@ define(
                );
            });

-            it("checks for creatability", function () {
-                provider.getActions({
+            it("provides actions for timeline and activity", function () {
+                var actions = provider.getActions({
                    key: "add",
                    domainObject: mockDomainObject
                });
+                expect(actions.length).toBe(2);
+                expect(actions[0].metadata.type).toBe('timeline');
+                expect(actions[1].metadata.type).toBe('activity');
+
                // Make sure it was creation which was used to check
-                expect(mockPolicyService.allow)
-                    .toHaveBeenCalledWith("creation", mockTypes[0]);
-            });
-
-            it("checks for composability of type", function () {
-                provider.getActions({
-                    key: "add",
-                    domainObject: mockDomainObject
-                });
-
-                expect(mockPolicyService.allow).toHaveBeenCalledWith(
-                    "composition",
-                    jasmine.any(Object),
-                    jasmine.any(Object)
-                );
-
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('type');
            });
        });
    }
--- a/platform/commonUI/edit/test/creation/CreateActionSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js
@@ -138,7 +138,7 @@ define(

                expect(metadata.name).toEqual("Test");
                expect(metadata.description).toEqual("a test type");
-                expect(metadata.cssclass).toEqual("icon-telemetry");
+                expect(metadata.cssClass).toEqual("icon-telemetry");
            });

            describe("the perform function", function () {
--- a/platform/commonUI/edit/test/creation/CreateWizardSpec.js
+++ b/platform/commonUI/edit/test/creation/CreateWizardSpec.js
@@ -175,7 +175,7 @@ define(
                expect(mockPolicyService.allow).toHaveBeenCalledWith(
                    'composition',
                    mockOtherType,
-                    mockType
+                    mockDomainObject
                );
            });

--- a/platform/commonUI/formats/bundle.js
+++ b/platform/commonUI/formats/bundle.js
@@ -42,6 +42,7 @@ define([
                    "type": "provider",
                    "implementation": FormatProvider,
                    "depends": [
+                        "openmct",
                        "formats[]"
                    ]
                }
--- a/platform/commonUI/formats/src/FormatProvider.js
+++ b/platform/commonUI/formats/src/FormatProvider.js
@@ -89,22 +89,21 @@ define([
     * @param {Array.<function(new : Format)>} format constructors,
     *        from the `formats` extension category.
     */
-    function FormatProvider(formats) {
-        var formatMap = {};
+    function FormatProvider(openmct, formats) {
+        this.telemetryAPI = openmct.telemetry;

        function addToMap(Format) {
            var key = Format.key;
-            if (key && !formatMap[key]) {
-                formatMap[key] = new Format();
+            if (key && !openmct.telemetry.getFormat(key)) {
+                openmct.telemetry.addFormat(new Format());
            }
        }

        formats.forEach(addToMap);
-        this.formatMap = formatMap;
    }

    FormatProvider.prototype.getFormat = function (key) {
-        var format = this.formatMap[key];
+        var format = this.telemetryAPI.getFormat(key);
        if (!format) {
            throw new Error("FormatProvider: No format found for " + key);
        }
--- a/platform/commonUI/formats/src/UTCTimeFormat.js
+++ b/platform/commonUI/formats/src/UTCTimeFormat.js
@@ -64,7 +64,7 @@ define([
         *
         * Licensed
         */
-        return [
+        var format = [
            [".SSS", function (m) {
                return m.milliseconds();
            }],
@@ -93,62 +93,30 @@ define([
        ].filter(function (row) {
            return row[1](momentified);
        })[0][0];
+
+        if (format !== undefined) {
+            return moment.utc(value).format(scaledFormat);
+        }
    }

    /**
-     * Returns a description of the current range of the time conductor's
-     * bounds.
-     * @param timeRange
-     * @returns {*}
+     * @param {number} value The value to format.
+     * @param {number} [minValue] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. Specifies the smallest number on the scale.
+     * @param {number} [maxValue] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. Specifies the largest number on the scale
+     * @param {number} [count] Contextual information for scaled formatting used in linear scales such as conductor
+     * and plot axes. The number of labels on the scale.
+     * @returns {string} the formatted date(s). If multiple values were requested, then an array of
+     * formatted values will be returned. Where a value could not be formatted, `undefined` will be returned at its position
+     * in the array.
     */
-    UTCTimeFormat.prototype.timeUnits = function (timeRange) {
-        var momentified = moment.duration(timeRange);
-
-        return [
-            ["Decades", function (r) {
-                return r.years() > 15;
-            }],
-            ["Years", function (r) {
-                return r.years() > 1;
-            }],
-            ["Months", function (r) {
-                return r.years() === 1 || r.months() > 1;
-            }],
-            ["Days", function (r) {
-                return r.months() === 1 || r.days() > 1;
-            }],
-            ["Hours", function (r) {
-                return r.days() === 1 || r.hours() > 1;
-            }],
-            ["Minutes", function (r) {
-                return r.hours() === 1 || r.minutes() > 1;
-            }],
-            ["Seconds", function (r) {
-                return r.minutes() === 1 || r.seconds() > 1;
-            }],
-            ["Milliseconds", function (r) {
-                return true;
-            }]
-        ].filter(function (row) {
-            return row[1](momentified);
-        })[0][0];
-    };
-
-    /**
-     *
-     * @param value
-     * @param {Scale} [scale] Optionally provides context to the
-     * format request, allowing for scale-appropriate formatting.
-     * @returns {string} the formatted date
-     */
-    UTCTimeFormat.prototype.format = function (value, scale) {
-        if (scale !== undefined) {
-            var scaledFormat = getScaledFormat(value, scale);
-            if (scaledFormat) {
-                return moment.utc(value).format(scaledFormat);
-            }
+    UTCTimeFormat.prototype.format = function (value, minValue, maxValue, count) {
+        if (arguments.length > 1) {
+            return values.map(getScaledFormat);
+        } else {
+            return moment.utc(value).format(DATE_FORMAT) + "Z";
        }
-        return moment.utc(value).format(DATE_FORMAT) + "Z";
    };

    UTCTimeFormat.prototype.parse = function (text) {
--- a/platform/commonUI/general/res/sass/startup-base.scss
+++ b/platform/commonUI/general/res/sass/startup-base.scss
@@ -19,6 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+$output-bourbon-deprecation-warnings: false;
@import "bourbon";
@import "logo-and-bg";

--- a/platform/commonUI/general/res/templates/controls/action-button.html
+++ b/platform/commonUI/general/res/templates/controls/action-button.html
@@ -19,7 +19,7 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<a class="s-button key-{{parameters.action.getMetadata().key}} {{parameters.action.getMetadata().cssclass}}"
+<a class="s-button key-{{parameters.action.getMetadata().key}} {{parameters.action.getMetadata().cssClass}}"
   ng-class="{ labeled: parameters.labeled }"
   title="{{parameters.action.getMetadata().description}}"
   ng-click="parameters.action.perform()">
--- a/platform/commonUI/general/res/templates/controls/switcher.html
+++ b/platform/commonUI/general/res/templates/controls/switcher.html
@@ -20,7 +20,7 @@
 at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ViewSwitcherController">
-    <div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssclass}}"
+    <div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssClass}}"
 	    ng-if="view.length > 1"
 	    ng-controller="ClickAwayController as toggle">

@@ -33,7 +33,7 @@
            <ul>
                <li ng-repeat="option in view"
                    ng-click="ngModel.selected = option; toggle.setState(false)"
-                    class="{{option.cssclass}}">
+                    class="{{option.cssClass}}">
                    {{option.name}}
                </li>
            </ul>
--- a/platform/commonUI/general/res/templates/menu/context-menu.html
+++ b/platform/commonUI/general/res/templates/menu/context-menu.html
@@ -25,7 +25,7 @@
            <li ng-repeat="menuAction in menuActions"
                ng-click="menuAction.perform()"
                title="{{menuAction.getMetadata().description}}"
-                class="{{menuAction.getMetadata().cssclass}}">
+                class="{{menuAction.getMetadata().cssClass}}">
                {{menuAction.getMetadata().name}}
            </li>
        </ul>
--- a/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss
+++ b/platform/commonUI/themes/espresso/res/sass/theme-espresso.scss
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+$output-bourbon-deprecation-warnings: false;
@import "bourbon";

@import "../../../../general/res/sass/_mixins";
--- a/platform/commonUI/themes/snow/res/sass/theme-snow.scss
+++ b/platform/commonUI/themes/snow/res/sass/theme-snow.scss
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+$output-bourbon-deprecation-warnings: false;
@import "bourbon";

@import "../../../../general/res/sass/_mixins";
--- a/platform/containment/bundle.js
+++ b/platform/containment/bundle.js
@@ -40,9 +40,6 @@ define([
                {
                    "category": "composition",
                    "implementation": CompositionPolicy,
-                    "depends": [
-                        "$injector"
-                    ],
                    "message": "Objects of this type cannot contain objects of that type."
                },
                {
--- a/platform/containment/src/CapabilityTable.js
+++ b/platform/containment/src/CapabilityTable.js
@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-
-define(
-    [],
-    function () {
-
-        /**
-         * Build a table indicating which types are expected to expose
-         * which capabilities. This supports composition policy (rules
-         * for which objects can contain which other objects) which
-         * sometimes is determined based on the presence of capabilities.
-         * @constructor
-         * @memberof platform/containment
-         */
-        function CapabilityTable(typeService, capabilityService) {
-            var self = this;
-
-            // Build an initial model for a type
-            function buildModel(type) {
-                var model = Object.create(type.getInitialModel() || {});
-                model.type = type.getKey();
-                return model;
-            }
-
-            // Get capabilities expected for this type
-            function getCapabilities(type) {
-                return capabilityService.getCapabilities(buildModel(type));
-            }
-
-            // Populate the lookup table for this type's capabilities
-            function addToTable(type) {
-                var typeKey = type.getKey();
-                Object.keys(getCapabilities(type)).forEach(function (key) {
-                    self.table[key] = self.table[key] || {};
-                    self.table[key][typeKey] = true;
-                });
-            }
-
-            // Build the table
-            this.table = {};
-            (typeService.listTypes() || []).forEach(addToTable);
-        }
-
-        /**
-         * Check if a type is expected to expose a specific capability.
-         * @param {string} typeKey the type identifier
-         * @param {string} capabilityKey the capability identifier
-         * @returns {boolean} true if expected to be exposed
-         */
-        CapabilityTable.prototype.hasCapability = function (typeKey, capabilityKey) {
-            return (this.table[capabilityKey] || {})[typeKey];
-        };
-
-        return CapabilityTable;
-    }
-);
--- a/platform/containment/src/ComposeActionPolicy.js
+++ b/platform/containment/src/ComposeActionPolicy.js
@@ -45,9 +45,7 @@ define(
        ComposeActionPolicy.prototype.allowComposition = function (containerObject, selectedObject) {
            // Get the object types involved in the compose action
            var containerType = containerObject &&
-                    containerObject.getCapability('type'),
-                selectedType = selectedObject &&
-                    selectedObject.getCapability('type');
+                containerObject.getCapability('type');

            // Get a reference to the policy service if needed...
            this.policyService = this.policyService || this.getPolicyService();
@@ -57,7 +55,7 @@ define(
                this.policyService.allow(
                    'composition',
                    containerType,
-                    selectedType
+                    selectedObject
                );
        };

--- a/platform/containment/src/CompositionPolicy.js
+++ b/platform/containment/src/CompositionPolicy.js
@@ -26,8 +26,8 @@
 * @namespace platform/containment
 */
 define(
-    ['./ContainmentTable'],
-    function (ContainmentTable) {
+    [],
+    function () {

        /**
         * Defines composition policy as driven by type metadata.
@@ -35,21 +35,33 @@ define(
         * @memberof platform/containment
         * @implements {Policy.<Type, Type>}
         */
-        function CompositionPolicy($injector) {
-            // We're really just wrapping the containment table and rephrasing
-            // it as a policy decision.
-            var table;
-
-            this.getTable = function () {
-                return (table = table || new ContainmentTable(
-                    $injector.get('typeService'),
-                    $injector.get('capabilityService')
-                ));
-            };
+        function CompositionPolicy() {
        }

-        CompositionPolicy.prototype.allow = function (candidate, context) {
-            return this.getTable().canContain(candidate, context);
+        CompositionPolicy.prototype.allow = function (parentType, child) {
+            var parentDef = parentType.getDefinition();
+
+            // A parent without containment rules can contain anything.
+            if (!parentDef.contains) {
+                return true;
+            }
+
+            // If any containment rule matches context type, the candidate
+            // can contain this type.
+            return parentDef.contains.some(function (c) {
+                // Simple containment rules are supported typeKeys.
+                if (typeof c === 'string') {
+                    return c === child.getCapability('type').getKey();
+                }
+                // More complicated rules require context to have all specified
+                // capabilities.
+                if (!Array.isArray(c.has)) {
+                    c.has = [c.has];
+                }
+                return c.has.every(function (capability) {
+                    return child.hasCapability(capability);
+                });
+            });
        };

        return CompositionPolicy;
--- a/platform/containment/src/ContainmentTable.js
+++ b/platform/containment/src/ContainmentTable.js
@@ -1,116 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ['./CapabilityTable'],
-    function (CapabilityTable) {
-
-        // Symbolic value for the type table for cases when any type
-        // is allowed to be contained.
-        var ANY = true;
-
-        /**
-         * Supports composition policy by maintaining a table of
-         * domain object types, to determine if they can contain
-         * other domain object types. This is determined at application
-         * start time (plug-in support means this cannot be determined
-         * prior to that, but we don't want to redo these calculations
-         * every time policy is checked.)
-         * @constructor
-         * @memberof platform/containment
-         */
-        function ContainmentTable(typeService, capabilityService) {
-            var self = this,
-                types = typeService.listTypes(),
-                capabilityTable = new CapabilityTable(typeService, capabilityService);
-
-            // Add types which have all these capabilities to the set
-            // of allowed types
-            function addToSetByCapability(set, has) {
-                has = Array.isArray(has) ? has : [has];
-                types.forEach(function (type) {
-                    var typeKey = type.getKey();
-                    set[typeKey] = has.map(function (capabilityKey) {
-                        return capabilityTable.hasCapability(typeKey, capabilityKey);
-                    }).reduce(function (a, b) {
-                        return a && b;
-                    }, true);
-                });
-            }
-
-            // Add this type (or type description) to the set of allowed types
-            function addToSet(set, type) {
-                // Is this a simple case of an explicit type identifier?
-                if (typeof type === 'string') {
-                    // If so, add it to the set of allowed types
-                    set[type] = true;
-                } else {
-                    // Otherwise, populate that set based on capabilities
-                    addToSetByCapability(set, (type || {}).has || []);
-                }
-            }
-
-            // Add to the lookup table for this type
-            function addToTable(type) {
-                var key = type.getKey(),
-                    definition = type.getDefinition() || {},
-                    contains = definition.contains;
-
-                // Check for defined containment restrictions
-                if (contains === undefined) {
-                    // If not, accept anything
-                    self.table[key] = ANY;
-                } else {
-                    // Start with an empty set...
-                    self.table[key] = {};
-                    // ...cast accepted types to array if necessary...
-                    contains = Array.isArray(contains) ? contains : [contains];
-                    // ...and add all containment rules to that set
-                    contains.forEach(function (c) {
-                        addToSet(self.table[key], c);
-                    });
-                }
-            }
-
-            // Build the table
-            this.table = {};
-            types.forEach(addToTable);
-        }
-
-        /**
-         * Check if domain objects of one type can contain domain
-         * objects of another type.
-         * @param {Type} containerType type of the containing domain object
-         * @param {Type} containedType type of the domain object
-         *        to be contained
-         * @returns {boolean} true if allowable
-         */
-        ContainmentTable.prototype.canContain = function (containerType, containedType) {
-            var set = this.table[containerType.getKey()] || {};
-            // Recognize either the symbolic value for "can contain
-            // anything", or lookup the specific type from the set.
-            return (set === ANY) || set[containedType.getKey()];
-        };
-
-        return ContainmentTable;
-    }
-);
--- a/platform/containment/test/CapabilityTableSpec.js
+++ b/platform/containment/test/CapabilityTableSpec.js
@@ -1,85 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/CapabilityTable"],
-    function (CapabilityTable) {
-        describe("Composition policy's capability table", function () {
-            var mockTypeService,
-                mockCapabilityService,
-                mockTypes,
-                table;
-
-            beforeEach(function () {
-                mockTypeService = jasmine.createSpyObj(
-                    'typeService',
-                    ['listTypes']
-                );
-                mockCapabilityService = jasmine.createSpyObj(
-                    'capabilityService',
-                    ['getCapabilities']
-                );
-                // Both types can only contain b, let's say
-                mockTypes = ['a', 'b'].map(function (type) {
-                    var mockType = jasmine.createSpyObj(
-                        'type-' + type,
-                        ['getKey', 'getDefinition', 'getInitialModel']
-                    );
-                    mockType.getKey.andReturn(type);
-                    // Return a model to drive apparent capabilities
-                    mockType.getInitialModel.andReturn({ id: type });
-                    return mockType;
-                });
-
-                mockTypeService.listTypes.andReturn(mockTypes);
-                mockCapabilityService.getCapabilities.andCallFake(function (model) {
-                    var capabilities = {};
-                    capabilities[model.id + '-capability'] = true;
-                    return capabilities;
-                });
-
-                table = new CapabilityTable(
-                    mockTypeService,
-                    mockCapabilityService
-                );
-            });
-
-            it("provides for lookup of capabilities by type", function () {
-                // Based on initial model, should report the presence
-                // of particular capabilities - suffixed above with -capability
-                expect(table.hasCapability('a', 'a-capability'))
-                    .toBeTruthy();
-                expect(table.hasCapability('a', 'b-capability'))
-                    .toBeFalsy();
-                expect(table.hasCapability('a', 'c-capability'))
-                    .toBeFalsy();
-                expect(table.hasCapability('b', 'a-capability'))
-                    .toBeFalsy();
-                expect(table.hasCapability('b', 'b-capability'))
-                    .toBeTruthy();
-                expect(table.hasCapability('b', 'c-capability'))
-                    .toBeFalsy();
-            });
-
-        });
-    }
-);
--- a/platform/containment/test/ComposeActionPolicySpec.js
+++ b/platform/containment/test/ComposeActionPolicySpec.js
@@ -79,7 +79,7 @@ define(
                expect(mockPolicyService.allow).toHaveBeenCalledWith(
                    'composition',
                    mockTypes[0],
-                    mockTypes[1]
+                    mockDomainObjects[1]
                );
            });

--- a/platform/containment/test/CompositionPolicySpec.js
+++ b/platform/containment/test/CompositionPolicySpec.js
@@ -24,60 +24,94 @@ define(
    ["../src/CompositionPolicy"],
    function (CompositionPolicy) {
        describe("Composition policy", function () {
-            var mockInjector,
-                mockTypeService,
-                mockCapabilityService,
-                mockTypes,
+            var typeA,
+                typeB,
+                typeC,
+                mockChildObject,
                policy;

            beforeEach(function () {
-                mockInjector = jasmine.createSpyObj('$injector', ['get']);
-                mockTypeService = jasmine.createSpyObj(
-                    'typeService',
-                    ['listTypes']
+                typeA = jasmine.createSpyObj(
+                    'type A-- the particular kind',
+                    ['getKey', 'getDefinition']
                );
-                mockCapabilityService = jasmine.createSpyObj(
-                    'capabilityService',
-                    ['getCapabilities']
-                );
-                // Both types can only contain b, let's say
-                mockTypes = ['a', 'b'].map(function (type) {
-                    var mockType = jasmine.createSpyObj(
-                        'type-' + type,
-                        ['getKey', 'getDefinition', 'getInitialModel']
-                    );
-                    mockType.getKey.andReturn(type);
-                    mockType.getDefinition.andReturn({
-                        contains: ['b']
-                    });
-                    mockType.getInitialModel.andReturn({});
-                    return mockType;
+                typeA.getKey.andReturn('a');
+                typeA.getDefinition.andReturn({
+                    contains: ['a']
                });

-                mockInjector.get.andCallFake(function (name) {
-                    return {
-                        typeService: mockTypeService,
-                        capabilityService: mockCapabilityService
-                    }[name];
+
+                typeB = jasmine.createSpyObj(
+                    'type B-- anything goes',
+                    ['getKey', 'getDefinition']
+                );
+                typeB.getKey.andReturn('b');
+                typeB.getDefinition.andReturn({
+                    contains: ['a', 'b']
                });

-                mockTypeService.listTypes.andReturn(mockTypes);
-                mockCapabilityService.getCapabilities.andReturn({});
+                typeC = jasmine.createSpyObj(
+                    'type C-- distinguishing and interested in telemetry',
+                    ['getKey', 'getDefinition']
+                );
+                typeC.getKey.andReturn('c');
+                typeC.getDefinition.andReturn({
+                    contains: [{has: 'telemetry'}]
+                });

-                policy = new CompositionPolicy(mockInjector);
+                mockChildObject = jasmine.createSpyObj(
+                    'childObject',
+                    ['getCapability', 'hasCapability']
+                );
+
+                policy = new CompositionPolicy();
            });

-            // Test basic composition policy here; test more closely at
-            // the unit level in ContainmentTable for 'has' support, et al
-            it("enforces containment rules defined by types", function () {
-                expect(policy.allow(mockTypes[0], mockTypes[1]))
-                    .toBeTruthy();
-                expect(policy.allow(mockTypes[1], mockTypes[1]))
-                    .toBeTruthy();
-                expect(policy.allow(mockTypes[1], mockTypes[0]))
-                    .toBeFalsy();
-                expect(policy.allow(mockTypes[0], mockTypes[0]))
-                    .toBeFalsy();
+            describe('enforces simple containment rules', function () {
+
+                it('allows when type matches', function () {
+                    mockChildObject.getCapability.andReturn(typeA);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeTruthy();
+
+                    expect(policy.allow(typeB, mockChildObject))
+                        .toBeTruthy();
+
+                    mockChildObject.getCapability.andReturn(typeB);
+                    expect(policy.allow(typeB, mockChildObject))
+                        .toBeTruthy();
+                });
+
+
+                it('disallows when type doesn\'t match', function () {
+
+                    mockChildObject.getCapability.andReturn(typeB);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeFalsy();
+
+                    mockChildObject.getCapability.andReturn(typeC);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeFalsy();
+                });
+
+            });
+
+            describe('enforces capability-based containment rules', function () {
+                it('allows when object has capability', function () {
+                    mockChildObject.hasCapability.andReturn(true);
+                    expect(policy.allow(typeC, mockChildObject))
+                        .toBeTruthy();
+                    expect(mockChildObject.hasCapability)
+                        .toHaveBeenCalledWith('telemetry');
+                });
+
+                it('skips when object doesn\'t have capability', function () {
+                    mockChildObject.hasCapability.andReturn(false);
+                    expect(policy.allow(typeC, mockChildObject))
+                        .toBeFalsy();
+                    expect(mockChildObject.hasCapability)
+                        .toHaveBeenCalledWith('telemetry');
+                });
            });

        });
--- a/platform/containment/test/ContainmentTableSpec.js
+++ b/platform/containment/test/ContainmentTableSpec.js
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/ContainmentTable"],
-    function (ContainmentTable) {
-        describe("Composition policy's containment table", function () {
-            var mockTypeService,
-                mockCapabilityService,
-                mockTypes,
-                table;
-
-            beforeEach(function () {
-                mockTypeService = jasmine.createSpyObj(
-                    'typeService',
-                    ['listTypes']
-                );
-                mockCapabilityService = jasmine.createSpyObj(
-                    'capabilityService',
-                    ['getCapabilities']
-                );
-                // Both types can only contain b, let's say
-                mockTypes = ['a', 'b', 'c'].map(function (type, index) {
-                    var mockType = jasmine.createSpyObj(
-                        'type-' + type,
-                        ['getKey', 'getDefinition', 'getInitialModel']
-                    );
-                    mockType.getKey.andReturn(type);
-                    mockType.getDefinition.andReturn({
-                        // First two contain objects with capability 'b';
-                        // third one defines no containership rules
-                        contains: (index < 2) ? [{ has: 'b' }] : undefined
-                    });
-                    // Return a model to drive apparent capabilities
-                    mockType.getInitialModel.andReturn({ id: type });
-                    return mockType;
-                });
-
-                mockTypeService.listTypes.andReturn(mockTypes);
-                mockCapabilityService.getCapabilities.andCallFake(function (model) {
-                    var capabilities = {};
-                    capabilities[model.id] = true;
-                    return capabilities;
-                });
-
-                table = new ContainmentTable(
-                    mockTypeService,
-                    mockCapabilityService
-                );
-            });
-
-            // The plain type case is tested in CompositionPolicySpec,
-            // so just test for special syntax ('has', or no contains rules) here
-            it("enforces 'has' containment rules related to capabilities", function () {
-                expect(table.canContain(mockTypes[0], mockTypes[1]))
-                    .toBeTruthy();
-                expect(table.canContain(mockTypes[1], mockTypes[1]))
-                    .toBeTruthy();
-                expect(table.canContain(mockTypes[1], mockTypes[0]))
-                    .toBeFalsy();
-                expect(table.canContain(mockTypes[0], mockTypes[0]))
-                    .toBeFalsy();
-            });
-
-            it("allows anything when no containership rules are defined", function () {
-                expect(table.canContain(mockTypes[2], mockTypes[0]))
-                    .toBeTruthy();
-                expect(table.canContain(mockTypes[2], mockTypes[1]))
-                    .toBeTruthy();
-                expect(table.canContain(mockTypes[2], mockTypes[2]))
-                    .toBeTruthy();
-            });
-
-
-        });
-    }
-);
--- a/platform/core/bundle.js
+++ b/platform/core/bundle.js
@@ -241,7 +241,7 @@ define([
                            "property": "name",
                            "pattern": "\\S+",
                            "required": true,
-                            "cssclass": "l-input-lg"
+                            "cssClass": "l-input-lg"
                        },
                        {
                            "name": "Notes",
@@ -249,19 +249,19 @@ define([
                            "property": "notes",
                            "control": "textarea",
                            "required": false,
-                            "cssclass": "l-textarea-sm"
+                            "cssClass": "l-textarea-sm"
                        }
                    ]
                },
                {
                    "key": "root",
                    "name": "Root",
-                    "cssclass": "icon-folder"
+                    "cssClass": "icon-folder"
                },
                {
                    "key": "folder",
                    "name": "Folder",
-                    "cssclass": "icon-folder",
+                    "cssClass": "icon-folder",
                    "features": "creation",
                    "description": "Create folders to organize other objects or links to objects.",
                    "priority": 1000,
@@ -272,11 +272,11 @@ define([
                {
                    "key": "unknown",
                    "name": "Unknown Type",
-                    "cssclass": "icon-object-unknown"
+                    "cssClass": "icon-object-unknown"
                },
                {
                    "name": "Unknown Type",
-                    "cssclass": "icon-object-unknown"
+                    "cssClass": "icon-object-unknown"
                }
            ],
            "capabilities": [
--- a/platform/core/src/actions/ActionAggregator.js
+++ b/platform/core/src/actions/ActionAggregator.js
@@ -58,7 +58,7 @@ define(
         * @property {string} key machine-readable identifier for this action
         * @property {string} name human-readable name for this action
         * @property {string} description human-readable description
-         * @property {string} cssclass CSS class for icon
+         * @property {string} cssClass CSS class for icon
         * @property {ActionContext} context the context in which the action
         *           will be performed.
         */
--- a/platform/core/src/capabilities/CoreCapabilityProvider.js
+++ b/platform/core/src/capabilities/CoreCapabilityProvider.js
@@ -53,10 +53,10 @@ define(
         */
        function CoreCapabilityProvider(capabilities, $log) {
            // Filter by invoking the capability's appliesTo method
-            function filterCapabilities(model) {
+            function filterCapabilities(model, id) {
                return capabilities.filter(function (capability) {
                    return capability.appliesTo ?
-                            capability.appliesTo(model) :
+                            capability.appliesTo(model, id) :
                            true;
                });
            }
@@ -75,8 +75,8 @@ define(
                return result;
            }

-            function getCapabilities(model) {
-                return packageCapabilities(filterCapabilities(model));
+            function getCapabilities(model, id) {
+                return packageCapabilities(filterCapabilities(model, id));
            }

            return {
--- a/platform/core/src/types/TypeImpl.js
+++ b/platform/core/src/types/TypeImpl.js
@@ -56,12 +56,12 @@ define(
         * @method Type#getDescription
         */
        /**
-         * Get the cssclass associated with this type. cssclass is a
+         * Get the cssClass associated with this type. cssClass is a
         * string which will appear as an icon (when
         * displayed in an appropriate font) which visually
         * distinguish types from one another.
         *
-         * @returns {string} the cssclass for this type
+         * @returns {string} the cssClass for this type
         * @method Type#getCssClass
         */
        /**
@@ -145,7 +145,7 @@ define(
        };

        TypeImpl.prototype.getCssClass = function () {
-            return this.typeDef.cssclass;
+            return this.typeDef.cssClass;
        };

        TypeImpl.prototype.getProperties = function () {
--- a/platform/core/test/types/TypeImplSpec.js
+++ b/platform/core/test/types/TypeImplSpec.js
@@ -33,7 +33,7 @@ define(
                    key: 'test-type',
                    name: 'Test Type',
                    description: 'A type, for testing',
-                    cssclass: 'icon-telemetry-panel',
+                    cssClass: 'icon-telemetry-panel',
                    inherits: ['test-parent-1', 'test-parent-2'],
                    features: ['test-feature-1'],
                    properties: [{}],
--- a/platform/core/test/types/TypeProviderSpec.js
+++ b/platform/core/test/types/TypeProviderSpec.js
@@ -30,18 +30,18 @@ define(
                testTypeDefinitions = [
                    {
                        key: 'basic',
-                        cssclass: "icon-magnify-in",
+                        cssClass: "icon-magnify-in",
                        name: "Basic Type"
                    },
                    {
                        key: 'multi1',
-                        cssclass: "icon-trash",
+                        cssClass: "icon-trash",
                        description: "Multi1 Description",
                        capabilities: ['a1', 'b1']
                    },
                    {
                        key: 'multi2',
-                        cssclass: "icon-magnify-out",
+                        cssClass: "icon-magnify-out",
                        capabilities: ['a2', 'b2', 'c2']
                    },
                    {
--- a/platform/entanglement/bundle.js
+++ b/platform/entanglement/bundle.js
@@ -66,7 +66,7 @@ define([
                    "key": "move",
                    "name": "Move",
                    "description": "Move object to another location.",
-                    "cssclass": "icon-move",
+                    "cssClass": "icon-move",
                    "category": "contextual",
                    "implementation": MoveAction,
                    "depends": [
@@ -79,7 +79,7 @@ define([
                    "key": "copy",
                    "name": "Duplicate",
                    "description": "Duplicate object to another location.",
-                    "cssclass": "icon-duplicate",
+                    "cssClass": "icon-duplicate",
                    "category": "contextual",
                    "implementation": CopyAction,
                    "depends": [
@@ -95,7 +95,7 @@ define([
                    "key": "link",
                    "name": "Create Link",
                    "description": "Create Link to object in another location.",
-                    "cssclass": "icon-link",
+                    "cssClass": "icon-link",
                    "category": "contextual",
                    "implementation": LinkAction,
                    "depends": [
@@ -108,7 +108,7 @@ define([
                    "key": "follow",
                    "name": "Go To Original",
                    "description": "Go to the original, un-linked instance of this object.",
-                    "cssclass": "",
+                    "cssClass": "",
                    "category": "contextual",
                    "implementation": GoToOriginalAction
                },
@@ -116,7 +116,7 @@ define([
                    "key": "locate",
                    "name": "Set Primary Location",
                    "description": "Set a domain object's primary location.",
-                    "cssclass": "",
+                    "cssClass": "",
                    "category": "contextual",
                    "implementation": SetPrimaryLocationAction
                }
--- a/platform/entanglement/src/services/CopyService.js
+++ b/platform/entanglement/src/services/CopyService.js
@@ -48,7 +48,7 @@ define(
            return this.policyService.allow(
                "composition",
                parentCandidate.getCapability('type'),
-                object.getCapability('type')
+                object
            );
        };

--- a/platform/entanglement/src/services/LinkService.js
+++ b/platform/entanglement/src/services/LinkService.js
@@ -52,7 +52,7 @@ define(
            return this.policyService.allow(
                "composition",
                parentCandidate.getCapability('type'),
-                object.getCapability('type')
+                object
            );
        };

--- a/platform/entanglement/src/services/LocationService.js
+++ b/platform/entanglement/src/services/LocationService.js
@@ -58,7 +58,7 @@ define(
                        sections: [
                            {
                                name: 'Location',
-                                cssclass: "grows",
+                                cssClass: "grows",
                                rows: [
                                    {
                                        name: label,
--- a/platform/entanglement/src/services/MoveService.js
+++ b/platform/entanglement/src/services/MoveService.js
@@ -56,7 +56,7 @@ define(
            return this.policyService.allow(
                "composition",
                parentCandidate.getCapability('type'),
-                object.getCapability('type')
+                object
            );
        };

--- a/platform/entanglement/test/services/CopyServiceSpec.js
+++ b/platform/entanglement/test/services/CopyServiceSpec.js
@@ -104,7 +104,7 @@ define(
                        expect(policyService.allow).toHaveBeenCalledWith(
                            "composition",
                            parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                        );
                    });

--- a/platform/entanglement/test/services/LinkServiceSpec.js
+++ b/platform/entanglement/test/services/LinkServiceSpec.js
@@ -114,7 +114,7 @@ define(
                        expect(mockPolicyService.allow).toHaveBeenCalledWith(
                            "composition",
                            parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                        );
                    });

--- a/platform/entanglement/test/services/MoveServiceSpec.js
+++ b/platform/entanglement/test/services/MoveServiceSpec.js
@@ -124,7 +124,7 @@ define(
                        expect(policyService.allow).toHaveBeenCalledWith(
                            "composition",
                            parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                        );
                    });

--- a/platform/features/clock/bundle.js
+++ b/platform/features/clock/bundle.js
@@ -136,7 +136,7 @@ define([
                    ],
                    "category": "contextual",
                    "name": "Start",
-                    "cssclass": "icon-play",
+                    "cssClass": "icon-play",
                    "priority": "preferred"
                },
                {
@@ -147,7 +147,7 @@ define([
                    ],
                    "category": "contextual",
                    "name": "Restart at 0",
-                    "cssclass": "icon-refresh",
+                    "cssClass": "icon-refresh",
                    "priority": "preferred"
                }
            ],
@@ -155,7 +155,7 @@ define([
                {
                    "key": "clock",
                    "name": "Clock",
-                    "cssclass": "icon-clock",
+                    "cssClass": "icon-clock",
                    "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
                    "priority": 101,
                    "features": [
@@ -183,7 +183,7 @@ define([
                                            "name": "hh:mm:ss"
                                        }
                                    ],
-                                    "cssclass": "l-inline"
+                                    "cssClass": "l-inline"
                                },
                                {
                                    "control": "select",
@@ -197,7 +197,7 @@ define([
                                            "name": "24hr"
                                        }
                                    ],
-                                    "cssclass": "l-inline"
+                                    "cssClass": "l-inline"
                                }
                            ]
                        }
@@ -212,7 +212,7 @@ define([
                {
                    "key": "timer",
                    "name": "Timer",
-                    "cssclass": "icon-timer",
+                    "cssClass": "icon-timer",
                    "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
                    "priority": 100,
                    "features": [
--- a/platform/features/clock/src/controllers/TimerController.js
+++ b/platform/features/clock/src/controllers/TimerController.js
@@ -131,11 +131,11 @@ define(
        /**
         * Get the CSS class to display the right icon
         * for the start/restart button.
-         * @returns {string} cssclass to display
+         * @returns {string} cssClass to display
         */
        TimerController.prototype.buttonCssClass = function () {
            return this.relevantAction ?
-                    this.relevantAction.getMetadata().cssclass : "";
+                    this.relevantAction.getMetadata().cssClass : "";
        };

        /**
--- a/platform/features/clock/test/controllers/TimerControllerSpec.js
+++ b/platform/features/clock/test/controllers/TimerControllerSpec.js
@@ -85,8 +85,8 @@ define(
                        'timer.restart': mockRestart
                    }[k]];
                });
-                mockStart.getMetadata.andReturn({ cssclass: "icon-play", name: "Start" });
-                mockRestart.getMetadata.andReturn({ cssclass: "icon-refresh", name: "Restart" });
+                mockStart.getMetadata.andReturn({ cssClass: "icon-play", name: "Start" });
+                mockRestart.getMetadata.andReturn({ cssClass: "icon-refresh", name: "Restart" });
                mockScope.domainObject = mockDomainObject;

                testModel = {};
@@ -144,7 +144,7 @@ define(
                expect(controller.text()).toEqual("0D 00:00:00");
            });

-            it("shows cssclass & name for the applicable start/restart action", function () {
+            it("shows cssClass & name for the applicable start/restart action", function () {
                invokeWatch('domainObject', mockDomainObject);
                expect(controller.buttonCssClass()).toEqual("icon-play");
                expect(controller.buttonText()).toEqual("Start");
--- a/platform/features/conductor/core/bundle.js
+++ b/platform/features/conductor/core/bundle.js
@@ -21,7 +21,6 @@
 *****************************************************************************/

 define([
-    "./src/ui/TimeConductorViewService",
    "./src/ui/TimeConductorController",
    "./src/ui/ConductorAxisController",
    "./src/ui/ConductorTOIController",
@@ -34,7 +33,6 @@ define([
    "text!./res/templates/time-of-interest.html",
    "legacyRegistry"
 ], function (
-    TimeConductorViewService,
    TimeConductorController,
    ConductorAxisController,
    ConductorTOIController,
@@ -50,16 +48,6 @@ define([

    legacyRegistry.register("platform/features/conductor/core", {
        "extensions": {
-            "services": [
-                {
-                    "key": "timeConductorViewService",
-                    "implementation": TimeConductorViewService,
-                    "depends": [
-                        "openmct",
-                        "timeSystems[]"
-                    ]
-                }
-            ],
            "controllers": [
                {
                    "key": "TimeConductorController",
@@ -69,8 +57,7 @@ define([
                        "$window",
                        "$location",
                        "openmct",
-                        "timeConductorViewService",
-                        "timeSystems[]",
+                        "timeConductorService",
                        "formatService"
                    ]
                },
@@ -80,7 +67,7 @@ define([
                    "depends": [
                        "$scope",
                        "openmct",
-                        "timeConductorViewService",
+                        "timeConductorService",
                        "formatService"
                    ]
                },
@@ -150,6 +137,13 @@ define([
                    "link": "https://github.com/d3/d3/blob/master/LICENSE"
                }
            ],
+            "constants": [
+                {
+                    "key": "DEFAULT_TIMECONDUCTOR_MODE",
+                    "value": "realtime",
+                    "priority": "fallback"
+                }
+            ],
            "formats": [
                {
                    "key": "number",
--- a/platform/features/conductor/core/res/sass/time-conductor-espresso.scss
+++ b/platform/features/conductor/core/res/sass/time-conductor-espresso.scss
@@ -19,6 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+$output-bourbon-deprecation-warnings: false;
@import "bourbon";
@import "../../../../../commonUI/general/res/sass/constants";
@import "../../../../../commonUI/general/res/sass/mixins";
--- a/platform/features/conductor/core/res/sass/time-conductor-snow.scss
+++ b/platform/features/conductor/core/res/sass/time-conductor-snow.scss
@@ -19,6 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+$output-bourbon-deprecation-warnings: false;
@import "bourbon";
@import "../../../../../commonUI/general/res/sass/constants";
@import "../../../../../commonUI/general/res/sass/mixins";
--- a/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
+++ b/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
@@ -22,19 +22,18 @@
 <div class="contents">
    <div class="pane left menu-items">
        <ul>
-            <li ng-repeat="(key, metadata) in ngModel.options"
+            <li ng-repeat="option in ngModel.options"
                ng-click="ngModel.selectedKey=key">
-                <a ng-mouseover="ngModel.activeMetadata = metadata"
+                <a ng-mouseover="ngModel.activeMetadata = option"
                   ng-mouseleave="ngModel.activeMetadata = undefined"
-                   class="menu-item-a {{metadata.cssclass}}">
-                    {{metadata.name}}
+                   class="menu-item-a {{ngModel.activeMetadata.cssClass}}">
+                    {{option.name}}
                </a>
            </li>
        </ul>
    </div>
    <div class="pane right menu-item-description">
-        <div
-                class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssclass}}"></div>
+        <div class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssClass}}"></div>
        <div class="desc-area title">
            {{ngModel.activeMetadata.name}}
        </div>
--- a/platform/features/conductor/core/res/templates/mode-selector/mode-selector.html
+++ b/platform/features/conductor/core/res/templates/mode-selector/mode-selector.html
@@ -19,14 +19,13 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<span ng-controller="ClickAwayController as modeController">
+<span ng-controller="ClickAwayController as sourceController">
    <div class="s-menu-button"
-         ng-click="modeController.toggle()">
-		<span class="title-label">{{ngModel.options[ngModel.selectedKey]
-            .label}}</span>
+         ng-click="sourceController.toggle()">
+        <span class="title-label">{{ngModel.sources[ngModel.selectedSource].name}}</span>
    </div>
    <div class="menu super-menu mini mode-selector-menu"
-         ng-show="modeController.isActive()">
+         ng-show="sourceController.isActive()">
        <mct-include key="'mode-menu'"
                     ng-model="ngModel">
        </mct-include>
--- a/platform/features/conductor/core/res/templates/time-conductor.html
+++ b/platform/features/conductor/core/res/templates/time-conductor.html
@@ -1,8 +1,7 @@
 <!-- Parent holder for time conductor. follow-mode | fixed-mode -->
 <div ng-controller="TimeConductorController as tcController"
    class="holder grows flex-elem l-flex-row l-time-conductor {{modeModel.selectedKey}}-mode {{timeSystemModel.selected.metadata.key}}-time-system"
-        ng-class="{'status-panning': tcController.panning}">
-
+        ng-class="{'status-panning': tcController.panning}" ng-show="showTimeConductor">
    <div class="flex-elem holder time-conductor-icon">
        <div class="hand-little"></div>
        <div class="hand-big"></div>
@@ -100,7 +99,7 @@
        <div class="l-time-conductor-controls l-row-elem l-flex-row flex-elem">
            <mct-include
                key="'mode-selector'"
-                ng-model="modeModel"
+                ng-model="sourceModel"
                class="holder flex-elem menus-up mode-selector">
            </mct-include>
            <mct-control
--- a/platform/features/conductor/core/src/timeSystems/LocalClock.js
+++ b/platform/features/conductor/core/src/timeSystems/LocalClock.js
@@ -1,89 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(['./TickSource'], function (TickSource) {
-    /**
-     * @implements TickSource
-     * @constructor
-     */
-    function LocalClock($timeout, period) {
-        TickSource.call(this);
-
-        this.metadata = {
-            key: 'local',
-            mode: 'realtime',
-            cssclass: 'icon-clock',
-            label: 'Real-time',
-            name: 'Real-time Mode',
-            description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
-        };
-
-        this.period = period;
-        this.$timeout = $timeout;
-        this.timeoutHandle = undefined;
-    }
-
-    LocalClock.prototype = Object.create(TickSource.prototype);
-
-    LocalClock.prototype.start = function () {
-        this.timeoutHandle = this.$timeout(this.tick.bind(this), this.period);
-    };
-
-    LocalClock.prototype.stop = function () {
-        if (this.timeoutHandle) {
-            this.$timeout.cancel(this.timeoutHandle);
-        }
-    };
-
-    LocalClock.prototype.tick = function () {
-        var now = Date.now();
-        this.listeners.forEach(function (listener) {
-            listener(now);
-        });
-        this.timeoutHandle = this.$timeout(this.tick.bind(this), this.period);
-    };
-
-    /**
-     * Register a listener for the local clock. When it ticks, the local
-     * clock will provide the current local system time
-     *
-     * @param listener
-     * @returns {function} a function for deregistering the provided listener
-     */
-    LocalClock.prototype.listen = function (listener) {
-        var listeners = this.listeners;
-        listeners.push(listener);
-
-        if (listeners.length === 1) {
-            this.start();
-        }
-
-        return function () {
-            listeners.splice(listeners.indexOf(listener));
-            if (listeners.length === 0) {
-                this.stop();
-            }
-        }.bind(this);
-    };
-
-    return LocalClock;
-});
--- a/platform/features/conductor/core/src/timeSystems/LocalClockSpec.js
+++ b/platform/features/conductor/core/src/timeSystems/LocalClockSpec.js
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(["./LocalClock"], function (LocalClock) {
-    describe("The LocalClock class", function () {
-        var clock,
-            mockTimeout,
-            timeoutHandle = {};
-
-        beforeEach(function () {
-            mockTimeout = jasmine.createSpy("timeout");
-            mockTimeout.andReturn(timeoutHandle);
-            mockTimeout.cancel = jasmine.createSpy("cancel");
-
-            clock = new LocalClock(mockTimeout, 0);
-            clock.start();
-        });
-
-        it("calls listeners on tick with current time", function () {
-            var mockListener = jasmine.createSpy("listener");
-            clock.listen(mockListener);
-            clock.tick();
-            expect(mockListener).toHaveBeenCalledWith(jasmine.any(Number));
-        });
-
-        it("stops ticking when stop is called", function () {
-            clock.stop();
-            expect(mockTimeout.cancel).toHaveBeenCalledWith(timeoutHandle);
-        });
-    });
-});
--- a/platform/features/conductor/core/src/timeSystems/TickSource.js
+++ b/platform/features/conductor/core/src/timeSystems/TickSource.js
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([], function () {
-    /**
-     * A tick source is an event generator such as a timing signal, or
-     * indicator of data availability, which can be used to advance the Time
-     * Conductor. Usage is simple, a listener registers a callback which is
-     * invoked when this source 'ticks'.
-     *
-     * @interface
-     * @constructor
-     */
-    function TickSource() {
-        this.listeners = [];
-    }
-
-    /**
-     * @param callback Function to be called when this tick source ticks.
-     * @returns an 'unlisten' function that will remove the callback from
-     * the registered listeners
-     */
-    TickSource.prototype.listen = function (callback) {
-        throw new Error('Not implemented');
-    };
-
-    return TickSource;
-});
--- a/platform/features/conductor/core/src/timeSystems/TimeSystem.js
+++ b/platform/features/conductor/core/src/timeSystems/TimeSystem.js
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([], function () {
-    /**
-     * @interface
-     * @constructor
-     */
-    function TimeSystem() {
-        /**
-         * @typedef TimeSystemMetadata
-         * @property {string} key
-         * @property {string} name
-         * @property {string} description
-         *
-         * @type {TimeSystemMetadata}
-         */
-        this.metadata = undefined;
-    }
-
-    /**
-     * Time formats are defined as extensions. Time systems that implement
-     * this interface should provide an array of format keys supported by them.
-     *
-     * @returns {string[]} An array of time format keys
-     */
-    TimeSystem.prototype.formats = function () {
-        throw new Error('Not implemented');
-    };
-
-    /**
-     * @typedef DeltaFormat
-     * @property {string} type the type of MctControl used to represent this
-     * field. Typically 'datetime-field' for UTC based dates, or 'textfield'
-     * otherwise
-     * @property {string} [format] An optional field specifying the
-     * Format to use for delta fields in this time system.
-     */
-    /**
-     * Specifies a format for deltas in this time system.
-     *
-     * @returns {DeltaFormat} a delta format specifier
-     */
-    TimeSystem.prototype.deltaFormat = function () {
-        throw new Error('Not implemented');
-    };
-
-    /**
-     * Returns the tick sources supported by this time system. Tick sources
-     * are event generators that can be used to advance the time conductor
-     * @returns {TickSource[]} The tick sources supported by this time system.
-     */
-    TimeSystem.prototype.tickSources = function () {
-        throw new Error('Not implemented');
-    };
-
-    /***
-     *
-     * @typedef {object} TimeConductorZoom
-     * @property {number} min The largest time span that the time
-     * conductor can display in this time system. ie. the span of the time
-     * conductor in its most zoomed out state.
-     * @property {number} max The smallest time span that the time
-     * conductor can display in this time system. ie. the span of the time
-     * conductor bounds in its most zoomed in state.
-     *
-     * @typedef {object} TimeSystemDefault
-     * @property {TimeConductorDeltas} deltas The deltas to apply by default
-     * when this time system is active. Applies to real-time modes only
-     * @property {TimeConductorBounds} bounds The bounds to apply by default
-     * when this time system is active
-     * @property {TimeConductorZoom} zoom Default min and max zoom levels
-     * @returns {TimeSystemDefault[]} At least one set of default values for
-     * this time system.
-     */
-    TimeSystem.prototype.defaults = function () {
-        throw new Error('Not implemented');
-    };
-
-    /**
-     * @return {boolean}
-     */
-    TimeSystem.prototype.isUTCBased = function () {
-        return true;
-    };
-
-    return TimeSystem;
-});
--- a/platform/features/conductor/core/src/ui/ConductorAxisController.js
+++ b/platform/features/conductor/core/src/ui/ConductorAxisController.js
@@ -137,7 +137,7 @@ define(
        ConductorAxisController.prototype.changeTimeSystem = function (timeSystem) {
            this.timeSystem = timeSystem;

-            var key = timeSystem.formats()[0];
+            var key = timeSystem.format;
            if (key !== undefined) {
                var format = this.formatService.getFormat(key);
                var bounds = this.conductor.bounds();
@@ -158,10 +158,7 @@ define(
                    if (tickValue instanceof Date) {
                        tickValue = tickValue.getTime();
                    }
-                    return format.format(tickValue, {
-                        min: bounds.start,
-                        max: bounds.end
-                    });
+                    return format.format(tickValue, bounds.start, bounds.end);
                });
                this.axisElement.call(this.xAxis);
            }
@@ -210,7 +207,7 @@ define(
         * Initiate panning via a click + drag gesture on the time conductor
         * scale. Panning triggers a "pan" event
         * @param {number} delta the offset from the original click event
-         * @see TimeConductorViewService#
+         * @see TimeConductorService
         * @fires platform.features.conductor.ConductorAxisController~pan
         */
        ConductorAxisController.prototype.pan = function (delta) {
--- a/platform/features/conductor/core/src/ui/MctConductorAxis.js
+++ b/platform/features/conductor/core/src/ui/MctConductorAxis.js
@@ -32,7 +32,7 @@ define(['./ConductorAxisController'], function (ConductorAxisController) {
            controller: [
                'openmct',
                'formatService',
-                'timeConductorViewService',
+                'timeConductorService',
                '$scope',
                '$element',
                ConductorAxisController
--- a/platform/features/conductor/core/src/ui/TimeConductorController.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorController.js
@@ -40,7 +40,14 @@ define(
         * @memberof platform.features.conductor
         * @constructor
         */
-        function TimeConductorController($scope, $window, $location, openmct, conductorViewService, timeSystems, formatService) {
+        function TimeConductorController(
+            $scope,
+            $window,
+            $location,
+            openmct,
+            conductorService,
+            formatService
+        ) {

            var self = this;

@@ -54,16 +61,14 @@ define(
            this.$scope = $scope;
            this.$window = $window;
            this.$location = $location;
-            this.conductorViewService = conductorViewService;
+            this.conductorService = conductorService;
            this.conductor = openmct.conductor;
-            this.modes = conductorViewService.availableModes();
+            this.modes = conductorService.availableModes();
            this.validation = new TimeConductorValidation(this.conductor);
            this.formatService = formatService;

            // Construct the provided time system definitions
-            this.timeSystems = timeSystems.map(function (timeSystemConstructor) {
-                return timeSystemConstructor();
-            });
+            this.sourceModel.sources = conductorService.availableTickSources();

            this.initializeScope();
            var searchParams = JSON.parse(JSON.stringify(this.$location.search()));
@@ -76,7 +81,7 @@ define(
                this.changeTimeSystem(this.conductor.timeSystem());
            }

-            var deltas = this.conductorViewService.deltas();
+            var deltas = this.conductorService.deltas();
            if (deltas) {
                this.setFormFromDeltas(deltas);
            }
@@ -123,14 +128,14 @@ define(
            //Represents the various modes, and the currently selected mode
            //in the view
            this.$scope.modeModel = {
-                options: this.conductorViewService.availableModes()
+                options: this.conductorService.availableModes()
            };

            // Watch scope for selection of mode or time system by user
            this.$scope.$watch('modeModel.selectedKey', this.setMode);

-            this.conductorViewService.on('pan', this.onPan);
-            this.conductorViewService.on('pan-stop', this.onPanStop);
+            this.conductorService.on('pan', this.onPan);
+            this.conductorService.on('pan-stop', this.onPanStop);

            this.$scope.$on('$destroy', this.destroy);
        };
@@ -139,11 +144,11 @@ define(
            //Set mode from url if changed
            if (searchParams[SEARCH.MODE] === undefined ||
                searchParams[SEARCH.MODE] !== this.$scope.modeModel.selectedKey) {
-                this.setMode(searchParams[SEARCH.MODE] || "fixed");
+                this.setMode(searchParams[SEARCH.MODE] || this.DEFAULT_MODE);
            }

            if (searchParams[SEARCH.TIME_SYSTEM] &&
-                searchParams[SEARCH.TIME_SYSTEM] !== this.conductor.timeSystem().metadata.key) {
+                searchParams[SEARCH.TIME_SYSTEM] !== this.conductor.timeSystem().key) {
                //Will select the specified time system on the conductor
                this.selectTimeSystemByKey(searchParams[SEARCH.TIME_SYSTEM]);
            }
@@ -183,8 +188,8 @@ define(
            this.conductor.off('bounds', this.changeBounds);
            this.conductor.off('timeSystem', this.changeTimeSystem);

-            this.conductorViewService.off('pan', this.onPan);
-            this.conductorViewService.off('pan-stop', this.onPanStop);
+            this.conductorService.off('pan', this.onPan);
+            this.conductorService.off('pan-stop', this.onPanStop);
        };

        /**
@@ -196,7 +201,7 @@ define(
            //If a zoom or pan is currently in progress, do not override form values.
            if (!this.zooming && !this.panning) {
                this.setFormFromBounds(bounds);
-                if (this.conductorViewService.mode() === 'fixed') {
+                if (this.conductorService.mode() === 'fixed') {
                    //Set bounds in URL on change
                    this.setParam(SEARCH.START_BOUND, bounds.start);
                    this.setParam(SEARCH.END_BOUND, bounds.end);
@@ -229,21 +234,6 @@ define(
            }
        };

-        /**
-         * On mode change, populate form based on time systems available
-         * from the selected mode.
-         * @param mode
-         */
-        TimeConductorController.prototype.setFormFromMode = function (mode) {
-            this.$scope.modeModel.selectedKey = mode;
-            //Synchronize scope with time system on mode
-            this.$scope.timeSystemModel.options =
-                this.conductorViewService.availableTimeSystems()
-                .map(function (t) {
-                    return t.metadata;
-                });
-        };
-
        /**
         * When the deltas change, update the values in the UI
         * @private
@@ -293,7 +283,7 @@ define(
            };
            if (this.validation.validateStartDelta(deltas.start) && this.validation.validateEndDelta(deltas.end)) {
                //Sychronize deltas between form and mode
-                this.conductorViewService.deltas(deltas);
+                this.conductorService.deltas(deltas);

                //Set Deltas in URL on change
                this.setParam(SEARCH.START_DELTA, deltas.start);
@@ -301,39 +291,6 @@ define(
            }
        };

-        /**
-         * Change the selected Time Conductor mode. This will call destroy
-         * and initialization functions on the relevant modes, setting
-         * default values for bound and deltas in the form.
-         *
-         * @private
-         * @param newModeKey
-         * @param oldModeKey
-         */
-        TimeConductorController.prototype.setMode = function (newModeKey, oldModeKey) {
-            //Set mode in URL on change
-            this.setParam(SEARCH.MODE, newModeKey);
-
-            if (newModeKey !== oldModeKey) {
-                this.conductorViewService.mode(newModeKey);
-                this.setFormFromMode(newModeKey);
-
-                if (newModeKey === "fixed") {
-                    this.setParam(SEARCH.START_DELTA, undefined);
-                    this.setParam(SEARCH.END_DELTA, undefined);
-                } else {
-                    this.setParam(SEARCH.START_BOUND, undefined);
-                    this.setParam(SEARCH.END_BOUND, undefined);
-
-                    var deltas = this.conductorViewService.deltas();
-                    if (deltas) {
-                        this.setParam(SEARCH.START_DELTA, deltas.start);
-                        this.setParam(SEARCH.END_DELTA, deltas.end);
-                    }
-                }
-            }
-        };
-
        /**
         * Respond to time system selection from UI
         *
@@ -417,7 +374,7 @@ define(
            var zoomDefaults = this.conductor.timeSystem().defaults().zoom;
            var timeSpan = Math.pow((1 - sliderValue), 4) * (zoomDefaults.min - zoomDefaults.max);

-            var zoom = this.conductorViewService.zoom(timeSpan);
+            var zoom = this.conductorService.zoom(timeSpan);

            this.$scope.boundsModel.start = zoom.bounds.start;
            this.$scope.boundsModel.end = zoom.bounds.end;
@@ -442,7 +399,7 @@ define(
            this.setDeltas(this.$scope.boundsModel);
            this.zooming = false;

-            this.conductorViewService.emit('zoom-stop');
+            this.conductorService.emit('zoom-stop');
        };

        /**
--- a/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js
@@ -130,8 +130,10 @@ define(['./TimeConductorController'], function (TimeConductorController) {
                    mockLocation,
                    {conductor: mockTimeConductor},
                    mockConductorViewService,
-                    mockTimeSystems,
-                    mockFormatService
+                    mockFormatService,
+                    'fixed',
+                    true
+
                );

                tsListener = getListener(mockTimeConductor.on, "timeSystem");
@@ -244,7 +246,6 @@ define(['./TimeConductorController'], function (TimeConductorController) {
            var ts1Metadata;
            var ts2Metadata;
            var ts3Metadata;
-            var mockTimeSystemConstructors;

            beforeEach(function () {
                mode = "realtime";
@@ -276,11 +277,7 @@ define(['./TimeConductorController'], function (TimeConductorController) {
                ];

                //Wrap in mock constructors
-                mockTimeSystemConstructors = mockTimeSystems.map(function (mockTimeSystem) {
-                    return function () {
-                        return mockTimeSystem;
-                    };
-                });
+                mockConductorViewService.systems = mockTimeSystems;

                controller = new TimeConductorController(
                    mockScope,
@@ -288,8 +285,9 @@ define(['./TimeConductorController'], function (TimeConductorController) {
                    mockLocation,
                    {conductor: mockTimeConductor},
                    mockConductorViewService,
-                    mockTimeSystemConstructors,
-                    mockFormatService
+                    mockFormatService,
+                    "fixed",
+                    true
                );
            });

@@ -434,12 +432,7 @@ define(['./TimeConductorController'], function (TimeConductorController) {
                    }
                };

-                mockTimeSystems.push(function () {
-                    return timeSystem;
-                });
-                mockTimeSystems.push(function () {
-                    return otherTimeSystem;
-                });
+                mockConductorViewService.systems = [timeSystem, otherTimeSystem];

                urlBounds = {
                    start: 100,
@@ -467,8 +460,9 @@ define(['./TimeConductorController'], function (TimeConductorController) {
                    mockLocation,
                    {conductor: mockTimeConductor},
                    mockConductorViewService,
-                    mockTimeSystems,
-                    mockFormatService
+                    mockFormatService,
+                    "fixed",
+                    true
                );

                spyOn(controller, "setMode");
--- a/platform/features/conductor/core/src/ui/TimeConductorMode.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorMode.js
@@ -153,25 +153,6 @@ define(
            }
        };

-        /**
-         * @private
-         * @param {number} time some value that is valid in the current TimeSystem
-         */
-        TimeConductorMode.prototype.tick = function (time) {
-            var deltas = this.deltas();
-            var startTime = time;
-            var endTime = time;
-
-            if (deltas) {
-                startTime = time - deltas.start;
-                endTime = time + deltas.end;
-            }
-            this.conductor.bounds({
-                start: startTime,
-                end: endTime
-            });
-        };
-
        /**
         * Get or set the current value for the deltas used by this time system.
         * On change, the new deltas will be used to calculate and set the
--- a/platform/features/conductor/core/src/ui/TimeConductorViewService.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorViewService.js
@@ -1,229 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [
-        'EventEmitter',
-        './TimeConductorMode'
-    ],
-    function (EventEmitter, TimeConductorMode) {
-
-        /**
-         * A class representing the state of the time conductor view. This
-         * exposes details of the UI that are not represented on the
-         * TimeConductor API itself such as modes and deltas.
-         *
-         * @memberof platform.features.conductor
-         * @param conductor
-         * @param timeSystems
-         * @constructor
-         */
-        function TimeConductorViewService(openmct, timeSystems) {
-
-            EventEmitter.call(this);
-
-            this.systems = timeSystems.map(function (timeSystemConstructor) {
-                return timeSystemConstructor();
-            });
-
-            this.conductor = openmct.conductor;
-            this.currentMode = undefined;
-
-            /**
-             * @typedef {object} ModeMetadata
-             * @property {string} key A unique identifying key for this mode
-             * @property {string} cssClass The css class for the glyph
-             * representing this mode
-             * @property {string} label A short label for this mode
-             * @property {string} name A longer name for the mode
-             * @property {string} description A description of the mode
-             */
-            this.availModes = {
-                'fixed': {
-                    key: 'fixed',
-                    cssclass: 'icon-calendar',
-                    label: 'Fixed',
-                    name: 'Fixed Timespan Mode',
-                    description: 'Query and explore data that falls between two fixed datetimes.'
-                }
-            };
-
-            function hasTickSource(sourceType, timeSystem) {
-                return timeSystem.tickSources().some(function (tickSource) {
-                    return tickSource.metadata.mode === sourceType;
-                });
-            }
-
-            var timeSystemsForMode = function (sourceType) {
-                return this.systems.filter(hasTickSource.bind(this, sourceType));
-            }.bind(this);
-
-            //Only show 'real-time mode' if appropriate time systems available
-            if (timeSystemsForMode('realtime').length > 0) {
-                var realtimeMode = {
-                    key: 'realtime',
-                    cssclass: 'icon-clock',
-                    label: 'Real-time',
-                    name: 'Real-time Mode',
-                    description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
-                };
-                this.availModes[realtimeMode.key] = realtimeMode;
-            }
-
-            //Only show 'LAD mode' if appropriate time systems available
-            if (timeSystemsForMode('lad').length > 0) {
-                var ladMode = {
-                    key: 'lad',
-                    cssclass: 'icon-database',
-                    label: 'LAD',
-                    name: 'LAD Mode',
-                    description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
-                };
-                this.availModes[ladMode.key] = ladMode;
-            }
-        }
-
-        TimeConductorViewService.prototype = Object.create(EventEmitter.prototype);
-
-        /**
-         * Getter/Setter for the Time Conductor Mode. Modes determine the
-         * behavior of the time conductor, especially with regards to the
-         * bounds and how they change with time.
-         *
-         * In fixed mode, the bounds do not change with time, but can be
-         * modified by the used
-         *
-         * In realtime mode, the bounds change with time. Bounds are not
-         * directly modifiable by the user, however deltas can be.
-         *
-         * In Latest Available Data (LAD) mode, the bounds are updated when
-         * data is received. As with realtime mode the
-         *
-         * @param {string} newModeKey One of 'fixed', 'realtime', or 'LAD'
-         * @returns {string} the current mode, one of 'fixed', 'realtime',
-         * or 'LAD'.
-         *
-         */
-        TimeConductorViewService.prototype.mode = function (newModeKey) {
-            function contains(timeSystems, ts) {
-                return timeSystems.filter(function (t) {
-                        return t.metadata.key === ts.metadata.key;
-                    }).length > 0;
-            }
-
-            if (arguments.length === 1) {
-                var timeSystem = this.conductor.timeSystem();
-                var modes = this.availableModes();
-                var modeMetaData = modes[newModeKey];
-
-                if (this.currentMode) {
-                    this.currentMode.destroy();
-                }
-                this.currentMode = new TimeConductorMode(modeMetaData, this.conductor, this.systems);
-
-                // If no time system set on time conductor, or the currently selected time system is not available in
-                // the new mode, default to first available time system
-                if (!timeSystem || !contains(this.currentMode.availableTimeSystems(), timeSystem)) {
-                    timeSystem = this.currentMode.availableTimeSystems()[0];
-                    this.conductor.timeSystem(timeSystem, timeSystem.defaults().bounds);
-                }
-            }
-            return this.currentMode ? this.currentMode.metadata().key : undefined;
-        };
-
-        /**
-         * @typedef {object} TimeConductorDeltas
-         * @property {number} start Used to set the start bound of the
-         * TimeConductor on tick. A positive value that will be subtracted
-         * from the value provided by a tick source to determine the start
-         * bound.
-         * @property {number} end Used to set the end bound of the
-         * TimeConductor on tick. A positive value that will be added
-         * from the value provided by a tick source to determine the start
-         * bound.
-         */
-        /**
-         * Deltas define the offset from the latest time value provided by
-         * the current tick source. Deltas are only valid in realtime or LAD
-         * modes.
-         *
-         * Realtime mode:
-         *     - start: A time in ms before now which will be used to
-         *     determine the 'start' bound on tick
-         *     - end: A time in ms after now which will be used to determine
-         *     the 'end' bound on tick
-         *
-         * LAD mode:
-         *     - start: A time in ms before the timestamp of the last data
-         *     received which will be used to determine the 'start' bound on
-         *     tick
-         *     - end: A time in ms after the timestamp of the last data received
-         *     which will be used to determine the 'end' bound on tick
-         * @returns {TimeConductorDeltas} current value of the deltas
-         */
-        TimeConductorViewService.prototype.deltas = function () {
-            //Deltas stored on mode. Use .apply to preserve arguments
-            return this.currentMode.deltas.apply(this.currentMode, arguments);
-        };
-
-        /**
-         * Availability of modes depends on the time systems and tick
-         * sources available. For example, Latest Available Data mode will
-         * not be available if there are no time systems and tick sources
-         * that support LAD mode.
-         * @returns {ModeMetadata[]}
-         */
-        TimeConductorViewService.prototype.availableModes = function () {
-            return this.availModes;
-        };
-
-        /**
-         * Availability of time systems depends on the currently selected
-         * mode. Time systems and tick sources are mode dependent
-         */
-        TimeConductorViewService.prototype.availableTimeSystems = function () {
-            return this.currentMode.availableTimeSystems();
-        };
-
-        /**
-         * An event to indicate that zooming is taking place
-         * @event platform.features.conductor.TimeConductorViewService~zoom
-         * @property {ZoomLevel} zoom the new zoom level.
-         */
-        /**
-         * Zoom to given time span. Will fire a zoom event with new zoom
-         * bounds. Zoom bounds emitted in this way are considered ephemeral
-         * and should be overridden by any time conductor bounds events. Does
-         * not set bounds globally.
-         * @param {number} zoom A time duration in ms
-         * @fires platform.features.conductor.TimeConductorViewService~zoom
-         * @see module:openmct.TimeConductor#bounds
-         */
-        TimeConductorViewService.prototype.zoom = function (timeSpan) {
-            var zoom = this.currentMode.calculateZoom(timeSpan);
-            this.emit("zoom", zoom);
-            return zoom;
-        };
-
-        return TimeConductorViewService;
-    }
-);
--- a/platform/features/conductor/core/src/ui/TimeConductorViewServiceSpec.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorViewServiceSpec.js
@@ -20,7 +20,7 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-define(['./TimeConductorViewService'], function (TimeConductorViewService) {
+define(['./TimeConductorService'], function (TimeConductorService) {
    describe("The Time Conductor view service", function () {
        var mockTimeConductor;
        var basicTimeSystem;
--- a/platform/features/conductor/utcTimeSystem/bundle.js
+++ b/platform/features/conductor/utcTimeSystem/bundle.js
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    "./src/UTCTimeSystem",
-    'legacyRegistry'
-], function (
-    UTCTimeSystem,
-    legacyRegistry
-) {
-    legacyRegistry.register("platform/features/conductor/utcTimeSystem", {
-        "extensions": {
-            "timeSystems": [
-                {
-                    "implementation": UTCTimeSystem,
-                    "depends": ["$timeout"]
-                }
-            ]
-        }
-    });
-});
--- a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
+++ b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    '../../core/src/timeSystems/TimeSystem',
-    '../../core/src/timeSystems/LocalClock'
-], function (TimeSystem, LocalClock) {
-    var FIFTEEN_MINUTES = 15 * 60 * 1000,
-        DEFAULT_PERIOD = 1000;
-
-    /**
-     * This time system supports UTC dates and provides a ticking clock source.
-     * @implements TimeSystem
-     * @constructor
-     */
-    function UTCTimeSystem($timeout) {
-        TimeSystem.call(this);
-
-        /**
-         * Some metadata, which will be used to identify the time system in
-         * the UI
-         * @type {{key: string, name: string, cssclass: string}}
-         */
-        this.metadata = {
-            'key': 'utc',
-            'name': 'UTC',
-            'cssclass': 'icon-clock'
-        };
-
-        this.fmts = ['utc'];
-        this.sources = [new LocalClock($timeout, DEFAULT_PERIOD)];
-    }
-
-    UTCTimeSystem.prototype = Object.create(TimeSystem.prototype);
-
-    UTCTimeSystem.prototype.formats = function () {
-        return this.fmts;
-    };
-
-    UTCTimeSystem.prototype.deltaFormat = function () {
-        return 'duration';
-    };
-
-    UTCTimeSystem.prototype.tickSources = function () {
-        return this.sources;
-    };
-
-    UTCTimeSystem.prototype.defaults = function () {
-        var now = Math.ceil(Date.now() / 1000) * 1000;
-        var ONE_MINUTE = 60 * 1 * 1000;
-        var FIFTY_YEARS = 50 * 365 * 24 * 60 * 60 * 1000;
-
-        return {
-            key: 'utc-default',
-            name: 'UTC time system defaults',
-            deltas: {start: FIFTEEN_MINUTES, end: 0},
-            bounds: {start: now - FIFTEEN_MINUTES, end: now},
-            zoom: {min: FIFTY_YEARS, max: ONE_MINUTE}
-        };
-    };
-
-    return UTCTimeSystem;
-});
--- a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystemSpec.js
+++ b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystemSpec.js
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(['./UTCTimeSystem'], function (UTCTimeSystem) {
-    describe("The UTCTimeSystem class", function () {
-        var timeSystem,
-            mockTimeout;
-
-        beforeEach(function () {
-            mockTimeout = jasmine.createSpy("timeout");
-            timeSystem = new UTCTimeSystem(mockTimeout);
-        });
-
-        it("defines at least one format", function () {
-            expect(timeSystem.formats().length).toBeGreaterThan(0);
-        });
-
-        it("defines a tick source", function () {
-            var tickSources = timeSystem.tickSources();
-            expect(tickSources.length).toBeGreaterThan(0);
-        });
-
-        it("defines some defaults", function () {
-            expect(timeSystem.defaults()).toBeDefined();
-        });
-    });
-});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Henry	3abb2f3070	Fixing more broken links	2017-03-09 16:25:52 +00:00
Andrew Henry	1bc6ac8d0b	[Conductor] Added support for new style registration of formats tolegacy services	2017-03-09 16:25:35 +00:00
Andrew Henry	453431e13b	Fixing broken links	2017-03-09 16:07:08 +00:00
Andrew Henry	bbbbf1eab3	[Conductor] Added 'addFormat' function to telemetry API	2017-03-09 16:06:35 +00:00
Andrew Henry	bde6ad9da2	WIP	2017-03-09 15:48:05 +00:00
Andrew Henry	7416cae097	[Conductor] Added new methods to Time Conductor public API	2017-03-09 15:47:41 +00:00
Henry	59afbb9996	Added new methods to TimeConductor	2017-03-07 17:06:16 +00:00
Pete Richards	c394fe9287	Merge remote-tracking branch 'origin/open1465'	2017-03-03 11:26:25 -08:00
Henry	06f4a955b5	[Tables] Maintain correct insertion order with duplicates. Fixes #1465	2017-03-02 14:29:08 -08:00
Henry	a2bf92db97	[Tables] Subscribe to parent if a telemetry object, or children, but not both. Fixes #1464	2017-03-01 18:55:17 -08:00
Charles Hacskaylo	6fa5a31217	Merge pull request #1433 from nasa/open1432 [Build] Installed sound suppression system for Bourbon deprecation messages.	2017-02-27 11:12:27 -08:00
Pete Richards	5bc7a701dc	Merge pull request #1455 from nasa/api-conductor-config [Conductor] Allow configuration of conductor defaults	2017-02-24 14:58:50 -08:00
Pete Richards	5cd0516048	Enable TC by default and hide Set up TC so that it is always enabled and defaults to realtime mode. This allows us to have warp-like functionality without showing the TC interface, and simplifies a lot of tutorials. We can still reconfigure the TC by re-installing the plugin with different settings	2017-02-24 14:56:18 -08:00
Pete Richards	48a603ece8	Merge branch 'api-legacy-telemetry-provider-v2'	2017-02-24 14:47:10 -08:00
Pete Richards	abfa56464a	Merge branch 'plugins-functions'	2017-02-24 14:34:54 -08:00
Henry	c1d6e21c3c	Added tests. Fixes #1364	2017-02-23 13:50:14 -08:00
Henry	3bd556a406	Fixed failing tests	2017-02-23 10:21:33 -08:00
Henry	347fb6d882	Fixed style errors	2017-02-23 10:19:10 -08:00
Henry	b3cf7a5d93	Added support for new style telemetry providers from old screens. Converted SWG to new style data adapter	2017-02-23 09:58:46 -08:00
Andrew Henry	c7cffdeb3b	Merge pull request #1453 from nasa/restore-search-navigation [Search] Allow navigation from results	2017-02-22 13:21:03 -08:00
Pete Richards	d45ae7908d	[Search] Allow navigation from results Fix search item so that navigation occurs after clicking on a search result, while still properly preventing navigation when required. Related to #1366	2017-02-22 13:08:54 -08:00
Henry	b10fb4533e	All builtin plugins now standardized as functions	2017-02-22 12:51:49 -08:00
Andrew Henry	c74fdb816f	Merge pull request #1450 from nasa/fix-table-tests Add hasCapability to mock	2017-02-21 18:14:18 -08:00
Pete Richards	40985a56c8	Add hasCapability to mock	2017-02-21 18:01:43 -08:00
Pete Richards	5c01f0be24	Merge branch 'open1077' into 1435-integration	2017-02-21 17:22:36 -08:00
Andrew Henry	f7ff5af60b	Merge pull request #1448 from nasa/update-composition-policy Update composition policy	2017-02-21 17:18:59 -08:00
Andrew Henry	2088fc52f3	Merge pull request #1446 from nasa/fix-orphan-navigation Orphan check uses capability not model	2017-02-21 17:08:40 -08:00
Andrew Henry	db33ab143e	Merge pull request #1445 from nasa/api-updates Api updates	2017-02-21 17:04:45 -08:00
Pete Richards	8c77d4006a	Pass options to support checks	2017-02-21 17:03:16 -08:00
Pete Richards	2fa567b98b	[Table] Track by index, save the elements	2017-02-21 16:49:39 -08:00
Andrew Henry	e61f04663a	Merge pull request #1444 from nasa/consistent-css-class cssclass is now cssClass	2017-02-21 16:36:30 -08:00
Andrew Henry	4b905fa7d2	Merge pull request #1443 from nasa/remove-old-bundle-loading Stop loading bundles.json	2017-02-21 16:32:26 -08:00
Andrew Henry	5e6e7f018a	Merge pull request #1442 from nasa/dev-skip-optimize [Build] Skip optimize in dev environment	2017-02-21 16:26:41 -08:00
Andrew Henry	53f56b430a	Merge pull request #1449 from nasa/identifier-not-key [API] Use proper key format	2017-02-21 16:24:17 -08:00
Pete Richards	50c934820c	Merge pull request #1424 from nasa/open1382 [Tables] Do not persist column configuration for non-editable objects	2017-02-21 15:18:56 -08:00
Pete Richards	2a10a2cae2	Update specs to match composition policies	2017-02-21 15:14:35 -08:00
Pete Richards	65325b90fd	Composition policy takes child instance The composition policy now takes a child instance instead of the child type, as in all cases we have access to the child object. This allows new-style objects to be contained by old-style objects. Updated all composition policies to use standardized argument names instead of `context` and `candidate`; this makes it easier to understand. Updated AddActionProvider to hardcode the object types supported.	2017-02-21 12:32:49 -08:00
Pete Richards	cfecc36ae6	Orphan check uses capability not model Switch orphan checking to use capability instead of model. This ensures that new-style composition providers work as intended.	2017-02-21 12:10:17 -08:00
Pete Richards	d9f8622459	[Telemetry] Update TelemetryProvider API Based on feedback from tutorial sprint, update provider API, formatter API, and legacy adapter code. Providers can now implement separate checks for providing realtime and historical data, and providers are not registered with a specific strategy. Strategy is instead intended to be an attribute in the request options. Removed unused code in the telemetry API and simplify limitEvaluators.	2017-02-21 11:51:32 -08:00
Pete Richards	8e13819e1e	[API] composition providers receive new-style objects Ensure that composition providers get new-style objects (with id included) so that they can properly check for applicability.	2017-02-21 11:21:08 -08:00
Pete Richards	aaedf5d576	cssclass is now cssClass Make property name consistent with standard camelCase naming.	2017-02-21 11:14:46 -08:00
Pete Richards	af9ffaf02d	Stop loading bundles.json Stop application from requesting bundles.json at first load. This was confusing to some external developers who would see an error in the log and not know the cause.	2017-02-21 11:11:16 -08:00
Pete Richards	970acbd56e	[Build] Skip optimize in dev environment Skip optimize in dev environment to speed up project rebuilds. Very helpful when integration testing openmct.js build artifact.	2017-02-21 11:05:20 -08:00
Andrew Henry	46c7399867	Merge pull request #1410 from joshbaldwin/master adding MCT name to README	2017-02-21 09:09:51 -08:00
Andrew Henry	9a6745635d	Merge pull request #1431 from dhrubomoy/master [Documentation] Fixed filename	2017-02-15 10:18:46 -08:00
Pete Richards	fa962b42bc	[API] Use proper key format	2017-02-13 13:21:55 -08:00
Henry	34dc457aff	[Tables] Restored telemetry datum field 'name'. Fixed bug with default sort not working	2017-02-10 15:39:39 -08:00
Henry	a3311e4c57	[Tables] Tests and style fixes	2017-02-10 14:22:30 -08:00
Henry	ef8efbd53d	[Tables] Default UTC time system if available and none others defined	2017-02-10 14:22:28 -08:00
Henry	6cd99efbb9	[Tables] Added telemetry buffer so that subscription data is not discarded if it's beyond the end bounds	2017-02-10 14:22:28 -08:00
Henry	ae2b73a4f5	[Tables] Increase default table size	2017-02-10 14:22:28 -08:00
Henry	0c3ff82cfe	[Table] Added ticking to combined historical/real-time table Don't add duplicate telemetry data	2017-02-10 14:22:20 -08:00
Henry	50f303bbdc	[Tables] limit digests to increase performance	2017-02-10 14:22:20 -08:00
Henry	2a4944d6ee	[Tables] Refactoring for consolidation of historical and real-time tables Added batch processing of large historical queries. #1077	2017-02-10 14:21:48 -08:00
Henry	3544caf4be	[API] Observer path was accessing object key incorrectly	2017-02-10 14:21:47 -08:00
Henry	976333d7f7	[Tables] Support for subscriptions from new Telemetry API Historical and real-time data flowing Added formatting, and limits. Support telemetry objects themselves and not just composition of telemetry objects Apply default time range if none supplied (15 minutes)	2017-02-10 14:21:26 -08:00
Henry	6d5530ba9c	[Tables] Using new composition API to fetch all telemetry objects	2017-02-10 14:12:10 -08:00
Henry	77d0134e2e	[Build] Added Bourbon deprecation warning suppression system.	2017-02-10 10:03:05 -08:00
Dhrubomoy Das Gupta	d3b4ad41c2	[Documentation] Fixed filename Fixed file name "Platform.md" to "platform.md". "Platform.md" was giving a 404 error when clicked, in github and in the official site as well.	2017-02-09 20:54:52 -05:00
Andrew Henry	b28eb049dc	Merge pull request #1420 from BogdanAlexandru/tutorial-fix [Tutorial] Replace glyph mentions with cssclass	2017-02-06 11:57:49 -08:00
Henry	3d3baddd23	[Tables] Do not persist column configuration for non-editable objects	2017-02-02 15:44:36 -08:00
Bogdan	e712edba4e	[Tutorial] Fix icon set url	2017-01-31 21:35:42 +02:00
Bogdan	35d8024aaa	[Tutorial] Better describe cssclass	2017-01-31 21:32:31 +02:00
Alex M	17564aa489	[Tutorial] Replace glyph mentions with cssclass	2017-01-29 18:16:36 +02:00
Josh Baldwin	9f9d28deef	adding MCT name to README	2017-01-21 11:27:20 -05:00