squash merge open933 into integration-1089, resolve merge conflicts.

example/localTimeSystem/bundle.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    "./src/LocalTimeSystem",
+    "./src/LocalTimeFormat",
+    'legacyRegistry'
+], function (
+    LocalTimeSystem,
+    LocalTimeFormat,
+    legacyRegistry
+) {
+    legacyRegistry.register("example/localTimeSystem", {
+        "extensions": {
+            "formats": [
+                {
+                    "key": "local-format",
+                    "implementation": LocalTimeFormat
+                }
+            ],
+            "timeSystems": [
+                {
+                    "implementation": LocalTimeSystem,
+                    "depends": ["$timeout"]
+                }
+            ]
+        }
+    });
+});