Merge branch 'dev/inventory-0.2.0.Alpha1' into mazz/hawkular-437-serv…

…er-agent-comm Conflicts: pom.xml
hawkular · Jul 17, 2015 · 4bd1cc2 · 4bd1cc2
2 parents 6c80833 + 7f11e03
commit 4bd1cc2
Show file tree

Hide file tree

Showing 40 changed files with 882 additions and 1,004 deletions.
diff --git a/console/pom.xml b/console/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.hawkular</groupId>
     <artifactId>hawkular</artifactId>
     <version>1.0.0.Alpha3-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java b/console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java
@@ -36,11 +36,11 @@ public class PushStateConfigurationProvider extends HttpConfigurationProvider {
     public Configuration getConfiguration(final ServletContext context) {
         return ConfigurationBuilder.begin()
                 .addRule()
-                .when(Direction.isInbound().and(Path.matches("/{path}"))
-                        .andNot(Resource.exists("/{path}"))
-                        .andNot(ServletMapping.includes("/{path}")))
-                .perform(Log.message(Logger.Level.INFO, "Page not found. This may be due to html5mode routing in " +
-                        "AngularJS application. Falling back to index.html.").and(Forward.to("/index.html")))
+                .when(Direction.isInbound().and(Path.matches("/hawkular-ui{path}"))
+                        .andNot(Resource.exists("/hawkular-ui{path}"))
+                        .andNot(ServletMapping.includes("/hawkular-ui{path}")))
+                .perform(Log.message(Logger.Level.DEBUG, "Page not found: /hawkular-ui{path} This may be due to " +
+                        "html5mode routing in AngularJS. Falling back to index.html.").and(Forward.to("/index.html")))
                 .where("path").matches(".*");
     }
 

diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -16,31 +16,31 @@
     "angular-md5": "0.1.7",
     "angular-momentjs": "0.1.9",
     "angular-patternfly": "0.0.6",
-    "angular-resource": "1.3.15",
     "angular-scroll": "0.6.5",
     "angular-ui-select": "0.11.2",
+    "angular-toastr": "1.4.1",
     "bootstrap-select": "1.6",
-    "d3": "3.5.5",
-    "event-drops": "0.1.1",
-    "hawkular-charts": "~0.4.5",
-    "hawkular-ui-services": "0.5.0",
+    "hawkular-charts": "~0.4.6",
+    "hawkular-ui-services": "0.5.2",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.16",
     "hawtio-template-cache": "2.0.3",
     "hawtio-utilities": "2.0.21",
     "hawtio-oauth": "2.0.7",
     "lodash": "3.2.0",
     "moment": "2.10.3",
-    "toastr": "2.1.1",
-    "patternfly": "1.3.0"
+    "patternfly": "1.3.0",
+    "keycloak": "1.3.1"
   },
   "devDependencies": {
-    "angular-mocks": "1.3.15",
-    "angular-resource": "1.3.15",
+    "angular-mocks": "1.4.2",
+    "angular-resource": "1.4.2",
     "hawtio-core-dts": "2.0.18"
   },
   "resolutions": {
     "patternfly": "1.3.0",
-    "angular": "1.3.15"
+    "angular": "1.4.2",
+    "angular-resource": "1.4.2",
+    "keycloak": "1.3.1"
   }
 }
diff --git a/console/src/main/scripts/gulpfile.js b/console/src/main/scripts/gulpfile.js
@@ -26,6 +26,7 @@ var gulp = require('gulp'),
     size = require('gulp-size'),
     s = require('underscore.string'),
     tslint = require('gulp-tslint'),
+    tsd = require('gulp-tsd'),
     jsString;
 
 // CONSTANTS
@@ -90,6 +91,13 @@ gulp.task('bower', function () {
         .pipe(gulp.dest('.'));
 });
 
+gulp.task('tsd', function (callback) {
+    tsd({
+        command: 'reinstall',
+        config: './tsd.json'
+    }, callback);
+});
+
 /** Adjust the reference path of any typescript-built plugin this project depends on */
 gulp.task('path-adjust', function () {
     gulp.src('libs/**/includes.d.ts')
@@ -152,11 +160,11 @@ var gulpTsc = function(done) {
     });
 };
 
-gulp.task('tsc', ['clean-defs'], function (done) {
+gulp.task('tsc', ['clean-defs', 'tsd'], function (done) {
   gulpTsc(done);
 });
 
-gulp.task('tsc-live', ['copy-sources','clean-defs'], function (done) {
+gulp.task('tsc-live', ['copy-sources','clean-defs', 'tsd'], function (done) {
   gulpTsc(done);
 });
 

diff --git a/console/src/main/scripts/package.json b/console/src/main/scripts/package.json
@@ -17,6 +17,7 @@
     "gulp-replace": "0.5.3",
     "gulp-size": "^1.2.0",
     "gulp-sourcemaps": "1.5.2",
+    "gulp-tsd": "0.0.4",
     "gulp-tslint": "^1.5.0",
     "gulp-typescript": "^2.7.8",
     "gulp-watch": "^4.2.4",

diff --git a/console/src/main/scripts/plugins/accounts/includes.ts b/console/src/main/scripts/plugins/accounts/includes.ts
@@ -15,5 +15,6 @@
 /// limitations under the License.
 ///
 
+/// <reference path="../includes.ts"/>
 /// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>
 /// <reference path="../../libs/hawtio-oauth/defs.d.ts"/>
diff --git a/console/src/main/scripts/plugins/accounts/ts/accountsPlugin.ts b/console/src/main/scripts/plugins/accounts/ts/accountsPlugin.ts
@@ -59,7 +59,10 @@ module HawkularAccounts {
             $document.find('body').eq(0).addClass('inactivity-modal-open');
             $modal.open({
                 templateUrl: 'plugins/accounts/html/inactivityModal.html',
-                backdrop: 'static'
+                backdrop: 'static',
+                keyboard: false
+            }).opened.then(() => {
+                HawtioKeycloak.keycloak.clearToken();
             });
         });
 

diff --git a/console/src/main/scripts/plugins/directives/includes.ts b/console/src/main/scripts/plugins/directives/includes.ts
@@ -15,5 +15,5 @@
 /// limitations under the License.
 ///
 
+/// <reference path="../includes.ts"/>
 /// <reference path="../../libs/hawtio-utilities/defs.d.ts"/>
-/// <reference path="vendor/moment/moment.d.ts"/>