added grunt watch configuration

mpoehler · Aug 11, 2014 · 8386c87 · 8386c87
1 parent 6de424a
commit 8386c87
Showing 5 changed files with 82 additions and 14 deletions.
diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -78,21 +78,11 @@
                     <!-- relative to src/main/webapp/, default: static -->
                     <jsSourceDirectory>static</jsSourceDirectory>
 
-                    <!-- example options usage to get verbose output in logs -->
+                    <!-- get verbose output in logs -->
                     <gruntOptions>
                         <gruntOption>--verbose</gruntOption>
                     </gruntOptions>
 
-                    <!-- example npm install env variable -->
-                    <npmEnvironmentVar>
-                        <PHANTOMJS_CDNURL>http://cnpmjs.org/downloads</PHANTOMJS_CDNURL>
-                    </npmEnvironmentVar>
-
-                    <!-- example options usage to filter variables in given resource -->
-                    <filteredResources>
-                        <filteredResource>maven-properties.json</filteredResource>
-                    </filteredResources>
-
                 </configuration>
                 <executions>
                     <execution>
@@ -106,6 +96,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                  <filesets>
+                    <fileset>
+                      <directory>target</directory>
+                      <directory>target-grunt</directory>
+                    </fileset>
+                  </filesets>
+                </configuration>
+              </plugin>
         </plugins>
     </build>
 </project>
diff --git a/webapp/src/main/webapp/static/Gruntfile.js b/webapp/src/main/webapp/static/Gruntfile.js
@@ -2,6 +2,9 @@ module.exports = function(grunt) {
 
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
+
+        gruntMavenProperties: grunt.file.readJSON('grunt-maven.json'),
+
         concat: {
 	      options: {
 	        separator: ';'
@@ -11,6 +14,7 @@ module.exports = function(grunt) {
 	        dest: 'dist/<%= pkg.name %>.js'
 	      }
 	    },
+
 	    uglify: {
 	      options: {
 	        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
@@ -20,11 +24,38 @@ module.exports = function(grunt) {
 	          'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
 	        }
 	      }
-	    }
+	    },
+
+	    mavenPrepare: {
+		    options: {
+		      resources: ['**']
+		    },
+		    prepare: {}
+		},
+
+		mavenDist: {
+		    options: {
+		      warName: '',
+		      deliverables: ['optiker-verzeichnis.min.js'],
+		      gruntDistDir: 'dist'
+		    },
+		    dist: {}
+		},
+
+		watch: {
+		    maven: {
+		      files: ['../src/main/webapp/static/*.js'],
+		      tasks: ['default'],
+		      options: {      			
+    		  }
+		  }
+  		}
     });
 
+  	grunt.loadNpmTasks('grunt-maven');
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-watch');
 
-    grunt.registerTask('default', ['concat', 'uglify']);
+    grunt.registerTask('default', ['mavenPrepare','concat', 'uglify', 'mavenDist']);
 };
diff --git a/webapp/src/main/webapp/static/app.js b/webapp/src/main/webapp/static/app.js
@@ -0,0 +1,26 @@
+'use strict';
+
+/* App Module */
+
+var klpvAdminApp = angular.module('OptikerVerzeichnisApp', [
+  'ngRoute'
+]);
+
+
+
+
+klpvAdminApp.config(['$routeProvider',
+  function($routeProvider) {
+    $routeProvider.
+      when('/optiker/:city/:name', {
+        templateUrl: 'optiker.html',
+        controller: 'OptikerDetailsCtrl'
+      }).
+      when('/', {
+          templateUrl: 'homepage.html',
+          controller: 'HonepageCtrl'
+        }).
+      otherwise({
+        redirectTo: '/'
+      });
+  }]);
diff --git a/webapp/src/main/webapp/static/grunt-maven.json b/webapp/src/main/webapp/static/grunt-maven.json
@@ -0,0 +1,7 @@
+{
+	"projectRootPath": "../",
+    "targetPath": "../target/webapp-1.0",
+    "sourceDirectory": "src",
+    "jsSourceDirectory": "static",
+    "filteredFiles": []
+}
diff --git a/webapp/src/main/webapp/static/package.json b/webapp/src/main/webapp/static/package.json
@@ -3,7 +3,9 @@
   "version": "1.0.0",
   "devDependencies": {
     "grunt": "~0.4.5",
+    "grunt-maven": "~1.1.0",
     "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-uglify": "~0.5.1"
+    "grunt-contrib-uglify": "~0.5.1",
+    "grunt-contrib-watch": "~0.6.1"
   }
 }