Merge branch 'master' into mazz/integration-assembly

hawkular · Feb 18, 2015 · 033ac3f · 033ac3f
2 parents d8feaa9 + a85e936
commit 033ac3f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/ui/console/pom.xml b/ui/console/pom.xml
@@ -31,6 +31,10 @@
   <name>hawkular-console</name>
   <packaging>war</packaging>
 
+  <properties>
+    <hawkular.console.context>/hawkular-console</hawkular.console.context>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -120,6 +124,14 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <webResources>
+            <resource>
+              <directory>src/main/webapp</directory>
+              <includes>
+                <include>index.html</include>
+                <include>WEB-INF/*</include>
+              </includes>
+              <filtering>true</filtering>
+            </resource>
             <resource>
               <directory>target</directory>
               <includes>
@@ -138,9 +150,9 @@
   <profiles>
     <profile>
       <id>dev</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
+      <properties>
+        <hawkular.console.context>/</hawkular.console.context>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -163,10 +175,5 @@
         </plugins>
       </build>
     </profile>
-    <!-- This profile doesn't do anything, other than cause the above 'development' profile not to be activated when
-      we are performing a release -->
-    <profile>
-      <id>release</id>
-    </profile>
   </profiles>
 </project>
diff --git a/ui/console/src/main/webapp/WEB-INF/jboss-web.xml b/ui/console/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,5 @@
 -->
 
 <jboss-web>
-  <context-root>hawkular-console</context-root>
+  <context-root>${hawkular.console.context}</context-root>
 </jboss-web>
diff --git a/ui/console/src/main/webapp/index.html b/ui/console/src/main/webapp/index.html
@@ -3,7 +3,7 @@
 
   <head>
     <title>hawkular-console</title>
-    <base href='/'></base>
+    <base href='${hawkular.console.context}'></base>
     <meta charset="UTF8">