Skip to content

Commit 7aceb01

Browse files
author
Nicolas Romanetti
committed
sync with latest templates
1 parent 8ee1f29 commit 7aceb01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1102
-1070
lines changed

‎quickstart-generated/src/main/config/celerio-maven-plugin/metadata.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tables>
1111
<table name="AUTHOR" type="TABLE" remarks="Author has various dates for demo">
1212
<columns>
13-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5040E36F_4237_4D2B_9322_F6D64B91F2CD)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
13+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D1897134_A014_478C_B025_4E417B689147)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
1414
<column name="CIVILITY" columnDef="MR" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="2" size="2" type="CHAR"/>
1515
<column name="FIRST_NAME" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="3" size="100" type="VARCHAR"/>
1616
<column name="LAST_NAME" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="4" size="100" type="VARCHAR"/>
@@ -31,7 +31,7 @@
3131
</table>
3232
<table name="BOOK" type="TABLE" remarks="BOOK supports file upload/download for demo">
3333
<columns>
34-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6768F5B0_4F21_49A7_8416_1DAD99CD1601)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
34+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6A4632B_FC06_47EC_A4CE_958D3ECDE658)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
3535
<column name="TITLE" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="2" size="100" type="VARCHAR"/>
3636
<column name="SUMMARY" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="3" size="255" type="VARCHAR"/>
3737
<column name="EXTRACT_BINARY" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="4" size="2147483647" type="VARBINARY"/>
@@ -57,7 +57,7 @@
5757
</table>
5858
<table name="PASSPORT" type="TABLE">
5959
<columns>
60-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E2970F9D_A1C5_490B_9B9F_041223D0E10B)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
60+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_877784B7_B012_4EA0_AB1C_22314ECDAC2F)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
6161
<column name="PASSPORT_NUMBER" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="2" size="100" type="VARCHAR"/>
6262
<column name="EXPIRATION_DATE" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="3" size="8" type="DATE"/>
6363
<column name="HOLDER_ID" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="4" size="10" type="INTEGER"/>
@@ -75,7 +75,7 @@
7575
</table>
7676
<table name="PROJECT" type="TABLE">
7777
<columns>
78-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D234D41B_6223_4F9C_8D08_2CDABD243B71)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
78+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5C9AF53D_0418_4A2E_B1C5_3F515ED7E077)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
7979
<column name="NAME" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="2" size="100" type="VARCHAR"/>
8080
<column name="URL" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="3" size="100" type="VARCHAR"/>
8181
<column name="AUTHOR_ID" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="4" size="10" type="INTEGER"/>
@@ -93,7 +93,7 @@
9393
</table>
9494
<table name="ROLE" type="TABLE">
9595
<columns>
96-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_628BADD9_DE00_4465_815C_2AACF06224B8)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
96+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_470CC41A_5AF8_4958_8D00_873246B01002)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
9797
<column name="ROLE_NAME" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="2" size="100" type="VARCHAR"/>
9898
</columns>
9999
<indexes>
@@ -107,7 +107,7 @@
107107
</table>
108108
<table name="USER" type="TABLE" remarks="The User is a human that can connect to this web application">
109109
<columns>
110-
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_13AD0A4D_022D_4C23_8B39_4EC99E837ADA)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
110+
<column name="ID" columnDef="(NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F7643B85_797F_402D_BC21_3106E0012504)" decimalDigits="0" autoIncrement="true" nullable="false" ordinalPosition="1" size="10" type="INTEGER"/>
111111
<column name="LOGIN" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="2" remarks="The login used to login" size="100" type="VARCHAR"/>
112112
<column name="PASSWORD" decimalDigits="0" autoIncrement="false" nullable="false" ordinalPosition="3" size="100" type="VARCHAR"/>
113113
<column name="EMAIL" decimalDigits="0" autoIncrement="false" nullable="true" ordinalPosition="4" size="100" type="VARCHAR"/>

‎quickstart-generated/src/main/resources/application.yml

+7
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,10 @@ spring:
4747
chain:
4848
cache: false
4949

50+
---
51+
52+
#
53+
# profile used by Dockerfile... just for convenient demo
54+
#
55+
spring.profiles: demowithdocker
56+
spring.datasource.url: jdbc:h2:/db/angulardb;MVCC=TRUE;FILE_LOCK=NO

‎quickstart-generated/web/.angular-cli.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,16 @@
3636
},
3737
"lint": [
3838
{
39-
"project": "src/tsconfig.app.json"
39+
"project": "src/tsconfig.app.json",
40+
"exclude": "**/node_modules/**"
4041
},
4142
{
42-
"project": "src/tsconfig.spec.json"
43+
"project": "src/tsconfig.spec.json",
44+
"exclude": "**/node_modules/**"
4345
},
4446
{
45-
"project": "e2e/tsconfig.e2e.json"
47+
"project": "e2e/tsconfig.e2e.json",
48+
"exclude": "**/node_modules/**"
4649
}
4750
],
4851
"test": {

‎quickstart-generated/web/README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Web
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.3.
44

55
## Development server
66

77
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
88

99
## Code scaffolding
1010

11-
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
11+
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
1212

1313
## Build
1414

@@ -21,7 +21,6 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
2121
## Running end-to-end tests
2222

2323
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
24-
Before running the tests make sure you are serving the app via `ng serve`.
2524

2625
## Further help
2726

‎quickstart-generated/web/e2e/app.e2e-spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { WebPage } from './app.po';
1+
import { AppPage } from './app.po';
22

33
describe('web App', () => {
4-
let page: WebPage;
4+
let page: AppPage;
55

66
beforeEach(() => {
7-
page = new WebPage();
7+
page = new AppPage();
88
});
99

10-
it('should display message saying app works', () => {
10+
it('should display welcome message', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('app works!');
12+
expect(page.getParagraphText()).toEqual('Welcome to app!');
1313
});
1414
});

‎quickstart-generated/web/e2e/app.po.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { browser, element, by } from 'protractor';
1+
import { browser, by, element } from 'protractor';
22

3-
export class WebPage {
3+
export class AppPage {
44
navigateTo() {
55
return browser.get('/');
66
}

‎quickstart-generated/web/e2e/tsconfig.e2e.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
5+
"baseUrl": "./",
56
"module": "commonjs",
67
"target": "es5",
7-
"types":[
8+
"types": [
89
"jasmine",
10+
"jasminewd2",
911
"node"
1012
]
1113
}

‎quickstart-generated/web/karma.conf.js

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Karma configuration file, see link for more information
2-
// https://karma-runner.github.io/0.13/config/configuration-file.html
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

44
module.exports = function (config) {
55
config.set({
@@ -15,25 +15,14 @@ module.exports = function (config) {
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
18-
files: [
19-
{ pattern: './src/test.ts', watched: false }
20-
],
21-
preprocessors: {
22-
'./src/test.ts': ['@angular/cli']
23-
},
24-
mime: {
25-
'text/x-typescript': ['ts','tsx']
26-
},
2718
coverageIstanbulReporter: {
2819
reports: [ 'html', 'lcovonly' ],
2920
fixWebpackSourcePaths: true
3021
},
3122
angularCli: {
3223
environment: 'dev'
3324
},
34-
reporters: config.angularCli && config.angularCli.codeCoverage
35-
? ['progress', 'coverage-istanbul']
36-
: ['progress', 'kjhtml'],
25+
reporters: ['progress', 'kjhtml'],
3726
port: 9876,
3827
colors: true,
3928
logLevel: config.LOG_INFO,

‎quickstart-generated/web/package.json

+27-28
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,45 @@
55
"scripts": {
66
"ng": "ng",
77
"start": "ng serve",
8-
"build": "ng build",
8+
"build": "ng build --prod",
99
"test": "ng test",
1010
"lint": "ng lint",
1111
"e2e": "ng e2e"
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^4.2.4",
16-
"@angular/common": "^4.0.0",
17-
"@angular/compiler": "^4.0.0",
18-
"@angular/core": "^4.0.0",
19-
"@angular/forms": "^4.0.0",
20-
"@angular/http": "^4.0.0",
21-
"@angular/material": "^2.0.0-beta.6",
22-
"@angular/platform-browser": "^4.0.0",
23-
"@angular/platform-browser-dynamic": "^4.0.0",
24-
"@angular/router": "^4.0.0",
15+
"@angular/animations": "^5.0.0",
16+
"@angular/common": "^5.0.0",
17+
"@angular/compiler": "^5.0.0",
18+
"@angular/core": "^5.0.0",
19+
"@angular/forms": "^5.0.0",
20+
"@angular/http": "^5.0.0",
21+
"@angular/platform-browser": "^5.0.0",
22+
"@angular/platform-browser-dynamic": "^5.0.0",
23+
"@angular/router": "^5.0.0",
2524
"core-js": "^2.4.1",
26-
"font-awesome": "^4.7.0",
27-
"primeng": "^4.1.0-rc.2",
28-
"rxjs": "^5.1.0",
29-
"zone.js": "^0.8.4"
25+
"rxjs": "^5.5.2",
26+
"zone.js": "^0.8.14"
3027
},
3128
"devDependencies": {
32-
"@angular/cli": "1.0.0",
33-
"@angular/compiler-cli": "^4.0.0",
34-
"@types/jasmine": "2.5.38",
29+
"@angular/cli": "1.6.3",
30+
"@angular/compiler-cli": "^5.0.0",
31+
"@angular/language-service": "^5.0.0",
32+
"@types/jasmine": "~2.5.53",
33+
"@types/jasminewd2": "~2.0.2",
3534
"@types/node": "~6.0.60",
36-
"codelyzer": "~2.0.0",
37-
"jasmine-core": "~2.5.2",
38-
"jasmine-spec-reporter": "~3.2.0",
39-
"karma": "~1.4.1",
40-
"karma-chrome-launcher": "~2.0.0",
35+
"codelyzer": "^4.0.1",
36+
"jasmine-core": "~2.6.2",
37+
"jasmine-spec-reporter": "~4.1.0",
38+
"karma": "~1.7.0",
39+
"karma-chrome-launcher": "~2.1.1",
4140
"karma-cli": "~1.0.1",
41+
"karma-coverage-istanbul-reporter": "^1.2.1",
4242
"karma-jasmine": "~1.1.0",
4343
"karma-jasmine-html-reporter": "^0.2.2",
44-
"karma-coverage-istanbul-reporter": "^0.2.0",
45-
"protractor": "~5.1.0",
46-
"ts-node": "~2.0.0",
47-
"tslint": "~4.5.0",
48-
"typescript": "~2.2.0"
44+
"protractor": "~5.1.2",
45+
"ts-node": "~3.2.0",
46+
"tslint": "~5.7.0",
47+
"typescript": "~2.4.2"
4948
}
5049
}

‎quickstart-generated/web/protractor.conf.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ exports.config = {
1919
defaultTimeoutInterval: 30000,
2020
print: function() {}
2121
},
22-
beforeLaunch: function() {
22+
onPrepare() {
2323
require('ts-node').register({
2424
project: 'e2e/tsconfig.e2e.json'
2525
});
26-
},
27-
onPrepare() {
2826
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
2927
}
3028
};

‎quickstart-generated/web/proxy.conf.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,25 @@
66
"/img": {
77
"target": "http://localhost:8080",
88
"secure": false
9+
},
10+
"/webjars": {
11+
"target": "http://localhost:8080",
12+
"secure": false
13+
},
14+
"/v2": {
15+
"target": "http://localhost:8080",
16+
"secure": false
17+
},
18+
"/swagger*": {
19+
"target": "http://localhost:8080",
20+
"secure": false
21+
},
22+
"/configuration/security": {
23+
"target": "http://localhost:8080",
24+
"secure": false
25+
},
26+
"/configuration/ui": {
27+
"target": "http://localhost:8080",
28+
"secure": false
929
}
10-
}
30+
}

‎quickstart-generated/web/src/app/app.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
import { TestBed, async } from '@angular/core/testing';
1212
import { NO_ERRORS_SCHEMA } from '@angular/core';
13-
import { Observable } from 'rxjs/Observable';
13+
import { Observable } from 'rxjs/Rx';
1414

1515
import { AppComponent } from './app.component';
1616
import { AuthService } from "./service/auth.service";

‎quickstart-generated/web/src/app/app.component.ts

+2-10
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ export class AppComponent implements OnInit {
128128
{label: "Source code", icon: 'fa-github-alt', url: "https://github.com/jaxio/celerio-angular-quickstart"},
129129
{label: "Celerio Documentation", icon: 'fa-external-link', url: "http://www.jaxio.com/documentation/celerio/"},
130130
{label: "Angular Cli", icon: 'fa-external-link', url: "https://cli.angular.io/"},
131-
{label: "Angular 4", icon: 'fa-external-link', url: "https://angular.io/"},
132-
{label: "Material 2", icon: 'fa-external-link', url: "https://material.angular.io/"},
131+
{label: "Angular 5", icon: 'fa-external-link', url: "https://angular.io/"},
132+
{label: "Material 5", icon: 'fa-external-link', url: "https://material.angular.io/"},
133133
{label: "PrimeNG Showcase", icon: 'fa-external-link', url: "http://www.primefaces.org/primeng"},
134134
{label: "TypeScript", icon: 'fa-external-link', url: "https://www.typescriptlang.org/"},
135135
{label: "Spring Boot", icon: 'fa-external-link', url: "http://projects.spring.io/spring-boot/"},
@@ -179,12 +179,4 @@ export class AppComponent implements OnInit {
179179
}
180180
);
181181
}
182-
183-
// sample method from angular doc
184-
private handleError (error: any) {
185-
let errMsg = (error.message) ? error.message :
186-
error.status ? `Status: ${error.status} - Text: ${error.statusText}` : 'Server error';
187-
console.error(errMsg); // log to console instead
188-
return Observable.throw(errMsg);
189-
}
190182
}

‎quickstart-generated/web/src/app/app.module.ts

+12-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { BrowserModule } from '@angular/platform-browser';
1212
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
1313
import { NgModule } from '@angular/core';
1414
import { FormsModule } from '@angular/forms';
15-
import { HttpModule } from '@angular/http';
15+
import { HttpClientModule } from '@angular/common/http';
1616
import { RouterModule } from '@angular/router';
17-
import { MaterialModule } from '@angular/material';
17+
import { MatDatepickerModule, MatNativeDateModule, MatDialogModule, MatCardModule, MatIconModule, MatSelectModule, MatTabsModule, MatInputModule, MatButtonModule } from '@angular/material';
1818
import { ConfirmDialogModule, FileUploadModule, PanelModule, GrowlModule, MenubarModule, DialogModule, ButtonModule, AutoCompleteModule, DataTableModule, SharedModule, DropdownModule,PickListModule,CheckboxModule,TriStateCheckboxModule, InputTextModule,InputTextareaModule,CalendarModule,PasswordModule,TabViewModule } from 'primeng/primeng';
1919
import { ConfirmationService } from 'primeng/primeng';
2020
import { AppComponent } from './app.component';
@@ -146,10 +146,18 @@ import { UserCompleteComponent } from './entities/user/user-auto-complete.compon
146146
BrowserModule,
147147
BrowserAnimationsModule,
148148
FormsModule,
149-
HttpModule,
149+
HttpClientModule,
150150

151151
// angular material,
152-
MaterialModule,
152+
MatDatepickerModule,
153+
MatNativeDateModule,
154+
MatDialogModule,
155+
MatCardModule,
156+
MatIconModule,
157+
MatSelectModule,
158+
MatTabsModule,
159+
MatInputModule,
160+
MatButtonModule,
153161

154162
// primeng
155163
ConfirmDialogModule,

0 commit comments

Comments
 (0)