Bug fixes and simplification.

README.adoc

@@ -1,12 +1,12 @@
-= Hawkular Console
+= Hawkular UI Components
 
 [.lead]
-*Hawkular Console* is the home of the UI console for https://github.com/hawkular/hawkular[Hawkular].  This console is based on https://github.com/hawtio/hawtio/blob/master/docs/Overview2dotX.md[Hawt.io 2], which a javascript based client-side framework. The various directories underneath console directory are Hawt.io 2 plugins and the various plugins eventually compose a Hawkular console. This modular approach to creating hawtio console plugins allows us to create individual plugins that comprise a console or can easily  be plugged into other Hawtio based consoles. The plugin system makes it easy to add/remove functionality (even dynamically).
+*Hawkular UI Components* is the home of UI Components that comprise the Hawkular console for https://github.com/hawkular/hawkular[Hawkular].  This console is based on https://github.com/hawtio/hawtio/blob/master/docs/Overview2dotX.md[Hawt.io 2], which a javascript based client-side framework. The various directories underneath console directory are Hawt.io 2 plugins and the various plugins eventually compose a Hawkular console. This modular approach to creating hawtio console plugins allows us to create individual plugins that comprise a console or can easily  be plugged into other Hawtio based consoles. The plugin system makes it easy to add/remove functionality (even dynamically).
 
 
 == Bower Component
 
-This git repository is published as bower component and consumed by the https://github.com/hawkular/hawkular[Hawkular Console]. Assets such as html/css/images/javascript can be published.
+This git repository is published as bower component and consumed by the https://github.com/hawkular/hawkular/ui/console/README.adoc[Hawkular Console]. Assets such as html/css/images/javascript can be published.
 
 
 _Note: Right now this component, is an unregistered bower component (and just pulled in by its git reference), soon it will have its own name on the bower registry like - 'hawtio-hawkular-console'_
@@ -39,9 +39,9 @@ The publish builds process make content available to the consumer of the bower p
 
 cd into the appropriate plugin directory `cd plugins/metrics`
 
-`gulp dist`
+`gulp build`
 
-This will build the assets into the _hawkular-console/dist_ directory. The artefacts are now ready for publishing via bower.
+This will build the assets into the _hawkular-ui-components/dist_ directory. The artefacts are now ready for publishing via bower.
 
 _Note: if you are adding new assets make sure they get added to the *main* section of the ../bower.json file._
 
@@ -55,7 +55,7 @@ And from root of this git repo:
 
  `git push && git push --tags`
 
-This pushes and publishes the hawkular-console bower component so it can be used in the Hawkular UI hawkular-console or any other Hawt console.
+This pushes and publishes the hawkular-ui-components bower component so it can be used in the Hawkular UI hawkular-console or any other Hawt console.
 
 `bower update` in the client will update to the new version (as long as the rules are set properly)
 

dist/hawkular-alerts.js

@@ -3,7 +3,7 @@
 /// <reference path="../../includes.ts"/>
 var HawkularAlerts;
 (function (HawkularAlerts) {
-    HawkularAlerts.pluginName = "hawtio-assembly";
+    HawkularAlerts.pluginName = "hawkular-alerts";
     HawkularAlerts.log = Logger.get(HawkularAlerts.pluginName);
     HawkularAlerts.templatePath = "plugins/alerts/html";
 })(HawkularAlerts || (HawkularAlerts = {}));

dist/hawkular-metrics.js

@@ -3,7 +3,7 @@
 /// <reference path="../../includes.ts"/>
 var HawkularMetrics;
 (function (HawkularMetrics) {
-    HawkularMetrics.pluginName = "hawtio-assembly";
+    HawkularMetrics.pluginName = "hawkular-metrics";
     HawkularMetrics.log = Logger.get(HawkularMetrics.pluginName);
     HawkularMetrics.templatePath = "plugins/metrics/html";
 })(HawkularMetrics || (HawkularMetrics = {}));

plugins/alerts/gulpfile.js

@@ -89,6 +89,7 @@ gulp.task('template', ['tsc'], function() {
 gulp.task('concat', ['template'], function() {
   return gulp.src(['compiled.js', 'templates.js'])
     .pipe(plugins.concat(config.js))
+    .pipe(gulp.dest(config.dist))
     .pipe(gulp.dest(config.rootDist));
 });
 

plugins/alerts/plugins/alerts/ts/alertsGlobals.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../includes.ts"/>
 module HawkularAlerts {
 
-  export var pluginName = "hawtio-assembly";
+  export var pluginName = "hawkular-alerts";
 
   export var log:Logging.Logger = Logger.get(pluginName);
 

plugins/metrics/bower.json

@@ -19,19 +19,12 @@
   "dependencies": {
     "hawtio-core": "~2.0.0",
     "hawtio-core-navigation": "~2.0.0",
-    "hawtio-utilities": "~2.0.0",
-    "toastr": "~2.0.3",
-    "moment": "2.7.0",
-    "rhqm-charts": "~0.1.7",
-    "hawkular-alerts-ui": "mtho11/hawkular-alerts-ui"
+    "hawtio-utilities": "~2.0.0"
   },
   "devDependencies": {
     "bootstrap": "~3.3.1",
     "patternfly": "~1.1.2",
     "hawtio-core-dts": "~2.0.0",
-    "angular-mocks": "~1.3.7"
-  },
-  "resolutions": {
-    "angular": "1.3.10"
+    "angular-mocks": "~1.3.11"
   }
 }

plugins/metrics/gulpfile.js

@@ -89,6 +89,7 @@ gulp.task('template', ['tsc'], function() {
 gulp.task('concat', ['template'], function() {
   return gulp.src(['compiled.js', 'templates.js'])
     .pipe(plugins.concat(config.js))
+    .pipe(gulp.dest(config.dist))
     .pipe(gulp.dest(config.rootDist));
 });
 

plugins/metrics/index.html

@@ -11,7 +11,6 @@
     <link rel="stylesheet" href="libs/patternfly/dist/css/patternfly.css" />
 
     <!-- bower:css -->
-    <link rel="stylesheet" href="libs/toastr/toastr.css" />
     <!-- endbower -->
 
     <!-- ES6/ES6 shim -->
@@ -42,13 +41,6 @@
     <script src="libs/hawtio-utilities/dist/sugar.js"></script>
     <script src="libs/hawtio-utilities/dist/angular-file-upload.js"></script>
     <script src="libs/hawtio-utilities/dist/hawtio-utilities.js"></script>
-    <script src="libs/toastr/toastr.js"></script>
-    <script src="libs/moment/moment.js"></script>
-    <script src="libs/d3/d3.js"></script>
-    <script src="libs/d3-tip/index.js"></script>
-    <script src="libs/numeral/numeral.js"></script>
-    <script src="libs/rhqm-charts/dist/rhqm-charts.js"></script>
-    <script src="libs/hawkular-alerts-ui/dist/hawkular-alerts.js"></script>
     <!-- endbower -->
 
     <script src="libs/bootstrap/dist/js/bootstrap.js"></script>

plugins/metrics/plugins/metrics/ts/metricsGlobals.ts

@@ -1,7 +1,7 @@
 /// <reference path="../../includes.ts"/>
 module HawkularMetrics {
 
-  export var pluginName = "hawtio-assembly";
+  export var pluginName = "hawkular-metrics";
 
   export var log:Logging.Logger = Logger.get(pluginName);