Release v1.1.1

This commit is contained in:
Julien Dubois 2014-09-10 15:44:27 +02:00
parent 5810e3d016
commit f026558365
5 changed files with 496 additions and 494 deletions

View File

@ -4,7 +4,6 @@
root = true
[*]
# Change these settings to your own preference

View File

@ -1,4 +1,4 @@
// Generated on 2014-09-08 using generator-jhipster 1.1.0
// Generated on 2014-09-10 using generator-jhipster 1.1.1
'use strict';
// # Globbing
@ -10,439 +10,439 @@
var proxySnippet = require('grunt-connect-proxy/lib/utils').proxyRequest;
module.exports = function (grunt) {
require('load-grunt-tasks')(grunt);
require('time-grunt')(grunt);
require('load-grunt-tasks')(grunt);
require('time-grunt')(grunt);
grunt.initConfig({
yeoman: {
// configurable paths
app: require('./bower.json').appPath || 'app',
dist: 'src/main/webapp/dist'
},
watch: {
styles: {
files: ['src/main/webapp/styles/{,*/}*.css'],
tasks: ['copy:styles', 'autoprefixer']
},
livereload: {
options: {
livereload: 35729
grunt.initConfig({
yeoman: {
// configurable paths
app: require('./bower.json').appPath || 'app',
dist: 'src/main/webapp/dist'
},
files: [
'src/main/webapp/**/*.html',
'.tmp/styles/{,*/}*.css',
'{.tmp/,}src/main/webapp/scripts/{,*/}*.js',
'src/main/webapp/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
]
}
},
autoprefixer: {
options: ['last 1 version'],
dist: {
files: [{
expand: true,
cwd: '.tmp/styles/',
src: '{,*/}*.css',
dest: '.tmp/styles/'
}]
}
},
connect: {
proxies: [
{
context: '/app',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
watch: {
styles: {
files: ['src/main/webapp/styles/{,*/}*.css'],
tasks: ['copy:styles', 'autoprefixer']
},
livereload: {
options: {
livereload: 35729
},
files: [
'src/main/webapp/**/*.html',
'.tmp/styles/{,*/}*.css',
'{.tmp/,}src/main/webapp/scripts/{,*/}*.js',
'src/main/webapp/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
]
}
},
{
context: '/metrics',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
autoprefixer: {
options: ['last 1 version'],
dist: {
files: [{
expand: true,
cwd: '.tmp/styles/',
src: '{,*/}*.css',
dest: '.tmp/styles/'
}]
}
},
{
context: '/dump',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
connect: {
proxies: [
{
context: '/app',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
},
{
context: '/metrics',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
},
{
context: '/dump',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
},
{
context: '/api-docs',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
},
{
context: '/console',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
}
],
options: {
port: 9000,
// Change this to 'localhost' to deny access to the server from outside.
hostname: '0.0.0.0',
livereload: 35729
},
livereload: {
options: {
open: true,
base: [
'.tmp',
'src/main/webapp'
],
middleware: function (connect) {
return [
proxySnippet,
connect.static('.tmp'),
connect.static('src/main/webapp')
];
}
}
},
test: {
options: {
port: 9001,
base: [
'.tmp',
'test',
'src/main/webapp'
]
}
},
dist: {
options: {
base: '<%= yeoman.dist %>'
}
}
},
{
context: '/api-docs',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
clean: {
dist: {
files: [{
dot: true,
src: [
'.tmp',
'<%= yeoman.dist %>/*',
'!<%= yeoman.dist %>/.git*'
]
}]
},
server: '.tmp'
},
{
context: '/console',
host: 'localhost',
port: 8080,
https: false,
changeOrigin: false
}
],
options: {
port: 9000,
// Change this to 'localhost' to deny access to the server from outside.
hostname: '0.0.0.0',
livereload: 35729
},
livereload: {
options: {
open: true,
base: [
'.tmp',
'src/main/webapp'
],
middleware: function (connect) {
return [
proxySnippet,
connect.static('.tmp'),
connect.static('src/main/webapp')
];
}
}
},
test: {
options: {
port: 9001,
base: [
'.tmp',
'test',
'src/main/webapp'
]
}
},
dist: {
options: {
base: '<%= yeoman.dist %>'
}
}
},
clean: {
dist: {
files: [{
dot: true,
src: [
'.tmp',
'<%= yeoman.dist %>/*',
'!<%= yeoman.dist %>/.git*'
]
}]
},
server: '.tmp'
},
jshint: {
options: {
jshintrc: '.jshintrc'
},
all: [
'Gruntfile.js',
'src/main/webapp/scripts/{,*/}*.js'
]
},
coffee: {
options: {
sourceMap: true,
sourceRoot: ''
},
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/scripts',
src: '{,*/}*.coffee',
dest: '.tmp/scripts',
ext: '.js'
}]
},
test: {
files: [{
expand: true,
cwd: 'test/spec',
src: '{,*/}*.coffee',
dest: '.tmp/spec',
ext: '.js'
}]
}
},
// not used since Uglify task does concat,
// but still available if needed
/*concat: {
dist: {}
},*/
rev: {
dist: {
files: {
src: [
'<%= yeoman.dist %>/scripts/{,*/}*.js',
'<%= yeoman.dist %>/styles/{,*/}*.css',
'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
'<%= yeoman.dist %>/fonts/*'
]
}
}
},
useminPrepare: {
html: 'src/main/webapp/{,*/}*.html',
options: {
dest: '<%= yeoman.dist %>'
}
},
usemin: {
html: ['<%= yeoman.dist %>/{,*/}*.html'],
css: ['<%= yeoman.dist %>/styles/{,*/}*.css'],
options: {
dirs: ['<%= yeoman.dist %>']
}
},
imagemin: {
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/images',
src: '{,*/}*.{jpg,jpeg}', // we don't optimize PNG files as it doesn't work on Linux. If you are not on Linux, feel free to use '{,*/}*.{png,jpg,jpeg}'
dest: '<%= yeoman.dist %>/images'
}]
}
},
svgmin: {
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/images',
src: '{,*/}*.svg',
dest: '<%= yeoman.dist %>/images'
}]
}
},
cssmin: {
// By default, your `index.html` <!-- Usemin Block --> will take care of
// minification. This option is pre-configured if you do not wish to use
// Usemin blocks.
// dist: {
// files: {
// '<%= yeoman.dist %>/styles/main.css': [
// '.tmp/styles/{,*/}*.css',
// 'styles/{,*/}*.css'
// ]
// }
// }
},
htmlmin: {
dist: {
options: {
removeCommentsFromCDATA: true,
// https://github.com/yeoman/grunt-usemin/issues/44
collapseWhitespace: true,
collapseBooleanAttributes: true,
conservativeCollapse: true,
removeAttributeQuotes: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true
jshint: {
options: {
jshintrc: '.jshintrc'
},
all: [
'Gruntfile.js',
'src/main/webapp/scripts/{,*/}*.js'
]
},
files: [{
expand: true,
cwd: '<%= yeoman.dist %>',
src: ['*.html', 'views/*.html'],
dest: '<%= yeoman.dist %>'
}]
}
},
// Put files not handled in other tasks here
copy: {
dist: {
files: [{
expand: true,
dot: true,
cwd: 'src/main/webapp',
dest: '<%= yeoman.dist %>',
src: [
'*.html',
'views/*.html',
'images/{,*/}*.{png,gif,webp}',
'fonts/*'
]
}, {
expand: true,
cwd: '.tmp/images',
dest: '<%= yeoman.dist %>/images',
src: [
'generated/*'
]
}]
},
styles: {
expand: true,
cwd: 'src/main/webapp/styles',
dest: '.tmp/styles/',
src: '{,*/}*.css'
},
generateHerokuDirectory: {
expand: true,
dest: 'deploy/heroku',
src: [
'pom.xml',
'src/main/**'
]
},
generateOpenshiftDirectory: {
expand: true,
dest: 'deploy/openshift',
src: [
'pom.xml',
'src/main/**'
]
},
},
concurrent: {
server: [
'copy:styles'
],
test: [
'copy:styles'
],
dist: [
'copy:styles',
'imagemin',
'svgmin'
]
},
karma: {
unit: {
configFile: 'src/test/javascript/karma.conf.js',
singleRun: true
}
},
cdnify: {
dist: {
html: ['<%= yeoman.dist %>/*.html']
}
},
ngAnnotate: {
dist: {
files: [{
expand: true,
cwd: '.tmp/concat/scripts',
src: '*.js',
dest: '.tmp/concat/scripts'
}]
}
},
replace: {
dist: {
src: ['<%= yeoman.dist %>/index.html'],
overwrite: true, // overwrite matched source files
replacements: [{
from: '<div class="development"></div>',
to: ''
}]
}
},
uglify: {
dist: {
files: {
'<%= yeoman.dist %>/scripts/scripts.js': [
'<%= yeoman.dist %>/scripts/scripts.js'
]
}
}
},
buildcontrol: {
options: {
commit: true,
push: false,
connectCommits: false,
message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%'
},
heroku: {
options: {
dir: 'deploy/heroku',
remote: 'heroku',
branch: 'master'
}
},
openshift: {
options: {
dir: 'deploy/openshift',
remote: 'openshift',
branch: 'master'
}
}
},
});
coffee: {
options: {
sourceMap: true,
sourceRoot: ''
},
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/scripts',
src: '{,*/}*.coffee',
dest: '.tmp/scripts',
ext: '.js'
}]
},
test: {
files: [{
expand: true,
cwd: 'test/spec',
src: '{,*/}*.coffee',
dest: '.tmp/spec',
ext: '.js'
}]
}
},
// not used since Uglify task does concat,
// but still available if needed
/*concat: {
dist: {}
},*/
rev: {
dist: {
files: {
src: [
'<%= yeoman.dist %>/scripts/{,*/}*.js',
'<%= yeoman.dist %>/styles/{,*/}*.css',
'<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
'<%= yeoman.dist %>/fonts/*'
]
}
}
},
useminPrepare: {
html: 'src/main/webapp/{,*/}*.html',
options: {
dest: '<%= yeoman.dist %>'
}
},
usemin: {
html: ['<%= yeoman.dist %>/{,*/}*.html'],
css: ['<%= yeoman.dist %>/styles/{,*/}*.css'],
options: {
dirs: ['<%= yeoman.dist %>']
}
},
imagemin: {
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/images',
src: '{,*/}*.{jpg,jpeg}', // we don't optimize PNG files as it doesn't work on Linux. If you are not on Linux, feel free to use '{,*/}*.{png,jpg,jpeg}'
dest: '<%= yeoman.dist %>/images'
}]
}
},
svgmin: {
dist: {
files: [{
expand: true,
cwd: 'src/main/webapp/images',
src: '{,*/}*.svg',
dest: '<%= yeoman.dist %>/images'
}]
}
},
cssmin: {
// By default, your `index.html` <!-- Usemin Block --> will take care of
// minification. This option is pre-configured if you do not wish to use
// Usemin blocks.
// dist: {
// files: {
// '<%= yeoman.dist %>/styles/main.css': [
// '.tmp/styles/{,*/}*.css',
// 'styles/{,*/}*.css'
// ]
// }
// }
},
htmlmin: {
dist: {
options: {
removeCommentsFromCDATA: true,
// https://github.com/yeoman/grunt-usemin/issues/44
collapseWhitespace: true,
collapseBooleanAttributes: true,
conservativeCollapse: true,
removeAttributeQuotes: true,
removeRedundantAttributes: true,
useShortDoctype: true,
removeEmptyAttributes: true
},
files: [{
expand: true,
cwd: '<%= yeoman.dist %>',
src: ['*.html', 'views/*.html'],
dest: '<%= yeoman.dist %>'
}]
}
},
// Put files not handled in other tasks here
copy: {
dist: {
files: [{
expand: true,
dot: true,
cwd: 'src/main/webapp',
dest: '<%= yeoman.dist %>',
src: [
'*.html',
'views/*.html',
'images/{,*/}*.{png,gif,webp}',
'fonts/*'
]
}, {
expand: true,
cwd: '.tmp/images',
dest: '<%= yeoman.dist %>/images',
src: [
'generated/*'
]
}]
},
styles: {
expand: true,
cwd: 'src/main/webapp/styles',
dest: '.tmp/styles/',
src: '{,*/}*.css'
},
generateHerokuDirectory: {
expand: true,
dest: 'deploy/heroku',
src: [
'pom.xml',
'src/main/**'
]
},
generateOpenshiftDirectory: {
expand: true,
dest: 'deploy/openshift',
src: [
'pom.xml',
'src/main/**'
]
},
},
concurrent: {
server: [
'copy:styles'
],
test: [
'copy:styles'
],
dist: [
'copy:styles',
'imagemin',
'svgmin'
]
},
karma: {
unit: {
configFile: 'src/test/javascript/karma.conf.js',
singleRun: true
}
},
cdnify: {
dist: {
html: ['<%= yeoman.dist %>/*.html']
}
},
ngAnnotate: {
dist: {
files: [{
expand: true,
cwd: '.tmp/concat/scripts',
src: '*.js',
dest: '.tmp/concat/scripts'
}]
}
},
replace: {
dist: {
src: ['<%= yeoman.dist %>/index.html'],
overwrite: true, // overwrite matched source files
replacements: [{
from: '<div class="development"></div>',
to: ''
}]
}
},
uglify: {
dist: {
files: {
'<%= yeoman.dist %>/scripts/scripts.js': [
'<%= yeoman.dist %>/scripts/scripts.js'
]
}
}
},
buildcontrol: {
options: {
commit: true,
push: false,
connectCommits: false,
message: 'Built %sourceName% from commit %sourceCommit% on branch %sourceBranch%'
},
heroku: {
options: {
dir: 'deploy/heroku',
remote: 'heroku',
branch: 'master'
}
},
openshift: {
options: {
dir: 'deploy/openshift',
remote: 'openshift',
branch: 'master'
}
}
},
});
grunt.registerTask('server', function (target) {
if (target === 'dist') {
return grunt.task.run(['build', 'connect:dist:keepalive']);
}
grunt.registerTask('server', function (target) {
if (target === 'dist') {
return grunt.task.run(['build', 'connect:dist:keepalive']);
}
grunt.task.run([
'clean:server',
'concurrent:server',
'autoprefixer',
'configureProxies',
'connect:livereload',
'watch'
grunt.task.run([
'clean:server',
'concurrent:server',
'autoprefixer',
'configureProxies',
'connect:livereload',
'watch'
]);
});
grunt.registerTask('test', [
'clean:server',
'concurrent:test',
'autoprefixer',
'connect:test',
'karma'
]);
});
grunt.registerTask('test', [
'clean:server',
'concurrent:test',
'autoprefixer',
'connect:test',
'karma'
]);
grunt.registerTask('build', [
'clean:dist',
'useminPrepare',
'concurrent:dist',
'autoprefixer',
'concat',
'copy:dist',
'ngAnnotate',
'cssmin',
'replace',
'uglify',
'rev',
'usemin',
'htmlmin'
]);
grunt.registerTask('build', [
'clean:dist',
'useminPrepare',
'concurrent:dist',
'autoprefixer',
'concat',
'copy:dist',
'ngAnnotate',
'cssmin',
'replace',
'uglify',
'rev',
'usemin',
'htmlmin'
]);
grunt.registerTask('buildHeroku', [
'test',
'build',
'copy:generateHerokuDirectory',
]);
grunt.registerTask('buildHeroku', [
'test',
'build',
'copy:generateHerokuDirectory',
]);
grunt.registerTask('deployHeroku', [
'test',
'build',
'copy:generateHerokuDirectory',
'buildcontrol:heroku'
]);
grunt.registerTask('deployHeroku', [
'test',
'build',
'copy:generateHerokuDirectory',
'buildcontrol:heroku'
]);
grunt.registerTask('buildOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory',
]);
grunt.registerTask('buildOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory',
]);
grunt.registerTask('deployOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory',
'buildcontrol:openshift'
]);
grunt.registerTask('deployOpenshift', [
'test',
'build',
'copy:generateOpenshiftDirectory',
'buildcontrol:openshift'
]);
grunt.registerTask('default', [
'test',
'build'
]);
grunt.registerTask('default', [
'test',
'build'
]);
};

View File

@ -1,25 +1,25 @@
{
"name": "jhipster",
"version": "0.0.0",
"dependencies": {
"bootstrap-sass": "twbs/bootstrap-sass#~3.1.1",
"modernizr": "2.7.1",
"jquery": "2.1.1",
"angular": "1.2.22",
"json3": "3.3.2",
"angular-route": "1.2.22",
"angular-resource": "1.2.22",
"angular-cookies": "1.2.22",
"angular-sanitize": "1.2.22",
"angular-translate": "2.2.0",
"angular-translate-storage-cookie": "2.2.0",
"angular-translate-loader-static-files": "2.2.0",
"angular-dynamic-locale": "0.1.1",
"angular-i18n": "1.2.22",
"swagger-ui": "2.0.18"
},
"devDependencies": {
"angular-mocks": "1.2.22",
"angular-scenario": "1.2.22"
}
}
"name": "jhipster",
"version": "0.0.0",
"dependencies": {
"bootstrap-sass": "twbs/bootstrap-sass#~3.1.1",
"modernizr": "2.7.1",
"jquery": "2.1.1",
"angular": "1.2.22",
"json3": "3.3.2",
"angular-route": "1.2.22",
"angular-resource": "1.2.22",
"angular-cookies": "1.2.22",
"angular-sanitize": "1.2.22",
"angular-translate": "2.2.0",
"angular-translate-storage-cookie": "2.2.0",
"angular-translate-loader-static-files": "2.2.0",
"angular-dynamic-locale": "0.1.1",
"angular-i18n": "1.2.22",
"swagger-ui": "2.0.18"
},
"devDependencies": {
"angular-mocks": "1.2.22",
"angular-scenario": "1.2.22"
}
}

View File

@ -1,50 +1,50 @@
{
"name": "jhipster",
"version": "0.0.0",
"description": "Description for jhipster",
"dependencies": {
},
"devDependencies": {
"grunt": "0.4.5",
"grunt-autoprefixer": "0.7.5",
"grunt-build-control": "0.1.3",
"grunt-wiredep": "1.8.0",
"grunt-cli": "0.1.13",
"grunt-contrib-copy": "0.5.0",
"grunt-concurrent": "0.5.0",
"grunt-connect-proxy": "0.1.10",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.4.0",
"grunt-contrib-connect": "0.8.0",
"grunt-contrib-cssmin": "0.9.0",
"grunt-contrib-htmlmin": "0.3.0",
"grunt-contrib-imagemin": "0.7.1",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-uglify": "0.4.0",
"grunt-contrib-watch": "0.6.1",
"grunt-modernizr": "0.5.2",
"grunt-ng-annotate": "0.3.2",
"grunt-rev": "0.1.0",
"grunt-svgmin": "0.4.0",
"grunt-text-replace": "0.3.12",
"grunt-usemin": "2.2.0",
"load-grunt-tasks": "0.5.0",
"grunt-karma": "0.8.3",
"time-grunt": "0.3.2",
"event-stream": "3.1.5",
"karma-script-launcher": "0.1.0",
"karma-chrome-launcher": "0.1.4",
"karma-html2js-preprocessor": "0.1.0",
"karma-jasmine": "0.2.2",
"karma-requirejs": "0.2.2",
"karma-phantomjs-launcher": "0.1.4",
"karma": "0.12.16",
"bower": "1.3.5",
"generator-jhipster": "1.1.0",
"lodash": "2.4.1",
"zeparser": "0.0.7"
},
"engines": {
"node": ">=0.10.0"
}
"name": "jhipster",
"version": "0.0.0",
"description": "Description for jhipster",
"dependencies": {
},
"devDependencies": {
"grunt": "0.4.5",
"grunt-autoprefixer": "0.7.5",
"grunt-build-control": "0.1.3",
"grunt-wiredep": "1.8.0",
"grunt-cli": "0.1.13",
"grunt-contrib-copy": "0.5.0",
"grunt-concurrent": "0.5.0",
"grunt-connect-proxy": "0.1.10",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-concat": "0.4.0",
"grunt-contrib-connect": "0.8.0",
"grunt-contrib-cssmin": "0.9.0",
"grunt-contrib-htmlmin": "0.3.0",
"grunt-contrib-imagemin": "0.7.1",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-uglify": "0.4.0",
"grunt-contrib-watch": "0.6.1",
"grunt-modernizr": "0.5.2",
"grunt-ng-annotate": "0.3.2",
"grunt-rev": "0.1.0",
"grunt-svgmin": "0.4.0",
"grunt-text-replace": "0.3.12",
"grunt-usemin": "2.2.0",
"load-grunt-tasks": "0.5.0",
"grunt-karma": "0.8.3",
"time-grunt": "0.3.2",
"event-stream": "3.1.5",
"karma-script-launcher": "0.1.0",
"karma-chrome-launcher": "0.1.4",
"karma-html2js-preprocessor": "0.1.0",
"karma-jasmine": "0.2.2",
"karma-requirejs": "0.2.2",
"karma-phantomjs-launcher": "0.1.4",
"karma": "0.12.16",
"bower": "1.3.5",
"generator-jhipster": "1.1.1",
"lodash": "2.4.1",
"zeparser": "0.0.7"
},
"engines": {
"node": ">=0.10.0"
}
}

View File

@ -4,6 +4,7 @@ import com.mycompany.myapp.security.*;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
@ -118,7 +119,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
.antMatchers("/protected/**").authenticated();
}
@EnableGlobalMethodSecurity(prePostEnabled = true, jsr250Enabled = true)
private static class GlobalSecurityConfiguration extends GlobalMethodSecurityConfiguration {
}