Moving the 'dev' folder into the root, since it is not an IDM project…

… resource
zzzprojects · Jun 2, 2014 · 4735fb2 · 4735fb2
1 parent 6e87992
commit 4735fb2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .project
 .vagrant
 .DS_Store
+node_modules
 target
 src/main/resources/dev/node_modules
diff --git a/src/main/resources/dev/Gruntfile.js → Gruntfile.js b/src/main/resources/dev/Gruntfile.js → Gruntfile.js
@@ -3,16 +3,16 @@ module.exports = function(grunt) {
     grunt.initConfig({
         watch: {
             copy: {
-                files: ['../ui/**/*.js','../script/*.js','../**/*.groovy', '../ui/**/*.html', '../conf/*.json', '../ui/**/*.less', '../ui/**/*.css'],
+                files: ['src/main/resources/ui/**/*.js','src/main/resources/script/*.js','src/main/resources/**/*.groovy', 'src/main/resources/ui/**/*.html', 'src/main/resources/conf/*.json', 'src/main/resources/ui/**/*.less', 'src/main/resources/ui/**/*.css'],
                 tasks: [ 'sync' ]
             }
         },
         sync: {
             custom: {
                 files: [{
-                    cwd     : '..',
+                    cwd     : 'src/main/resources',
                     src     : ['**/*'], 
-                    dest    : '../../../../target/sqlfiddle',
+                    dest    : 'target/sqlfiddle',
                     flatten : false,
                     expand  : true
                 }]

diff --git a/src/main/resources/dev/package.json → package.json b/src/main/resources/dev/package.json → package.json
diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml
@@ -11,9 +11,6 @@
             <directory>${basedir}/src/main/resources</directory>
             <outputDirectory>/</outputDirectory>
             <fileMode>0640</fileMode>
-            <excludes>
-                <exclude>dev/*</exclude>
-            </excludes>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/idm-staging/openidm</directory>