Skip to content

Commit

Permalink
Merge pull request #261 from Alfresco/dev-dcano-ADF-5258
Browse files Browse the repository at this point in the history
[ADF-5258] Update Generator to ADF 4.1.0
  • Loading branch information
davidcanonieto authored Oct 12, 2020
2 parents a60de46 + daf6042 commit 7fbefe9
Show file tree
Hide file tree
Showing 18 changed files with 472 additions and 431 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,19 @@ matrix:
#E2e tests
- stage: E2e tests
name: adf-cli-acs-template
script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-acs-template
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-acs-template --spec sidebar_component.e2e.ts
- stage: E2e tests
name: adf-cli-aps-template
script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-aps-template --spec sidebar_component.e2e.ts
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-aps-template --spec sidebar_component.e2e.ts
- stage: E2e tests
name: adf-cli-acs-aps-template
script: travis_retry ./scripts/test-e2e.sh --proxy $E2E_HOST -host "localhost:4200" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_USERNAME" -save --skip-lint -b -f adf-cli-acs-aps-template
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-acs-aps-template --spec sidebar_component.e2e.ts
- stage: E2e tests
name: adf-cli-activiti-template
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -u "$E2E_SSO_USERNAME" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-template --spec sidebar_component.e2e.ts
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-template --spec sidebar_component.e2e.ts
- stage: E2e tests
name: adf-cli-activiti-acs-template
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -u "$E2E_SSO_USERNAME" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-acs-template --spec sidebar_component.e2e.ts
script: travis_retry ./scripts/test-e2e.sh --proxy "$E2E_HOST" -host "localhost:4200" -host_sso "$E2E_HOST_SSO" -host_bpm "$E2E_HOST_BPM" -host_identity "$E2E_HOST_IDENTITY" -p "$E2E_SS0_PASSWORD" -e "$E2E_EMAIL" -save --skip-lint -b -sso -gnu -f adf-cli-activiti-acs-template --spec sidebar_component.e2e.ts

- stage: Release
name: Release
Expand Down
12 changes: 6 additions & 6 deletions app/templates/adf-cli-acs-aps-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adf-cli-acs-aps-template",
"version": "4.0.0",
"version": "4.1.0-beta6",
"blueprint": "Content and Process Services with APS 1",
"description": "ACS APS ADF Application with Angular CLI",
"license": "MIT",
Expand All @@ -17,11 +17,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "4.0.0",
"@alfresco/adf-process-services": "4.0.0",
"@alfresco/adf-core": "4.0.0",
"@alfresco/adf-extensions": "4.0.0",
"@alfresco/js-api": "4.0.0",
"@alfresco/adf-content-services": "4.1.0-beta6",
"@alfresco/adf-process-services": "4.1.0-beta6",
"@alfresco/adf-core": "4.1.0-beta6",
"@alfresco/adf-extensions": "4.1.0-beta6",
"@alfresco/js-api": "4.1.0-beta1",
"@angular/animations": "10.0.6",
"@angular/cdk": "10.0.2",
"@angular/common": "10.0.6",
Expand Down
120 changes: 66 additions & 54 deletions app/templates/adf-cli-acs-aps-template/src/app.config.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,68 @@
{
"$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
"ecmHost": "http://{hostname}{:port}",
"bpmHost": "http://{hostname}{:port}",
"providers" : "ALL",
"application": {
"name": "Alfresco ADF Application"
},
"languages": [
{
"key": "en",
"label": "English"
},
{
"key": "fr",
"label": "French"
},
{
"key": "de",
"label": "German"
},
{
"key": "it",
"label": "Italian"
},
{
"key": "es",
"label": "Spanish"
},
{
"key": "ja",
"label": "Japanese"
},
{
"key": "nl",
"label": "Dutch"
},
{
"key": "pt-BR",
"label": "Brazilian Portuguese"
},
{
"key": "nb",
"label": "Norwegian"
},
{
"key": "ru",
"label": "Russian"
},
{
"key": "zh-CN",
"label": "Simplified Chinese"
}
],
"logLevel" : "trace"
"$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
"ecmHost": "{protocol}//{hostname}{:port}",
"bpmHost": "{protocol}//{hostname}{:port}",
"identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
"providers": "ALL",
"application": {
"name": "Alfresco ADF Application"
},
"authType": "OAUTH",
"oauth2": {
"host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
"clientId": "activiti",
"scope": "openid",
"secret": "",
"implicitFlow": false,
"redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",
"redirectUri": "/",
"redirectUriLogout": "/logout"
},
"languages": [
{
"key": "en",
"label": "English"
},
{
"key": "fr",
"label": "French"
},
{
"key": "de",
"label": "German"
},
{
"key": "it",
"label": "Italian"
},
{
"key": "es",
"label": "Spanish"
},
{
"key": "ja",
"label": "Japanese"
},
{
"key": "nl",
"label": "Dutch"
},
{
"key": "pt-BR",
"label": "Brazilian Portuguese"
},
{
"key": "nb",
"label": "Norwegian"
},
{
"key": "ru",
"label": "Russian"
},
{
"key": "zh-CN",
"label": "Simplified Chinese"
}
],
"logLevel": "trace"
}
10 changes: 5 additions & 5 deletions app/templates/adf-cli-acs-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adf-cli-acs-template",
"version": "4.0.0",
"version": "4.1.0-beta6",
"blueprint": "Content Services",
"description": "ACS ADF Application with Angular CLI",
"license": "MIT",
Expand All @@ -17,10 +17,10 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "4.0.0",
"@alfresco/adf-core": "4.0.0",
"@alfresco/adf-extensions": "4.0.0",
"@alfresco/js-api": "4.0.0",
"@alfresco/adf-content-services": "4.1.0-beta6",
"@alfresco/adf-core": "4.1.0-beta6",
"@alfresco/adf-extensions": "4.1.0-beta6",
"@alfresco/js-api": "4.1.0-beta1",
"@angular/animations": "10.0.6",
"@angular/cdk": "10.0.2",
"@angular/common": "10.0.6",
Expand Down
120 changes: 66 additions & 54 deletions app/templates/adf-cli-acs-template/src/app.config.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,68 @@
{
"$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
"ecmHost": "http://{hostname}{:port}",
"bpmHost": "http://{hostname}{:port}",
"providers" : "ECM",
"application": {
"name": "Alfresco ADF Application"
},
"languages": [
{
"key": "en",
"label": "English"
},
{
"key": "fr",
"label": "French"
},
{
"key": "de",
"label": "German"
},
{
"key": "it",
"label": "Italian"
},
{
"key": "es",
"label": "Spanish"
},
{
"key": "ja",
"label": "Japanese"
},
{
"key": "nl",
"label": "Dutch"
},
{
"key": "pt-BR",
"label": "Brazilian Portuguese"
},
{
"key": "nb",
"label": "Norwegian"
},
{
"key": "ru",
"label": "Russian"
},
{
"key": "zh-CN",
"label": "Simplified Chinese"
}
],
"logLevel" : "trace"
"$schema": "../node_modules/@alfresco/adf-core/app.config.schema.json",
"ecmHost": "{protocol}//{hostname}{:port}",
"bpmHost": "{protocol}//{hostname}{:port}",
"identityHost": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
"providers": "ECM",
"application": {
"name": "Alfresco ADF Application"
},
"authType": "OAUTH",
"oauth2": {
"host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
"clientId": "activiti",
"scope": "openid",
"secret": "",
"implicitFlow": false,
"redirectSilentIframeUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",
"redirectUri": "/",
"redirectUriLogout": "/logout"
},
"languages": [
{
"key": "en",
"label": "English"
},
{
"key": "fr",
"label": "French"
},
{
"key": "de",
"label": "German"
},
{
"key": "it",
"label": "Italian"
},
{
"key": "es",
"label": "Spanish"
},
{
"key": "ja",
"label": "Japanese"
},
{
"key": "nl",
"label": "Dutch"
},
{
"key": "pt-BR",
"label": "Brazilian Portuguese"
},
{
"key": "nb",
"label": "Norwegian"
},
{
"key": "ru",
"label": "Russian"
},
{
"key": "zh-CN",
"label": "Simplified Chinese"
}
],
"logLevel": "trace"
}
12 changes: 6 additions & 6 deletions app/templates/adf-cli-activiti-acs-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adf-cli-activiti-acs-template",
"version": "4.0.0",
"version": "4.1.0-beta6",
"blueprint": "Content and Process Services with Activiti",
"description": "APS ADF Application with Angular CLI",
"license": "MIT",
Expand All @@ -17,11 +17,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "4.0.0",
"@alfresco/adf-process-services-cloud": "4.0.0",
"@alfresco/adf-core": "4.0.0",
"@alfresco/adf-extensions": "4.0.0",
"@alfresco/js-api": "4.0.0",
"@alfresco/adf-content-services": "4.1.0-beta6",
"@alfresco/adf-process-services-cloud": "4.1.0-beta6",
"@alfresco/adf-core": "4.1.0-beta6",
"@alfresco/adf-extensions": "4.1.0-beta6",
"@alfresco/js-api": "4.1.0-beta1",
"@angular/animations": "10.0.6",
"@angular/cdk": "10.0.2",
"@angular/common": "10.0.6",
Expand Down
12 changes: 6 additions & 6 deletions app/templates/adf-cli-activiti-cloud-acs-template/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adf-cli-activiti-cloud-acs-template",
"version": "4.0.0",
"version": "4.1.0-beta6",
"blueprint": "Content and Process Services with Activiti Cloud",
"description": "APS ADF Application with Angular CLI",
"license": "MIT",
Expand All @@ -17,11 +17,11 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "4.0.0",
"@alfresco/adf-process-services-cloud": "4.0.0",
"@alfresco/adf-core": "4.0.0",
"@alfresco/adf-extensions": "4.0.0",
"@alfresco/js-api": "4.0.0",
"@alfresco/adf-content-services": "4.1.0-beta6",
"@alfresco/adf-process-services-cloud": "4.1.0-beta6",
"@alfresco/adf-core": "4.1.0-beta6",
"@alfresco/adf-extensions": "4.1.0-beta6",
"@alfresco/js-api": "4.1.0-beta1",
"@angular/animations": "10.0.6",
"@angular/cdk": "10.0.2",
"@angular/common": "10.0.6",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ describe('TasksComponent', () => {
}
},
isEcmBpmConfiguration: () => false,
isEcmConfiguration: () => false
isEcmConfiguration: () => false,
isEcmLoggedIn: () => false
};

beforeEach(() => {
Expand Down
Loading

0 comments on commit 7fbefe9

Please sign in to comment.