Merge pull request #133 from edgarmueller/topic/rename-apps-dir

Rename apps dir to examples
eclipsesource · Nov 6, 2015 · 71c80a0 · 71c80a0
2 parents 196af21 + d1d1b64
commit 71c80a0
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 267 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "app/bower_components"
+  "directory": "examples/bower_components"
 }
diff --git a/.gitignore b/.gitignore
@@ -27,11 +27,11 @@ tests/**/*.js
 # logs
 *.log
 
-# test app
-app/bower_components/
-app/css/jsonforms.css
-app/js/jsonforms.js
-app/js/jsonforms.min.js
+# examples
+examples/bower_components/
+examples/css/jsonforms.css
+examples/js/jsonforms.js
+examples/js/jsonforms.min.js
 
 # webstorm
 .idea

diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,6 @@ before_script:
   - npm run update-webdriver
 
 script:
-  - grunt app
+  - grunt examples
   - grunt test
   - grunt coveralls:karma_tests
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -69,7 +69,7 @@ module.exports = function(grunt) {
                 mainModule: 'jsonforms',
                 externalModules: ['ui.bootstrap', 'ui.validate', 'ui.grid', 'ui.grid.edit', 'ui.grid.pagination', 'ui.grid.autoResize']
             },
-            app: {
+            examples: {
                 src:  'components/**/*.js',
                 dest: 'temp/jsonforms.js'
             }
@@ -88,10 +88,10 @@ module.exports = function(grunt) {
         },
 
         copy: {
-            app: {
+            examples: {
                 files: [
-                    // dist to app
-                    {expand:true, cwd: 'dist/', src: ['**'], dest: 'app'}
+                    // dist to examples
+                    {expand:true, cwd: 'dist/', src: ['**'], dest: 'examples'}
                 ]
             }
         },
@@ -151,7 +151,7 @@ module.exports = function(grunt) {
             server: {
                 options: {
                     port: 8000,
-                    base: 'app'
+                    base: 'examples'
                 }
             }
         },
@@ -177,9 +177,9 @@ module.exports = function(grunt) {
                 files: 'templates/**',
                 tasks: ['ngtemplates:dist', "concat:dist", 'uglify:dist']
             },
-            app: {
+            examples: {
                 files: ['dist/**'],
-                tasks: ['copy:app']
+                tasks: ['copy:examples']
             }
         },
 
@@ -188,9 +188,9 @@ module.exports = function(grunt) {
                 'dist/**',
                 'temp/**'
             ],
-            app: [
-                'app/js/jsonforms*',
-                'app/css/jsonforms*'
+            examples: [
+                'examples/js/jsonforms*',
+                'examples/css/jsonforms*'
             ],
             dev: [
                 'components/references.ts',
@@ -202,7 +202,7 @@ module.exports = function(grunt) {
                 'tests/**/*.js.map'
             ],
             downloads: [
-                'app/bower_components',
+                'examples/bower_components',
                 'node_modules'
             ],
             coverage: [
@@ -214,16 +214,16 @@ module.exports = function(grunt) {
             all: [
                 'dist',
                 'temp',
-                'app/js/jsonforms*',
-                'app/css/jsonforms*',
+                'examples/js/jsonforms*',
+                'examples/css/jsonforms*',
                 'components/references.ts',
                 'components/**/*.js',
                 'components/**/*.js.map',
                 'tests/references.ts',
                 'tests/**/*.js',
                 '!tests/**/*.conf.js',
                 'tests/**/*.js.map',
-                'app/bower_components',
+                'examples/bower_components',
                 'node_modules',
                 'coverage',
                 '.tscache'
@@ -301,16 +301,16 @@ module.exports = function(grunt) {
         'uglify:dist'
     ]);
 
-    // Build example application
-    grunt.registerTask('app', [
+    // Build example applications
+    grunt.registerTask('examples', [
         'dist',
-        'copy:app'
+        'copy:examples'
     ]);
 
     // Test unit and e2e tests
     grunt.registerTask('test', [
         'clean:coverage',
-        'app',
+        'examples',
         'ts:test',
         'karma',
         'connect',

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ create forms by leveraging the capabilities of JSON and JSON schema.
 JSONForms uses [Grunt](http://gruntjs.com/) to build and test.
 
 * Run ```grunt``` or ```grunt dist``` to build the distribution
-* Run ```grunt app``` to build the application
+* Run ```grunt examples``` to build the application
 * Run ```grunt test``` to test the framework and the application
 * Run ```grunt watch``` during development to automatically rebuild the distribution and application when any of the development files are touched.
 * Run ```grunt clean:all``` if you want to clean the whole project.

diff --git a/app/css/main.css b/app/css/main.css
diff --git a/app/assets/db.json → examples/assets/db.json b/app/assets/db.json → examples/assets/db.json
diff --git a/app/embed-index.html → examples/embed-index.html b/app/embed-index.html → examples/embed-index.html
diff --git a/app/js/AsyncController.js → examples/js/AsyncController.js b/app/js/AsyncController.js → examples/js/AsyncController.js
diff --git a/app/js/DefaultSchemaController.js → examples/js/DefaultSchemaController.js b/app/js/DefaultSchemaController.js → examples/js/DefaultSchemaController.js
diff --git a/app/js/DefaultUISchemaController.js → examples/js/DefaultUISchemaController.js b/app/js/DefaultUISchemaController.js → examples/js/DefaultUISchemaController.js
diff --git a/app/js/EditorController.js → examples/js/EditorController.js b/app/js/EditorController.js → examples/js/EditorController.js
diff --git a/app/js/LocalController.js → examples/js/LocalController.js b/app/js/LocalController.js → examples/js/LocalController.js
diff --git a/app/js/MyControl.js → examples/js/MyControl.js b/app/js/MyControl.js → examples/js/MyControl.js
diff --git a/app/js/MyController.js → examples/js/MyController.js b/app/js/MyController.js → examples/js/MyController.js
diff --git a/app/js/PlaceholderController.js → examples/js/PlaceholderController.js b/app/js/PlaceholderController.js → examples/js/PlaceholderController.js
diff --git a/app/js/RemoteControllers.js → examples/js/RemoteControllers.js b/app/js/RemoteControllers.js → examples/js/RemoteControllers.js
diff --git a/app/js/app.js → examples/js/app.js b/app/js/app.js → examples/js/app.js
diff --git a/app/templates/async.html → examples/templates/async.html b/app/templates/async.html → examples/templates/async.html
diff --git a/app/templates/custom.html → examples/templates/custom.html b/app/templates/custom.html → examples/templates/custom.html
diff --git a/app/templates/default-schema.html → examples/templates/default-schema.html b/app/templates/default-schema.html → examples/templates/default-schema.html
diff --git a/app/templates/defaultui.html → examples/templates/defaultui.html b/app/templates/defaultui.html → examples/templates/defaultui.html
diff --git a/app/templates/editor.html → examples/templates/editor.html b/app/templates/editor.html → examples/templates/editor.html
diff --git a/app/templates/local.html → examples/templates/local.html b/app/templates/local.html → examples/templates/local.html
diff --git a/app/templates/placeholder-comments.html → examples/templates/placeholder-comments.html b/app/templates/placeholder-comments.html → examples/templates/placeholder-comments.html
diff --git a/app/templates/placeholder-posts.html → examples/templates/placeholder-posts.html b/app/templates/placeholder-posts.html → examples/templates/placeholder-posts.html
diff --git a/app/templates/placeholder-users.html → examples/templates/placeholder-users.html b/app/templates/placeholder-users.html → examples/templates/placeholder-users.html
diff --git a/app/templates/remote.html → examples/templates/remote.html b/app/templates/remote.html → examples/templates/remote.html