Generate schemas directly into webapp lib directory, add 'em to index…

….html and have grunt watch monitor them.
hawtio · Nov 18, 2013 · 4c78b37 · 4c78b37
1 parent 36354d3
commit 4c78b37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/hawtio-web/GruntFile.js b/hawtio-web/GruntFile.js
@@ -83,8 +83,8 @@ module.exports = function (grunt) {
       app: {
         files: ['src/main/webapp/**',
                 '!src/main/webapp/**/*.ts',
-                'target/schema/js/*.js',
                 'GruntFile.js',
+                "<%= grunt.option('webapp_outdir') %>/lib/*.js",
                 "<%= grunt.option('webapp_outdir') %>/app/app.js"],
         tasks: [],
         options: {

diff --git a/hawtio-web/pom.xml b/hawtio-web/pom.xml
@@ -18,7 +18,7 @@
     <grunt-executable>grunt</grunt-executable>
     <npm-executable>npm</npm-executable>
     <phantomjs-executable>${basedir}/node_modules/.bin/phantomjs</phantomjs-executable>
-    <schema-outdir>${project.build.directory}/schema/js</schema-outdir>
+    <schema-outdir>${webapp-outdir}/lib</schema-outdir>
   </properties>
 
 

diff --git a/hawtio-web/src/main/webapp/index.html b/hawtio-web/src/main/webapp/index.html
@@ -388,6 +388,12 @@ <h2 title="Status Code: {{connectFailure.status}}">Cannot Connect: {{connectFail
     <!-- json schema definition -->
     <script type="text/javascript" src="lib/jsonschema.js"></script>
 
+    <!-- Dozer schemas, generated during build -->
+    <script type="text/javascript" src="lib/dozerMapping.js"></script>
+    <script type="text/javascript" src="lib/dozerField.js"></script>
+    <script type="text/javascript" src="lib/dozerMappings.js"></script>
+    <script type="text/javascript" src="lib/dozerFieldExclude.js"></script>
+
     <!-- markdown renderer -->
     <script type="text/javascript" src="lib/marked.js"></script>