Addressed additional style errors.

API.md

@@ -52,6 +52,7 @@
     - [The URL Status Indicator](#the-url-status-indicator)
     - [Creating a Simple Indicator](#creating-a-simple-indicator)
     - [Custom Indicators](#custom-indicators)
+  - [Included Plugins](#included-plugins)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -428,7 +429,7 @@ attribute      | type   | flags    | notes
 
 ###### Value Hints
 
-Each telemetry value description has an object defining hints.  Keys in this this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.
+Each telemetry value description has an object defining hints.  Keys in this this object represent the hint itself, and the value represents the weight of that hint.  A lower weight means the hint has a higher priority.  For example, multiple values could be hinted for use as the y axis of a plot (raw, engineering), but the highest priority would be the default choice.  Likewise, a table will use hints to determine the default order of columns.
 
 Known hints:
 
@@ -510,7 +511,7 @@ example:
 }
 ```
 
-This strategy says "I want the latest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
+This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
 
 ##### `minmax` request strategy
 
@@ -605,7 +606,7 @@ evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
 
 ### Telemetry Consumer APIs **draft**
 
-The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiment with them before they are finalized, please contact the team via the contact-us link on our website.
+The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
 
 
 ## Time API
@@ -993,7 +994,7 @@ A common use case for indicators is to convey the state of some external system
 persistence backend or HTTP server. So long as this system is accessible via HTTP request, 
 Open MCT provides a general purpose indicator to show whether the server is available and 
 returing a 2xx status code. The URL Status Indicator is made available as a default plugin. See
-the [documentation](./src/plugins/URLIndicatorPlugin) for details on how to install and configure the 
+[Included Plugins](#included-plugins) below for details on how to install and configure the 
 URL Status Indicator.
 
 ### Creating a Simple Indicator
@@ -1032,7 +1033,7 @@ different colors to indicate status.
 
 ### Custom Indicators
 
-A completely custom indicator can be added by simply providing a DOM element to place alongside other indicators.
+A completely custom indicator can be added by simple providing a DOM element to place alongside other indicators.
 
 ``` javascript
     var domNode = document.createElement('div');
@@ -1045,3 +1046,59 @@ A completely custom indicator can be added by simply providing a DOM element to
         element: domNode
     });
 ```
+
+## Included Plugins
+
+Open MCT is packaged along with a few general-purpose plugins:
+
+* `openmct.plugins.Conductor` provides a user interface for working with time
+within the application. If activated, configuration must be provided. This is 
+detailed in the section on [Time Conductor Configuration](#time-conductor-configuration).
+* `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.URLIndicator` adds an indicator which shows the
+availability of a URL with the following options: 
+  - `url` : URL to indicate the status of
+  - `iconClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
+  - `interval`: Interval between checking the connection, defaults to `10000`
+  - `label` Name showing up as text in the status bar, defaults to url
+```javascript
+openmct.install(openmct.plugins.URLIndicator({
+  url: 'http://localhost:8080',
+    iconClass: 'check',
+    interval: 10000,
+    label: 'Localhost'
+ })
+);
+```
+* `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());
+```

LICENSE.md

@@ -1,7 +0,0 @@
-# Open MCT License
-
-Open MCT, Copyright (c) 2014-2019, 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.

LICENSES.md

@@ -0,0 +1,691 @@
+# Open MCT Licenses
+
+Open MCT, Copyright (c) 2014-2017, 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 as follows.
+
+## Software Components Licenses
+
+This software includes components released under the following licenses:
+
+---
+
+### SuperSocket
+
+#### Info
+
+* Link: https://supersocket.codeplex.com/
+
+* Version: 0.9.0.2
+
+* Author: Kerry Jiang
+
+* Description: Supports SuperWebSocket
+
+#### License
+
+Copyright 2012 Kerry Jiang (kerry-jiang@hotmail.com)
+
+SuperSocket 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.
+
+---
+
+### SuperWebSocket
+
+#### Info
+
+* Link: https://superswebocket.codeplex.com/
+
+* Version: 0.9.0.2
+
+* Author: Kerry Jiang
+
+* Description: WebSocket implementation for client-server communication
+
+#### License
+
+Copyright 2010-2013 Kerry Jiang (kerry-jiang@hotmail.com)
+
+SuperWebSocket 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.
+
+
+---
+
+### log4net
+
+#### Info
+
+* Link: http://logging.apache.org/log4net/
+
+* Version: 1.2.13
+
+* Author: Apache Software Foundation
+
+* Description: Logging.
+
+#### License
+
+Copyright © 2004-2015 Apache Software Foundation.
+
+log4net 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.
+
+---
+
+### Blanket.js
+
+#### Info
+
+* Link: http://blanketjs.org/
+
+* Version: 1.1.5
+
+* Author: Alex Seville
+
+* Description: Code coverage measurement and reporting
+
+#### License
+
+Copyright (c) 2013 Alex Seville
+
+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.
+
+---
+
+### Jasmine
+
+#### Info
+
+* Link: http://jasmine.github.io/
+
+* Version: 1.3.1
+
+* Author: Pivotal Labs
+
+* Description: Unit testing
+
+#### License
+
+Copyright (c) 2008-2011 Pivotal Labs
+
+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.
+
+---
+
+### RequireJS
+
+#### Info
+
+* Link: http://requirejs.org/
+
+* Version: 2.1.22
+
+* Author: The Dojo Foundation
+
+* Description: Script loader
+
+#### License
+
+Copyright (c) 2010-2015, The Dojo Foundation
+
+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.
+
+---
+
+### requirejs-text
+
+#### Info
+
+* Link: https://github.com/requirejs/text
+
+* Version: 2.0.14
+
+* Author: The Dojo Foundation
+
+* Description: Text loading plugin for RequireJS
+
+#### License
+
+Copyright (c) 2010-2014, The Dojo Foundation
+
+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.
+
+---
+
+### AngularJS
+
+#### Info
+
+* Link: http://angularjs.org/
+
+* Version: 1.4.4
+
+* Author: Google
+
+* Description: Client-side web application framework
+
+#### License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.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.
+
+---
+
+### Angular-Route
+
+#### Info
+
+* Link: http://angularjs.org/
+
+* Version: 1.4.4
+
+* Author: Google
+
+* Description: Client-side view routing
+
+#### License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.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.
+
+---
+
+### ES6-Promise
+
+#### Info
+
+* Link: https://github.com/jakearchibald/es6-promise
+
+* Version: 3.0.2
+
+* Authors: Yehuda Katz, Tom Dale, Stefan Penner and contributors
+
+* Description: Promise polyfill for pre-ECMAScript 6 browsers
+
+#### License
+
+Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
+
+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.
+
+---
+
+### screenfull.js
+
+#### Info
+
+* Link: https://github.com/sindresorhus/screenfull.js/
+
+* Version: 3.0.0
+
+* Author: Sindre Sorhus
+
+* Description: Wrapper for cross-browser usage of fullscreen API
+
+#### License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+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.
+
+---
+
+### Math.uuid.js
+
+#### Info
+
+* Link: https://github.com/broofa/node-uuid
+
+* Version: 1.4.7
+
+* Author: Robert Kieffer
+
+* Description: Unique identifer generation.
+
+#### License
+
+Copyright (c) 2010-2012 Robert Kieffer
+
+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.
+
+---
+
+### Normalize.css
+
+#### Info
+
+* Link: https://github.com/necolas/normalize.css
+
+* Version: 1.1.2
+
+* Authors: Nicolas Gallagher, Jonathan Neal
+
+* Description: Browser style normalization
+
+#### License
+
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+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.
+
+---
+
+### Moment.js
+
+#### Info
+
+* Link: http://momentjs.com
+
+* Version: 2.11.1
+
+* Authors: Tim Wood, Iskren Chernev, Moment.js contributors
+
+* Description: Time/date parsing/formatting
+
+#### License
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+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.
+
+---
+
+### moment-duration-format
+
+#### Info
+
+* Link: https://github.com/jsmreese/moment-duration-format
+
+* Version: 1.3.0
+
+* Authors: John Madhavan-Reese
+
+* Description: Duration parsing/formatting
+
+#### License
+
+Copyright 2014 John Madhavan-Reese
+
+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.
+
+---
+
+### CSV.js
+
+#### Info
+
+* Link: https://github.com/knrz/CSV.js
+
+* Version: 3.6.4
+
+* Authors: Kash Nouroozi
+
+* Description: Encoder for CSV (comma separated values) export
+
+#### License
+
+Copyright (c) 2014 Kash Nouroozi
+
+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.
+
+---
+
+### FileSaver.js
+
+#### Info
+
+* Link: https://github.com/eligrey/FileSaver.js/
+
+* Version: 0.0.2
+
+* Authors: Eli Grey
+
+* Description: File download initiator (for file exports)
+
+#### License
+
+Copyright © 2015 Eli Grey.
+
+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.
+
+---
+
+### Zepto
+
+#### Info
+
+* Link: http://zeptojs.com/
+
+* Version: 1.1.6
+
+* Authors: Thomas Fuchs
+
+* Description: DOM manipulation
+
+#### License
+
+Copyright (c) 2010-2016 Thomas Fuchs
+http://zeptojs.com/
+
+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.
+
+---
+
+### Json.NET
+
+#### Info
+
+* Link: http://www.newtonsoft.com/json
+
+* Version: 6.0.8
+
+* Author: Newtonsoft
+
+* Description: JSON serialization/deserialization
+
+#### License
+
+Copyright (c) 2007 James Newton-King
+
+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.
+
+---
+
+### Nancy
+
+#### Info
+
+* Link: http://nancyfx.org
+
+* Version: 0.23.2
+
+* Author: Andreas Håkansson, Steven Robbins and contributors
+
+* Description: Embedded web server
+
+#### License
+
+Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
+
+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.
+
+---
+
+### Nancy.Hosting.Self
+
+#### Info
+
+* Link: http://nancyfx.org
+
+* Version: 0.23.2
+
+* Author: Andreas Håkansson, Steven Robbins and contributors
+
+* Description: Embedded web server
+
+#### License
+
+Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors
+
+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.
+
+---
+
+### 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.

README.md

@@ -9,6 +9,26 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S
 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.
@@ -30,7 +50,7 @@ Open MCT is now running, and can be accessed by pointing a web browser at [http:
 
 ## Documentation
 
-Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/).
+Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally.
 
 ### Examples
 
@@ -38,29 +58,68 @@ The clearest examples for developing Open MCT plugins are in the
 [tutorials](https://github.com/nasa/openmct-tutorial) provided in
 our documentation.
 
-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! Feedback can be provided via [GitHub issues](https://github.com/nasa/openmct/issues), or by emailing us at [arc-dl-openmct@mail.nasa.gov](mailto:arc-dl-openmct@mail.nasa.gov).
+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.
 
-## Building Applications With 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.
 
-Open MCT is built using [`npm`](http://npmjs.com/) and [`webpack`](https://webpack.js.org/).
+### 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:
 
-See our documentation for a guide on [building Applications with Open MCT](https://github.com/nasa/openmct/blob/master/API.md#starting-an-open-mct-application).
+* `npm install`
+* `npm install canvas nomnoml`
+* `npm run docs`
 
-## Plugins
+Documentation will be generated in `target/docs`.
 
-Open MCT can be extended via plugins that make calls to the Open MCT API. A plugin is a group 
-of software components (including source code and resources such as images and HTML templates)
-that is intended to be added or removed as a single unit.
+## Deploying Open MCT
 
-As well as providing an extension mechanism, most of the core Open MCT codebase is also 
-written as plugins.
+Open MCT is built using [`npm`](http://npmjs.com/)
+and [`gulp`](http://gulpjs.com/).
 
-For information on writing plugins, please see [our API documentation](https://github.com/nasa/openmct/blob/master/API.md#plugins).
+To build Open MCT for deployment:
+
+`npm run prepare`
+
+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).
+
+## 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
+Open MCT will be expressed as a bundle; platform components are also
+expressed as bundles.
+
+A bundle is also just a directory which contains a file `bundle.json`,
+which declares its contents.
+
+The file `bundles.json` (note the plural), at the top level of the
+repository, is a JSON file containing an array of all bundles (expressed as
+directory names) to include in a running instance of Open MCT. Adding or
+removing paths from this list will add or remove bundles from the running
+application.
 
 ## Tests
 
-Tests are written for [Jasmine 3](https://jasmine.github.io/api/3.1/global)
+Tests are written for [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html)
 and run by [Karma](http://karma-runner.github.io). To run:
 
 `npm test`
@@ -76,7 +135,7 @@ naming convention is otherwise the same.)
 ### Test Reporting
 
 When `npm test` is run, test results will be written as HTML to
-`dist/reports/tests/`. Code coverage information is written to `dist/reports/coverage`.
+`target/tests`. Code coverage information is written to `target/coverage`.
 
 # Glossary
 
@@ -86,8 +145,11 @@ addressed (either by updating this glossary or changing code to reflect
 correct usage.) Other developer documentation, particularly in-line
 documentation, may presume an understanding of these terms.
 
-* _plugin_: A plugin is a removable, reusable grouping of software elements.
-  The application is composed of plugins.
+* _bundle_: A bundle is a removable, reusable grouping of software elements.
+  The application is composed of bundles. Plug-ins are bundles. For more
+  information, refer to framework documentation (under `platform/framework`.)
+* _capability_: An object which exposes dynamic behavior or non-persistent
+  state associated with a domain object.
 * _composition_: In the context of a domain object, this refers to the set of
   other domain objects that compose or are contained by that object. A domain
   object's composition is the set of domain objects that should appear
@@ -102,8 +164,13 @@ documentation, may presume an understanding of these terms.
 * _domain object_: A meaningful object to the user; a distinct thing in
   the work support by Open MCT. Anything that appears in the left-hand
   tree is a domain object.
-* _identifier_: A tuple consisting of a namespace and a key, which together uniquely
-  identifies a domain object.
+* _extension_: An extension is a unit of functionality exposed to the
+  platform in a declarative fashion by a bundle. For more
+  information, refer to framework documentation (under `platform/framework`.)
+* _id_: A string which uniquely identifies a domain object.
+* _key_: When used as an object property, this refers to the machine-readable
+  identifier for a specific thing in a set of things. (Most often used in the
+  context of extensions or other similar application-specific object sets.)
 * _model_: The persistent state associated with a domain object. A domain
   object's model is a JavaScript object which can be converted to JSON
   without losing information (that is, it contains no methods.)
@@ -115,5 +182,7 @@ documentation, may presume an understanding of these terms.
   a user clicks on a domain object in the tree, they are _navigating_ to
   it, and it is thereafter considered the _navigated_ object (until the
   user makes another such choice.)
-* _namespace_: A name used to identify a persistence store. A running open MCT 
-application could potentially use multiple persistence stores, with the 
+* _space_: A name used to identify a persistence store. Interactions with
+  persistence will 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.)

app.js

@@ -19,7 +19,7 @@
 
     // Defaults
     options.port = options.port || options.p || 8080;
-    options.host = options.host || 'localhost'
+    options.host = options.host || options.h || 'localhost'
     options.directory = options.directory || options.D || '.';
     ['include', 'exclude', 'i', 'x'].forEach(function (opt) {
         options[opt] = options[opt] || [];
@@ -34,11 +34,10 @@
     if (options.help || options.h) {
         console.log("\nUsage: node app.js [options]\n");
         console.log("Options:");
-        console.log("  --help, -h                 Show this message.");
-        console.log("  --port, -p <number>        Specify port.");
-        console.log("  --host <host>              Specify host to listen on.");
-        console.log("  --include, -i <bundle>     Include the specified bundle.");
-        console.log("  --exclude, -x <bundle>     Exclude the specified bundle.");
+        console.log("  --help, -h               Show this message.");
+        console.log("  --port, -p <number>      Specify port.");
+        console.log("  --include, -i <bundle>   Include the specified bundle.");
+        console.log("  --exclude, -x <bundle>   Exclude the specified bundle.");
         console.log("  --directory, -D <bundle>   Serve files from specified directory.");
         console.log("");
         process.exit(0);

docs/src/index.md

@@ -33,5 +33,5 @@ As we transition to a new API, the following documentation for the old API
  * The [Developer's Guide](guide/) goes into more detail about how to use the
  platform and the functionality that it provides.
 
- * The [Tutorials](https://github.com/nasa/openmct-tutorial) give examples of extending the platform to add
+ * The [Tutorials](tutorials/) give examples of extending the platform to add
  functionality, and integrate with data sources.

gulpfile.js

@@ -31,6 +31,7 @@ var gulp = require('gulp'),
     git = require('git-rev-sync'),
     moment = require('moment'),
     project = require('./package.json'),
+    _ = require('lodash'),
     paths = {
         main: 'openmct.js',
         dist: 'dist',
@@ -139,7 +140,7 @@ gulp.task('checkstyle', function () {
     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, function () {});
+    var moveReport = fs.rename.bind(fs, reportName, reportPath, _.noop);
 
     mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
 
@@ -178,4 +179,4 @@ gulp.task('install', [ 'assets', 'scripts' ]);
 
 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
-gulp.task('build', [ 'verify', 'install' ]);
+gulp.task('build', [ 'verify', 'install' ]);

openmct.js

@@ -41,14 +41,14 @@ requirejs.config({
         "lodash": "bower_components/lodash/lodash",
         "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
         "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
-        "d3-axis": "node_modules/d3-axis/dist/d3-axis.min",
-        "d3-array": "node_modules/d3-array/dist/d3-array.min",
-        "d3-collection": "node_modules/d3-collection/dist/d3-collection.min",
+        "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
+        "d3-array": "node_modules/d3-array/build/d3-array.min",
+        "d3-collection": "node_modules/d3-collection/build/d3-collection.min",
         "d3-color": "node_modules/d3-color/build/d3-color.min",
         "d3-format": "node_modules/d3-format/build/d3-format.min",
         "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
-        "d3-time": "node_modules/d3-time/dist/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/dist/d3-time-format.min",
+        "d3-time": "node_modules/d3-time/build/d3-time.min",
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
         "html2canvas": "node_modules/html2canvas/dist/html2canvas.min",
         "painterro": "node_modules/painterro/build/painterro.min",
         "printj": "node_modules/printj/dist/printj.min"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openmct",
   "version": "0.14.0-SNAPSHOT",
-  "description": "The Open MCT core platform.",
+  "description": "The Open MCT core platform",
   "dependencies": {
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
@@ -15,7 +15,7 @@
     "d3-time-format": "2.1.x",
     "express": "^4.13.1",
     "minimist": "^1.1.1",
-    "painterro": "0.2.65",
+    "painterro": "^0.2.65",
     "request": "^2.69.0",
     "vue": "^2.5.6"
   },
@@ -43,6 +43,7 @@
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
     "karma-requirejs": "^1.1.0",
+    "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "merge-stream": "^1.0.0",

platform/commonUI/edit/bundle.js

@@ -33,6 +33,7 @@ define([
     "./src/actions/SaveAndStopEditingAction",
     "./src/actions/SaveAsAction",
     "./src/actions/CancelAction",
+    "./src/actions/CreateNewFolderAction",
     "./src/policies/EditActionPolicy",
     "./src/policies/EditPersistableObjectsPolicy",
     "./src/policies/EditableLinkPolicy",
@@ -71,6 +72,7 @@ define([
     SaveAndStopEditingAction,
     SaveAsAction,
     CancelAction,
+    CreateNewFolderAction,
     EditActionPolicy,
     EditPersistableObjectsPolicy,
     EditableLinkPolicy,
@@ -145,7 +147,10 @@ define([
                     "depends": [
                         "$scope",
                         "$timeout",
-                        "objectService"
+                        "objectService",
+                        "typeService",
+                        "policyService",
+                        "instantiate"
                     ]
                 }
             ],
@@ -242,6 +247,14 @@ define([
                     "cssClass": "icon-x no-label",
                     "description": "Discard changes made to these objects.",
                     "depends": []
+                },
+                {
+                    "key": "create-new-folder",
+                    "implementation": CreateNewFolderAction,
+                    "description": "Creates a new folder.",
+                    "depends": [
+                        "typeService"
+                    ]
                 }
             ],
             "policies": [

platform/commonUI/edit/res/templates/create/create-new-folder.html

@@ -0,0 +1,33 @@
+<!--span
+ Open MCT, Copyright (c) 2014-2018, 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.
+-->
+<div name="newFolder" ng-controller="LocatorController">
+        <div ng-if="!createNewFolder">
+            <a class="s-button icon-folder-new" ng-click="createNewFolderClickHandler()" > 
+                <span class="title-label">New Folder</span>
+            </a>
+        </div>
+        <div ng-if="createNewFolder">
+            <span><input type="text" ng-model="newFolderName" name="newFolderName"></span>
+            <a class="s-button" ng-click="createClickHandler()">Create</a>
+            <a class="s-button icon-x" ng-click="cancelClickHandler()"></a>
+        </div>
+</div>

platform/commonUI/edit/res/templates/create/locator.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -26,4 +26,22 @@
                             ng-model="treeModel">
         </mct-representation>
     </div>
+    
+    <!-- Create New Folder Action -->
+    <div class="newFolderCreation" style="margin-top:10px; position:absolute; left:0px;">
+        
+        <!-- New folder button, triggers create new folder action. -->
+        <div ng-show="!newFolderCreationTriggered">
+            <a class="s-button icon-folder-new" ng-class="{disabled: !validParent()}" ng-click="newFolderButtonClickHandler()">
+                <span class="text-label">New Folder</span>
+            </a>
+        </div>
+        
+        <!-- Get folder name -->
+        <div ng-show="newFolderCreationTriggered">
+            <input type="text" ng-model="newFolderNameInput">
+            <a class="s-button" ng-class="{ disabled: !validParent() || !validFolderName() }" ng-click="newFolderCreateButtonClickHandler()">Create</a>
+            <a class="s-button icon-x" ng-click="newFolderCancelButtonClickHandler()"></a>
+        </div>
+    </div>
 </div>

platform/commonUI/edit/src/actions/CreateNewFolderAction.js

@@ -0,0 +1,89 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define([
+
+],
+    function (
+
+    ) {
+
+        /**
+         * The CreateNewFolderAction; action is triggered by the new folder button in the locator.
+         *
+         * @constructor
+         * @implements {Action}
+         * @memberof platform/commonUI/edit
+         */
+        function CreateNewFolderAction(
+            typeService,
+            context
+        ) {
+            this.parent = (context || {}).domainObject;
+            this.typeService = typeService;
+            this.type = typeService.getType('folder');
+        }
+
+        CreateNewFolderAction.prototype.perform = function (folderName) {
+            var parent = this.parent,
+                typeService = this.typeService,
+                newModel = this.type.getInitialModel(),
+                folderType = typeService.getType('folder');
+
+            newModel.type = folderType.getKey();
+            newModel.name = folderName;
+
+            function instantiateObject() {
+                var newObject = parent.useCapability('instantiation', newModel);
+                newObject.useCapability('mutation', function () {
+                    newModel.location = parent.getId();
+                });
+                return addToParentAndReturn(newObject);
+            }
+
+            function addToParentAndReturn(newObject) {
+                return parent.getCapability('composition').add(newObject)
+                            .then(function () {
+                                    return newObject;
+                                });
+            }
+
+            return instantiateObject(newModel, parent);
+        };
+
+        /**
+         * Check if this action is applicable in a given context.
+         * This will ensure that a domain object is present in the context,
+         * and that this domain object is in Edit mode.
+         * @returns true if applicable
+         */
+        CreateNewFolderAction.appliesTo = function (context) {
+            var parent = (context || {}).domainObject;
+            return parent && parent.hasCapability('editor');
+
+        };
+
+        return CreateNewFolderAction;
+    }
+);
+

platform/commonUI/edit/src/actions/RemoveAction.js

@@ -51,7 +51,7 @@ define([
     /**
      * Perform this action.
      */
-    RemoveAction.prototype.perform = function (skipWarning) {
+    RemoveAction.prototype.perform = function () {
         var dialog,
             dialogService = this.dialogService,
             domainObject = this.domainObject,
@@ -115,18 +115,12 @@ define([
             return parent.useCapability('mutation', doMutate);
         }
 
-        if (skipWarning) {
-
-            removeFromContext(domainObject);
-
-        } else {
-            /*
-            * Pass in the function to remove the domain object so it can be
-            * associated with an 'OK' button press
-            */
-            dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
-            dialog.show();
-        }
+        /*
+         * Pass in the function to remove the domain object so it can be
+         * associated with an 'OK' button press
+         */
+        dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
+        dialog.show();
     };
 
     // Object needs to have a parent for Remove to be applicable

platform/commonUI/edit/src/creation/LocatorController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -31,7 +31,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function LocatorController($scope, $timeout, objectService) {
+        function LocatorController($scope, $timeout, objectService, typeService, policyService, instantiate) {
             // Populate values needed by the locator control. These are:
             // * rootObject: The top-level object, since we want to show
             //               the full tree
@@ -66,8 +66,8 @@ define(
 
                 // Restrict which locations can be selected
                 if (domainObject &&
-                        $scope.structure &&
-                            $scope.structure.validate) {
+                    $scope.structure &&
+                    $scope.structure.validate) {
                     if (!$scope.structure.validate(domainObject)) {
                         setLocatingObject(priorObject, undefined);
                         return;
@@ -81,11 +81,64 @@ define(
                         !!$scope.treeModel.selectedObject
                     );
                 }
+
+                // Check if create new folder is a valid action for selected object
+                $scope.validParent = function () {
+                    if ($scope.treeModel.selectedObject) {
+                        return policyService.allow(
+                                "composition",
+                                $scope.treeModel.selectedObject,
+                                instantiate(typeService.getType('folder').getInitialModel())
+                        );
+                    } else {
+                        return false;
+                    }
+                };
             }
 
+            $scope.newFolderButtonClickHandler = function () {
+                $scope.newFolderCreationTriggered = true;
+            };
+
+            $scope.newFolderCancelButtonClickHandler = function () {
+                $scope.newFolderCreationTriggered = false;
+                resetNewFolderNameInput();
+            };
+
+            // Get expected input pattern for folder name
+            var folderNamePattern = new RegExp(
+                typeService.getType('folder').getProperties()[0].propertyDefinition.pattern
+            );
+
+            // Validate folder name externally to avoid affecting overall form validation
+            $scope.validFolderName = function () {
+                return $scope.newFolderNameInput && folderNamePattern.test($scope.newFolderNameInput);
+            };
+
+            function selectAndScrollToNewFolder(newFolder) {
+                $scope.treeModel.selectedObject = newFolder;
+            }
+
+            function resetNewFolderNameInput() {
+                $scope.newFolderNameInput = "Unnamed Folder";
+                $scope.newFolderCreationTriggered = false;
+            }
+
+
+            // Create new folder, update selection to new folder and reset new folder button
+            $scope.newFolderCreateButtonClickHandler = function () {
+                var createNewFolderAction = $scope.treeModel.selectedObject.getCapability('action').getActions('create-new-folder')[0];
+                createNewFolderAction.perform($scope.newFolderNameInput)
+                                     .then(selectAndScrollToNewFolder)
+                                     .then(resetNewFolderNameInput);
+            };
+
             // Initial state for the tree's model
-            $scope.treeModel =
-                { selectedObject: $scope.ngModel[$scope.field] };
+            $scope.treeModel = { selectedObject: $scope.ngModel[$scope.field] };
+
+            //Initial values for new folder action
+            $scope.newFolderNameInput = "Unnamed Folder";
+            $scope.newFolderCreationTriggered = false;
 
             // Watch for changes from the tree
             $scope.$watch("treeModel.selectedObject", setLocatingObject);

platform/commonUI/edit/src/services/TransactionManager.js

@@ -77,19 +77,14 @@ define([], function () {
                 return promiseFn().then(nextFn);
             };
         }
-        /**
-         * Clear any existing persistence calls for object with given ID. This ensures only the most recent persistence
-         * call is executed. This should prevent stale objects being persisted and overwriting fresh ones.
-         */
-        if (this.isScheduled(id)) {
-            this.clearTransactionsFor(id);
-        }
 
-        this.clearTransactionFns[id] =
-            this.transactionService.addToTransaction(
-                chain(onCommit, release),
-                chain(onCancel, release)
-            );
+        if (!this.isScheduled(id)) {
+            this.clearTransactionFns[id] =
+                this.transactionService.addToTransaction(
+                    chain(onCommit, release),
+                    chain(onCancel, release)
+                );
+        }
     };
 
     /**

platform/commonUI/edit/test/actions/CreateNewFolderActionSpec.js

@@ -0,0 +1,117 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ['../../src/actions/CreateNewFolderAction'],
+    function (CreateNewFolderAction) {
+
+        describe("The Create New Folder Action", function () {
+            var mockDomainObject,
+                mockNewObject,
+                mockType,
+                testModel,
+                mockFolderName,
+                mockTypeService,
+                mockActionContext,
+                mockCompositionCapability,
+                action;
+            function mockPromise(value) {
+                return (value && value.then) ? value : {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+            beforeEach(function () {
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getCapability",
+                        "useCapability",
+                        "hasCapability",
+                        "getId"
+                    ]
+                );
+                mockNewObject = jasmine.createSpyObj(
+                    "newObject",
+                    [
+                        "getCapability",
+                        "useCapability",
+                        "hasCapability",
+                        "getId"
+                    ]
+                );
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getInitialModel"
+                    ]
+                );
+                testModel = {
+                                type: mockType,
+                                name: "Name",
+                                location: "someLocation"
+                            };
+                mockFolderName = "Name";
+                mockTypeService = jasmine.createSpyObj(
+                    "typeService",
+                    ["getType"]
+                );
+                mockActionContext = { domainObject: mockDomainObject };
+                mockCompositionCapability = jasmine.createSpyObj(
+                    "composition",
+                    ["add"]
+                );
+                mockType.getKey.and.returnValue("test");
+                mockType.getInitialModel.and.returnValue(testModel);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
+                    return (capability === 'composition') && mockCompositionCapability;
+                });
+                mockDomainObject.hasCapability.and.returnValue(true);
+                mockCompositionCapability.add.and.returnValue(mockPromise(true));
+                mockDomainObject.useCapability.and.callFake(function (capability) {
+                    return (capability === 'instantiation') && mockNewObject;
+                });
+                mockTypeService.getType.and.returnValue(mockType);
+                mockDomainObject.getId.and.returnValue("id");
+                action = new CreateNewFolderAction(mockTypeService, mockActionContext);
+            });
+            it("uses the instantiation capability when performed", function () {
+                action.perform(mockFolderName);
+                expect(mockDomainObject.useCapability)
+                    .toHaveBeenCalledWith("instantiation", jasmine.any(Object));
+            });
+            it("adds new objects to the parent's composition", function () {
+                action.perform(mockFolderName);
+                expect(mockDomainObject.getCapability).toHaveBeenCalledWith("composition");
+                expect(mockCompositionCapability.add).toHaveBeenCalled();
+            });
+            it("is only applicable when a domain object is in context", function () {
+                expect(CreateNewFolderAction.appliesTo(mockActionContext)).toBeTruthy();
+                expect(CreateNewFolderAction.appliesTo({})).toBeFalsy();
+                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith('editor');
+            });
+        });
+    }
+);
+

platform/commonUI/edit/test/actions/RemoveActionSpec.js

@@ -124,17 +124,6 @@ define(
                 expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
             });
 
-            it("does not show a blocking message dialog when true is passed to perform", function () {
-                mockParent = jasmine.createSpyObj(
-                    "parent",
-                    ["getModel", "getCapability", "useCapability"]
-                );
-
-                action.perform(true);
-
-                expect(mockDialogService.showBlockingMessage).not.toHaveBeenCalled();
-            });
-
             describe("after the remove callback is triggered", function () {
                 var mockChildContext,
                     mockChildObject,

platform/commonUI/edit/test/creation/LocatorControllerSpec.js

@@ -31,26 +31,63 @@ define(
             var mockScope,
                 mockTimeout,
                 mockDomainObject,
+                mockFolderObject,
                 mockRootObject,
                 mockContext,
+                mockActions,
                 mockObjectService,
+                mockTypeService,
+                mockType,
+                mockInstantiate,
+                mockPolicyService,
                 getObjectsPromise,
+                testModel,
+                capabilities,
+                mockCreateNewFolderAction,
+                mockActionCapability,
+                mockProperties,
                 controller;
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    ["$watch"]
+                    ["$watch", "validParent"]
                 );
                 mockTimeout = jasmine.createSpy("$timeout");
+                mockInstantiate = jasmine.createSpy("instantiate");
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getCapability"]
+                    [
+                        "useCapability",
+                        "getModel",
+                        "getCapability"
+                    ]
+                );
+                mockFolderObject = jasmine.createSpyObj(
+                    "folderObject",
+                    [
+                        "useCapability",
+                        "getModel",
+                        "getCapability"
+                    ]
+                );
+                mockCreateNewFolderAction = jasmine.createSpyObj(
+                    "createNewFolderAction",
+                    [
+                        "perform"
+                    ]
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "rootObject",
                     ["getCapability"]
                 );
+                mockActionCapability = jasmine.createSpyObj(
+                    "actionCapability",
+                    [
+                        "getActions",
+                        "perform"
+                    ]
+                );
                 mockContext = jasmine.createSpyObj(
                     "context",
                     ["getRoot"]
@@ -59,25 +96,70 @@ define(
                     "objectService",
                     ["getObjects"]
                 );
+                mockTypeService = jasmine.createSpyObj(
+                    "typeService",
+                    ["getType"]
+                );
+                mockPolicyService = jasmine.createSpyObj(
+                    "policyService",
+                    ["allow"]
+                );
                 getObjectsPromise = jasmine.createSpyObj(
                     "promise",
                     ["then"]
                 );
-
-                mockDomainObject.getCapability.and.returnValue(mockContext);
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getProperties",
+                        "getInitialModel"
+                    ]
+                );
+                testModel = { someKey: "some value" };
+                mockProperties = ['a', 'b', 'c'].map(function (k) {
+                    var mockProperty = jasmine.createSpyObj(
+                            'property-' + k,
+                            ['propertyDefinition']
+                        );
+                    mockProperty.propertyDefinition = {
+                            key: "name",
+                            pattern: "test"
+                        };
+                    return mockProperty;
+                });
+                capabilities = {
+                    "action" : mockActionCapability,
+                    "context": mockContext
+                };
+                mockActions = [mockCreateNewFolderAction];
                 mockContext.getRoot.and.returnValue(mockRootObject);
                 mockObjectService.getObjects.and.returnValue(getObjectsPromise);
-
+                mockTypeService.getType.and.callFake(function (typename) {
+                    return mockType;
+                });
+                mockInstantiate.and.returnValue(mockFolderObject);
+                mockType.getKey.and.returnValue("test");
+                mockType.getInitialModel.and.returnValue(testModel);
+                mockType.getProperties.and.returnValue(mockProperties);
+                mockDomainObject.getCapability.and.callFake(function (capability) {
+                    return capabilities[capability];
+                });
+                mockDomainObject.useCapability.and.returnValue();
+                mockDomainObject.getModel.and.returnValue(testModel);
+                mockFolderObject.getCapability.and.returnValue(capabilities);
+                mockFolderObject.useCapability.and.returnValue();
+                mockFolderObject.getModel.and.returnValue(testModel);
                 mockScope.ngModel = {};
                 mockScope.field = "someField";
 
-                controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                controller = new LocatorController(mockScope, mockTimeout, mockObjectService, mockTypeService, mockPolicyService, mockInstantiate);
             });
             describe("when context is available", function () {
 
                 beforeEach(function () {
                         mockContext.getRoot.and.returnValue(mockRootObject);
-                        controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                        controller = new LocatorController(mockScope, mockTimeout, mockObjectService, mockTypeService, mockPolicyService, mockInstantiate);
                     });
 
                 it("adds a treeModel to scope", function () {
@@ -145,7 +227,7 @@ define(
                     getObjectsPromise.then.and.callFake(function (callback) {
                         callback({'ROOT': defaultRoot});
                     });
-                    controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
+                    controller = new LocatorController(mockScope, mockTimeout, mockObjectService, mockTypeService, mockPolicyService, mockInstantiate);
                 });
 
                 it("provides a default context where none is available", function () {
@@ -169,3 +251,4 @@ define(
         });
     }
 );
+

platform/commonUI/edit/test/services/TransactionManagerSpec.js

@@ -93,33 +93,24 @@ define(
                     expect(mockOnCancel).toHaveBeenCalled();
                 });
 
-                describe("Adds callbacks to transaction", function () {
-                    beforeEach(function () {
-                        spyOn(manager, 'clearTransactionsFor');
-                        manager.clearTransactionsFor.and.callThrough();
-                    });
+                it("ignores subsequent calls for the same object", function () {
+                    manager.addToTransaction(
+                        testId,
+                        jasmine.createSpy(),
+                        jasmine.createSpy()
+                    );
+                    expect(mockTransactionService.addToTransaction.calls.count())
+                        .toEqual(1);
+                });
 
-                    it("and clears pending calls if same object", function () {
-                        manager.addToTransaction(
-                            testId,
-                            jasmine.createSpy(),
-                            jasmine.createSpy()
-                        );
-                        expect(manager.clearTransactionsFor).toHaveBeenCalledWith(testId);
-                    });
-
-                    it("and does not clear pending calls if different object", function () {
-                        manager.addToTransaction(
-                            'other-id',
-                            jasmine.createSpy(),
-                            jasmine.createSpy()
-                        );
-                        expect(manager.clearTransactionsFor).not.toHaveBeenCalled();
-                    });
-
-                    afterEach(function () {
-                        expect(mockTransactionService.addToTransaction.calls.count()).toEqual(2);
-                    });
+                it("accepts subsequent calls for other objects", function () {
+                    manager.addToTransaction(
+                        'other-id',
+                        jasmine.createSpy(),
+                        jasmine.createSpy()
+                    );
+                    expect(mockTransactionService.addToTransaction.calls.count())
+                        .toEqual(2);
                 });
 
                 it("does not remove callbacks from the transaction", function () {

platform/commonUI/general/res/sass/controls/_indicators.scss

@@ -120,16 +120,6 @@ mct-indicators mct-include {
                 top: 100%;
                 @include triangle('down', $size: 4px, $ratio: 1, $color: $hbg);
             }
-            
-            &:after {
-                // Hit area
-                $p: -7px;
-                content: '';
-                display: block;
-                position: absolute;
-                top: $p; right: $p; bottom: $p; left: $p;
-                z-index: -1;
-            }
         }
 
         &:hover {

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -268,6 +268,7 @@
 
 .gl-plot-tick,
 .tick-label {
+    @include reverseEllipsis();
     font-size: 0.7rem;
     position: absolute;
     &.gl-plot-x-tick-label,

platform/commonUI/themes/espresso/README.md

@@ -1,7 +0,0 @@
-# Espresso Theme
-Dark theme for the Open MCT user interface.
-
-## Installation
-```js
-openmct.install(openmct.plugins.Espresso());
-```

platform/commonUI/themes/snow/README.md

@@ -1,7 +0,0 @@
-# Espresso Theme
-A light colored theme for the Open MCT user interface.
-
-## Installation
-```js
-openmct.install(openmct.plugins.Snow());
-```

platform/core/src/actions/ActionCapability.js

@@ -102,14 +102,14 @@ define(
          * @returns {Action[]} an array of matching actions
          * @memberof platform/core.ActionCapability#
          */
-        ActionCapability.prototype.perform = function (context, flag) {
+        ActionCapability.prototype.perform = function (context) {
             // Alias to getActions(context)[0].perform, with a
             // check for empty arrays.
             var actions = this.getActions(context);
 
             return this.$q.when(
                 (actions && actions.length > 0) ?
-                    actions[0].perform(flag) :
+                    actions[0].perform() :
                     undefined
             );
         };

platform/core/src/runs/TransactingMutationListener.js

@@ -43,10 +43,23 @@ define([], function () {
         var mutationTopic = topic('mutation');
         mutationTopic.listen(function (domainObject) {
             var persistence = domainObject.getCapability('persistence');
+            var wasActive = transactionService.isActive();
             cacheService.put(domainObject.getId(), domainObject.getModel());
 
             if (hasChanged(domainObject)) {
-                persistence.persist();
+
+                if (!wasActive) {
+                    transactionService.startTransaction();
+                }
+
+                transactionService.addToTransaction(
+                    persistence.persist.bind(persistence),
+                    persistence.refresh.bind(persistence)
+                );
+
+                if (!wasActive) {
+                    transactionService.commit();
+                }
             }
         });
     }

platform/core/test/runs/TransactingMutationListenerSpec.js

@@ -24,27 +24,22 @@ define(
     ["../../src/runs/TransactingMutationListener"],
     function (TransactingMutationListener) {
 
-        describe("TransactingMutationListener", function () {
+        xdescribe("TransactingMutationListener", function () {
             var mockTopic,
                 mockMutationTopic,
-                mockCacheService,
                 mockTransactionService,
                 mockDomainObject,
-                mockModel,
                 mockPersistence;
 
             beforeEach(function () {
                 mockTopic = jasmine.createSpy('topic');
                 mockMutationTopic =
                     jasmine.createSpyObj('mutation', ['listen']);
-                mockCacheService =
-                    jasmine.createSpyObj('cacheService', [
-                        'put'
-                    ]);
                 mockTransactionService =
                     jasmine.createSpyObj('transactionService', [
                         'isActive',
                         'startTransaction',
+                        'addToTransaction',
                         'commit'
                     ]);
                 mockDomainObject = jasmine.createSpyObj(
@@ -57,24 +52,18 @@ define(
                 );
 
                 mockTopic.and.callFake(function (t) {
-                    expect(t).toBe('mutation');
-                    return mockMutationTopic;
+                    return (t === 'mutation') && mockMutationTopic;
                 });
 
-                mockDomainObject.getId.and.returnValue('mockId');
                 mockDomainObject.getCapability.and.callFake(function (c) {
-                    expect(c).toBe('persistence');
-                    return mockPersistence;
+                    return (c === 'persistence') && mockPersistence;
                 });
-                mockModel = {};
-                mockDomainObject.getModel.and.returnValue(mockModel);
 
                 mockPersistence.persisted.and.returnValue(true);
 
                 return new TransactingMutationListener(
                     mockTopic,
-                    mockTransactionService,
-                    mockCacheService
+                    mockTransactionService
                 );
             });
 
@@ -83,27 +72,48 @@ define(
                     .toHaveBeenCalledWith(jasmine.any(Function));
             });
 
-            it("calls persist if the model has changed", function () {
-                mockModel.persisted = Date.now();
+            [false, true].forEach(function (isActive) {
+                var verb = isActive ? "is" : "isn't";
 
-                //Mark the model dirty by setting the mutated date later than the last persisted date.
-                mockModel.modified = mockModel.persisted + 1;
+                function onlyWhenInactive(expectation) {
+                    return isActive ? expectation.not : expectation;
+                }
 
-                mockMutationTopic.listen.calls.mostRecent()
-                    .args[0](mockDomainObject);
+                describe("when a transaction " + verb + " active", function () {
+                    var innerVerb = isActive ? "does" : "doesn't";
 
-                expect(mockPersistence.persist).toHaveBeenCalled();
-            });
+                    beforeEach(function () {
+                        mockTransactionService.isActive.and.returnValue(isActive);
+                    });
 
-            it("does not call persist if the model has not changed", function () {
-                mockModel.persisted = Date.now();
+                    describe("and mutation occurs", function () {
+                        beforeEach(function () {
+                            mockMutationTopic.listen.calls.mostRecent()
+                                .args[0](mockDomainObject);
+                        });
 
-                mockModel.modified = mockModel.persisted;
 
-                mockMutationTopic.listen.calls.mostRecent()
-                    .args[0](mockDomainObject);
+                        it(innerVerb + " start a new transaction", function () {
+                            onlyWhenInactive(
+                                expect(mockTransactionService.startTransaction)
+                            ).toHaveBeenCalled();
+                        });
 
-                expect(mockPersistence.persist).not.toHaveBeenCalled();
+                        it("adds to the active transaction", function () {
+                            expect(mockTransactionService.addToTransaction)
+                                .toHaveBeenCalledWith(
+                                jasmine.any(Function),
+                                jasmine.any(Function)
+                            );
+                        });
+
+                        it(innerVerb + " immediately commit", function () {
+                            onlyWhenInactive(
+                                expect(mockTransactionService.commit)
+                            ).toHaveBeenCalled();
+                        });
+                    });
+                });
             });
         });
     }

platform/entanglement/src/services/MoveService.js

@@ -92,7 +92,7 @@ define(
                 .then(function () {
                     return object
                         .getCapability('action')
-                        .perform('remove', true);
+                        .perform('remove');
                 });
         };
 

platform/entanglement/test/services/MoveServiceSpec.js

@@ -224,11 +224,10 @@ define(
                             locationPromise.resolve();
                         });
 
-                        it("removes object from parent without user warning dialog", function () {
+                        it("removes object from parent", function () {
                             expect(actionCapability.perform)
-                                .toHaveBeenCalledWith('remove', true);
+                                .toHaveBeenCalledWith('remove');
                         });
-
                     });
 
                 });
@@ -245,9 +244,9 @@ define(
                             .toHaveBeenCalled();
                     });
 
-                    it("removes object from parent without user warning dialog", function () {
+                    it("removes object from parent", function () {
                         expect(actionCapability.perform)
-                            .toHaveBeenCalledWith('remove', true);
+                            .toHaveBeenCalledWith('remove');
                     });
                 });
 

platform/features/hyperlink/bundle.js

@@ -45,6 +45,7 @@ define([
                       "key": "url",
                       "name": "URL",
                       "control": "textfield",
+                      "pattern": "^(ftp|https?)\\:\\/\\/",
                       "required": true,
                       "cssClass": "l-input-lg"
                   },

platform/features/layout/src/FixedController.js

@@ -87,8 +87,7 @@ define(
                 'setDisplayedValue',
                 'subscribeToObject',
                 'unsubscribe',
-                'updateView',
-                'setSelection'
+                'updateView'
             ].forEach(function (name) {
                 self[name] = self[name].bind(self);
             });
@@ -225,7 +224,7 @@ define(
             // Respond to external bounds changes
             this.openmct.time.on("bounds", updateDisplayBounds);
 
-            this.openmct.selection.on('change', this.setSelection);
+            this.openmct.selection.on('change', this.setSelection.bind(this));
             this.$element.on('click', this.bypassSelection.bind(this));
             this.unlisten = this.openmct.objects.observe(this.newDomainObject, '*', function (obj) {
                 this.newDomainObject = JSON.parse(JSON.stringify(obj));
@@ -234,9 +233,6 @@ define(
 
             this.updateElementPositions(this.newDomainObject.layoutGrid);
             refreshElements();
-
-            //force a click, to initialize Fixed Position Controller on SelectionAPI
-            $element[0].click();
         }
 
         FixedController.prototype.updateElementPositions = function (layoutGrid) {

platform/features/my-items/README.md

@@ -1,8 +0,0 @@
-# My Items plugin
-Defines top-level folder named "My Items" to store user-created items. Enabled by default, this can be disabled in a 
-read-only deployment with no user-editable objects.
-
-## Installation
-```js
-openmct.install(openmct.plugins.MyItems());
-```

platform/features/table/res/sass/table.scss

@@ -35,30 +35,28 @@ mct-table {
     }
 
     .mct-table {
-        tr {
-            display: flex; // flex-flow defaults to row nowrap (which is what we want) so no need to define
-            height: 18px; // Needed when a row has empty values in its cells
-            align-items: stretch;
-        }
-
-        td, th {
-            box-sizing: border-box;
-            display: block;
-            flex: 1 0 auto;
-            white-space: nowrap;
-        }
-
         thead {
             display: block;
+            tr {
+                display: block;
+                white-space: nowrap;
+                th {
+                    display: inline-block;
+                    box-sizing: border-box;
+                }
+            }
         }
-
         tbody {
             tr {
                 position: absolute;
+                white-space: nowrap;
+                display: block;
             }
-
             td {
+                white-space: nowrap;
                 overflow: hidden;
+                box-sizing: border-box;
+                display: inline-block;
             }
         }
     }

platform/import-export/README.md

@@ -1,14 +0,0 @@
-# Import / Export Plugin
-The Import/Export plugin allows objects to be exported as JSON files. This allows for sharing of objects between users 
-who are not using a shared persistence store. It also allows object trees to be backed up. Additionally, object trees 
-exported using this tool can then be exposed as read-only static root trees using the 
-[Static Root Plugin](../../src/plugins/staticRootPlugin/README.md).
-
-Upon installation it will add two new context menu actions to allow import and export of objects. Initiating the Export 
-action on an object will produce a JSON file that includes the object and all of its composed children. Selecting Import 
-on an object will allow the user to import a previously exported object tree as a child of the selected object.
-
-## Installation
-```js
-openmct.install(openmct.plugins.ImportExport())
-```

platform/import-export/src/actions/ExportAsJSONAction.js

@@ -133,7 +133,7 @@ define(['lodash'], function (_) {
         copyOfChild.location = parentId;
         parent.composition[index] = copyOfChild.identifier;
         this.tree[newIdString] = copyOfChild;
-        this.tree[parentId].composition[index] = copyOfChild.identifier;
+        this.tree[parentId].composition[index] = newIdString;
 
         return copyOfChild;
     };

platform/import-export/src/actions/ImportAsJSONAction.js

@@ -79,18 +79,16 @@ define(['zepto'], function ($) {
             var parentModel = parent.getModel();
             var newObj;
 
-            seen.push(this.getKeyString(parent.getId()));
+            seen.push(parent.getId());
             parentModel.composition.forEach(function (childId, index) {
-                var childIdString = this.getKeyString(childId);
-                if (!tree[childIdString] || seen.includes(childIdString)) {
+                if (!tree[childId] || seen.includes(childId)) {
                     return;
                 }
 
-                newObj = this.instantiate(tree[childIdString], childIdString);
-                // New object has not been persisted yet so clear persisted
-                // timestamp from copied model.
-                delete newObj.getModel().persisted;
-                newObj.getCapability('persistence').persist();
+                newObj = this.instantiate(tree[childId], childId);
+                parent.getCapability("composition").add(newObj);
+                newObj.getCapability("location")
+                    .setPrimaryLocation(tree[childId].location);
                 this.deepInstantiate(newObj, tree, seen);
             }, this);
         }
@@ -105,10 +103,6 @@ define(['zepto'], function ($) {
         return tree;
     };
 
-    ImportAsJSONAction.prototype.getKeyString = function (identifier) {
-        return this.openmct.objects.makeKeyString(identifier);
-    };
-
     /**
      * Rewrites all instances of a given id in the tree with a newly generated
      * replacement to prevent collision.

platform/import-export/test/actions/ImportAsJSONActionSpec.js

@@ -47,12 +47,7 @@ define(
                 uniqueId = 0;
                 newObjects = [];
                 openmct = {
-                    $injector: jasmine.createSpyObj('$injector', ['get']),
-                    objects: {
-                        makeKeyString: function (identifier) {
-                            return identifier.key;
-                        }
-                    }
+                    $injector: jasmine.createSpyObj('$injector', ['get'])
                 };
                 mockInstantiate = jasmine.createSpy('instantiate').and.callFake(
                     function (model, id) {
@@ -159,7 +154,7 @@ define(
                             body: JSON.stringify({
                                 "openmct": {
                                     "infiniteParent": {
-                                        "composition": [{key: "infinteChild", namespace: ""}],
+                                        "composition": ["infinteChild"],
                                         "name": "1",
                                         "type": "folder",
                                         "modified": 1503598129176,
@@ -167,7 +162,7 @@ define(
                                         "persisted": 1503598129176
                                     },
                                     "infinteChild": {
-                                        "composition": [{key: "infinteParent", namespace: ""}],
+                                        "composition": ["infiniteParent"],
                                         "name": "2",
                                         "type": "folder",
                                         "modified": 1503598132428,

platform/persistence/couch/README.md

@@ -1,8 +1,2 @@
-# Couch DB Persistence Plugin
-An adapter for using CouchDB for persistence of user-created objects. The plugin installation function takes the URL 
-for the CouchDB database as a parameter.
-
-## Installation
-```js
-openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
-```
+This bundle implements a connection to an external CouchDB persistence 
+store in Open MCT.

platform/persistence/elastic/README.md

@@ -1,8 +1,2 @@
-# Elasticsearch Persistence Provider
-An adapter for using Elastic for persistence of user-created objects. The installation function takes the URL for an 
-Elasticsearch server as a parameter.
-
-## Installation
-```js
-openmct.install(openmct.plugins.Elasticsearch('http://localhost:9200'))
-```
+This bundle implements a connection to an external ElasticSearch persistence 
+store in Open MCT.

platform/persistence/local/README.md

@@ -1,9 +0,0 @@
-# Local Storage Plugin
-Provides persistence of user-created objects in browser Local Storage. Objects persisted in this way will only be 
-available from the browser and machine on which they were persisted. For shared persistence, consider the 
-[Elasticsearch](../elastic/) and [CouchDB](../couch/) persistence plugins.
-
-## Installation
-```js
-openmct.install(openmct.plugins.LocalStorage());
-```

scripts/migrate-for-jshint.js

@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+// Converts all templateUrl references in bundle.js files to
+// plain template references, loading said templates with the
+// RequireJS text plugin.
+
+var glob = require('glob'),
+    fs = require('fs');
+
+function migrate(file) {
+    var sourceCode = fs.readFileSync(file, 'utf8'),
+        lines = sourceCode.split('\n')
+            .filter(function (line) {
+                return !(/^\W*['"]use strict['"];\W*$/.test(line));
+            })
+            .filter(function (line) {
+                return line.indexOf("/*global") !== 0;
+            });
+    fs.writeFileSync(file, lines.join('\n'));
+}
+
+glob('@(src|platform)/**/*.js', {}, function (err, files) {
+    if (err) {
+        console.log(err);
+        return;
+    }
+
+    files.forEach(migrate);
+});

scripts/migrate-templates.js

@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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.
+ *****************************************************************************/
+
+// Converts all templateUrl references in bundle.js files to
+// plain template references, loading said templates with the
+// RequireJS text plugin.
+
+var glob = require('glob'),
+    fs = require('fs'),
+    path = require('path'),
+    _ = require('lodash');
+
+function toTemplateName(templateUrl) {
+    var parts = templateUrl.split('/');
+    return _.camelCase(parts[parts.length - 1].replace(".html", "")) +
+            "Template";
+}
+
+function getTemplateUrl(sourceLine) {
+    return _.trim(sourceLine.split(":")[1], "\", ");
+}
+
+function hasTemplateUrl(sourceLine) {
+    return sourceLine.indexOf("templateUrl") !== -1;
+}
+
+function findTemplateURLs(sourceCode) {
+    return sourceCode.split('\n')
+        .map(_.trim)
+        .filter(hasTemplateUrl)
+        .map(getTemplateUrl);
+}
+
+function injectRequireArgument(sourceCode, templateUrls) {
+    var lines = sourceCode.split('\n'),
+        index;
+
+    templateUrls = _.uniq(templateUrls);
+
+    // Add arguments for source paths...
+    index = lines.map(_.trim).indexOf("'legacyRegistry'");
+    lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
+        return "    \"text!./res/" + url + "\",";
+    }).concat(lines.slice(index)));
+
+    /// ...and for arguments
+    index = lines.map(_.trim).indexOf("legacyRegistry");
+    lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
+        return "    " + toTemplateName(url) + ",";
+    }).concat(lines.slice(index)));
+
+    return lines.join('\n');
+}
+
+function rewriteUrl(sourceLine) {
+    return [
+        sourceLine.substring(0, sourceLine.indexOf(sourceLine.trim())),
+        "\"template\": " + toTemplateName(getTemplateUrl(sourceLine)),
+        _.endsWith(sourceLine, ",") ? "," : ""
+    ].join('');
+}
+
+function rewriteLine(sourceLine) {
+    return hasTemplateUrl(sourceLine) ?
+        rewriteUrl(sourceLine.replace("templateUrl", "template")) :
+        sourceLine;
+}
+
+function rewriteTemplateUrls(sourceCode) {
+    return sourceCode.split('\n').map(rewriteLine).join('\n');
+}
+
+function migrate(file) {
+    var sourceCode = fs.readFileSync(file, 'utf8');
+    fs.writeFileSync(file, rewriteTemplateUrls(
+        injectRequireArgument(sourceCode, findTemplateURLs(sourceCode))
+    ), 'utf8');
+}
+
+glob('platform/**/bundle.js', {}, function (err, files) {
+    if (err) {
+        console.log(err);
+        return;
+    }
+
+    files.forEach(migrate);
+});

scripts/rebundle-template.txt

@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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([
+    <%= implPaths %>
+    'legacyRegistry'
+], function (
+    <%= implNames %>
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("<%= bundleName %>", <%= bundleContents %>);
+});

scripts/rebundle.js

@@ -0,0 +1,72 @@
+// Temporary utility script to rewrite bundle.json
+// files as bundle.js files.
+
+var glob = require('glob'),
+    fs = require('fs'),
+    path = require('path'),
+    _ = require('lodash'),
+    template = _.template(
+        fs.readFileSync(path.resolve(__dirname, 'rebundle-template.txt'), 'utf8')
+    );
+
+function indent(str, depth) {
+    return _.trimLeft(str.split('\n').map(function (line) {
+        return _.repeat('    ', depth || 1) + line;
+    }).filter(function (line) {
+        return line.trim().length > 0;
+    }).join('\n'));
+}
+
+function findImpls(bundleContents) {
+    return _(bundleContents.extensions || {})
+        .map()
+        .flatten()
+        .pluck('implementation')
+        .filter()
+        .uniq()
+        .value();
+}
+
+function toIdentifier(impl) {
+    var parts = impl.replace(".js", "").split('/');
+    return parts[parts.length - 1];
+}
+
+function toPath(impl) {
+    return "\"./src/" + impl.replace(".js", "") + "\"";
+}
+
+function replaceImpls(bundleText) {
+    var rx = /"implementation": "([^"]*)"/;
+    return bundleText.split('\n').map(function (line) {
+        var m = line.match(rx);
+        return m !== null ?
+                line.replace(rx, '"implementation": ' + toIdentifier(m[1])) :
+                line;
+    }).join('\n');
+}
+
+function rebundle(file) {
+    var plainJson = fs.readFileSync(file, 'utf8'),
+        bundleContents = JSON.parse(plainJson),
+        impls = findImpls(bundleContents),
+        bundleName = file.replace("/bundle.json", ""),
+        outputFile = file.replace(".json", ".js"),
+        contents = template({
+            bundleName: bundleName,
+            implPaths: indent(impls.map(toPath).concat([""]).join(",\n")),
+            implNames: indent(impls.map(toIdentifier).concat([""]).join(",\n")),
+            bundleContents: indent(replaceImpls(JSON.stringify(bundleContents, null, 4)))
+        });
+    fs.writeFileSync(outputFile, contents, 'utf8');
+}
+
+glob('**/bundle.json', {}, function (err, files) {
+    if (err) {
+        console.log(err);
+        return;
+    }
+
+    files.forEach(rebundle);
+});
+

src/api/composition/CompositionCollection.js

@@ -177,15 +177,7 @@ define([
     CompositionCollection.prototype.load = function () {
         return this.provider.load(this.domainObject)
             .then(function (children) {
-                return Promise.all(children.map(function (c) {
-                    return this.publicAPI.objects.get(c);
-                }, this));
-            }.bind(this))
-            .then(function (childObjects) {
-                childObjects.forEach(function (c) {
-                    this.add(c, true);
-                }, this);
-                return childObjects;
+                return Promise.all(children.map(this.onProviderAdd, this));
             }.bind(this))
             .then(function (children) {
                 this.emit('load');

src/plugins/URLIndicatorPlugin/README.md

@@ -1,21 +0,0 @@
-# URL Indicator
-Adds an indicator which shows the availability of a URL, with success based on receipt of a 200 HTTP code. Can be used 
-for monitoring the availability of web services.
-
-## Installation
-```js
-openmct.install(openmct.plugins.URLIndicator({
-  url: 'http://localhost:8080',
-    iconClass: 'check',
-    interval: 10000,
-    label: 'Localhost'
- })
-);
-```
-
-## Options
-* __url__: URL to indicate the status of
-* __iconClass__: Icon to show in the status bar, defaults to icon-database. See the [Style Guide](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home/glyphs?view=styleguide.glyphs) for more icon options.
-* __interval__: Interval between checking the connection, defaults to 10000
-* __label__: Name showing up as text in the status bar, defaults to url
-

src/plugins/autoflow/AutoflowTabularPlugin.js

@@ -25,6 +25,15 @@ define([
 ], function (
     AutoflowTabularView
 ) {
+    /**
+     * This plugin provides an Autoflow Tabular View for domain objects
+     * in Open MCT.
+     *
+     * @param {Object} options
+     * @param {String} [options.type] the domain object type for which
+     *        this view should be available; if omitted, this view will
+     *        be available for all objects
+     */
     return function (options) {
         return function (openmct) {
             var views = (openmct.mainViews || openmct.objectViews);

src/plugins/autoflow/README.md

@@ -1,15 +0,0 @@
-# Autoflow View
-
-This plugin provides the Autoflow View for domain objects in Open MCT. This view allows users to visualize the latest 
-values of a collection of telemetry points in a condensed list.
-
-## Installation
-``` js
-    openmct.install(openmct.plugins.AutoflowView({
-        type: "telemetry.fixed"
-    }));
-```
-
-## Options
-* `type`: The object type to add the Autoflow View to. Currently supports a single value. If not provided, will make the 
-Autoflow view available for all objects (which is probably not what you want).

src/plugins/plot/README.md

@@ -1,10 +0,0 @@
-# Plot Plugin
-
-Enables plot visualization of telemetry data. This plugin adds a plot view that is available from the view switcher for 
-all telemetry objects. Two user createble objects are also added by this plugin, for Overlay and Stacked Plots. 
-Telemetry objects can be added to Overlay and Stacked Plots via drag and drop.
-
-## Installation
-``` js
-openmct.install(openmct.plugins.Plot());
-```

src/plugins/plot/res/templates/mct-plot.html

@@ -193,7 +193,7 @@
                               left: (100 * (tick.value - min) / interval) + '%'
                           }"
                           ng-title=":: tick.fullText || tick.text">
-                         {{:: tick.text }}
+                         {{:: tick.text | reverse}}
                      </div>
                 </mct-ticks>
 

src/plugins/plot/src/inspector/PlotYAxisFormController.js

@@ -46,7 +46,7 @@ define([
             },
             {
                 modelProp: 'range',
-                objectPath: 'configuration.yAxis.range',
+                objectPath: 'form.yAxis.range',
                 coerce: function coerceRange(range) {
                     if (!range) {
                         return {

src/plugins/staticRootPlugin/README.md

@@ -1,19 +0,0 @@
-# Static Root Plugin
-
-This plugin takes an object tree as JSON and exposes it as a non-editable root level tree. This can be useful if you 
-have static non-editable content that you wish to expose, such as a standard set of displays that should not be edited 
-(but which can be copied and then modified if desired).
-
-Any object tree in Open MCT can be exported as JSON after installing the 
-[Import/Export plugin](../../../platform/import-export/README.md).
-
-## Installation
-``` js
-openmct.install(openmct.plugins.StaticRootPlugin('mission', 'data/static-objects.json'));
-```
-
-## Parameters
-The StaticRootPlugin takes two parameters:
-1. __namespace__: This should be a name that uniquely identifies this collection of objects.
-2. __path__: The file that the static tree should be exposed from. This will need to be a path that is reachable by a web 
-browser, ie not a path on the local file system.

src/plugins/summaryWidget/README.md

@@ -1,10 +0,0 @@
-# Summary Widget Plugin
-Summary widgets can be used to provide visual indication of state based on telemetry data. They allow rules to be 
-defined that can then be used to change the appearance of the summary widget element based on data. For example, a 
-summary widget could be defined that is green when a temparature reading is between `0` and `100` centigrade, red when 
-it's above `100`, and orange when it's below `0`.
-
-## Installation
-```js
-openmct.install(openmct.plugins.SummaryWidget());
-```

test-main.js

@@ -67,14 +67,14 @@ requirejs.config({
         "lodash": "bower_components/lodash/lodash",
         "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
         "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
-        "d3-axis": "node_modules/d3-axis/dist/d3-axis.min",
-        "d3-array": "node_modules/d3-array/dist/d3-array.min",
-        "d3-collection": "node_modules/d3-collection/dist/d3-collection.min",
+        "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
+        "d3-array": "node_modules/d3-array/build/d3-array.min",
+        "d3-collection": "node_modules/d3-collection/build/d3-collection.min",
         "d3-color": "node_modules/d3-color/build/d3-color.min",
         "d3-format": "node_modules/d3-format/build/d3-format.min",
         "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
-        "d3-time": "node_modules/d3-time/dist/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/dist/d3-time-format.min",
+        "d3-time": "node_modules/d3-time/build/d3-time.min",
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
         "html2canvas": "node_modules/html2canvas/dist/html2canvas.min",
         "painterro": "node_modules/painterro/build/painterro.min",
         "printj": "node_modules/printj/dist/printj.min"