Merge branch 'master' into mazz/integration-assembly

Conflicts:
	pom.xml
	ui/console/dist/hawkular-console.js

.travis.maven.settings.xml

@@ -23,6 +23,14 @@
 
   <interactiveMode>false</interactiveMode>
 
+  <servers>
+    <server>
+      <id>jboss-snapshots-repository</id>
+      <username>${env.NEXUS_DEPLOY_USERNAME}</username>
+      <password>${env.NEXUS_DEPLOY_PASSWORD}</password>
+    </server>
+  </servers>
+
   <profiles>
     <profile>
       <id>securecentral</id>

.travis.yml

@@ -1,13 +1,16 @@
 language: java
-
 jdk:
-  - oraclejdk8
-
+- oraclejdk8
 install:
-  - mvn -s .travis.maven.settings.xml -version -B
-
+- mvn -s .travis.maven.settings.xml -version -B
 script:
-  - mvn -fae -s .travis.maven.settings.xml clean install
-
+- mvn -fae -s .travis.maven.settings.xml clean install
 notifications:
   email: false
+env:
+  global:
+  - secure: h2UBs+L83eGd8+vTvd4B5sh+ixjp67JB/5Ko/zGAEt6a3hIgrhqyjiXJmaEH3+jzJZKXUcUC6uOuxXHwZ4ODeF+McHViOjqqUGEynJ7AsLXqSr5SSBKZuY/pb69phQnh7Br5w2D+5IFHWEcjrSo/kHDbeZBVAMFRDeGVwpHy2yA=
+  - secure: BADgz+otMMO+gUlFNduU/mgFm1dOfv2ZWAYD3nO1nEwu7Y1QVUsqimHdlqntUcinILDVeD33oT27kElERvr7KyjfDEPSDAVUg5Y/5soezg/tBu0zi3iodAP2GynOMohS/Rfm4+3ajWuEe/Y2SYjFXgldMR9qjP+/31FsVtW8Op0=
+
+after_success:
+- test "${TRAVIS_BRANCH}" = "master" && test "${TRAVIS_PULL_REQUEST}" = "false" && mvn  -s .travis.maven.settings.xml deploy -DskipTests

ui/console/pom.xml

@@ -29,7 +29,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hawkular-console</artifactId>
   <name>hawkular-console</name>
-  <packaging>pom</packaging>
+  <packaging>war</packaging>
 
   <build>
     <plugins>
@@ -57,6 +57,7 @@
           </execution>
         </executions>
       </plugin>
+
       <!-- Download node.js and related modules to install 3rd party frontend libraries -->
       <plugin>
         <groupId>com.github.eirslett</groupId>
@@ -73,7 +74,7 @@
             <goals>
               <goal>install-node-and-npm</goal>
             </goals>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <configuration>
               <nodeVersion>v0.10.33</nodeVersion>
               <npmVersion>2.1.10</npmVersion>
@@ -85,7 +86,7 @@
             <goals>
               <goal>npm</goal>
             </goals>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <configuration>
               <arguments>install</arguments>
             </configuration>
@@ -96,7 +97,7 @@
             <goals>
               <goal>bower</goal>
             </goals>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <configuration>
               <arguments>install</arguments>
             </configuration>
@@ -107,14 +108,34 @@
             <goals>
               <goal>gulp</goal>
             </goals>
-            <phase>package</phase>
+            <phase>prepare-package</phase>
             <configuration>
               <arguments>build</arguments>
             </configuration>
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>target/dist</directory>
+              <filtering>false</filtering>
+            </resource>
+            <resource>
+              <directory>target</directory>
+              <includes>
+                <include>libs/**</include>
+              </includes>
+              <filtering>false</filtering>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
     </plugins>
+
   </build>
 
   <profiles>

ui/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -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.
+
+-->
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+</jboss-deployment-structure>

ui/console/src/main/webapp/WEB-INF/jboss-web.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+
+    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.
+
+-->
+
+<jboss-web>
+  <context-root>hawkular-console</context-root>
+</jboss-web>

ui/console/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,25 @@
+<!--
+
+    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.
+
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+</web-app>