Merge branch 'master' into HWKINVENT-26

hawkular · Apr 13, 2015 · 7b12632 · 7b12632
2 parents 7eb8769 + 947e71d
commit 7b12632
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 61 deletions.
diff --git a/ui/console/pom.xml b/ui/console/pom.xml
@@ -80,64 +80,6 @@
         </executions>
       </plugin>
 
-      <!-- Download node.js and related modules to install 3rd party frontend libraries -->
-      <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.20</version>
-
-        <configuration>
-          <workingDirectory>target/gulp-build/</workingDirectory>
-        </configuration>
-
-        <executions>
-          <execution>
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <nodeVersion>v0.10.33</nodeVersion>
-              <npmVersion>2.1.10</npmVersion>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>npm install</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <arguments>install</arguments>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>bower install</id>
-            <goals>
-              <goal>bower</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <arguments>install</arguments>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>gulp build</id>
-            <goals>
-              <goal>gulp</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <arguments>build</arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
@@ -201,6 +143,78 @@
       </build>
     </profile>
 
+    <!-- Download node.js and related modules to install 3rd party frontend libraries -->
+    <profile>
+      <id>default-build</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <hawkular.console.context>/</hawkular.console.context>
+        <hawkular.console.index.html.base.href>/</hawkular.console.index.html.base.href>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>0.0.20</version>
+
+            <configuration>
+              <workingDirectory>target/gulp-build/</workingDirectory>
+            </configuration>
+
+            <executions>
+              <execution>
+                <id>install node and npm</id>
+                <goals>
+                  <goal>install-node-and-npm</goal>
+                </goals>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <nodeVersion>v0.10.33</nodeVersion>
+                  <npmVersion>2.1.10</npmVersion>
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>npm install</id>
+                <goals>
+                  <goal>npm</goal>
+                </goals>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <arguments>install</arguments>
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>bower install</id>
+                <goals>
+                  <goal>bower</goal>
+                </goals>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <arguments>install</arguments>
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>gulp build</id>
+                <goals>
+                  <goal>gulp</goal>
+                </goals>
+                <phase>prepare-package</phase>
+                <configuration>
+                  <arguments>build</arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>link</id>
       <properties>

diff --git a/ui/console/src/main/scripts/bower.json b/ui/console/src/main/scripts/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "hawkular-console",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": true,
   "keywords": [
     "hawtio hawkular console"
@@ -17,7 +17,7 @@
     "hawtio-utilities": "2.0.21",
     "hawtio-template-cache": "2.0.2",
     "patternfly": "1.1.3",
-    "hawkular-ui-components": "^0.2.4"
+    "hawkular-ui-components": "^0.3.1"
   },
   "devDependencies": {
     "hawtio-core-dts": "2.0.17"

diff --git a/ui/console/src/main/scripts/plugins/includes.ts b/ui/console/src/main/scripts/plugins/includes.ts
@@ -15,4 +15,4 @@
 /// limitations under the License.
 ///
 
-/// <reference path="../libs/hawtio-utilities/defs.d.ts"/>
+// Console code placeholder