v2.8.0 release

This commit is contained in:
Julien Dubois 2015-04-20 15:24:53 +02:00
parent 07c318eab6
commit 2e15a8d22d
25 changed files with 75 additions and 85 deletions

5
.gitattributes vendored
View File

@ -12,3 +12,8 @@
*.png binary
*.jpg binary
*.jar binary
*.pdf binary
*.eot binary
*.ttf binary
*.gzip binary
*.gz binary

View File

@ -1,4 +1,4 @@
// Generated on 2015-04-03 using generator-jhipster 2.7.0
// Generated on 2015-04-20 using generator-jhipster 2.8.0
'use strict';
var fs = require('fs');

View File

@ -41,7 +41,7 @@
"karma-requirejs": "0.2.2",
"karma-phantomjs-launcher": "0.1.4",
"karma": "0.12.32",
"generator-jhipster": "2.7.0",
"generator-jhipster": "2.8.0",
"lodash": "3.3.1",
"xml2js": "0.4.5",
"zeparser": "0.0.7",

13
pom.xml
View File

@ -26,8 +26,8 @@
<awaitility.version>1.4.0</awaitility.version>
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<gatling.version>2.1.4</gatling.version>
<gatling-maven-plugin.version>2.1.2</gatling-maven-plugin.version>
<gatling.version>2.1.5</gatling.version>
<gatling-maven-plugin.version>2.1.5</gatling-maven-plugin.version>
<hibernate.version>4.3.6.Final</hibernate.version>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
@ -42,7 +42,7 @@
<maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<maven-sortpom-plugin.version>2.3.0</maven-sortpom-plugin.version>
<metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
<metrics-spring.version>3.0.3</metrics-spring.version>
<metrics-spring.version>3.0.4</metrics-spring.version>
<run.addResources>false</run.addResources>
<sonar-maven-plugin.version>2.3</sonar-maven-plugin.version>
<spring-security.version>4.0.0.RELEASE</spring-security.version>
@ -340,11 +340,6 @@
<artifactId>spring-security-data</artifactId>
<version>${spring-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-messaging</artifactId>
<version>${spring-security.version}</version>
</dependency>
<!-- reporting -->
<dependency>
<groupId>fr.ippon.spark.metrics</groupId>
@ -555,7 +550,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<jvmArguments>-Djava.rmi.server.hostname=localhost -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>
<jvmArguments>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</jvmArguments>
<arguments>
<argument>--spring.profiles.active=dev</argument>
</arguments>

View File

@ -19,6 +19,7 @@ import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.util.StringUtils;
import javax.sql.DataSource;
import java.util.Arrays;
@ -58,7 +59,7 @@ public class DatabaseConfiguration implements EnvironmentAware {
}
HikariConfig config = new HikariConfig();
config.setDataSourceClassName(propertyResolver.getProperty("dataSourceClassName"));
if (propertyResolver.getProperty("url") == null || "".equals(propertyResolver.getProperty("url"))) {
if(StringUtils.isEmpty(propertyResolver.getProperty("url"))) {
config.addDataSourceProperty("databaseName", propertyResolver.getProperty("databaseName"));
config.addDataSourceProperty("serverName", propertyResolver.getProperty("serverName"));
} else {

View File

@ -14,12 +14,12 @@ import java.util.Properties;
@Configuration
public class MailConfiguration implements EnvironmentAware {
private static final String ENV_SPRING_MAIL = "spring.mail.";
private static final String ENV_SPRING_MAIL = "mail.";
private static final String DEFAULT_HOST = "127.0.0.1";
private static final String PROP_HOST = "host";
private static final String DEFAULT_PROP_HOST = "localhost";
private static final String PROP_PORT = "port";
private static final String PROP_USER = "user";
private static final String PROP_USER = "username";
private static final String PROP_PASSWORD = "password";
private static final String PROP_PROTO = "protocol";
private static final String PROP_TLS = "tls";

View File

@ -89,6 +89,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
.and()
.rememberMe()
.rememberMeServices(rememberMeServices)
.rememberMeParameter("remember-me")
.key(env.getProperty("jhipster.security.rememberme.key"))
.and()
.formLogin()

View File

@ -50,7 +50,7 @@ public class AuditEventConverter {
}
/**
* Internal conversion. This method will allow to save additionnals data.
* Internal conversion. This method will allow to save additional data.
* By default, it will save the object as string
*
* @param data the data to convert

View File

@ -14,7 +14,7 @@ import java.io.Serializable;
* An authority (a security role) used by Spring Security.
*/
@Entity
@Table(name = "T_AUTHORITY")
@Table(name = "JHI_AUTHORITY")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
public class Authority implements Serializable {

View File

@ -12,7 +12,7 @@ import java.util.Map;
* @see org.springframework.boot.actuate.audit.AuditEvent
*/
@Entity
@Table(name = "T_PERSISTENT_AUDIT_EVENT")
@Table(name = "JHI_PERSISTENT_AUDIT_EVENT")
public class PersistentAuditEvent {
@Id
@ -33,7 +33,7 @@ public class PersistentAuditEvent {
@ElementCollection
@MapKeyColumn(name="name")
@Column(name="value")
@CollectionTable(name="T_PERSISTENT_AUDIT_EVENT_DATA", joinColumns=@JoinColumn(name="event_id"))
@CollectionTable(name="JHI_PERSISTENT_AUDIT_EVENT_DATA", joinColumns=@JoinColumn(name="event_id"))
private Map<String, String> data = new HashMap<>();
public Long getId() {

View File

@ -20,7 +20,7 @@ import java.io.Serializable;
* @see com.mycompany.myapp.security.CustomPersistentRememberMeServices
*/
@Entity
@Table(name = "T_PERSISTENT_TOKEN")
@Table(name = "JHI_PERSISTENT_TOKEN")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
public class PersistentToken implements Serializable {

View File

@ -17,7 +17,7 @@ import java.util.Set;
* A user.
*/
@Entity
@Table(name = "T_USER")
@Table(name = "JHI_USER")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
public class User extends AbstractAuditingEntity implements Serializable {
@ -64,7 +64,7 @@ public class User extends AbstractAuditingEntity implements Serializable {
@JsonIgnore
@ManyToMany
@JoinTable(
name = "T_USER_AUTHORITY",
name = "JHI_USER_AUTHORITY",
joinColumns = {@JoinColumn(name = "user_id", referencedColumnName = "id")},
inverseJoinColumns = {@JoinColumn(name = "authority_name", referencedColumnName = "name")})
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)

View File

@ -26,10 +26,8 @@ spring:
hibernate.cache.use_query_cache: false
hibernate.generate_statistics: true
hibernate.cache.region.factory_class: org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
mail:
baseUrl: http://localhost:8080
messages:
cache-seconds: 1
thymeleaf:
mode: XHTML
cache: false

View File

@ -31,10 +31,6 @@ spring:
hibernate.generate_statistics: false
hibernate.cache.region.factory_class: org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory
mail:
baseUrl: http://localhost:8080
thymeleaf:
mode: XHTML
cache: true

View File

@ -13,19 +13,16 @@ async:
maxPoolSize: 50
queueCapacity: 10000
spring:
mail:
host: localhost
port: 25
user:
password:
protocol: smtp
tls: false
auth: false
from: jhipster@localhost
mail:
host: localhost
port: 25
username:
password:
protocol: smtp
tls: false
auth: false
from: jhipster@localhost
messageSource:
cacheSeconds: 1
swagger:
title: jhipster API

View File

@ -16,7 +16,7 @@
The initial schema has the '00000000000001' id, so that it is over-written if we re-generate it.
-->
<changeSet id="00000000000001" author="jhipster">
<createTable tableName="T_USER">
<createTable tableName="JHI_USER">
<column name="id" type="bigint" autoIncrement="true">
<constraints primaryKey="true" nullable="false"/>
</column>
@ -45,24 +45,24 @@
</createTable>
<createIndex indexName="idx_user_login"
tableName="T_USER"
tableName="JHI_USER"
unique="true">
<column name="login" type="varchar(50)"/>
</createIndex>
<createIndex indexName="idx_user_email"
tableName="T_USER"
tableName="JHI_USER"
unique="true">
<column name="email" type="varchar(100)"/>
</createIndex>
<createTable tableName="T_AUTHORITY">
<createTable tableName="JHI_AUTHORITY">
<column name="name" type="varchar(50)">
<constraints primaryKey="true" nullable="false"/>
</column>
</createTable>
<createTable tableName="T_USER_AUTHORITY">
<createTable tableName="JHI_USER_AUTHORITY">
<column name="user_id" type="bigint">
<constraints nullable="false"/>
</column>
@ -71,9 +71,9 @@
</column>
</createTable>
<addPrimaryKey columnNames="user_id, authority_name" tableName="T_USER_AUTHORITY"/>
<addPrimaryKey columnNames="user_id, authority_name" tableName="JHI_USER_AUTHORITY"/>
<createTable tableName="T_PERSISTENT_TOKEN">
<createTable tableName="JHI_PERSISTENT_TOKEN">
<column name="series" type="varchar(255)">
<constraints primaryKey="true" nullable="false"/>
</column>
@ -87,43 +87,43 @@
</createTable>
<addForeignKeyConstraint baseColumnNames="authority_name"
baseTableName="T_USER_AUTHORITY"
baseTableName="JHI_USER_AUTHORITY"
constraintName="fk_authority_name"
referencedColumnNames="name"
referencedTableName="T_AUTHORITY"/>
referencedTableName="JHI_AUTHORITY"/>
<addForeignKeyConstraint baseColumnNames="user_id"
baseTableName="T_USER_AUTHORITY"
baseTableName="JHI_USER_AUTHORITY"
constraintName="fk_user_id"
referencedColumnNames="id"
referencedTableName="T_USER"/>
referencedTableName="JHI_USER"/>
<addForeignKeyConstraint baseColumnNames="user_id"
baseTableName="T_PERSISTENT_TOKEN"
baseTableName="JHI_PERSISTENT_TOKEN"
constraintName="fk_user_persistent_token"
referencedColumnNames="id"
referencedTableName="T_USER"/>
referencedTableName="JHI_USER"/>
<loadData encoding="UTF-8"
file="config/liquibase/users.csv"
separator=";"
tableName="T_USER">
tableName="JHI_USER">
<column name="activated" type="boolean"/>
<column name="created_date" type="timestamp"/>
</loadData>
<dropDefaultValue tableName="T_USER" columnName="created_date" columnDataType="datetime"/>
<dropDefaultValue tableName="JHI_USER" columnName="created_date" columnDataType="datetime"/>
<loadData encoding="UTF-8"
file="config/liquibase/authorities.csv"
separator=";"
tableName="T_AUTHORITY"/>
tableName="JHI_AUTHORITY"/>
<loadData encoding="UTF-8"
file="config/liquibase/users_authorities.csv"
separator=";"
tableName="T_USER_AUTHORITY"/>
tableName="JHI_USER_AUTHORITY"/>
<createTable tableName="T_PERSISTENT_AUDIT_EVENT">
<createTable tableName="JHI_PERSISTENT_AUDIT_EVENT">
<column name="event_id" type="bigint" autoIncrement="true">
<constraints primaryKey="true" nullable="false"/>
</column>
@ -134,7 +134,7 @@
<column name="event_type" type="varchar(255)"/>
</createTable>
<createTable tableName="T_PERSISTENT_AUDIT_EVENT_DATA">
<createTable tableName="JHI_PERSISTENT_AUDIT_EVENT_DATA">
<column name="event_id" type="bigint">
<constraints nullable="false"/>
</column>
@ -143,26 +143,26 @@
</column>
<column name="value" type="varchar(255)"/>
</createTable>
<addPrimaryKey columnNames="event_id, name" tableName="T_PERSISTENT_AUDIT_EVENT_DATA"/>
<addPrimaryKey columnNames="event_id, name" tableName="JHI_PERSISTENT_AUDIT_EVENT_DATA"/>
<createIndex indexName="idx_persistent_audit_event"
tableName="T_PERSISTENT_AUDIT_EVENT"
tableName="JHI_PERSISTENT_AUDIT_EVENT"
unique="false">
<column name="principal" type="varchar(255)"/>
<column name="event_date" type="timestamp"/>
</createIndex>
<createIndex indexName="idx_persistent_audit_event_data"
tableName="T_PERSISTENT_AUDIT_EVENT_DATA"
tableName="JHI_PERSISTENT_AUDIT_EVENT_DATA"
unique="false">
<column name="event_id" type="bigint"/>
</createIndex>
<addForeignKeyConstraint baseColumnNames="event_id"
baseTableName="T_PERSISTENT_AUDIT_EVENT_DATA"
baseTableName="JHI_PERSISTENT_AUDIT_EVENT_DATA"
constraintName="FK_event_persistent_audit_event_data"
referencedColumnNames="event_id"
referencedTableName="T_PERSISTENT_AUDIT_EVENT"/>
referencedTableName="JHI_PERSISTENT_AUDIT_EVENT"/>
</changeSet>
</databaseChangeLog>

View File

@ -6,7 +6,7 @@
"home": "Home",
"entities": {
"main": "Entities",
"additionalEntity": "JHipster will add addtional entities"
"additionalEntity": "JHipster will add additional entities here (do not translate!)"
},
"account": {
"main": "Account",

View File

@ -6,7 +6,7 @@
"home": "Accueil",
"entities": {
"main": "Entités",
"additionalEntity": "JHipster will add addtional entities"
"additionalEntity": "JHipster will add additional entities here (do not translate!)"
},
"account": {
"main": "Compte",

View File

@ -1,8 +1,5 @@
<!doctype html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
<html class="no-js">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -20,7 +17,7 @@
<!-- endbuild -->
</head>
<body ng-app="jhipsterApp">
<!--[if lt IE 10]>
<!--[if lt IE 9]>
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<div ng-show="{{ENV === 'dev'}}" class="development" ng-cloak=""></div>

View File

@ -1,7 +1,7 @@
<div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<h2 translate="password.title" translate-values="{username: '{{account.login}}'}">Password for [<b>{{account.login}}</b>]</h2>
<h2 translate="password.title" translate-values="{username: '{{account.login}}'}">Password</h2>
<div class="alert alert-success" ng-show="success" translate="password.messages.success">
<strong>Password changed!</strong>

View File

@ -1,6 +1,6 @@
<div>
<h2 translate="sessions.title" translate-values="{username: '{{account.login}}'}">Active sessions for [<b>{{account.login}}</b>]</h2>
<h2 translate="sessions.title" translate-values="{username: '{{account.login}}'}">Active sessions</h2>
<div class="alert alert-success" ng-show="success" translate="sessions.messages.success">
<strong>Session invalidated!</strong>

View File

@ -1,7 +1,7 @@
<div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<h2 translate="settings.title" translate-values="{username: '{{settingsAccount.login}}'}">User settings for [<b>{{settingsAccount.login}}</b>]</h2>
<h2 translate="settings.title" translate-values="{username: '{{settingsAccount.login}}'}">User settings</h2>
<div class="alert alert-success" ng-show="success" translate="settings.messages.success">
<strong>Settings saved!</strong>

View File

@ -1,7 +1,7 @@
<div>
<h2 translate="logs.title">Logs</h2>
<p translate="logs.nbloggers" translate-values="{total: '{{ loggers.length }}'}">There are {{ loggers.length }} loggers.</p>
<p translate="logs.nbloggers" translate-values="{total: '{{ loggers.length }}'}">There are 0 loggers.</p>
{{'logs.filter' | translate}} <input type="text" ng-model="filter" class="form-control">

View File

@ -6,7 +6,7 @@ angular.module('jhipsterApp')
login: function(credentials) {
var data = 'j_username=' + encodeURIComponent(credentials.username) +
'&j_password=' + encodeURIComponent(credentials.password) +
'&_spring_security_remember_me=' + credentials.rememberMe + '&submit=Login';
'&remember-me=' + credentials.rememberMe + '&submit=Login';
return $http.post('api/authentication', data, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'

View File

@ -35,14 +35,14 @@ spring:
hibernate.generate_statistics: true
hibernate.hbm2ddl.auto: validate
mail:
host: localhost
port: 25
user:
password:
protocol: smtp
tls: false
auth: false
mail:
host: localhost
port: 25
username:
password:
protocol: smtp
tls: false
auth: false
metrics:
jmx.enabled: false