Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Feb 13, 2017
1 parent 5b284c7 commit 603bc07
Show file tree
Hide file tree
Showing 35 changed files with 1,167 additions and 72 deletions.
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
######################
# Node
######################
node/
/node/
node_tmp/
node_modules/
npm-debug.log.*
Expand Down Expand Up @@ -67,14 +67,14 @@ local.properties
######################
# Maven
######################
log/
target/
/log/
/target/

######################
# Gradle
######################
.gradle/
build/
/build/

######################
# Package Files
Expand Down Expand Up @@ -109,7 +109,6 @@ Desktop.ini
######################
# Directories
######################
/build/
/bin/
/deploy/

Expand Down
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "4.0.2",
"jhipsterVersion": "4.0.3",
"enableSocialSignIn": false,
"useSass": false,
"jhiPrefix": "jhi",
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# jhipsterSampleApplication
This application was generated using JHipster 4.0.1, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.1](https://jhipster.github.io/documentation-archive/v4.0.1).
This application was generated using JHipster 4.0.2, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.2](https://jhipster.github.io/documentation-archive/v4.0.2).

## Development

Before you can build this project, you must install and configure the following dependencies on your machine:

1. [Node.js][]: We use Node to run a development web server and build the project.
Depending on your system, you can install Node either from source or as a pre-packaged bundle.
2. [Yarn][]: We use Yarn to manage Node dependencies.
Expand Down Expand Up @@ -95,13 +96,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To set up a CI environment, consult the [Setting up Continuous Integration][] page.

[JHipster Homepage and latest documentation]: https://jhipster.github.io
[JHipster 4.0.1 archive]: https://jhipster.github.io/documentation-archive/v4.0.1
[JHipster 4.0.2 archive]: https://jhipster.github.io/documentation-archive/v4.0.2

[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.0.1/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.0.1/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.0.1/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.0.1/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.0.1/setting-up-ci/
[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.0.2/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.0.2/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.0.2/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.0.2/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.0.2/setting-up-ci/

[Gatling]: http://gatling.io/
[Node.js]: https://nodejs.org/
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2017-02-06 using generator-jhipster 4.0.2
// Generated on 2017-02-13 using generator-jhipster 4.0.3
'use strict';

var gulp = require('gulp'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.3.1",
"event-stream": "3.3.4",
"generator-jhipster": "4.0.2",
"generator-jhipster": "4.0.3",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "2.0.0",
Expand Down
13 changes: 2 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
<hibernate.version>5.2.4.Final</hibernate.version>
<hikaricp.version>2.4.6</hikaricp.version>
<jacoco-maven-plugin.version>0.7.7.201606060606</jacoco-maven-plugin.version>
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
<java.version>1.8</java.version>
<jcache.version>1.0.0</jcache.version>
<jhipster.server.version>1.0.0</jhipster.server.version>
<jhipster.server.version>1.0.1</jhipster.server.version>
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
<liquibase.version>3.5.3</liquibase.version>
Expand Down Expand Up @@ -697,15 +697,6 @@
<profile.swagger>,swagger</profile.swagger>
</properties>
</profile>
<profile>
<id>shell</id>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-remote-shell</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>dev</id>
<activation>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
package io.github.jhipster.sample.config;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.*;

import javax.cache.CacheManager;

@Configuration
@EnableCaching
@AutoConfigureAfter(value = { MetricsConfiguration.class })
@AutoConfigureBefore(value = { WebConfigurer.class, DatabaseConfiguration.class })
public class CacheConfiguration {

private final Logger log = LoggerFactory.getLogger(CacheConfiguration.class);

private CacheManager cacheManager;

public CacheConfiguration(CacheManager cacheManager) {
this.cacheManager = cacheManager;
}
}
5 changes: 1 addition & 4 deletions src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spring:
hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.SpringCacheRegionFactory
cache:
jcache:
config: ehcache.xml
config: config/ehcache/ehcache-dev.xml
mail:
host: localhost
port: 25
Expand All @@ -70,9 +70,6 @@ server:
# ===================================================================

jhipster:
cache: # Cache configuration
ehcache: # Hibernate 2nd level cache
max-bytes-local-heap: 16M
security:
remember-me:
# security key (this key should be unique for your application, and kept secret)
Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/config/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spring:
hibernate.cache.region.factory_class: io.github.jhipster.config.jcache.SpringCacheRegionFactory
cache:
jcache:
config: ehcache.xml
config: config/ehcache/ehcache-dev.xml
mail:
host: localhost
port: 25
Expand Down Expand Up @@ -73,9 +73,6 @@ jhipster:
http:
cache: # Used by the CachingHttpHeadersFilter
timeToLiveInDays: 1461
cache: # Cache configuration
ehcache: # Hibernate 2nd level cache
max-bytes-local-heap: 256M
security:
remember-me:
# security key (this key should be unique for your application, and kept secret)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<expiry>
<ttl unit="seconds">3600</ttl>
</expiry>
<heap>100</heap>
<heap unit="entries">100</heap>
</cache-template>

<cache alias="io.github.jhipster.sample.domain.User" uses-template="simple"/>
Expand Down
36 changes: 36 additions & 0 deletions src/main/resources/config/ehcache/ehcache-prod.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns='http://www.ehcache.org/v3'
xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd">

<cache-template name="simple">
<expiry>
<ttl unit="seconds">3600</ttl>
</expiry>
<heap unit="entries">1000</heap>
</cache-template>

<cache alias="io.github.jhipster.sample.domain.User" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.Authority" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.User.authorities" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.PersistentToken" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.User.persistentTokens" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.BankAccount" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.BankAccount.operations" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.Label" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.Label.operations" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.Operation" uses-template="simple"/>

<cache alias="io.github.jhipster.sample.domain.Operation.labels" uses-template="simple"/>

<!-- jhipster-needle-ehcache-add-entry -->
</config>
18 changes: 9 additions & 9 deletions src/main/webapp/app/components/util/date-util.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@

DateUtils.$inject = ['$filter'];

function DateUtils ($filter) {
function DateUtils($filter) {

var service = {
convertDateTimeFromServer : convertDateTimeFromServer,
convertLocalDateFromServer : convertLocalDateFromServer,
convertLocalDateToServer : convertLocalDateToServer,
dateformat : dateformat
convertDateTimeFromServer: convertDateTimeFromServer,
convertLocalDateFromServer: convertLocalDateFromServer,
convertLocalDateToServer: convertLocalDateToServer,
dateformat: dateformat
};

return service;

function convertDateTimeFromServer (date) {
function convertDateTimeFromServer(date) {
if (date) {
return new Date(date);
} else {
return null;
}
}

function convertLocalDateFromServer (date) {
function convertLocalDateFromServer(date) {
if (date) {
var dateString = date.split('-');
return new Date(dateString[0], dateString[1] - 1, dateString[2]);
}
return null;
}

function convertLocalDateToServer (date) {
function convertLocalDateToServer(date) {
if (date) {
return $filter('date')(date, 'yyyy-MM-dd');
} else {
return null;
}
}

function dateformat () {
function dateformat() {
return 'yyyy-MM-dd';
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
.module('jhipsterSampleApplicationApp')
.controller('BankAccountController', BankAccountController);

BankAccountController.$inject = ['$scope', '$state', 'BankAccount'];
BankAccountController.$inject = ['BankAccount'];

function BankAccountController ($scope, $state, BankAccount) {
function BankAccountController(BankAccount) {
var vm = this;

vm.bankAccounts = [];
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/entities/label/label.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
.module('jhipsterSampleApplicationApp')
.controller('LabelController', LabelController);

LabelController.$inject = ['$scope', '$state', 'Label'];
LabelController.$inject = ['Label'];

function LabelController ($scope, $state, Label) {
function LabelController(Label) {
var vm = this;

vm.labels = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
.module('jhipsterSampleApplicationApp')
.controller('OperationController', OperationController);

OperationController.$inject = ['$scope', '$state', 'Operation', 'ParseLinks', 'AlertService', 'paginationConstants'];
OperationController.$inject = ['Operation', 'ParseLinks', 'AlertService', 'paginationConstants'];

function OperationController ($scope, $state, Operation, ParseLinks, AlertService, paginationConstants) {
function OperationController(Operation, ParseLinks, AlertService, paginationConstants) {
var vm = this;

vm.operations = [];
Expand Down
Loading

0 comments on commit 603bc07

Please sign in to comment.