add grootprovider

[ObjectAPI] Draft new Object API
Rought prototype of new object API.
2025-06-26 11:09:22 +00:00 · 2016-06-17 17:05:05 -07:00 · 2016-06-17 16:59:35 -07:00 · 2016-06-17 10:18:42 -07:00 · 2016-06-10 13:28:09 -07:00 · 2016-06-07 13:14:36 -07:00
1261 changed files with 17653 additions and 30946 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,6 @@
 *.gzip
 *.tgz
 *.DS_Store
-*.swp

 # Compiled CSS, unless directly added
 *.sass-cache
--- a/.jshintrc
+++ b/.jshintrc
@ -14,8 +14,7 @@
    "nonew": true,
    "predef": [
        "define",
-        "Promise",
-        "WeakMap"
+        "Promise"
    ],
    "shadow": "outer",
    "strict": "implied",
--- a/API.md
+++ b/API.md
@ -1,429 +0,0 @@
-# Building Applications With Open MCT
-
-## Scope and purpose of this document
-
-This document is intended to serve as a reference for developing an application 
-based on Open MCT. It will provide details of the API functions necessary to extend the 
-Open MCT platform meet common use cases such as integrating with a telemetry source. 
-
-The best place to start is with the [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial). 
-These will walk you through the process of getting up and running with Open MCT, 
-as well as addressing some common developer use cases.
-
-## Building From Source 
-
-The latest version of Open MCT is available from [our GitHub repository](https://github.com/nasa/openmct). 
-If you have `git`, and `node` installed, you can build Open MCT with the commands 
-```
-git clone https://github.com/nasa/openmct.git
-cd openmct
-npm install
-```
-
-These commands will fetch the Open MCT source from our GitHub repository, and build 
-a minified version that can be included in your application. The output of the 
-build process is placed in a `dist` folder under the openmct source directory, 
-which can be copied out to another location as needed. The contents of this 
-folder will include a minified javascript file named `openmct.js` as well as 
-assets such as html, css, and images necessary for the UI. 
-
-## Starting an Open MCT application
-
-To start a minimally functional Open MCT application, it is necessary to include 
-the Open MCT distributable, enable some basic plugins, and bootstrap the application. 
-The tutorials walk through the process of getting Open MCT up and running from scratch,
-but provided below is a minimal HTML template that includes Open MCT, installs 
-some basic plugins, and bootstraps the application. It assumes that Open MCT is 
-installed under an `openmct` subdirectory, as described in [Building From Source](#building-from-source). 
-
-This approach includes openmct using a simple script tag, resulting in a global 
-variable named `openmct`. This `openmct` object is used subsequently to make API 
-calls. 
-
-Open MCT is packaged as a UMD (Universal Module Definition) module, so common 
-script loaders are also supported.
-
-```html
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Open MCT</title>
-    <script src="openmct.js"></script>
-</head>
-<body>
-    <script>
-        openmct.setAssetPath('openmct/dist');
-        openmct.install(openmct.plugins.LocalStorage());
-        openmct.install(openmct.plugins.MyItems());
-        openmct.install(openmct.plugins.UTCTimeSystem());
-        openmct.install(openmct.plugins.Espresso());
-        openmct.start();
-    </script>
-</body>
-</html>
-```
-
-The Open MCT library included above requires certain assets such as html templates, 
-images, and css. If you installed Open MCT from GitHub as described in the section 
-on [Building from Source](#building-from-source) then these assets will have been 
-downloaded along with the Open MCT javascript library. You can specify the 
-location of these assets by calling `openmct.setAssetPath()`. Typically this will 
-be the same location as the `openmct.js` library is included from.
-
-There are some plugins bundled with the application that provide UI, persistence, 
-and other default configuration which are necessary to be able to do anything with 
-the application initially. Any of these plugins can, in principle, be replaced with a custom 
-plugin. The included plugins are documented in the [Included Plugins](#included-plugins) 
-section.  
-
-## Plugins
-
-### Defining and Installing a New Plugin
-
-```javascript
-openmct.install(function install(openmctAPI) {
-    // Do things here
-    // ...
-});
-```
-
-New plugins are installed in Open MCT by calling `openmct.install`, and providing 
-a plugin installation function. This function will be invoked on application 
-startup with one parameter - the openmct API object. A common approach used in 
-the Open MCT codebase is to define a plugin as a function that returns this 
-installation function. This allows configuration to be specified when the plugin is included.
-
-eg.
-```javascript
-openmct.install(openmct.plugins.Elasticsearch("http://localhost:8002/openmct"));
-```
-This approach can be seen in all of the [plugins provided with Open MCT](https://github.com/nasa/openmct/blob/master/src/plugins/plugins.js).
-
-## Domain Objects and Identifiers
-
-_Domain Objects_ are the basic entities that represent domain knowledge in Open MCT.
-The temperature sensor on a solar panel, an overlay plot comparing 
-the results of all temperature sensors, the command dictionary for a spacecraft,
-the individual commands in that dictionary, the "My Items" folder:
-All of these things are domain objects.
-
-A _Domain Object_ is simply a javascript object with some standard attributes.  
-An example of a _Domain Object_ is the "My Items" object which is a folder in 
-which a user can persist any objects that they create. The My Items object 
-looks like this: 
-
-```javascript
-{
-    identifier: {
-        namespace: ""
-        key: "mine"
-    }
-    name:"My Items",
-    type:"folder",
-    location:"ROOT",
-    composition: []
-}
-```
-
-### Object Attributes
-
-The main attributes to note are the `identifier`, and `type` attributes.
-* `identifier`: A composite key that provides a universally unique identifier for 
-this object. The `namespace` and `key` are used to identify the object. The `key` 
-must be unique within the namespace. 
-* `type`: All objects in Open MCT have a type. Types allow you to form an 
-ontology of knowledge and provide an abstraction for grouping, visualizing, and 
-interpreting data. Details on how to define a new object type are provided below. 
-
-Open MCT uses a number of builtin types. Typically you are going to want to 
-define your own if extending Open MCT.
-
-### Domain Object Types
-
-Custom types may be registered via the `addType` function on the opencmt Type 
-registry.
-
-eg.
-```javascript
-openmct.types.addType('my-type', {
-    label: "My Type",
-    description: "This is a type that I added!",
-    creatable: true
-});
-```
-
-The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type 
-for an object.
-* An object type specification. An object type definition supports the following 
-attributes      
-    * `label`: a `string` naming this object type
-    * `description`: a `string` specifying a longer-form description of this type
-    * `initialize`: a `function` which initializes the model for new domain objects 
-    of this type. This can be used for setting default values on an object when 
-    it is instantiated.
-    * `creatable`: A `boolean` indicating whether users should be allowed to create 
-    this type (default: `false`). This will determine whether the type appears 
-    in the `Create` menu.
-    * `cssClass`: A `string` specifying a CSS class to apply to each representation 
-    of this object. This is used for specifying an icon to appear next to each 
-    object of this type.
-
-The [Open MCT Tutorials](https://github.com/openmct/openmct-tutorial) provide a 
-step-by-step examples of writing code for Open MCT that includes a [section on 
-defining a new object type](https://github.com/nasa/openmct-tutorial#step-3---providing-objects).
-
-## Root Objects
-
-In many cases, you'd like a certain object (or a certain hierarchy of objects) 
-to be accessible from the top level of the application (the tree on the left-hand 
-side of Open MCT.) For example, it is typical to expose a telemetry dictionary 
-as a hierarchy of telemetry-providing domain objects in this fashion.
-
-To do so, use the `addRoot` method of the object API.
-
-eg.
-```javascript
-openmct.objects.addRoot({
-        namespace: "my-namespace",
-        key: "my-key"
-    });
-```
-
-The `addRoot` function takes a single [object identifier](#domain-objects-and-identifiers) 
-as an argument. 
-
-Root objects are loaded just like any other objects, i.e. via an object
-provider.
-
-## Object Providers
-
-An Object Provider is used to build _Domain Objects_, typically retrieved from 
-some source such as a persistence store or telemetry dictionary. In order to 
-integrate telemetry from a new source an object provider will need to be created 
-that can build objects representing telemetry points exposed by the telemetry 
-source. The API call to define a new object provider is fairly straightforward. 
-Here's a very simple example:
-
-```javascript
-openmct.objects.addProvider('example.namespace', {
-    get: function (identifier) {
-        return Promise.resolve({
-            identifier: identifier,
-            name: 'Example Object',
-            type: 'example-object-type'
-        });
-    }
-});
-```
-The `addProvider` function takes two arguments:
-
-* `namespace`: A `string` representing the namespace that this object provider 
-will provide objects for.
-* `provider`: An `object` with a single function, `get`. This function accepts an 
-[Identifier](#domain-objects-and-identifiers) for the object to be provided. 
-It is expected that the `get` function will return a 
-[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) 
-that resolves with the object being requested.
-
-In future, object providers will support other methods to enable other operations 
-with persistence stores, such as creating, updating, and deleting objects.
-
-## Composition Providers
-
-The _composition_ of a domain object is the list of objects it contains, as shown 
-(for example) in the tree for browsing. Open MCT provides a
-[default solution](#default-composition-provider) for composition, but there
-may be cases where you want to provide the composition of a certain object
-(or type of object) dynamically.
-
-### Adding Composition Providers
-
-You may want to populate a hierarchy under a custom root-level object based on 
-the contents of a telemetry dictionary. To do this, you can add a new 
-Composition Provider:
-
-```javascript
-openmct.composition.addProvider({
-    appliesTo: function (domainObject) {
-        return domainObject.type === 'my-type';
-    },
-    load: function (domainObject) {
-        return Promise.resolve(myDomainObjects);
-    }
-});
-```
-The `addProvider` function accepts a Composition Provider object as its sole 
-argument. A Composition Provider is a javascript object exposing two functions:
-* `appliesTo`: A `function` that accepts a `domainObject` argument, and returns 
-a `boolean` value indicating whether this composition provider applies to the 
-given object.
-* `load`: A `function` that accepts a `domainObject` as an argument, and returns
-a `Promise` that resolves with an array of [Identifier](#domain-objects-and-identifiers).
-These identifiers will be used to fetch Domain Objects from an [Object Provider](#object-provider)
-
-### Default Composition Provider
-
-The default composition provider applies to any domain object with a `composition` 
-property. The value of `composition` should be an array of identifiers, e.g.:
-
-```javascript
-var domainObject = {
-    name: "My Object",
-    type: 'folder',
-    composition: [
-        {
-            id: '412229c3-922c-444b-8624-736d85516247',
-            namespace: 'foo'
-        },
-        {
-            key: 'd6e0ce02-5b85-4e55-8006-a8a505b64c75',
-            namespace: 'foo'
-        }
-    ]
-};
-```
-
-## Telemetry Providers
-
-When connecting to a new telemetry source, you will need to register a new
-_Telemetry Provider_. A _Telemetry Provider_ retrieves telemetry data from some telemetry 
-source, and exposes them in a way that can be used by Open MCT. A telemetry 
-provider typically can support a one off __request__ for a batch of telemetry data, 
-or it can provide the ability to __subscribe__ to receive new telemetry data when 
-it becomes available, or both.
-
-```javascript
-openmct.telemetry.addProvider({
-    supportsRequest: function (domainObject) {
-        //...
-    },
-    supportsSubscribe: function (domainObject) {
-        //...
-    },
-    request: function (domainObject, options) {    
-        //...
-    },
-    subscribe: function (domainObject, callback, options) {
-        //...
-    }
-})
-```
-
-A telemetry provider is an object with the following functions defined:
-
-* `supportsRequest`: An __optional__ `function` that accepts a 
-[Domain Object](#domain-objects-and-identifiers) and returns a `boolean` value
-indicating whether or not this provider supports telemetry requests for the 
-given object. If this returns `true` then a `request` function must be defined. 
-* `supportsSubscribe`: An __optional__ `function` that accepts a 
-[Domain Object](#domain-objects-and-identifiers) and returns a `boolean` value 
-indicating whether or not this provider supports telemetry subscriptions. If this 
-returns `true` then a `subscribe` function must also be defined. As with `request`, 
-the return value will typically be conditional, and based on attributes of 
-`domainObject` such as its identifier.
-* `request`: A `function` that returns a `Promise` that will resolve with an `Array` 
-of telemetry in a single query. This function accepts as arguments a 
-[Domain Object](#domain-objects-and-identifiers) and an object containing some 
-[request options](#telemetry-requests). 
-* `subscribe`:  A `function` that accepts a [Domain Object](#domain-objects-and-identifiers),
-a callback `function`, and a [telemetry request](#telemetry-requests). The 
-callback is invoked whenever telemetry is available, and 
-
-
-The implementations for `request` and `subscribe` can vary depending on the
-nature of the endpoint which will provide telemetry. In the example above,
-it is assumed that `myAdapter` contains the implementation details
-(such as HTTP requests, WebSocket connections, etc.) associated with some telemetry
-source.
-
-For a step-by-step guide to building a telemetry adapter, please see the 
-[Open MCT Tutorials](https://github.com/larkin/openmct-tutorial).
-
-### Telemetry Requests
-Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s 
-`request` function will include an `options` argument. These are simply javascript
-objects with attributes for the request parameters. An example of a telemetry 
-request object with a start and end time is included below:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240
-}
-```
-
-### Telemetry Data
-
-Telemetry data is provided to Open MCT by _[Telemetry Providers](#telemetry-providers)_
-in the form of javascript objects. A collection of telemetry values (for example, 
-retrieved in response to a `request`) is represented by an `Array` of javascript 
-objects. These telemetry javascript objects are simply key value pairs.
-
-Typically a telemetry datum will have some timestamp associated with it. This 
-time stamp should have a key that corresponds to some time system supported by 
-Open MCT. If the `UTCTimeSystem` plugin is installed, then the key `utc` can be used.
-   
-An example of a telemetry provider request function that returns a collection of
-mock telemtry data is below:
-
-```javascript
-openmct.telemetry.addProvider({
-    supportsRequest: function (domainObject) {
-        return true
-    },
-    request: function (domainObject, options) {    
-        return Promise.resolve([
-            {
-                'utc': Date.now() - 2000,
-                'value': 1,
-            },
-            {
-                'utc': Date.now() - 1000,
-                'value': 2,
-            },
-            {
-                'utc': Date.now(),
-                'value': 3,
-            }
-        ]);
-    }
-})
-```
-
-## Included Plugins
-
-Open MCT is packaged along with a few general-purpose plugins:
-
-* `openmct.plugins.CouchDB` is an adapter for using CouchDB for persistence
-  of user-created objects. This is a constructor that takes the URL for the
-  CouchDB database as a parameter, e.g.
-```javascript
-openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
-```
-* `openmct.plugins.Elasticsearch` is an adapter for using Elasticsearch for
-  persistence of user-created objects. This is a
-  constructor that takes the URL for the Elasticsearch instance as a
-  parameter. eg.
-```javascript
-openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
-```
-* `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
-  themes (dark and light) available for Open MCT. Note that at least one
-  of these themes must be installed for Open MCT to appear correctly.
-* `openmct.plugins.LocalStorage` provides persistence of user-created
-  objects in browser-local storage. This is particularly useful in
-  development environments.
-* `openmct.plugins.MyItems` adds a top-level folder named "My Items"
-  when the application is first started, providing a place for a
-  user to store created items.
-* `openmct.plugins.UTCTimeSystem` provides a default time system for Open MCT.
-
-Generally, you will want to either install these plugins, or install
-different plugins that provide persistence and an initial folder
-hierarchy.
-
-eg.
-```javascript
-openmct.install(openmct.plugins.LocalStorage());
-openmct.install(openmct.plugins.MyItems());
-```
--- a/LICENSES.md
+++ b/LICENSES.md
@ -1,12 +1,12 @@
-# Open MCT Licenses
+# Open MCT Web Licenses

-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 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 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.
+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 includes source code licensed under additional open source licenses as follows.
+Open MCT Web includes source code licensed under additional open source licenses as follows.

 ## Software Components Licenses

@ -560,132 +560,3 @@ The above copyright notice and this permission notice shall be included in all c

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---
-
-### Almond
-
-* Link: https://github.com/requirejs/almond
-
-* Version: 0.3.3
-
-* Author: jQuery Foundation
-
-* Description: Lightweight RequireJS replacement for builds
-
-#### License
-
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/requirejs/almond
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules directory, and certain utilities used
-to build or test the software in the test and dist directories, are
-externally maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
-
-
-### Lodash
-
-* Link: https://lodash.com
-
-* Version: 3.10.1
-
-* Author: Dojo Foundation
-
-* Description: Utility functions
-
-#### License
-
-Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-### EventEmitter3
-
-* Link: https://github.com/primus/eventemitter3
-
-* Version: 1.2.0
-
-* Author: Arnout Kazemier
-
-* Description: Event-driven programming support
-
-#### License
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Arnout Kazemier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,110 +1,13 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+# Open MCT

-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/)
-
-## See Open MCT in Action
-
-Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
-![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
-
-## New API
-
-A simpler, [easier-to-use API](https://nasa.github.io/openmct/docs/api/)
-has been added to Open MCT. Changes in this
-API include a move away from a declarative system of JSON configuration files
-towards an imperative system based on function calls. Developers will be able
-to extend and build on Open MCT by making direct function calls to a public
-API. Open MCT is also being refactored to minimize the dependencies that using
-Open MCT imposes on developers, such as the current requirement to use
-AngularJS.
-
-This new API has not yet been heavily used and is likely to contain defects.
-You can help by trying it out, and reporting any issues you encounter
-using our GitHub issue tracker. Such issues may include bugs, suggestions,
-missing documentation, or even just requests for help if you're having
-trouble.
-
-We want Open MCT to be as easy to use, install, run, and develop for as
-possible, and your feedback will help us get there!
-
-## Building and Running Open MCT Locally
-
-Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
-(These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.)
-
-1. Clone the source code
-
- `git clone https://github.com/nasa/openmct.git`
-
-2. Install development dependencies
-
- `npm install`
-
-3. Run a local development server
-
- `npm start`
-
-Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/)
-
-## Documentation
-
-Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally.
-
-### Examples
-
-The clearest examples for developing Open MCT plugins are in the
-[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in
-our documentation.
-
-For a practical example of a telemetry adapter, see David Hudson's
-[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct),
-which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players
-to build and use displays for their own missions in Open MCT.
-
-Additional examples are available in the `examples` hierarchy of this
-repository; however, be aware that these examples are
-[not fully-documented](https://github.com/nasa/openmct/issues/846), so
-the tutorials will likely serve as a better starting point.
-
-### Building the Open MCT Documentation Locally
-Open MCT's documentation is generated by an
-[npm](https://www.npmjs.com/)-based build.  It has additional dependencies that
-may not be available on every platform and thus is not covered in the standard
-npm install.  Ensure your system has [libcairo](http://cairographics.org/)
-installed and then run the following commands:
-
-* `npm install`
-* `npm install canvas nomnoml`
-* `npm run docs`
-
-Documentation will be generated in `target/docs`.
-
-## Deploying Open MCT
-
-Open MCT is built using [`npm`](http://npmjs.com/)
-and [`gulp`](http://gulpjs.com/).
-
-To build Open MCT for deployment:
-
-`npm run prepublish`
-
-This will compile and minify JavaScript sources, as well as copy over assets.
-The contents of the `dist` folder will contain a runnable Open MCT
-instance (e.g. by starting an HTTP server in that directory), including:
-
-* A `main.js` file containing Open MCT source code.
-* Various assets in the `example` and `platform` directories.
-* An `index.html` that runs Open MCT in its default configuration.
-
-Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+Open MCT is a web-based platform for mission operations user interface
+software.

 ## Bundles

 A bundle is a group of software components (including source code, declared
 as AMD modules, as well as resources such as images and HTML templates)
-that is intended to be added or removed as a single unit. A plug-in for
+that are intended to be added or removed as a single unit. A plug-in for
 Open MCT will be expressed as a bundle; platform components are also
 expressed as bundles.

@ -151,6 +54,39 @@ To run:
 * `npm install`
 * `npm run all`

+## Build
+
+Open MCT is built using [`npm`](http://npmjs.com/)
+and [`gulp`](http://gulpjs.com/).
+
+To build:
+
+`npm run prepublish`
+
+This will compile and minify JavaScript sources, as well as copy over assets.
+The contents of the `dist` folder will contain a runnable Open MCT
+instance (e.g. by starting an HTTP server in that directory), including:
+
+* A `main.js` file containing Open MCT source code.
+* Various assets in the `example` and `platform` directories.
+* An `index.html` that runs Open MCT in its default configuration.
+
+Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+
+### Building Documentation
+
+Open MCT's documentation is generated by an
+[npm](https://www.npmjs.com/)-based build.  It has additional dependencies that
+may not be available on every platform and thus is not covered in the standard
+npm install.  Ensure your system has [libcairo](http://cairographics.org/)
+installed and then run the following commands:
+
+* `npm install`
+* `npm install canvas nomnoml`
+* `npm run docs`
+
+Documentation will be generated in `target/docs`.
+
 # Glossary

 Certain terms are used throughout Open MCT with consistent meanings
@ -197,6 +133,6 @@ documentation, may presume an understanding of these terms.
  it, and it is thereafter considered the _navigated_ object (until the
  user makes another such choice.)
 * _space_: A name used to identify a persistence store. Interactions with
-  persistence will generally involve a `space` parameter in some form, to
+  persistence with generally involve a `space` parameter in some form, to
  distinguish multiple persistence stores from one another (for cases
  where there are multiple valid persistence locations available.)
--- a/app.js
+++ b/app.js
@ -42,8 +42,6 @@
        process.exit(0);
    }

-    app.disable('x-powered-by');
-
    // Override bundles.json for HTTP requests
    app.use('/' + BUNDLE_FILE, function (req, res) {
        var bundles;
@ -77,8 +75,6 @@
    // Expose everything else as static files
    app.use(express['static'](options.directory));

-    // Finally, open the HTTP server and log the instance to the console
-    app.listen(options.port, function() {
-        console.log('Open MCT application running at localhost:' + options.port)
-    });
+    // Finally, open the HTTP server
+    app.listen(options.port);
 }());
--- a/bower.json
+++ b/bower.json
@ -13,16 +13,13 @@
    "moment-duration-format": "^1.3.0",
    "requirejs": "~2.1.22",
    "text": "requirejs-text#^2.0.14",
-    "es6-promise": "^3.3.0",
+    "es6-promise": "^3.0.2",
    "screenfull": "^3.0.0",
    "node-uuid": "^1.4.7",
    "comma-separated-values": "^3.6.4",
    "FileSaver.js": "^0.0.2",
    "zepto": "^1.1.6",
    "eventemitter3": "^1.2.0",
-    "lodash": "3.10.1",
-    "almond": "~0.3.2",
-    "d3": "~4.1.0",
-    "html2canvas": "^0.4.1"
+    "lodash": "3.10.1"
  }
 }
--- a/build-docs.sh
+++ b/build-docs.sh
@ -1,11 +1,11 @@
 #!/bin/bash

 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2016, United States Government
+#* 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 is licensed under the Apache License, Version 2.0 (the
+#* 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.
@ -16,7 +16,7 @@
 #* License for the specific language governing permissions and limitations
 #* under the License.
 #*
-#* Open MCT includes source code licensed under additional open source
+#* 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.
@ -24,7 +24,7 @@

 # Script to build and deploy docs.

-OUTPUT_DIRECTORY="dist/docs"
+OUTPUT_DIRECTORY="target/docs"
 # Docs, once built, are pushed to the private website repo
 REPOSITORY_URL="git@github.com:nasa/openmct-website.git"
 WEBSITE_DIRECTORY="website"
@ -32,7 +32,7 @@ WEBSITE_DIRECTORY="website"
 BUILD_SHA=`git rev-parse HEAD`

 # A remote will be created for the git repository we are pushing to.
-# Don't worry, as this entire directory will get trashed in between builds.
+# Don't worry, as this entire directory will get trashed inbetween builds.
 REMOTE_NAME="documentation"
 WEBSITE_BRANCH="master"

@ -45,8 +45,8 @@ npm run docs

 echo "git clone $REPOSITORY_URL website"
 git clone $REPOSITORY_URL website || exit 1
-echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY"
-cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY
+echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs"
+cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs
 echo "cd $WEBSITE_DIRECTORY"
 cd $WEBSITE_DIRECTORY || exit 1

--- a/docs/gendocs.js
+++ b/docs/gendocs.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- 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/architecture/index.md
+++ b/docs/src/architecture/index.md
@ -6,7 +6,7 @@ overall architecture of Open MCT.
 The target audience includes:

 * _Platform maintainers_: Individuals involved in developing,
-  extending, and maintaining capabilities of the platform.
+  extending, and maintaing capabilities of the platform.
 * _Integration developers_: Individuals tasked with integrated
  Open MCT into a larger system, who need to understand
  its inner workings sufficiently to complete this integration.
@ -74,3 +74,5 @@ These layers are:
  typically consists of a mix of custom plug-ins to Open MCT,
  as well as optional features (such as Plot view) included alongside
  the platform.
+
+
--- a/docs/src/architecture/platform.md
+++ b/docs/src/architecture/platform.md
@ -1,6 +1,6 @@
 # Overview

-The Open MCT platform utilizes the [framework layer](framework.md)
+The Open MCT platform utilizes the [framework layer](Framework.md)
 to provide an extensible baseline for applications which includes:

 * A common user interface (and user interface paradigm) for dealing with
@ -38,7 +38,7 @@ in __any of these tiers__.
  are initiated from here and invoke behavior in the presentation layer. HTML 
  templates are written in Angular’s template syntax; see the [Angular documentation on templates](https://docs.angularjs.org/guide/templates). 
  These describe the page as actually seen by the user. Conceptually, 
-  stylesheets (controlling the look-and-feel of the rendered templates) belong 
+  stylesheets (controlling the lookandfeel of the rendered templates) belong 
  in this grouping as well. 
 * [_Presentation layer_](#presentation-layer): The presentation layer
  is responsible for updating (and providing information to update)
@ -48,7 +48,7 @@ in __any of these tiers__.
  display.
 * [_Information model_](#information-model): Provides a common (within Open MCT 
  Web) set of interfaces for dealing with “things”  domain objects  within the 
-  system. User-facing concerns in a Open MCT Web application are expressed as 
+  system. Userfacing concerns in a Open MCT Web application are expressed as 
  domain objects; examples include folders (used to organize other domain 
  objects), layouts (used to build displays), or telemetry points (used as 
  handles for streams of remote measurements.) These domain objects expose a 
@ -616,7 +616,7 @@ follows:
  part of an action's extension definition.
 * `CreateActionProvider` provides the various Create actions which
  populate the Create menu. These are driven by the available types,
-  so do not map easily to extension category `actions`; instead, these
+  so do not map easily ot extension category `actions`; instead, these
  are generated after looking up which actions are available from the
  [`TypeService`](#type-service).
 * `ActionAggregator` merges together actions from multiple providers.
--- a/docs/src/design/planning/APIRefactor.md
+++ b/docs/src/design/planning/APIRefactor.md
@ -1,7 +1,7 @@
 # API Refactoring

 This document summarizes a path toward implementing API changes
-from the [API Redesign](../proposals/APIRedesign.md) for Open MCT
+from the [API Redesign](../proposals/APIRedesign.md) for Open MCT Web
 v1.0.0.

 # Goals
@ -161,7 +161,7 @@ be included in a straightforward fashion.

 Some goals for this build step:

-* Compile (and, preferably, optimize/minify) Open MCT
+* Compile (and, preferably, optimize/minify) Open MCT Web
  sources into a single `.js` file.
  * It is desirable to do the same for HTML sources, but
    may wish to defer this until a subsequent refactoring
@ -170,7 +170,7 @@ Some goals for this build step:
  derivative projects in a straightforward fashion.

 Should also consider which dependency/packaging manager should
-be used by dependent projects to obtain Open MCT. Approaches
+be used by dependent projects to obtain Open MCT Web. Approaches
 include:

 1. Plain `npm`. Dependents then declare their dependency with
@ -203,7 +203,7 @@ to use for asset generation/management and compilation/minification/etc.

 ## Step 3. Separate repositories

-Refactor existing applications built on Open MCT such that they
+Refactor existing applications built on Open MCT Web such that they
 are no longer forks, but instead separate projects with a dependency
 on the built artifacts from Step 2.

@ -211,7 +211,7 @@ Note that this is achievable already using `bower` (see `warp-bower`
 branch at http://developer.nasa.gov/mct/warp for an example.)
 However, changes involved in switching to an imperative API and
 introducing a build process may change (and should simplify) the
-approach used to utilize Open MCT as a dependency, so these
+approach used to utilize Open MCT Web as a dependency, so these
 changes should be introduced first.

 ## Step 4. Design registration API
@ -287,7 +287,7 @@ or separately in parallel) and should involve a tight cycle of:
   planning should be done to spread out the changes incrementally.

 By necessity, these changes may break functionality in applications
-built using Open MCT. On a case-by-case basis, should consider
+built using Open MCT Web. On a case-by-case basis, should consider
 providing temporary "legacy support" to allow downstream updates
 to occur as a separate task; the relevant trade here is between
 waste/effort required to maintain legacy support, versus the
@ -299,11 +299,11 @@ across several repositories.

 Update bundles to remove any usages of legacy support for bundles
 (including that used by dependent projects.) Then, remove legacy
-support from Open MCT.
+support from Open MCT Web.

 ## Step 8. Release candidacy

-Once API changes are complete, Open MCT should enter a release
+Once API changes are complete, Open MCT Web should enter a release
 candidacy cycle. Important things to look at here:

 * Are changes really complete?
--- a/docs/src/design/proposals/APIRedesign.md
+++ b/docs/src/design/proposals/APIRedesign.md
@ -1,6 +1,6 @@
 # Overview

-The purpose of this document is to review feedback on Open MCT's
+The purpose of this document is to review feedback on Open MCT Web's
 current API and propose improvements to the API, particularly for a
 1.0.0 release.

@ -64,7 +64,7 @@ useful, powerful interfaces.
 ## Developer Intern Feedback

 This feedback comes from interns who worked closely with
-Open MCT as their primary task over the Summer of 2015.
+Open MCT Web as their primary task over the Summer of 2015.

 ### Developer Intern 1

@ -98,13 +98,13 @@ Worked on bug fixes in the platform and a plugin for search.
  It is hard to figure out what the difference between the various ways of
  dealing with telemetry are. e.g., what is the difference between just
  "Telemetry" and the "Telemetry Service"? There are many
-  "Telemetry Things" which seem related, but in an unclear way.
+  "Telemetry Thing"s which seem related, but in an unclear way.

 ### Developer Intern 2

 Worked on platform bug fixes and mobile support.

-* No guide for the UI and front end for the HTML/CSS part of Open MCT.
+* No guide for the UI and front end for the HTML/CSS part of Open MCT Web.
  Not sure if this is applicable or needed for developers, however would
  be helpful to any front end development
 * Found it difficult to follow the plot controller & subplot
@ -118,11 +118,11 @@ Worked on platform bug fixes and mobile support.
 ## Plugin Developer Feedback

 This feedback comes from developers who have worked on plugins for
-Open MCT, but have not worked on the platform.
+Open MCT Web, but have not worked on the platform.

 ### Plugin Developer 1

-Used Open MCT over the course of several months (on a
+Used Open MCT Web over the course of several months (on a
 less-than-half-time basis) to develop a
 spectrum visualization plugin.

@ -138,7 +138,7 @@ spectrum visualization plugin.

 ### Plugin Developer 2

-Used Open MCT over the course of several weeks (on a half-time basis)
+Used Open MCT Web over the course of several weeks (on a half-time basis)
 to develop a tabular visualization plugin.

 * Pain points
@ -180,7 +180,7 @@ to develop a tabular visualization plugin.
      * Add a model property to the bundle.json to take in "Hello World"
        as a parameter and pass through to the controller/view

-### Open Source Contributor
+### Open Source Contributer

 * [Failures are non-graceful when services are missing.](
   https://github.com/nasa/openmctweb/issues/79)
@ -197,7 +197,7 @@ to develop a tabular visualization plugin.
 ## Long-term Developer Notes

 The following notes are from original platform developer, with long
-term experience using Open MCT.
+term experience using Open MCT Web.

 * Bundle mechanism allows for grouping related components across concerns,
  and adding and removing these easily. (e.g. model and view components of
@ -214,13 +214,13 @@ to an entirely different framework.

 We can expect AngularJS 1.x to reach end-of-life reasonably soon thereafter.

-Our API is currently a superset of Angular's API, so this directly affects
+Our API is currently a superset of Angular's API, so this directly effects
 our API. Specifically, API changes should be oriented towards removing
 or reducing the Angular dependency.

 ### Angular's Role

-Angular is Open MCT's:
+Angular is Open MCT Web's:

 * Dependency injection framework.
 * Template rendering.
@ -268,7 +268,7 @@ by experience:

 * Feedback from new developers is that Angular was a hindrance to
  training, not a benefit. ("One more thing to learn.") Significant
-  documentation remains necessary for Open MCT.
+  documentation remains necessary for Open MCT Web.
 * Expected enhancements to maintainability will be effectively
  invalidated by an expected Angular end-of-life.
 * Data binding and automatic view updates do save development effort,
@ -456,7 +456,7 @@ Instead, propose that:
 For parity with actions, a `View` would be a constructor which
 takes an `ActionContext` as a parameter (with similarly-defined
 properties) and exposes a method to retrieve the HTML elements
-associated with it.
+associateed with it.

 The platform would then additionally expose an `AngularView`
 implementation to improve compatibility with existing
@ -526,7 +526,7 @@ subset of `$http`'s functionality.

 ### Detriments

-* Increases the number of interfaces in Open MCT. (Arguably,
+* Increases the number of interfaces in Open MCT Web. (Arguably,
  not really, since the same interfaces would exist if exposed
  by Angular.)

@ -574,7 +574,7 @@ This would also allow for "composite bundles" which serve as
 proxies for multiple bundles. The `BundleContext` could contain
 (or later be amended to contain) filtering rules to ignore
 other bundles and so forth (this has been useful for administering
-Open MCT in subtly different configurations in the past.)
+Open MCT Web in subtly different configurations in the past.)

 ### Benefits

@ -827,7 +827,7 @@ This could be resolved by:

 ## Nomenclature Change

-Instead of presenting Open MCT as a "framework" or
+Instead of presenting Open MCT Web as a "framework" or
 "platform", present it as an "extensible application."

 This is mostly a change for the developer guide. A
@ -1040,7 +1040,7 @@ This is a more specific variant of
 * Removes a whole category of API (bundle definitions), reducing
  learning curve associated with the software.
 * Closer to Angular style, reducing disconnect between learning
-  Angular and learning Open MCT (reducing burden of having
+  Angular and learning Open MCT Web (reducing burden of having
  to learn multiple paradigms.)
 * Clarifies "what can be found where" (albeit not perfectly)
  since you can look to module dependencies and follow back from there.
--- a/docs/src/design/proposals/APIRedesign_PeteRichards.md
+++ b/docs/src/design/proposals/APIRedesign_PeteRichards.md
@ -3,7 +3,7 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*

 - [Reducing interface depth (the bundle.json version)](#reducing-interface-depth-the-bundlejson-version)
-  - [Imperitive component registries](#imperative-component-registries)
+  - [Imperitive component registries](#imperitive-component-registries)
  - [Get rid of "extension category" concept.](#get-rid-of-extension-category-concept)
  - [Reduce number and depth of extension points](#reduce-number-and-depth-of-extension-points)
  - [Composite services should not be the default](#composite-services-should-not-be-the-default)
@ -30,11 +30,11 @@

 # Reducing interface depth (the bundle.json version)

-## Imperative component registries 
+## Imperitive component registries 

 Transition component registries to javascript, get rid of bundle.json and bundles.json.  Prescribe a method for application configuration, but allow flexibility in how application configuration is defined.

-Register components in an imperative fashion, see angularApp.factory, angularApp.controller, etc.  Alternatively, implement our own application object with new registries and it's own form of registering objects.
+Register components in an imperitive fashion, see angularApp.factory, angularApp.controller, etc.  Alternatively, implement our own application object with new registries and it's own form of registering objects.

 ## Get rid of "extension category" concept.

@ -99,7 +99,7 @@ To reduce interface depth, we can replace our own provider and registry patterns

 ## More angular: for all services

-Increasing our commitment to angular would mean using more of the angular factories, services, etc, and less of our home grown tools.  We'd implement our services and extension points as angular providers, and make them configurable via app.config.
+Increasing our commitment to angular would mean using more of the angular factorys, services, etc, and less of our home grown tools.  We'd implement our services and extension points as angular providers, and make them configurable via app.config.

 As an example, registering a specific type of model provider in angular would look like:

@ -126,9 +126,9 @@ Allow developers to use whatever module loading system they'd like to use, while

 ## Use gulp or grunt for standard tooling

-Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging.  Additional tools can be added to the workflow at low cost, simplifying the setup of developer environments.
+Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging.  Additional tools can be added to the workflow at low cost, simplifying the set up of developer environments.

-Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compilation, and ease of extensibility for standard production build processes.  They're key in decoupling code.
+Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compiliation, and ease of extensibility for standard production build processes.  They're key in decoupling code.

 ## Package openmctweb as single versioned file.

--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@ -643,7 +643,7 @@ to be passed along by other services.
 ## Domain Objects 

 Domain objects are the most fundamental component of Open MCT's information 
-model. A domain object is some distinct thing relevant to a user's workflow, 
+model. A domain object is some distinct thing relevant to a user's work flow, 
 such as a telemetry channel, display, or similar. Open MCT is a tool for 
 viewing, browsing, manipulating, and otherwise interacting with a graph of 
 domain objects. 
@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`.

 Controls provide options for the `mct-control` directive. 
 
-Ten standard control types are included in the forms bundle:
+Six standard control types are included in the forms bundle:

 * `textfield`: An area to enter plain text.
 * `select`: A drop-down list of options.
@ -942,12 +942,6 @@ Ten standard control types are included in the forms bundle:
 * `button`: A button.
 * `datetime`: An input for UTC date/time entry; gives result as a UNIX 
 timestamp, in milliseconds since start of 1970, UTC. 
-* `composite`: A control parenting an array of other controls.
-* `menu-button`: A drop-down list of items supporting custom behavior
-on click.
-* `dialog-button`: A button which opens a dialog allowing a single property
-to be edited.
-* `radio`: A radio button.

 New controls may be added as extensions of the controls category. Extensions of 
 this category have two properties: 
@ -987,7 +981,7 @@ Examples of gestures included in the platform are:
 composition.
 * `drop`: For representations that can be drop targets for drag-and-drop 
 composition. 
-* `menu`: For representations that can be used to popup a context menu. 
+* `menu`: For representations that can be used to pop up a context menu. 
 
 Gesture definitions have a property `key` which is used as a machine-readable 
 identifier for the gesture (e.g. `drag`, `drop`, `menu` above.) 
@ -1159,7 +1153,7 @@ For example, the _My Items_ folder is added as an extension of this category.

 Extensions of this category should have the following properties:

-* `id`: The machine-readable identifier for the domain object being exposed.
+* `id`: The machine-readable identifier for the domaiwn object being exposed.
 * `model`: The model, as a JSON object, for the domain object being exposed. 

 ## Stylesheets Category
@ -1339,6 +1333,55 @@ are supported:
 Open MCT defines several Angular directives that are intended for use both 
 internally within the platform, and by plugins. 

+## Before Unload 
+
+The `mct-before-unload` directive is used to listen for (and prompt for user 
+confirmation) of navigation changes in the browser. This includes reloading, 
+following links out of Open MCT, or changing routes. It is used to hook into 
+both `onbeforeunload` event handling as well as route changes from within 
+Angular.
+
+This directive is useable as an attribute. Its value should be an Angular 
+expression. When an action that would trigger an unload and/or route change 
+occurs, this Angular expression is evaluated. Its result should be a message to 
+display to the user to confirm their navigation change; if this expression 
+evaluates to a falsy value, no message will be displayed. 
+ 
+## Chart 
+
+The `mct-chart` directive is used to support drawing of simple charts. It is 
+present to support the Plot view, and its functionality is limited to the 
+functionality that is relevant for that view.
+
+This directive is used at the element level and takes one attribute, `draw` 
+which is an Angular expression which will should evaluate to a drawing object. 
+This drawing object should contain the following properties:
+
+* `dimensions`: The size, in logical coordinates, of the chart area. A 
+two-element array or numbers. 
+* `origin`: The position, in logical coordinates, of the lower-left corner of 
+the chart area. A two-element array or numbers. 
+* `lines`: An array of lines (e.g. as a plot line) to draw, where each line is 
+expressed as an object containing: 
+    * `buffer`: A Float32Array containing points in the line, in logical 
+    coordinates, in sequential x,y pairs. 
+    * `color`: The color of the line, as a four-element RGBA array, where 
+    each element is a number in the range of 0.0-1.0. 
+    * `points`: The number of points in the line. 
+* `boxes`: An array of rectangles to draw in the chart area. Each is an object 
+containing: 
+    * `start`: The first corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. 
+    * `end`: The opposite corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. color : The color of the line, as a 
+    four-element RGBA array, where each element is a number in the range of 
+    0.0-1.0. 
+
+While `mct-chart` is intended to support plots specifically, it does perform 
+some useful management of canvas objects (e.g. choosing between WebGL and Canvas 
+2D APIs for drawing based on browser support) so its usage is recommended when 
+its supported drawing primitives are sufficient for other charting tasks. 
+ 
 ## Container 

 The `mct-container` is similar to the `mct-include` directive insofar as it allows 
@ -2261,7 +2304,10 @@ 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 a given domain object(first argument, `parent`) can contain a candidate child object (second argument, `child`).
+* `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.
 * `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/index.md
+++ b/docs/src/index.md
@ -9,24 +9,13 @@

 Open MCT provides functionality out of the box, but it's also a platform for
 building rich mission operations applications based on modern web technology. 
- The platform is configured by plugins which extend the platform at a variety
- of extension points. The details of how to
+ The platform is configured declaratively, and defines conventions for
+ building on the provided capabilities by creating modular 'bundles' that 
+ extend the platform at a variety of extension points. The details of how to
 extend the platform are provided in the following documentation.

 ## Sections

- * The [API](api/) document is generated from inline documentation 
- using [JSDoc](http://usejsdoc.org/), and describes the JavaScript objects and
- functions that make up the software platform.
-
- * The [Development Process](process/) document describes the
- Open MCT software development cycle.
-
-## Legacy Documentation
-
-As we transition to a new API, the following documentation for the old API
-(which is supported during the transtion) may be useful as well:
-
 * The [Architecture Overview](architecture/) describes the concepts used 
 throughout Open MCT, and gives a high level overview of the platform's design.
 
@ -34,4 +23,12 @@ As we transition to a new API, the following documentation for the old API
 platform and the functionality that it provides.
 
 * The [Tutorials](tutorials/) give examples of extending the platform to add 
- functionality, and integrate with data sources.
+ functionality, 
+ and integrate with data sources.
+ 
+ * The [API](api/) document is generated from inline documentation 
+ using [JSDoc](http://usejsdoc.org/), and describes the JavaScript objects and
+ functions that make up the software platform.
+
+ * Finally, the [Development Process](process/) document describes the 
+ Open MCT software development cycle.
--- a/docs/src/process/testing/plan.md
+++ b/docs/src/process/testing/plan.md
@ -102,7 +102,7 @@ perform:

 * A relevant subset of [_user testing_](procedures.md#user-test-procedures)
  identified by the acting [project manager](../cycle.md#roles).
-* [_Long-duration testing_](procedures.md#long-duration-testing)
+* [_Long-duration testing_](procedures.md#long-duration-testng)
  (specifically, for 24 hours.)

 Issues are reported as a product of both forms of testing.
--- a/docs/src/tutorials/index.md
+++ b/docs/src/tutorials/index.md
--- a/example/README.md
+++ b/example/README.md
@ -1,2 +1,2 @@
 This directory is for example bundles, which are intended to illustrate 
-how to author new software components using Open MCT.
+how to author new software components using Open MCT Web.
--- a/example/builtins/bundle.js
+++ b/example/builtins/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/builtins/res/templates/example.html
+++ b/example/builtins/res/templates/example.html
@ -1,9 +1,9 @@
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ 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 is licensed under the Apache License, Version 2.0 (the
+ 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.
@ -14,7 +14,7 @@
 License for the specific language governing permissions and limitations
 under the License.

- Open MCT includes source code licensed under additional open source
+ 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.
--- a/example/builtins/src/ExampleController.js
+++ b/example/builtins/src/ExampleController.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/builtins/src/ExampleDirective.js
+++ b/example/builtins/src/ExampleDirective.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/builtins/src/ExampleService.js
+++ b/example/builtins/src/ExampleService.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/bundle.js
+++ b/example/composite/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeAggregator.js
+++ b/example/composite/src/SomeAggregator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeDecorator.js
+++ b/example/composite/src/SomeDecorator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeOtherDecorator.js
+++ b/example/composite/src/SomeOtherDecorator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeOtherExample.js
+++ b/example/composite/src/SomeOtherExample.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeOtherProvider.js
+++ b/example/composite/src/SomeOtherProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/composite/src/SomeProvider.js
+++ b/example/composite/src/SomeProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/eventGenerator/bundle.js
+++ b/example/eventGenerator/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -49,7 +49,7 @@ define([
                {
                    "key": "eventGenerator",
                    "name": "Event Message Generator",
-                    "cssClass": "icon-folder-new",
+                    "glyph": "\u0066",
                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
                    "priority": 10,
                    "features": "creation",
--- a/example/eventGenerator/data/transcript.json
+++ b/example/eventGenerator/data/transcript.json
@ -10,7 +10,7 @@
    "LMP: 47 degrees.",
    "CC: Eagle, looking great. You're GO.",
    "CC: Roger. 1202. We copy it.",
-    "O1: LMP 35 degrees. 35 degrees. 750. Coming down to 23.fl",
+    "O1: LMP 35 degrees. 35 degrees. 750. Coming aown to 23.fl",
    "LMP: 700 feet, 21 down, 33 degrees.",
    "LMP: 600 feet, down at 19.",
    "LMP: 540 feet, down at - 30. Down at 15.",
--- a/example/eventGenerator/src/EventTelemetry.js
+++ b/example/eventGenerator/src/EventTelemetry.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/eventGenerator/src/EventTelemetryProvider.js
+++ b/example/eventGenerator/src/EventTelemetryProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/export/ExportTelemetryAsCSVAction.js
+++ b/example/export/ExportTelemetryAsCSVAction.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -36,7 +36,7 @@ define([
                    "name": "Export Telemetry as CSV",
                    "implementation": ExportTelemetryAsCSVAction,
                    "category": "contextual",
-                    "cssClass": "icon-download",
+                    "glyph": "\u0033",
                    "depends": [ "exportService" ]
                }
            ]
--- a/example/extensions/bundle.js
+++ b/example/extensions/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/extensions/src/SomeExample.js
+++ b/example/extensions/src/SomeExample.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/forms/bundle.js
+++ b/example/forms/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/forms/res/templates/exampleForm.html
+++ b/example/forms/res/templates/exampleForm.html
@ -1,9 +1,9 @@
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ 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 is licensed under the Apache License, Version 2.0 (the
+ 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.
@ -14,20 +14,18 @@
 License for the specific language governing permissions and limitations
 under the License.

- Open MCT includes source code licensed under additional open source
+ 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.
 -->
 <div ng-controller="ExampleFormController">
-    <mct-toolbar structure="toolbar"
-                 ng-model="state"
-                 name="aToolbar"></mct-toolbar>
+    <mct-toolbar structure="toolbar" ng-model="state" name="aToolbar">
+    </mct-toolbar>
+
+    <mct-form structure="form" ng-model="state" name="aForm">
+    </mct-form>

-    <mct-form structure="form"
-              ng-model="state"
-              class="validates"
-              name="aForm"></mct-form>

    <ul>
        <li>Dirty: {{aForm.$dirty}}</li>
@ -35,8 +33,11 @@
    </ul>

    <pre>
+
+
    <textarea>
    {{state | json}}
    </textarea>
+
    </pre>
 </div>
--- a/example/forms/src/ExampleFormController.js
+++ b/example/forms/src/ExampleFormController.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -78,26 +78,27 @@ define(
                        items: [
                            {
                                control: "button",
-                                csslass: "icon-save",
+                                glyph: "1",
+                                description: "Button A",
                                click: function () {
-                                    window.alert("Save");
+                                    window.alert("A");
                                }
                            },
                            {
                                control: "button",
-                                csslass: "icon-x",
+                                glyph: "2",
                                description: "Button B",
                                click: function () {
-                                    window.alert("Cancel");
+                                    window.alert("B");
                                }
                            },
                            {
                                control: "button",
-                                csslass: "icon-trash",
+                                glyph: "3",
                                description: "Button C",
                                disabled: true,
                                click: function () {
-                                    window.alert("Delete");
+                                    window.alert("C");
                                }
                            }
                        ]
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@ -1,87 +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([
-    './WorkerInterface'
-], function (
-    WorkerInterface
-) {
-
-    var REQUEST_DEFAULTS = {
-        amplitude: 1,
-        period: 10,
-        offset: 0,
-        dataRateInHz: 1
-    };
-
-    function GeneratorProvider() {
-        this.workerInterface = new WorkerInterface();
-    }
-
-    GeneratorProvider.prototype.canProvideTelemetry = function (domainObject) {
-        return domainObject.type === 'generator';
-    };
-
-    GeneratorProvider.prototype.supportsRequest =
-        GeneratorProvider.prototype.supportsSubscribe =
-            GeneratorProvider.prototype.canProvideTelemetry;
-
-    GeneratorProvider.prototype.makeWorkerRequest = function (domainObject, request) {
-        var props = [
-            'amplitude',
-            'period',
-            'offset',
-            'dataRateInHz'
-        ];
-
-        var workerRequest = {};
-
-        props.forEach(function (prop) {
-            if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
-                workerRequest[prop] = domainObject.telemetry[prop];
-            }
-            if (request.hasOwnProperty(prop)) {
-                workerRequest[prop] = request[prop];
-            }
-            if (!workerRequest[prop]) {
-                workerRequest[prop] = REQUEST_DEFAULTS[prop];
-            }
-            workerRequest[prop] = Number(workerRequest[prop]);
-        });
-
-        return workerRequest;
-    };
-
-    GeneratorProvider.prototype.request = function (domainObject, request) {
-        var workerRequest = this.makeWorkerRequest(domainObject, request);
-        workerRequest.start = request.start;
-        workerRequest.end = request.end;
-        return this.workerInterface.request(workerRequest);
-    };
-
-    GeneratorProvider.prototype.subscribe = function (domainObject, callback, request) {
-        var workerRequest = this.makeWorkerRequest(domainObject, request);
-        return this.workerInterface.subscribe(workerRequest, callback);
-    };
-
-    return GeneratorProvider;
-});
--- a/example/generator/SinewaveTelemetryProvider.js
+++ b/example/generator/SinewaveTelemetryProvider.js
@ -1,70 +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,Promise*/
-
-/**
- * Module defining SinewaveTelemetryProvider. Created by vwoeltje on 11/12/14.
- */
-define([
-    "./SinewaveTelemetrySeries",
-    "./GeneratorProvider"
-], function (
-    SinewaveTelemetrySeries,
-    GeneratorProvider
-) {
-
-    function SinewaveTelemetryProvider() {
-        this.provider = new GeneratorProvider();
-    }
-
-    SinewaveTelemetryProvider.prototype.requestTelemetry = function (requests) {
-        if (requests[0].source !== 'generator') {
-            return Promise.resolve({});
-        }
-        return this.provider.request({}, requests[0])
-            .then(function (data) {
-                var res = {
-                    generator: {}
-                };
-                res.generator[requests[0].key] = new SinewaveTelemetrySeries(data);
-                return res;
-            });
-    };
-
-    SinewaveTelemetryProvider.prototype.subscribe = function (callback, requests) {
-        if (requests[0].source !== 'generator') {
-            return function unsubscribe() {};
-        }
-
-        function wrapper(data) {
-            var res = {
-                generator: {}
-            };
-            res.generator[requests[0].key] = new SinewaveTelemetrySeries(data);
-            callback(res);
-        }
-
-        return this.provider.subscribe({}, wrapper, requests[0]);
-    };
-
-    return SinewaveTelemetryProvider;
-});
--- a/example/generator/SinewaveTelemetrySeries.js
+++ b/example/generator/SinewaveTelemetrySeries.js
@ -1,75 +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,Promise*/
-
-/**
- * Module defining SinewaveTelemetry. Created by vwoeltje on 11/12/14.
- */
-define([
-
-], function (
-
-) {
-        "use strict";
-
-        function SinewaveTelemetrySeries(data) {
-            if (!Array.isArray(data)) {
-                data = [data];
-            }
-            this.data = data;
-        }
-
-        SinewaveTelemetrySeries.prototype.getPointCount = function () {
-            return this.data.length;
-        };
-
-
-        SinewaveTelemetrySeries.prototype.getDomainValue = function (
-            index,
-            domain
-        ) {
-            domain = domain || 'time';
-
-            return this.getDatum(index)[domain];
-        };
-
-        SinewaveTelemetrySeries.prototype.getRangeValue = function (
-            index,
-            range
-        ) {
-            range = range || 'sin';
-            return this.getDatum(index)[range];
-        };
-
-        SinewaveTelemetrySeries.prototype.getDatum = function (index) {
-            if (index > this.data.length || index < 0) {
-                throw new Error('IndexOutOfRange: index not available in series.');
-            }
-            return this.data[index];
-        };
-
-        SinewaveTelemetrySeries.prototype.getData = function () {
-            return this.data;
-        };
-
-        return SinewaveTelemetrySeries;
-});
--- a/example/generator/WorkerInterface.js
+++ b/example/generator/WorkerInterface.js
@ -1,115 +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([
-    'text!./generatorWorker.js',
-    'uuid'
-], function (
-    workerText,
-    uuid
-) {
-
-    var workerBlob = new Blob(
-        [workerText],
-        {type: 'application/javascript'}
-    );
-    var workerUrl = URL.createObjectURL(workerBlob);
-
-    function WorkerInterface() {
-        this.worker = new Worker(workerUrl);
-        this.worker.onmessage = this.onMessage.bind(this);
-        this.callbacks = {};
-    }
-
-    WorkerInterface.prototype.onMessage = function (message) {
-        message = message.data;
-        var callback = this.callbacks[message.id];
-        if (callback) {
-            if (callback(message)) {
-                delete this.callbacks[message.id];
-            }
-        }
-    };
-
-    WorkerInterface.prototype.dispatch = function (request, data, callback) {
-        var message = {
-            request: request,
-            data: data,
-            id: uuid()
-        };
-
-        if (callback) {
-            this.callbacks[message.id] = callback;
-        }
-
-        this.worker.postMessage(message);
-
-        return message.id;
-    };
-
-    WorkerInterface.prototype.request = function (request) {
-        var deferred = {};
-        var promise = new Promise(function (resolve, reject) {
-            deferred.resolve = resolve;
-            deferred.reject = reject;
-        });
-
-        function callback(message) {
-            if (message.error) {
-                deferred.reject(message.error);
-            } else {
-                deferred.resolve(message.data);
-            }
-            return true;
-        }
-
-        this.dispatch('request', request, callback);
-
-        return promise;
-    };
-
-    WorkerInterface.prototype.subscribe = function (request, cb) {
-        var isCancelled = false;
-
-        var callback = function (message) {
-            if (isCancelled) {
-                return true;
-            }
-            cb(message.data);
-        };
-
-        var messageId = this.dispatch('subscribe', request, callback)
-
-        return function () {
-            isCancelled = true;
-            this.dispatch('unsubscribe', {
-                id: messageId
-            });
-        }.bind(this);
-
-    };
-
-
-
-
-    return WorkerInterface;
-});
--- a/example/generator/bundle.js
+++ b/example/generator/bundle.js
@ -0,0 +1,144 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*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",
+                    "glyph": "\u0054",
+                    "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+                    "priority": 10,
+                    "features": "creation",
+                    "model": {
+                        "telemetry": {
+                            "period": 10
+                        }
+                    },
+                    "telemetry": {
+                        "source": "generator",
+                        "domains": [
+                            {
+                                "key": "time",
+                                "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*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});
--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@ -1,155 +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 self*/
-
-(function () {
-
-    var FIFTEEN_MINUTES = 15 * 60 * 1000;
-
-    var handlers = {
-        subscribe: onSubscribe,
-        unsubscribe: onUnsubscribe,
-        request: onRequest
-    };
-
-    var subscriptions = {};
-
-    function workSubscriptions(timestamp) {
-        var now = Date.now();
-        var nextWork = Math.min.apply(Math, Object.values(subscriptions).map(function (subscription) {
-            return subscription(now);
-        }));
-        var wait = nextWork - now;
-        if (wait < 0) {
-            wait = 0;
-        }
-
-        if (Number.isFinite(wait)) {
-            setTimeout(workSubscriptions, wait);
-        }
-    }
-
-    function onSubscribe(message) {
-        var data = message.data;
-
-        // Keep
-        var start = Date.now();
-        var step = 1000 / data.dataRateInHz;
-        var nextStep = start - (start % step) + step;
-
-        function work(now) {
-            while (nextStep < now) {
-                self.postMessage({
-                    id: message.id,
-                    data: {
-                        utc: nextStep,
-                        yesterday: nextStep - 60*60*24*1000,
-                        delta: 60*60*24*1000,
-                        sin: sin(nextStep, data.period, data.amplitude, data.offset),
-                        cos: cos(nextStep, data.period, data.amplitude, data.offset)
-                    }
-                });
-                nextStep += step;
-            }
-            return nextStep;
-        }
-
-        subscriptions[message.id] = work;
-        workSubscriptions();
-    }
-
-    function onUnsubscribe(message) {
-        delete subscriptions[message.data.id];
-    }
-
-    function onRequest(message) {
-        var data = message.data;
-        if (data.end == undefined) {
-            data.end = Date.now();
-        }
-        if (data.start == undefined){
-            data.start = data.end - FIFTEEN_MINUTES;
-        }
-
-        var now = Date.now();
-        var start = data.start;
-        var end = data.end > now ? now : data.end;
-        var amplitude = data.amplitude;
-        var period = data.period;
-        var offset = data.offset;
-        var dataRateInHz = data.dataRateInHz;
-
-        var step = 1000 / dataRateInHz;
-        var nextStep = start - (start % step) + step;
-
-        var data = [];
-
-        for (; nextStep < end; nextStep += step) {
-            data.push({
-                utc: nextStep,
-                yesterday: nextStep - 60*60*24*1000,
-                delta: 60*60*24*1000,
-                sin: sin(nextStep, period, amplitude, offset),
-                cos: cos(nextStep, period, amplitude, offset)
-            });
-        }
-        self.postMessage({
-            id: message.id,
-            data: data
-        });
-    }
-
-    function cos(timestamp, period, amplitude, offset) {
-        return amplitude *
-            Math.cos(timestamp / period / 1000 * Math.PI * 2) + offset;
-    }
-
-    function sin(timestamp, period, amplitude, offset) {
-        return amplitude *
-            Math.sin(timestamp / period / 1000 * Math.PI * 2) + offset;
-    }
-
-    function sendError(error, message) {
-        self.postMessage({
-            error: error.name + ': ' + error.message,
-            message: message,
-            id: message.id
-        });
-    }
-
-    self.onmessage = function handleMessage(event) {
-        var message = event.data;
-        var handler = handlers[message.request];
-
-        if (!handler) {
-            sendError(new Error('unknown message type'), message);
-        } else {
-            try {
-                handler(message);
-            } catch (e) {
-                sendError(e, message);
-            }
-        }
-    };
-
-}());
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@ -1,171 +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([
-    "./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/generator/src/SinewaveConstants.js
+++ b/example/generator/src/SinewaveConstants.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,12 +14,12 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
 *****************************************************************************/
-/*global define*/
+/*global define,Promise*/

 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
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,16 +14,17 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
 *****************************************************************************/
-/*global define*/
+/*global define,Promise*/

 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
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/generator/src/SinewaveTelemetryProvider.js
+++ b/example/generator/src/SinewaveTelemetryProvider.js
@ -0,0 +1,119 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SinewaveTelemetryProvider. Created by vwoeltje on 11/12/14.
+ */
+define(
+    ["./SinewaveTelemetrySeries"],
+    function (SinewaveTelemetrySeries) {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SinewaveTelemetryProvider($q, $timeout) {
+            var subscriptions = [],
+                generating = false;
+
+            //
+            function matchesSource(request) {
+                return request.source === "generator";
+            }
+
+            // Used internally; this will be repacked by doPackage
+            function generateData(request) {
+                return {
+                    key: request.key,
+                    telemetry: new SinewaveTelemetrySeries(request)
+                };
+            }
+
+            //
+            function doPackage(results) {
+                var packaged = {};
+                results.forEach(function (result) {
+                    packaged[result.key] = result.telemetry;
+                });
+                // Format as expected (sources -> keys -> telemetry)
+                return { generator: packaged };
+            }
+
+            function requestTelemetry(requests) {
+                return $timeout(function () {
+                    return doPackage(requests.filter(matchesSource).map(generateData));
+                }, 0);
+            }
+
+            function handleSubscriptions() {
+                subscriptions.forEach(function (subscription) {
+                    var requests = subscription.requests;
+                    subscription.callback(doPackage(
+                        requests.filter(matchesSource).map(generateData)
+                    ));
+                });
+            }
+
+            function startGenerating() {
+                generating = true;
+                $timeout(function () {
+                    handleSubscriptions();
+                    if (generating && subscriptions.length > 0) {
+                        startGenerating();
+                    } else {
+                        generating = false;
+                    }
+                }, 1000);
+            }
+
+            function subscribe(callback, requests) {
+                var subscription = {
+                    callback: callback,
+                    requests: requests
+                };
+
+                function unsubscribe() {
+                    subscriptions = subscriptions.filter(function (s) {
+                        return s !== subscription;
+                    });
+                }
+
+                subscriptions.push(subscription);
+
+                if (!generating) {
+                    startGenerating();
+                }
+
+                return unsubscribe;
+            }
+
+            return {
+                requestTelemetry: requestTelemetry,
+                subscribe: subscribe
+            };
+        }
+
+        return SinewaveTelemetryProvider;
+    }
+);
--- a/example/generator/src/SinewaveTelemetrySeries.js
+++ b/example/generator/src/SinewaveTelemetrySeries.js
@ -0,0 +1,78 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SinewaveTelemetry. Created by vwoeltje on 11/12/14.
+ */
+define(
+    ['./SinewaveConstants'],
+    function (SinewaveConstants) {
+        "use strict";
+
+        var ONE_DAY = 60 * 60 * 24,
+            firstObservedTime = Math.floor(SinewaveConstants.START_TIME / 1000);
+
+        /**
+         *
+         * @constructor
+         */
+        function SinewaveTelemetrySeries(request) {
+            var timeOffset = (request.domain === 'yesterday') ? ONE_DAY : 0,
+                latestTime = Math.floor(Date.now() / 1000) - timeOffset,
+                firstTime = firstObservedTime - timeOffset,
+                endTime = (request.end !== undefined) ?
+                        Math.floor(request.end / 1000) : latestTime,
+                count = Math.min(endTime, latestTime) - firstTime,
+                period = +request.period || 30,
+                generatorData = {},
+                requestStart = (request.start === undefined) ? firstTime :
+                        Math.max(Math.floor(request.start / 1000), firstTime),
+                offset = requestStart - firstTime;
+
+            if (request.size !== undefined) {
+                offset = Math.max(offset, count - request.size);
+            }
+
+            generatorData.getPointCount = function () {
+                return count - offset;
+            };
+
+            generatorData.getDomainValue = function (i, domain) {
+                // delta uses the same numeric values as the default domain,
+                // so it's not checked for here, just formatted for display
+                // differently.
+                return (i + offset) * 1000 + firstTime * 1000 -
+                    (domain === 'yesterday' ? (ONE_DAY * 1000) : 0);
+            };
+
+            generatorData.getRangeValue = function (i, range) {
+                range = range || "sin";
+                return Math[range]((i + offset) * Math.PI * 2 / period);
+            };
+
+            return generatorData;
+        }
+
+        return SinewaveTelemetrySeries;
+    }
+);
--- a/example/identity/bundle.js
+++ b/example/identity/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/identity/src/ExampleIdentityService.js
+++ b/example/identity/src/ExampleIdentityService.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/imagery/bundle.js
+++ b/example/imagery/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -49,7 +49,7 @@ define([
                {
                    "key": "imagery",
                    "name": "Example Imagery",
-                    "cssClass": "icon-image",
+                    "glyph": "\u00e3",
                    "features": "creation",
                    "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
                    "priority": 10,
--- a/example/imagery/src/ImageTelemetry.js
+++ b/example/imagery/src/ImageTelemetry.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -31,25 +31,10 @@ define(

        var firstObservedTime = Date.now(),
            images = [
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
-
+                "http://www.nasa.gov/393811main_Palomar_ao_bouchez_10s_after_impact_4x3_946-710.png",
+                "http://www.nasa.gov/393821main_Palomar_ao_bouchez_15s_after_impact_4x3_946-710.png",
+                "http://www.nasa.gov/images/content/393801main_CfhtVeillet2_4x3_516-387.jpg",
+                "http://www.nasa.gov/images/content/392790main_1024_768_GeminiNorth_NightBeforeImpact_946-710.jpg"
            ].map(function (url, index) {
                return {
                    timestamp: firstObservedTime + 1000 * index,
--- a/example/imagery/src/ImageTelemetryProvider.js
+++ b/example/imagery/src/ImageTelemetryProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- 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,77 +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/plugins/utcTimeSystem/LocalClock',
-    './LADTickSource'
-], function (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) {
-
-        /**
-         * Some metadata, which will be used to identify the time system in
-         * the UI
-         * @type {{key: string, name: string, glyph: string}}
-         */
-        this.key = 'local';
-        this.name = 'Local';
-        this.cssClass = '\u0043';
-
-        this.fmts = ['local-format'];
-        this.sources = [new LocalClock($timeout, DEFAULT_PERIOD), new LADTickSource($timeout, DEFAULT_PERIOD)];
-    }
-
-    LocalTimeSystem.prototype.formats = function () {
-        return this.fmts;
-    };
-
-    LocalTimeSystem.prototype.deltaFormat = function () {
-        return 'duration';
-    };
-
-    LocalTimeSystem.prototype.tickSources = function () {
-        return this.sources;
-    };
-
-    LocalTimeSystem.prototype.isUTCBased = function () {
-        return true;
-    };
-
-    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/mobile/bundle.js
+++ b/example/mobile/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/mobile/res/sass/mobile-example.scss
+++ b/example/mobile/res/sass/mobile-example.scss
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -25,7 +25,7 @@

@include phoneandtablet {
    // Show the Create button
-    .create-button-holder {
+    .create-btn-holder {
        display: block !important;
    }
 }
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -23,43 +23,45 @@

 define([
    "./src/RemsTelemetryServerAdapter",
+    "./src/RemsTelemetryInitializer",
    "./src/RemsTelemetryModelProvider",
    "./src/RemsTelemetryProvider",
    'legacyRegistry',
    "module"
 ], function (
    RemsTelemetryServerAdapter,
+    RemsTelemetryInitializer,
    RemsTelemetryModelProvider,
    RemsTelemetryProvider,
    legacyRegistry
 ) {
    "use strict";
-    legacyRegistry.register("example/msl", {
+    legacyRegistry.register("example/notifications", {
        "name" : "Mars Science Laboratory Data Adapter",
        "extensions" : {
        "types": [
            {
                "name":"Mars Science Laboratory",
                "key": "msl.curiosity",
-                    "cssClass": "icon-object"
+                "glyph": "o"
            },
            {
                "name": "Instrument",
                "key": "msl.instrument",
-                    "cssClass": "icon-object",
+                "glyph": "o",
                "model": {"composition": []}
            },
            {
                "name": "Measurement",
                "key": "msl.measurement",
-                    "cssClass": "icon-telemetry",
+                "glyph": "\u0054",
                "model": {"telemetry": {}},
                "telemetry": {
                    "source": "rems.source",
                    "domains": [
                        {
                            "name": "Time",
-                                "key": "utc",
+                            "key": "timestamp",
                            "format": "utc"
                        }
                    ]
@ -73,18 +75,13 @@ define([
            }
        ],
        "roots": [
-                {
-                    "id": "msl:curiosity"
-                }
-            ],
-            "models": [
            {
                "id": "msl:curiosity",
-                    "priority": "preferred",
+                "priority" : "preferred",
                "model": {
                    "type": "msl.curiosity",
                    "name": "Mars Science Laboratory",
-                        "composition": ["msl_tlm:rems"]
+                    "composition": []
                }
            }
        ],
@ -92,7 +89,13 @@ define([
            {
                "key":"rems.adapter",
                "implementation": RemsTelemetryServerAdapter,
-                    "depends": ["$http", "$log", "REMS_WS_URL"]
+                "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
+            }
+        ],
+        "runs": [
+            {
+                "implementation": RemsTelemetryInitializer,
+                "depends": ["rems.adapter", "objectService"]
            }
        ],
        "components": [
--- a/example/msl/src/MSLDataDictionary.js
+++ b/example/msl/src/MSLDataDictionary.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/msl/src/RemsTelemetryInitializer.js
+++ b/example/msl/src/RemsTelemetryInitializer.js
@ -0,0 +1,71 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    function (){
+        "use strict";
+
+        var TAXONOMY_ID = "msl:curiosity",
+            PREFIX = "msl_tlm:";
+
+        /**
+         * Function that is executed on application startup and populates
+         * the navigation tree with objects representing the MSL REMS
+         * telemetry points. The tree is populated based on the data
+         * dictionary on the provider.
+         *
+         * @param {RemsTelemetryServerAdapter} adapter The server adapter
+         * (necessary in order to retrieve data dictionary)
+         * @param objectService the ObjectService which allows for lookup of
+         * objects by ID
+         * @constructor
+         */
+        function RemsTelemetryInitializer(adapter, objectService) {
+            function makeId(element) {
+                return PREFIX + element.identifier;
+            }
+
+            function initializeTaxonomy(dictionary) {
+                function getTaxonomyObject(domainObjects) {
+                    return domainObjects[TAXONOMY_ID];
+                }
+
+                function populateModel (taxonomyObject) {
+                    return taxonomyObject.useCapability(
+                        "mutation",
+                        function (model) {
+                            model.name = dictionary.name;
+                            model.composition = dictionary.instruments.map(makeId);
+                        }
+                    );
+                }
+
+                objectService.getObjects([TAXONOMY_ID])
+                    .then(getTaxonomyObject)
+                    .then(populateModel);
+            }
+            initializeTaxonomy(adapter.dictionary);
+        }
+        return RemsTelemetryInitializer;
+    }
+);
--- a/example/msl/src/RemsTelemetryModelProvider.js
+++ b/example/msl/src/RemsTelemetryModelProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/msl/src/RemsTelemetryProvider.js
+++ b/example/msl/src/RemsTelemetryProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/msl/src/RemsTelemetrySeries.js
+++ b/example/msl/src/RemsTelemetrySeries.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/msl/src/RemsTelemetryServerAdapter.js
+++ b/example/msl/src/RemsTelemetryServerAdapter.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -42,12 +42,14 @@ define(
         * @param REMS_WS_URL The location of the REMS telemetry data.
         * @constructor
         */
-        function RemsTelemetryServerAdapter($http, $log, REMS_WS_URL) {
+        function RemsTelemetryServerAdapter($q, $http, $log, REMS_WS_URL) {
            this.localDataURI = module.uri.substring(0, module.uri.lastIndexOf('/') + 1) + LOCAL_DATA;
+            this.deferreds = {};
            this.REMS_WS_URL = REMS_WS_URL;
+            this.$q = $q;
            this.$http = $http;
            this.$log = $log;
-            this.promise = undefined;
+            this.cache = undefined;
        }

        /**
@ -63,10 +65,15 @@ define(
         */
        RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
            var self = this,
-                id = request.key;
+                id = request.key,
+                deferred = this.$q.defer();

            function processResponse(response){
                var data = [];
+                /*
+                 * Currently all data is returned for entire history of the mission. Cache response to avoid unnecessary re-queries.
+                 */
+                self.cache = response;
                /*
                 * History data is organised by Sol. Iterate over sols...
                 */
@ -103,15 +110,17 @@ define(
            }

            function packageAndResolve(results){
-                return {id: id, values: results};
+                deferred.resolve({id: id, values: results});
            }


-            return (this.promise = this.promise || this.$http.get(this.REMS_WS_URL))
+            this.$q.when(this.cache || this.$http.get(this.REMS_WS_URL))
                .catch(fallbackToLocal)
                .then(processResponse)
                .then(filterResults)
                .then(packageAndResolve);
+
+            return deferred.promise;
        };

        /**
@ -123,6 +132,7 @@ define(
         * @returns {Promise | Array<RemsTelemetryValue>} that resolves with an Array of {@link RemsTelemetryValue} objects for the request data key.
         */
        RemsTelemetryServerAdapter.prototype.history = function(request) {
+            var id = request.key;
            return this.requestHistory(request);
        };

--- a/example/notifications/bundle.js
+++ b/example/notifications/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/notifications/res/dialog-launch.html
+++ b/example/notifications/res/dialog-launch.html
@ -1,9 +1,9 @@
-<span class="status block" ng-controller="DialogLaunchController">
+<span class="status block ok" ng-controller="DialogLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <span class="status-indicator icon-box-with-arrow"></span><span class="label">
+    <span class="ui-symbol status-indicator">&#xe600;</span><span class="label">
        <a ng-click="launchProgress(true)">Known</a> |
        <a ng-click="launchProgress(false)">Unknown</a> |
        <a ng-click="launchError()">Error</a> |
        <a ng-click="launchInfo()">Info</a>
-    </span><span class="count"></span>
+    </span><span class="count">Dialogs</span>
 </span>
--- a/example/notifications/res/notification-launch.html
+++ b/example/notifications/res/notification-launch.html
@ -1,9 +1,9 @@
-<span class="status block" ng-controller="NotificationLaunchController">
+<span class="status block ok" ng-controller="NotificationLaunchController">
    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <span class="status-indicator icon-bell"></span><span class="label">
+    <span class="ui-symbol status-indicator">&#xe600;</span><span class="label">
        <a ng-click="newInfo()">Success</a> |
        <a ng-click="newError()">Error</a> |
        <a ng-click="newAlert()">Alert</a> |
        <a ng-click="newProgress()">Progress</a>
-    </span><span class="count"></span>
+    </span><span class="count">Notifications</span>
 </span>
--- a/example/notifications/src/DialogLaunchController.js
+++ b/example/notifications/src/DialogLaunchController.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -44,8 +44,7 @@ define(
             periodically with the progress of an ongoing process.
             */
            $scope.launchProgress = function (knownProgress) {
-                var dialog,
-                    model = {
+                var model = {
                    title: "Progress Dialog Example",
                    progress: 0,
                    hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.",
@ -58,7 +57,7 @@ define(
                            label: "Cancel Operation",
                            callback: function () {
                                $log.debug("Operation cancelled");
-                                    dialog.dismiss();
+                                dialogService.dismiss();
                            }
                        },
                        {
@ -78,9 +77,7 @@ define(
                    }
                }

-                dialog = dialogService.showBlockingMessage(model);
-
-                if (dialog) {
+                if (dialogService.showBlockingMessage(model)) {
                    //Do processing here
                    model.actionText = "Processing 100 objects...";
                    if (knownProgress) {
@ -96,8 +93,7 @@ define(
             Demonstrates launching an error dialog
             */
            $scope.launchError = function () {
-                var dialog,
-                    model = {
+                var model = {
                    title: "Error Dialog Example",
                    actionText: "Something happened, and it was not good.",
                    severity: "error",
@ -106,21 +102,20 @@ define(
                            label: "Try Again",
                            callback: function () {
                                $log.debug("Try Again Pressed");
-                                    dialog.dismiss();
+                                dialogService.dismiss();
                            }
                        },
                        {
                            label: "Cancel",
                            callback: function () {
                                $log.debug("Cancel Pressed");
-                                    dialog.dismiss();
+                                dialogService.dismiss();
                            }
                        }
                    ]
                };
-                dialog = dialogService.showBlockingMessage(model);

-                if (!dialog) {
+                if (!dialogService.showBlockingMessage(model)) {
                    $log.error("Could not display modal dialog");
                }
            };
@ -129,8 +124,7 @@ define(
             Demonstrates launching an error dialog
             */
            $scope.launchInfo = function () {
-                var dialog,
-                    model = {
+                var model = {
                    title: "Info Dialog Example",
                    actionText: "This is an example of a blocking info" +
                    " dialog. This dialog can be used to draw the user's" +
@ -140,14 +134,12 @@ define(
                            label: "OK",
                            callback: function () {
                                $log.debug("OK Pressed");
-                                    dialog.dismiss();
+                                dialogService.dismiss();
                            }
                        }
                };

-                dialog = dialogService.showBlockingMessage(model);
-
-                if (!dialog) {
+                if (!dialogService.showBlockingMessage(model)) {
                    $log.error("Could not display modal dialog");
                }
            };
--- a/example/notifications/src/DialogLaunchIndicator.js
+++ b/example/notifications/src/DialogLaunchIndicator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -32,15 +32,17 @@ define(
         * launched for demonstration and testing purposes.
         * @constructor
         */
-
        function DialogLaunchIndicator() {

        }

        DialogLaunchIndicator.template = 'dialogLaunchTemplate';

+        DialogLaunchIndicator.prototype.getGlyph = function () {
+            return "i";
+        };
        DialogLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'ok';
+            return 'caution';
        };
        DialogLaunchIndicator.prototype.getText = function () {
            return "Launch test dialog";
--- a/example/notifications/src/NotificationLaunchController.js
+++ b/example/notifications/src/NotificationLaunchController.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/notifications/src/NotificationLaunchIndicator.js
+++ b/example/notifications/src/NotificationLaunchIndicator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -26,21 +26,17 @@ define(
    function () {
        "use strict";

-        /**
-         * A tool for manually invoking notifications. When included this
-         * indicator will allow for notifications of different types to be
-         * launched for demonstration and testing purposes.
-         * @constructor
-         */
-
        function NotificationLaunchIndicator() {

        }

        NotificationLaunchIndicator.template = 'notificationLaunchTemplate';

+        NotificationLaunchIndicator.prototype.getGlyph = function () {
+            return "i";
+        };
        NotificationLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'ok';
+            return 'caution';
        };
        NotificationLaunchIndicator.prototype.getText = function () {
            return "Launch notification";
--- a/example/persistence/bundle.js
+++ b/example/persistence/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/persistence/src/BrowserPersistenceProvider.js
+++ b/example/persistence/src/BrowserPersistenceProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/plotOptions/bundle.js
+++ b/example/plotOptions/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -81,7 +81,7 @@ define([
                {
                    "key": "plot",
                    "name": "Example Telemetry Plot",
-                    "cssClass": "icon-telemetry-panel",
+                    "glyph": "\u0074",
                    "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-small l-numeric",
                            "key": "period",
                            "required": true,
                            "property": [
--- a/example/policy/bundle.js
+++ b/example/policy/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/policy/src/ExamplePolicy.js
+++ b/example/policy/src/ExamplePolicy.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/profiling/bundle.js
+++ b/example/profiling/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/profiling/src/DigestIndicator.js
+++ b/example/profiling/src/DigestIndicator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -59,14 +59,11 @@ define(
            update();

            return {
-                /**
-                 * 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
-                 */
-                getCssClass: function () {
-                    return "icon-connectivity";
+                getGlyph: function () {
+                    return ".";
+                },
+                getGlyphClass: function () {
+                    return undefined;
                },
                getText: function () {
                    return displayed + " digests/sec";
--- a/example/profiling/src/WatchIndicator.js
+++ b/example/profiling/src/WatchIndicator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -55,13 +55,24 @@ define(

            return {
                /**
-                 * Get the CSS class (single character used as an icon)
+                 * Get the glyph (single character used as an icon)
                 * to display in this indicator. This will return ".",
-                 * which should appear as a database icon.
+                 * which should appear as a dataflow icon.
                 * @returns {string} the character of the database icon
                 */
-                getCssClass: function () {
-                    return "icon-database";
+                getGlyph: function () {
+                    return "E";
+                },
+                /**
+                 * Get the name of the CSS class to apply to the glyph.
+                 * This is used to color the glyph to match its
+                 * state (one of ok, caution or err)
+                 * @returns {string} the CSS class to apply to this glyph
+                 */
+                getGlyphClass: function () {
+                    return (watches > 2000) ? "caution" :
+                            (watches < 1000) ? "ok" :
+                                    undefined;
                },
                /**
                 * Get the text that should appear in the indicator.
--- a/example/scratchpad/bundle.js
+++ b/example/scratchpad/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -33,11 +33,6 @@ define([
    legacyRegistry.register("example/scratchpad", {
        "extensions": {
            "roots": [
-                {
-                    "id": "scratch:root"
-                }
-            ],
-            "models": [
                {
                    "id": "scratch:root",
                    "model": {
--- a/example/scratchpad/src/ScratchPersistenceProvider.js
+++ b/example/scratchpad/src/ScratchPersistenceProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/taxonomy/bundle.js
+++ b/example/taxonomy/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -35,11 +35,6 @@ define([
        "description": "Example illustrating the addition of a static top-level hierarchy",
        "extensions": {
            "roots": [
-                {
-                    "id": "exampleTaxonomy"
-                }
-            ],
-            "models": [
                {
                    "id": "exampleTaxonomy",
                    "model": {
--- a/example/taxonomy/src/ExampleTaxonomyModelProvider.js
+++ b/example/taxonomy/src/ExampleTaxonomyModelProvider.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/worker/bundle.js
+++ b/example/worker/bundle.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
--- a/example/worker/src/FibonacciIndicator.js
+++ b/example/worker/src/FibonacciIndicator.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -50,12 +50,15 @@ define(
            requestNext();

            return {
-                getCssClass: function () {
-                    return "icon-object-unknown";
+                getGlyph: function () {
+                    return "?";
                },
                getText: function () {
                    return latest;
                },
+                getGlyphClass: function () {
+                    return "";
+                },
                getDescription: function () {
                    return "";
                }
--- a/gulpfile.js
+++ b/gulpfile.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,41 +14,47 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
 *****************************************************************************/

 /*global require,__dirname*/
-
 var gulp = require('gulp'),
+    requirejsOptimize = require('gulp-requirejs-optimize'),
    sourcemaps = require('gulp-sourcemaps'),
+    rename = require('gulp-rename'),
+    sass = require('gulp-sass'),
+    bourbon = require('node-bourbon'),
+    jshint = require('gulp-jshint'),
+    jscs = require('gulp-jscs'),
+    replace = require('gulp-replace-task'),
+    karma = require('karma'),
    path = require('path'),
    fs = require('fs'),
    git = require('git-rev-sync'),
    moment = require('moment'),
+    merge = require('merge-stream'),
    project = require('./package.json'),
    _ = require('lodash'),
    paths = {
-        main: 'openmct.js',
+        main: 'main.js',
        dist: 'dist',
-        reports: 'dist/reports',
+        assets: 'dist/assets',
        scss: ['./platform/**/*.scss', './example/**/*.scss'],
-        assets: [
-            './{example,platform}/**/*.{css,css.map,png,svg,ico,woff,eot,ttf}'
-        ],
-        scripts: [ 'openmct.js', 'platform/**/*.js', 'src/**/*.js' ],
+        scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ],
        specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ],
+        static: [
+            'index.html',
+            'platform/**/*',
+            'example/**/*',
+            'bower_components/**/*'
+        ]
    },
    options = {
        requirejsOptimize: {
-            name: 'bower_components/almond/almond.js',
-            include: paths.main.replace('.js', ''),
-            wrap: {
-                startFile: "src/start.frag",
-                endFile: "src/end.frag"
-            },
+            name: paths.main.replace(/\.js$/, ''),
            mainConfigFile: paths.main,
            wrapShim: true
        },
@ -57,6 +63,7 @@ var gulp = require('gulp'),
            singleRun: true
        },
        sass: {
+            includePaths: bourbon.includePaths,
            sourceComments: true
        },
        replace: {
@ -69,14 +76,7 @@ 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');
    return gulp.src(paths.main)
        .pipe(sourcemaps.init())
        .pipe(requirejsOptimize(options.requirejsOptimize))
@ -86,16 +86,10 @@ gulp.task('scripts', function () {
 });

 gulp.task('test', function (done) {
-    var karma = require('karma');
    new karma.Server(options.karma, done).start();
 });

 gulp.task('stylesheets', function () {
-    var sass = require('gulp-sass');
-    var rename = require('gulp-rename');
-    var bourbon = require('node-bourbon');
-    options.sass.includePaths = bourbon.includePaths;
-
    return gulp.src(paths.scss, {base: '.'})
        .pipe(sourcemaps.init())
        .pipe(sass(options.sass).on('error', sass.logError))
@ -109,9 +103,6 @@ gulp.task('stylesheets', function () {
 });

 gulp.task('lint', function () {
-    var jshint = require('gulp-jshint');
-    var merge = require('merge-stream');
-
    var nonspecs = paths.specs.map(function (glob) {
            return "!" + glob;
        }),
@ -121,45 +112,30 @@ gulp.task('lint', function () {
            .pipe(jshint({ jasmine: true }));

    return merge(scriptLint, specLint)
-        .pipe(jshint.reporter('gulp-jshint-html-reporter', {
-            filename: paths.reports + '/lint/jshint-report.html',
-            createMissingFolders : true
-        }))
        .pipe(jshint.reporter('default'))
        .pipe(jshint.reporter('fail'));
 });

 gulp.task('checkstyle', function () {
-    var jscs = require('gulp-jscs');
-    var mkdirp = require('mkdirp');
-    var reportName = 'jscs-html-report.html';
-    var reportPath = path.resolve(paths.reports, 'checkstyle', reportName);
-    var moveReport = fs.rename.bind(fs, reportName, reportPath, _.noop);
-
-    mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
-
    return gulp.src(paths.scripts)
        .pipe(jscs())
        .pipe(jscs.reporter())
-        .pipe(jscs.reporter('jscs-html-reporter')).on('finish', moveReport)
        .pipe(jscs.reporter('fail'));
 });

 gulp.task('fixstyle', function () {
-    var jscs = require('gulp-jscs');
-
    return gulp.src(paths.scripts, { base: '.' })
        .pipe(jscs({ fix: true }))
        .pipe(gulp.dest('.'));
 });

-gulp.task('assets', ['stylesheets'], function () {
-    return gulp.src(paths.assets)
+gulp.task('static', ['stylesheets'], function () {
+    return gulp.src(paths.static, { base: '.' })
        .pipe(gulp.dest(paths.dist));
 });

 gulp.task('watch', function () {
-    return gulp.watch(paths.scss, ['stylesheets', 'assets']);
+    gulp.watch(paths.scss, ['stylesheets']);
 });

 gulp.task('serve', function () {
@ -169,7 +145,7 @@ gulp.task('serve', function () {

 gulp.task('develop', ['serve', 'stylesheets', 'watch']);

-gulp.task('install', [ 'assets', 'scripts' ]);
+gulp.task('install', [ 'static', 'scripts' ]);

 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);

--- a/index.html
+++ b/index.html
@ -1,9 +1,9 @@
 <!--
- Open MCT, Copyright (c) 2014-2016, United States Government
+ 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 is licensed under the Apache License, Version 2.0 (the
+ 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.
@ -14,33 +14,34 @@
 License for the specific language governing permissions and limitations
 under the License.

- Open MCT includes source code licensed under additional open source
+ 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.
 -->
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <title></title>
-    <script src="bower_components/requirejs/require.js">
+    <script type="text/javascript"
+            src="bower_components/requirejs/require.js">
    </script>
-    <script>
-        require(['openmct'], function (openmct) {
-            [
-                'example/imagery',
-                '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.Generator());
-            openmct.install(openmct.plugins.UTCTimeSystem());
-            openmct.start();
+    <script type="text/javascript">
+        require(['main'], function (mct) {
+            require([
+                './tutorials/grootprovider/groots',
+                './tutorials/todo/todo',
+                './tutorials/todo/bundle',
+                './example/imagery/bundle',
+                './example/eventGenerator/bundle',
+                './example/generator/bundle',
+            ], function (grootify, todoPlugin) {
+                grootify(mct);
+                todoPlugin(mct);
+                mct.start();
+            })
        });
    </script>
    <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
@ -54,5 +55,7 @@
    <div class="l-splash-holder s-splash-holder">
        <div class="l-splash s-splash"></div>
    </div>
+
+    <div ng-view></div>
 </body>
 </html>
--- a/jsdoc.json
+++ b/jsdoc.json
@ -1,9 +1,9 @@
 {
    "source": {
        "include": [
-            "src/"
+            "platform/"
        ],
-        "includePattern": "src/.+\\.js$",
+        "includePattern": "platform/.+\\.js$",
        "excludePattern": ".+\\Spec\\.js$|lib/.+"
    },
    "plugins": [
--- a/karma.conf.js
+++ b/karma.conf.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -37,11 +37,9 @@ module.exports = function(config) {
            {pattern: 'bower_components/**/*.js', included: false},
            {pattern: 'src/**/*.js', included: false},
            {pattern: 'example/**/*.js', included: false},
-            {pattern: 'example/**/*.json', included: false},
            {pattern: 'platform/**/*.js', included: false},
            {pattern: 'warp/**/*.js', included: false},
            {pattern: 'platform/**/*.html', included: false},
-            {pattern: 'src/**/*.html', included: false},
            'test-main.js'
        ],

@ -53,7 +51,7 @@ module.exports = function(config) {
        // Preprocess matching files before serving them to the browser.
        // https://npmjs.org/browse/keyword/karma-preprocessor
        preprocessors: {
-            'src/**/!(*Spec).js': [ 'coverage' ],
+            'src/**/src/**/!(*Spec).js': [ 'coverage' ],
            'platform/**/src/**/!(*Spec).js': [ 'coverage' ]
        },

@ -76,14 +74,14 @@ module.exports = function(config) {
        // Specify browsers to run tests in.
        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
        browsers: [
-            'Chrome'
+            'PhantomJS'
        ],

        // Code coverage reporting.
        coverageReporter: {
            dir: process.env.CIRCLE_ARTIFACTS ?
                process.env.CIRCLE_ARTIFACTS + '/coverage' :
-                "dist/reports/coverage",
+                "dist/coverage",
            check: {
                global: {
                    lines: 80
@ -93,13 +91,13 @@ module.exports = function(config) {

        // HTML test reporting.
        htmlReporter: {
-            outputDir: "dist/reports/tests",
+            outputDir: "target/tests",
            preserveDescribeNesting: true,
            foldAll: false
        },

        junitReporter: {
-            outputDir: process.env.CIRCLE_TEST_REPORTS || 'dist/reports/junit'
+            outputDir: process.env.CIRCLE_TEST_REPORTS || 'target/junit'
        },

        // Continuous Integration mode.
--- a/openmct.js
+++ b/openmct.js
@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * 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 is licensed under the Apache License, Version 2.0 (the
+ * 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.
@ -14,7 +14,7 @@
 * License for the specific language governing permissions and limitations
 * under the License.
 *
- * Open MCT includes source code licensed under additional open source
+ * 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.
@ -27,9 +27,8 @@ requirejs.config({
        "angular": "bower_components/angular/angular.min",
        "angular-route": "bower_components/angular-route/angular-route.min",
        "csv": "bower_components/comma-separated-values/csv.min",
+        "es6-promise": "bower_components/es6-promise/promise.min",
        "EventEmitter": "bower_components/eventemitter3/index",
-        "es6-promise": "bower_components/es6-promise/es6-promise.min",
-        "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
        "moment": "bower_components/moment/moment",
        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
        "saveAs": "bower_components/FileSaver.js/FileSaver.min",
@ -37,8 +36,7 @@ requirejs.config({
        "text": "bower_components/text/text",
        "uuid": "bower_components/node-uuid/uuid",
        "zepto": "bower_components/zepto/zepto.min",
-        "lodash": "bower_components/lodash/lodash",
-        "d3": "bower_components/d3/d3.min"
+        "lodash": "bower_components/lodash/lodash"
    },
    "shim": {
        "angular": {
@ -50,9 +48,6 @@ requirejs.config({
        "EventEmitter": {
            "exports": "EventEmitter"
        },
-        "html2canvas": {
-            "exports": "html2canvas"
-        },
        "moment-duration-format": {
            "deps": ["moment"]
        },
@ -61,28 +56,57 @@ requirejs.config({
        },
        "zepto": {
            "exports": "Zepto"
-        },
-        "lodash": {
-            "exports": "lodash"
-        },
-        "d3": {
-            "exports": "d3"
        }
    }
 });

 define([
    './platform/framework/src/Main',
-    './src/defaultRegistry',
-    './src/MCT'
-], function (Main, defaultRegistry, MCT) {
-    var openmct = new MCT();
+    'legacyRegistry',
+    './src/MCT',

-    openmct.legacyRegistry = defaultRegistry;
+    './platform/framework/bundle',
+    './platform/core/bundle',
+    './platform/representation/bundle',
+    './platform/commonUI/about/bundle',
+    './platform/commonUI/browse/bundle',
+    './platform/commonUI/edit/bundle',
+    './platform/commonUI/dialog/bundle',
+    './platform/commonUI/formats/bundle',
+    './platform/commonUI/general/bundle',
+    './platform/commonUI/inspect/bundle',
+    './platform/commonUI/mobile/bundle',
+    './platform/commonUI/themes/espresso/bundle',
+    './platform/commonUI/notification/bundle',
+    './platform/containment/bundle',
+    './platform/execution/bundle',
+    './platform/exporters/bundle',
+    './platform/telemetry/bundle',
+    './platform/features/clock/bundle',
+    './platform/features/imagery/bundle',
+    './platform/features/layout/bundle',
+    './platform/features/pages/bundle',
+    './platform/features/plot/bundle',
+    './platform/features/timeline/bundle',
+    './platform/features/table/bundle',
+    './platform/forms/bundle',
+    './platform/identity/bundle',
+    './platform/persistence/aggregator/bundle',
+    './platform/persistence/local/bundle',
+    './platform/persistence/queue/bundle',
+    './platform/policy/bundle',
+    './platform/entanglement/bundle',
+    './platform/search/bundle',
+    './platform/status/bundle',
+    './platform/commonUI/regions/bundle'
+], function (Main, legacyRegistry, MCT) {
+    var mct = new MCT();

-    openmct.on('start', function () {
-        return new Main().run(defaultRegistry);
+    mct.legacyRegistry = legacyRegistry;
+    mct.run = mct.start;
+    mct.on('start', function () {
+        return new Main().run(legacyRegistry);
    });

-    return openmct;
+    return mct;
 });
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "0.12.1-SNAPSHOT",
+  "version": "0.10.2-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {
    "express": "^4.13.1",
@ -14,23 +14,22 @@
    "gulp": "^3.9.0",
    "gulp-jscs": "^3.0.2",
    "gulp-jshint": "^2.0.0",
-    "gulp-jshint-html-reporter": "^0.1.3",
    "gulp-rename": "^1.2.2",
    "gulp-replace-task": "^0.11.0",
    "gulp-requirejs-optimize": "^0.3.1",
    "gulp-sass": "^2.2.0",
    "gulp-sourcemaps": "^1.6.0",
    "jasmine-core": "^2.3.0",
-    "jscs-html-reporter": "^0.1.0",
    "jsdoc": "^3.3.2",
    "jshint": "^2.7.0",
    "karma": "^0.13.3",
-    "karma-chrome-launcher": "^0.1.12",
+    "karma-chrome-launcher": "^0.1.8",
    "karma-cli": "0.0.4",
    "karma-coverage": "^0.5.3",
    "karma-html-reporter": "^0.2.7",
    "karma-jasmine": "^0.1.5",
    "karma-junit-reporter": "^0.3.8",
+    "karma-phantomjs-launcher": "^1.0.0",
    "karma-requirejs": "^0.2.2",
    "lodash": "^3.10.1",
    "markdown-toc": "^0.11.7",
@ -39,6 +38,7 @@
    "mkdirp": "^0.5.1",
    "moment": "^2.11.1",
    "node-bourbon": "^4.2.3",
+    "phantomjs-prebuilt": "^2.1.0",
    "requirejs": "2.1.x",
    "split": "^1.0.0"
  },
@ -47,8 +47,8 @@
    "test": "karma start --single-run",
    "jshint": "jshint platform example",
    "watch": "karma start",
-    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
-    "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
+    "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api",
+    "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
    "docs": "npm run jsdoc ; npm run otherdoc",
    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
  },
--- a/platform/README.md
+++ b/platform/README.md
@ -1,2 +1,2 @@
-This directory contains all bundles for the Open MCT platform, as well 
+This directory contains all bundles for the Open MCT Web platform, as well 
 as the framework which runs them.
--- a/platform/commonUI/README.md
+++ b/platform/commonUI/README.md
@ -1,5 +1,5 @@
 This directory contains bundles containing common user interface
-elements of Open MCT; that is, the user interface for the application
+elements of Open MCT Web; that is, the user interface for the application
 as a whole (as opposed to for specific features) is implemented here.

 # Extensions
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pete Richards	d475d767d5	add grootprovider	2016-06-17 17:05:05 -07:00
Pete Richards	a63e053399	[ObjectAPI] Draft new Object API Rought prototype of new object API.	2016-06-17 16:59:35 -07:00
Victor Woeltjen	5de7a96ccc	Merge pull request #1010 from nasa/api-type-proto [API Prototype] Type registration	2016-06-17 10:18:42 -07:00
Victor Woeltjen	09a833f524	Merge branch 'api-tutorials' into api-type-proto	2016-06-10 13:28:09 -07:00
Victor Woeltjen	9c4e17bfab	[Tutorials] Add telemetry tutorial	2016-06-07 13:14:36 -07:00
Victor Woeltjen	d3e5d95d6b	[Tutorials] Add example server	2016-06-07 13:00:38 -07:00
Victor Woeltjen	c70793ac2d	[Tutorials] Add remainder of bargraph	2016-06-07 12:55:29 -07:00
Victor Woeltjen	a6ef1d3423	[Tutorials] Add Bar Graph tutorial	2016-06-07 12:49:38 -07:00
Victor Woeltjen	c4fec1af6a	[API] Move type toward a newer API	2016-05-27 13:31:30 -07:00
Victor Woeltjen	a6996df3df	[API] Begin moving out type	2016-05-27 13:17:16 -07:00
Victor Woeltjen	0c660238f2	[API] Add MCT class	2016-05-27 11:49:43 -07:00
Victor Woeltjen	b73b824e55	[API] Add EventEmitter dep	2016-05-27 11:45:59 -07:00
Victor Woeltjen	1954d98628	[Tutorials] Remove diff markings in TodoController	2016-05-27 11:30:53 -07:00
Victor Woeltjen	7aa034ce23	Add todo tutorial	2016-05-26 16:05:38 -07:00
Victor Woeltjen	385dc5d298	Begin adding tutorials	2016-05-26 15:36:09 -07:00