Merge pull request #294 from vrockai/refactorMove

HAWKULAR-346: Console dir structure refactoring

ui/README.adoc → console/README.adoc

@@ -35,15 +35,15 @@ npm modules and bower packages. Be aware, this causes the libraries not being up
 == Hawkular-ui-components development
 
 For the ease of development we're using the watch feature of the gulp tool. Gulp can watch for changes in source files
-and update the compiled console accordingly. To use this feature, you must start Hawkular from the 
-`$HAWKULAR_ROOT/dist/target/hawkular-x.y.x-SNAPSHOT/wildfly-x.x.z.Final/` directory. Once the server is up and running you have to 
-start the actual gulp task responsible for watching the changes. To achieve this, traverse to the 
+and update the compiled console accordingly. To use this feature, you must start Hawkular from the
+`$HAWKULAR_ROOT/dist/target/hawkular-x.y.x-SNAPSHOT/wildfly-x.x.z.Final/` directory. Once the server is up and running you have to
+start the actual gulp task responsible for watching the changes. To achieve this, traverse to the
 `$HAWKULAR_ROOT/ui/console/target/gulp-build/` directory and run:
 
 `gulp watch-server`
 
-The advantage of this approach is, that is scans for file changes in the source directory and apply them directly 
-into the target directory (`$HAWKULAR_ROOT/dist/target/hawkular-x.y.x-SNAPSHOT/wildfly-x.y.z.Final/`), which is suitable for console 
+The advantage of this approach is, that is scans for file changes in the source directory and apply them directly
+into the target directory (`$HAWKULAR_ROOT/dist/target/hawkular-x.y.x-SNAPSHOT/wildfly-x.y.z.Final/`), which is suitable for console
 developing since it doesn't require the whole maven build to see the actual changes in the console UI.
 
 == Other packages development

ui/console/src/main/scripts/gulpfile.js → console/src/main/scripts/gulpfile.js

@@ -30,8 +30,8 @@ var gulp = require('gulp'),
 
 // CONSTANTS
 
-var POM_MAIN_PATH = '../../../../pom.xml';
-var DIST_TARGET_PATH = '../../../../dist/target/';
+var POM_MAIN_PATH = '../../../pom.xml';
+var DIST_TARGET_PATH = '../../../dist/target/';
 var WF_CONSOLE_PATH = 'modules/org/hawkular/nest/main/deployments/hawkular-console.war/dist/';
 
 var plugins = gulpLoadPlugins({});
@@ -181,8 +181,7 @@ var gulpTemplate = function(){
       root: '',
       base: function(file){
         var filename = /[^/]*$/.exec( file.relative).input;
-        var prefixIndex = filename.indexOf('/') + 1;
-        return filename.substring(prefixIndex, filename.length);
+        return 'plugins/' + filename;
       },
       standalone: true,
       module: config.templateModule,

ui/console/src/main/scripts/plugins/accounts/plugins/includes.ts → console/src/main/scripts/plugins/accounts/includes.ts

@@ -15,5 +15,5 @@
 /// limitations under the License.
 ///
 
-/// <reference path="../../../libs/hawtio-utilities/defs.d.ts"/>
-/// <reference path="../../../libs/hawtio-oauth/defs.d.ts"/>
+/// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="../../libs/hawtio-oauth/defs.d.ts"/>

ui/console/src/main/scripts/plugins/inventory/plugins/includes.ts → console/src/main/scripts/plugins/alerts/includes.ts

@@ -15,4 +15,4 @@
 /// limitations under the License.
 ///
 
-/// <reference path="../../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>

ui/console/src/main/scripts/plugins/directives/plugins/alert/ts/alertDirective.ts → console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts

@@ -26,7 +26,7 @@ module Alert {
       alert: '=hkAlert',
       refresh: '&hkRefresh'
     };
-    public templateUrl = 'plugins/alert/html/alert.html';
+    public templateUrl = 'plugins/directives/alert/html/alert.html';
 
 
     constructor(private HawkularAlert) {
@@ -58,7 +58,7 @@ module Alert {
       alertList: '=hkAlertList',
       limit: '=hkLimit'
     };
-    public templateUrl = 'plugins/alert/html/alertList.html';
+    public templateUrl = 'plugins/directives/alert/html/alertList.html';
 
     constructor() {
       this.link = (scope: any, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) => {
@@ -84,14 +84,14 @@ module Alert {
     }
   }
 
-  class HkTimeInterval {
+  export class HkTimeInterval {
 
     public link: (scope: any, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) => void;
     public replace = 'true';
     public scope = {
       hkTime: '='
     };
-    public templateUrl = 'plugins/alert/html/timeInterval.html';
+    public templateUrl = 'plugins/directives/alert/html/timeInterval.html';
 
     public static Factory() {
       var directive = () => {
@@ -106,5 +106,5 @@ module Alert {
 
   _module.directive('hkAlertPanelList', Alert.HkAlertPanelList.Factory());
   _module.directive('hkAlertPanel', Alert.HkAlertPanel.Factory());
-  _module.directive('hkTimeInterval', HkTimeInterval.Factory());
+  _module.directive('hkTimeInterval', Alert.HkTimeInterval.Factory());
 }

ui/console/src/main/scripts/plugins/directives/plugins/includes.ts → console/src/main/scripts/plugins/directives/includes.ts

@@ -15,5 +15,5 @@
 /// limitations under the License.
 ///
 
-/// <reference path="../../../libs/hawtio-utilities/defs.d.ts"/>
-/// <reference path="../vendor/moment/moment.d.ts"/>
+/// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="vendor/moment/moment.d.ts"/>

ui/console/src/main/scripts/plugins/directives/plugins/sidebar/less/main.less → console/src/main/scripts/plugins/directives/sidebar/less/sidebar.less

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../../../libs/patternfly/components/bootstrap/less/mixins.less";
-@import "../../../../../libs/patternfly/less/variables.less";
+@import "../../../../libs/patternfly/components/bootstrap/less/variables.less";
+@import "../../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../../libs/patternfly/less/variables.less";
 
 .navbar-pf {
   margin-bottom: @grid-gutter-width/4;

ui/console/src/main/scripts/plugins/directives/plugins/sidebar/ts/sidebarGlobals.ts → console/src/main/scripts/plugins/directives/sidebar/ts/sidebarGlobals.ts

@@ -22,7 +22,7 @@ module Sidebar {
 
   export var log:Logging.Logger = Logger.get(pluginName);
 
-  export var templatePath = "plugins/sidebar/html/sidebar.html";
+  export var templatePath = "plugins/directives/sidebar/html/sidebar.html";
 
   export var globalEnvironmentId = "test";
 }

ui/console/src/main/scripts/plugins/directives/plugins/topbar/less/main.less → console/src/main/scripts/plugins/directives/topbar/less/topbar.less

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../../../libs/patternfly/components/bootstrap/less/mixins.less";
-@import "../../../../../libs/patternfly/less/variables.less";
+@import "../../../../libs/patternfly/components/bootstrap/less/variables.less";
+@import "../../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../../libs/patternfly/less/variables.less";
 
 .hk-screen-top-nav {
 

ui/console/src/main/scripts/plugins/directives/plugins/topbar/ts/topbarGlobals.ts → console/src/main/scripts/plugins/directives/topbar/ts/topbarGlobals.ts

@@ -22,7 +22,7 @@ module Topbar {
 
   export var log:Logging.Logger = Logger.get(pluginName);
 
-  export var templatePath = "plugins/topbar/html/topbar.html";
+  export var templatePath = "plugins/directives/topbar/html/topbar.html";
 
   export var globalEnvironmentId = "test";
 

ui/console/src/main/scripts/plugins/alerts/plugins/includes.ts → console/src/main/scripts/plugins/inventory/includes.ts

@@ -15,4 +15,4 @@
 /// limitations under the License.
 ///
 
-/// <reference path="../../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>

console/src/main/scripts/plugins/metrics/includes.ts

@@ -0,0 +1,20 @@
+///
+/// Copyright 2015 Red Hat, Inc. and/or its affiliates
+/// and other contributors as indicated by the @author tags.
+///
+/// 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.
+///
+
+/// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="../../libs/hawtio-core-dts/defs.d.ts"/>
+/// <reference path="../directives/vendor/moment/moment.d.ts"/>

ui/console/src/main/scripts/plugins/metrics/plugins/metrics/less/metrics-main.less → console/src/main/scripts/plugins/metrics/less/metrics.less

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import "../../../../../libs/patternfly/components/bootstrap/less/variables.less";
-@import "../../../../../libs/patternfly/components/bootstrap/less/mixins.less";
-@import "../../../../../libs/patternfly/less/variables.less";
+@import "../../../libs/patternfly/components/bootstrap/less/variables.less";
+@import "../../../libs/patternfly/components/bootstrap/less/mixins.less";
+@import "../../../libs/patternfly/less/variables.less";
 
 //variables override
 

pom.xml

@@ -54,7 +54,7 @@
   </licenses>
 
   <modules>
-    <module>ui/console</module>
+    <module>console</module>
     <module>modules/pinger</module>
     <module>modules/avail-creator</module>
     <module>dist</module>