Merge pull request #22 from vrockai/mavenFix

Fixed maven-gulp build process
hawkular · Feb 20, 2015 · c64233b · c64233b
2 parents ae4f0ed + cb35f6b
commit c64233b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 39 deletions.
diff --git a/ui/console/defs.d.ts b/ui/console/defs.d.ts
diff --git a/ui/console/pom.xml b/ui/console/pom.xml
@@ -47,15 +47,17 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/target/</outputDirectory>
+              <outputDirectory>${basedir}/target/gulp-build/</outputDirectory>
               <resources>
                 <resource>
-                  <directory>.</directory>
+                  <directory>src/main/webapp/</directory>
                   <excludes>
-                    <exclude>pom.xml</exclude>
-                    <exclude>target/</exclude>
+                    <exclude>WEB-INF/</exclude>
                   </excludes>
                 </resource>
+                <resource>
+                  <directory>src/main/scripts/</directory>
+                </resource>
               </resources>
             </configuration>
           </execution>
@@ -69,7 +71,7 @@
         <version>0.0.20</version>
 
         <configuration>
-          <workingDirectory>target</workingDirectory>
+          <workingDirectory>target/gulp-build/</workingDirectory>
         </configuration>
 
         <executions>
@@ -127,13 +129,19 @@
             <resource>
               <directory>src/main/webapp</directory>
               <includes>
-                <include>index.html</include>
                 <include>WEB-INF/*</include>
               </includes>
               <filtering>true</filtering>
             </resource>
             <resource>
-              <directory>target</directory>
+              <directory>target/gulp-build/</directory>
+              <includes>
+                <include>index.html</include>
+              </includes>
+              <filtering>true</filtering>
+            </resource>
+            <resource>
+              <directory>target/gulp-build/</directory>
               <includes>
                 <include>libs/**</include>
                 <include>dist/**</include>
@@ -161,7 +169,7 @@
               <excludeDefaultDirectories>true</excludeDefaultDirectories>
               <filesets>
                 <fileset>
-                  <directory>target</directory>
+                  <directory>target/gulp-build/</directory>
                   <excludes>
                     <exclude>node/**</exclude>
                     <exclude>node_modules/**</exclude>

diff --git a/ui/console/.bowerrc → ui/console/src/main/scripts/.bowerrc b/ui/console/.bowerrc → ui/console/src/main/scripts/.bowerrc
diff --git a/ui/console/bower.json → ui/console/src/main/scripts/bower.json b/ui/console/bower.json → ui/console/src/main/scripts/bower.json
diff --git a/ui/console/gulpfile.js → ui/console/src/main/scripts/gulpfile.js b/ui/console/gulpfile.js → ui/console/src/main/scripts/gulpfile.js
diff --git a/ui/console/package.json → ui/console/src/main/scripts/package.json b/ui/console/package.json → ui/console/src/main/scripts/package.json
diff --git a/ui/console/plugins/includes.ts → ...sole/src/main/scripts/plugins/includes.ts b/ui/console/plugins/includes.ts → ...sole/src/main/scripts/plugins/includes.ts
diff --git a/ui/console/tslint.json → ui/console/src/main/scripts/tslint.json b/ui/console/tslint.json → ui/console/src/main/scripts/tslint.json
diff --git a/ui/console/src/main/webapp/index.html b/ui/console/src/main/webapp/index.html
@@ -20,36 +20,6 @@
     <script src="libs/es5-dom-shim/__COMPILE/a.js"></script>
 
     <!-- bower:js -->
-    <script src="libs/jquery/dist/jquery.js"></script>
-    <script src="libs/angular/angular.js"></script>
-    <script src="libs/angular-sanitize/angular-sanitize.js"></script>
-    <script src="libs/js-logger/src/logger.js"></script>
-    <script src="libs/hawtio-core/hawtio-core.js"></script>
-    <script src="libs/lodash/dist/lodash.compat.js"></script>
-    <script src="libs/angular-route/angular-route.js"></script>
-    <script src="libs/hawtio-core-navigation/dist/hawtio-core-navigation.js"></script>
-    <script src="libs/uri.js/src/URI.js"></script>
-    <script src="libs/uri.js/src/IPv6.js"></script>
-    <script src="libs/uri.js/src/SecondLevelDomains.js"></script>
-    <script src="libs/uri.js/src/punycode.js"></script>
-    <script src="libs/uri.js/src/URITemplate.js"></script>
-    <script src="libs/uri.js/src/jquery.URI.js"></script>
-    <script src="libs/uri.js/src/URI.min.js"></script>
-    <script src="libs/uri.js/src/jquery.URI.min.js"></script>
-    <script src="libs/uri.js/src/URI.fragmentQuery.js"></script>
-    <script src="libs/uri.js/src/URI.fragmentURI.js"></script>
-    <script src="libs/hawtio-utilities/dist/sugar.js"></script>
-    <script src="libs/hawtio-utilities/dist/angular-file-upload.js"></script>
-    <script src="libs/hawtio-utilities/dist/hawtio-utilities.js"></script>
-    <script src="libs/hawtio-template-cache/dist/hawtio-template-cache.js"></script>
-    <script src="libs/d3/d3.js"></script>
-    <script src="libs/moment/moment.js"></script>
-    <script src="libs/d3-tip/index.js"></script>
-    <script src="libs/numeral/numeral.js"></script>
-    <script src="libs/hawkular-charts/hawkular-charts.js"></script>
-    <script src="libs/hawkular-ui-components/dist/hawkular-metrics.js"></script>
-    <script src="libs/hawkular-ui-components/dist/hawkular-alerts.js"></script>
-    <script src="libs/hawkular-ui-components/dist/hawkular-inventory.js"></script>
     <!-- endbower -->
 
     <script src="libs/bootstrap/dist/js/bootstrap.js"></script>