Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Aug 31, 2015
1 parent 2405bd0 commit 1911cb7
Show file tree
Hide file tree
Showing 131 changed files with 213 additions and 290 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"generator-jhipster": {
"baseName": "jhipster",
"baseName": "sampleApplication",
"packageName": "com.mycompany.myapp",
"packageFolder": "com/mycompany/myapp",
"authenticationType": "session",
Expand Down
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2015-08-28 using generator-jhipster 2.20.0
// Generated on 2015-08-31 using generator-jhipster 2.20.0
'use strict';
var fs = require('fs');

Expand Down Expand Up @@ -191,7 +191,7 @@ module.exports = function (grunt) {
src: ['scripts/app/**/*.html', 'scripts/components/**/*.html',],
dest: '.tmp/templates/templates.js',
options: {
module: 'jhipsterApp',
module: 'sampleapplicationApp',
usemin: 'scripts/app.js',
htmlmin: '<%= htmlmin.dist.options %>'
}
Expand Down Expand Up @@ -296,7 +296,7 @@ module.exports = function (grunt) {
},
ngconstant: {
options: {
name: 'jhipsterApp',
name: 'sampleapplicationApp',
deps: false,
wrap: '"use strict";\n// DO NOT EDIT THIS FILE, EDIT THE GRUNT TASK NGCONSTANT SETTINGS INSTEAD WHICH GENERATES THIS FILE\n{%= __ngModule %}'
},
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Developping jhipster
# Developping sampleApplication

jhipster was generated using JHipster, you can find documentation and help at [JHipster][].
sampleApplication was generated using JHipster, you can find documentation and help at [JHipster][].

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

Expand Down Expand Up @@ -28,7 +28,7 @@ Add the `-h` flag on any command to see how you can use it. For example, `bower

# Building for production

To optimize the jhipster client for production, run:
To optimize the sampleApplication client for production, run:

mvn -Pprod clean package

Expand All @@ -51,9 +51,9 @@ Unit tests are run by [Karma][] and written with [Jasmine][]. They're located in

To setup this project in Jenkins, use the following configuration:

* Project name: `jhipster`
* Project name: `sampleApplication`
* Source Code Management
* Git Repository: `git@github.com:xxxx/jhipster.git`
* Git Repository: `git@github.com:xxxx/sampleApplication.git`
* Branches to build: `*/master`
* Additional Behaviours: `Wipe out repository & force clone`
* Build Triggers
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "jhipster",
"name": "sampleApplication",
"version": "0.0.0",
"appPath": "src/main/webapp",
"testPath": "src/test/javascript/spec",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jhipster",
"name": "sampleapplication",
"version": "0.0.0",
"description": "Description for jhipster",
"description": "Description for sampleApplication",
"private": true,
"dependencies": {
},
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</parent>

<groupId>com.mycompany.myapp</groupId>
<artifactId>jhipster</artifactId>
<artifactId>sampleapplication</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>

<name>jhipster</name>
<name>sampleApplication</name>

<prerequisites>
<maven>3.0.0</maven>
Expand All @@ -37,7 +37,7 @@
<liquibase.version>3.4.1</liquibase.version>
<liquibase-slf4j.version>1.2.1</liquibase-slf4j.version>
<liquibase-hibernate4.version>3.5</liquibase-hibernate4.version>
<mapstruct.version>1.0.0.CR1</mapstruct.version>
<mapstruct.version>1.0.0.CR2</mapstruct.version>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<maven-sortpom-plugin.version>2.3.0</maven-sortpom-plugin.version>
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/com/mycompany/myapp/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Application {
private Environment env;

/**
* Initializes jhipster.
* Initializes sampleApplication.
* <p/>
* Spring profiles can be configured with a program arguments --spring.profiles.active=your-active-profile
* <p/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public Executor getAsyncExecutor() {
executor.setCorePoolSize(propertyResolver.getProperty("corePoolSize", Integer.class, 2));
executor.setMaxPoolSize(propertyResolver.getProperty("maxPoolSize", Integer.class, 50));
executor.setQueueCapacity(propertyResolver.getProperty("queueCapacity", Integer.class, 10000));
executor.setThreadNamePrefix("jhipster-Executor-");
executor.setThreadNamePrefix("sampleapplication-Executor-");
return new ExceptionHandlingAsyncTaskExecutor(executor);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ protected void configure(HttpSecurity http) throws Exception {
.antMatchers("/autoconfig/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/env/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/trace/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/mappings/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/v2/api-docs/**").permitAll()
.antMatchers("/configuration/security").permitAll()
.antMatchers("/configuration/ui").permitAll()
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/mycompany/myapp/web/rest/util/HeaderUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ public class HeaderUtil {

public static HttpHeaders createAlert(String message, String param) {
HttpHeaders headers = new HttpHeaders();
headers.add("X-jhipsterApp-alert", message);
headers.add("X-jhipsterApp-params", param);
headers.add("X-sampleapplicationApp-alert", message);
headers.add("X-sampleapplicationApp-params", param);
return headers;
}

public static HttpHeaders createEntityCreationAlert(String entityName, String param) {
return createAlert("jhipsterApp." + entityName + ".created", param);
return createAlert("sampleapplicationApp." + entityName + ".created", param);
}

public static HttpHeaders createEntityUpdateAlert(String entityName, String param) {
return createAlert("jhipsterApp." + entityName + ".updated", param);
return createAlert("sampleapplicationApp." + entityName + ".updated", param);
}

public static HttpHeaders createEntityDeletionAlert(String entityName, String param) {
return createAlert("jhipsterApp." + entityName + ".deleted", param);
return createAlert("sampleapplicationApp." + entityName + ".deleted", param);
}

}
2 changes: 1 addition & 1 deletion src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ metrics:
enabled: false
host: localhost
port: 2003
prefix: jhipster
prefix: sampleApplication

cache:
timeToLiveSeconds: 3600
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/config/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spring:
active: prod
datasource:
dataSourceClassName: com.mysql.jdbc.jdbc2.optional.MysqlDataSource
url: jdbc:mysql://localhost:3306/jhipster?useUnicode=true&characterEncoding=utf8
url: jdbc:mysql://localhost:3306/sampleApplication?useUnicode=true&characterEncoding=utf8
databaseName:
serverName:
username: root
Expand Down Expand Up @@ -48,7 +48,7 @@ metrics:
enabled: false
host: localhost
port: 2003
prefix: jhipster
prefix: sampleApplication

http:
cache:
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ mail:
protocol: smtp
tls: false
auth: false
from: jhipster@localhost
from: sampleApplication@localhost


swagger:
title: jhipster API
description: jhipster applications and beyond!
title: sampleApplication API
description: sampleApplication applications and beyond!
version: 0.0.1
termsOfServiceUrl: http://jhipster.github.io/
contact:
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/i18n/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ error.status=Status:
error.message=Message:

# Activation e-mail
email.activation.title=jhipster account activation
email.activation.title=sampleApplication account activation
email.activation.greeting=Dear {0}
email.activation.text1=Your jhipster account has been created, please click on the URL below to activate it:
email.activation.text1=Your sampleApplication account has been created, please click on the URL below to activate it:
email.activation.text2=Regards,
email.signature=jhipster Team.
email.signature=sampleApplication Team.

# Reset e-mail
email.reset.title=jhipster password reset
email.reset.title=sampleApplication password reset
email.reset.greeting=Dear {0}
email.reset.text1=For your jhipster account a password reset was requested, please click on the URL below to reset it:
email.reset.text1=For your sampleApplication account a password reset was requested, please click on the URL below to reset it:
email.reset.text2=Regards,
10 changes: 5 additions & 5 deletions src/main/resources/i18n/messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ error.status=Status:
error.message=Message:

# Activation e-mail
email.activation.title=Activation de votre compte jhipster
email.activation.title=Activation de votre compte sampleApplication
email.activation.greeting=Cher {0}
email.activation.text1=Votre compte jhipster a été créé, pour l'activer merci de cliquer sur le lien ci-dessous:
email.activation.text1=Votre compte sampleApplication a été créé, pour l'activer merci de cliquer sur le lien ci-dessous:
email.activation.text2=Cordialement,
email.signature=jhipster.
email.signature=sampleApplication.

# Reset e-mail
email.reset.title=jhipster password reset
email.reset.title=sampleApplication password reset
email.reset.greeting=Dear {0}
email.reset.text1=For your jhipster account a password reset was requested, please click on the URL below to reset it:
email.reset.text1=For your sampleApplication account a password reset was requested, please click on the URL below to reset it:
email.reset.text2=Regards,
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/bankAccount.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"bankAccount" : {
"home": {
"title": "BankAccounts",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"global": {
"title": "jhipster",
"title": "sampleApplication",
"browsehappy": "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
"menu": {
"home": "Home",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/label.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"label" : {
"home": {
"title": "Labels",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/operation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"operation" : {
"home": {
"title": "Operations",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/fr/bankAccount.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"bankAccount" : {
"home": {
"title": "BankAccounts",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/fr/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"global": {
"title": "jhipster",
"title": "sampleApplication",
"browsehappy": "Vous utilisez un <strong>ancien</strong> navigateur. Veuillez <a href=\"http://browsehappy.com/?locale=fr\">mettre à jour votre navigateur</a> pour une meilleure expérience.",
"menu": {
"home": "Accueil",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/fr/label.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"label" : {
"home": {
"title": "Labels",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/fr/operation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jhipsterApp": {
"sampleapplicationApp": {
"operation" : {
"home": {
"title": "Operations",
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>jhipster</title>
<title>sampleApplication</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
Expand All @@ -16,7 +16,7 @@
<link rel="stylesheet" href="assets/styles/main.css">
<!-- endbuild -->
</head>
<body ng-app="jhipsterApp">
<body ng-app="sampleapplicationApp">
<!--[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]-->
Expand Down

0 comments on commit 1911cb7

Please sign in to comment.