#441 set bpm host

demo-shell-ng2/app/app.component.ts

@@ -66,7 +66,8 @@ export class AppComponent {
                 public router: Router,
                 translate: AlfrescoTranslationService,
                 alfrescoSettingsService: AlfrescoSettingsService) {
-        alfrescoSettingsService.host = 'http://localhost:8080';
+        alfrescoSettingsService.ecmHost = 'http://localhost:8080';
+        alfrescoSettingsService.bpmHost = 'http://localhost:9999';
 
         this.translate = translate;
         this.translate.addTranslationFolder();

ng2-components/ng2-activiti-processlist/demo/src/main.ts

@@ -36,7 +36,7 @@ import { HTTP_PROVIDERS, BrowserXhr } from '@angular/http';
 class MyDemoApp implements OnInit {
 
     authenticated: boolean;
-    host: string = 'http://127.0.0.1:9999';
+    ecmHost: string = 'http://127.0.0.1:9999';
     token: string;
 
     constructor(
@@ -45,7 +45,7 @@ class MyDemoApp implements OnInit {
     ) {
         console.log('constructor');
 
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
         if (this.authService.getTicket()) {
             this.token = this.authService.getTicket();
         }
@@ -60,7 +60,7 @@ class MyDemoApp implements OnInit {
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
         this.login();
     }
 

ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBPM.service.ts

@@ -30,6 +30,10 @@ export class AlfrescoAuthenticationBPM extends AlfrescoAuthenticationBase implem
         super(alfrescoSettingsService, http);
     }
 
+    getHost(): string {
+        return this.alfrescoSettingsService.bpmHost;
+    }
+
     /**
      * Perform a login on behalf of the user and store the ticket returned
      *
@@ -68,7 +72,7 @@ export class AlfrescoAuthenticationBPM extends AlfrescoAuthenticationBase implem
     }
 
     private apiActivitiLogin(username: string, password: string) {
-        let url = 'http://localhost:9999/activiti-app/app/authentication';
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl + '/authentication';
         let headers = new Headers({
             'Content-Type': 'application/x-www-form-urlencoded'
         });
@@ -84,10 +88,14 @@ export class AlfrescoAuthenticationBPM extends AlfrescoAuthenticationBase implem
     }
 
     private apiActivitiLogout() {
-        let url = 'http://localhost:9999/activiti-app/app/logout';
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl + '/logout';
         return this.http.get(url).toPromise();
     }
 
+    /**
+     * The method return the ticket stored in the localStorage
+     * @returns ticket
+     */
     public getTicket(): string {
         return localStorage.getItem(`ticket-${this.TYPE}`);
     }

ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationBase.service.ts

@@ -25,8 +25,8 @@ export class AlfrescoAuthenticationBase {
 
     alfrescoApi: any;
 
-    private _authUrl: string = '/alfresco/api/-default-/public/authentication/versions/1';
     private alfrescoSetting: AlfrescoSettingsService;
+
     /**
      * Constructor
      * @param alfrescoSettingsService
@@ -36,10 +36,6 @@ export class AlfrescoAuthenticationBase {
         this.alfrescoSetting = alfrescoSettingsService;
     }
 
-    getBaseUrl(): string {
-        return this.alfrescoSetting.host + this._authUrl;
-    }
-
     /**
      * The method save the toke in the localStorage
      * @param ticket

ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationECM.service.ts

@@ -40,18 +40,18 @@ export class AlfrescoAuthenticationECM extends AlfrescoAuthenticationBase implem
 
         if (!this.isLoggedIn) {
             this.alfrescoApi = new AlfrescoApi({
-                host: this.getBaseUrl()
+                host: this.getHost()
             });
         } else {
             this.alfrescoApi = new AlfrescoApi({
                 ticket: this.getTicket(),
-                host: this.getBaseUrl()
+                host: this.getHost()
             });
         }
     }
 
-    getBaseUrl(): string {
+    getHost(): string {
-        return this.alfrescoSettingsService.host;
+        return this.alfrescoSettingsService.ecmHost;
     }
 
     /**
@@ -87,7 +87,7 @@ export class AlfrescoAuthenticationECM extends AlfrescoAuthenticationBase implem
         this.alfrescoApi = new AlfrescoApi({
             username: username,
             password: password,
-            host: this.getBaseUrl()
+            host: this.getHost()
         });
         return this.alfrescoApi.login();
     }

ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.spec.ts

@@ -49,7 +49,7 @@ describe('AlfrescoContentService', () => {
                 id: nodeId
             }
         })).toBe(
-            AlfrescoSettingsService.DEFAULT_HOST_ADDRESS + DEFAULT_CONTEXT_PATH +
+            AlfrescoSettingsService.DEFAULT_ECM_ADDRESS + DEFAULT_CONTEXT_PATH +
                 DEFAULT_BASE_API_PATH + '/nodes/' + nodeId + '/content' +
                 '?attachment=false&alf_ticket=' + authService.getTicket()
         );
@@ -61,7 +61,7 @@ describe('AlfrescoContentService', () => {
                 id: nodeId
             }
         })).toBe(
-            AlfrescoSettingsService.DEFAULT_HOST_ADDRESS + DEFAULT_CONTEXT_PATH +
+            AlfrescoSettingsService.DEFAULT_ECM_ADDRESS + DEFAULT_CONTEXT_PATH +
             DEFAULT_BASE_API_PATH + '/nodes/' + nodeId + '/renditions/doclib/content' +
             '?attachment=false&alf_ticket=' + authService.getTicket()
         );

ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.service.ts

@@ -20,26 +20,48 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class AlfrescoSettingsService {
 
-    static DEFAULT_HOST_ADDRESS: string = 'http://127.0.0.1:8080';
+    static DEFAULT_ECM_ADDRESS: string = 'http://127.0.0.1:8080';
-    static DEFAULT_CONTEXT_PATH: string = '/alfresco';
+    static DEFAULT_BPM_ADDRESS: string = 'http://127.0.0.1:8080';
-    static DEFAULT_BASE_API_PATH: string = '/api/-default-/public/alfresco/versions/1';
 
-    private _host: string = AlfrescoSettingsService.DEFAULT_HOST_ADDRESS;
+    static DEFAULT_ECM_CONTEXT_PATH: string = '/alfresco';
-    private _contextPath = AlfrescoSettingsService.DEFAULT_CONTEXT_PATH;
+    static DEFAULT_BPM_CONTEXT_PATH: string = '/activiti-app';
-    private _apiBasePath: string = AlfrescoSettingsService.DEFAULT_BASE_API_PATH;
+
+    static DEFAULT_ECM_BASE_API_PATH: string = '/api/-default-/public/alfresco/versions/1';
+    static DEFAULT_BPM_BASE_API_PATH: string = '/app';
+
+    private _ecmHost: string = AlfrescoSettingsService.DEFAULT_ECM_ADDRESS;
+    private _bpmHost: string = AlfrescoSettingsService.DEFAULT_BPM_ADDRESS;
+
+    private _ecmContextPath = AlfrescoSettingsService.DEFAULT_ECM_CONTEXT_PATH;
+    private _bpmContextPath = AlfrescoSettingsService.DEFAULT_BPM_CONTEXT_PATH;
+
+    private _apiECMBasePath: string = AlfrescoSettingsService.DEFAULT_ECM_BASE_API_PATH;
+    private _apiBPMBasePath: string = AlfrescoSettingsService.DEFAULT_BPM_BASE_API_PATH;
 
     private providers: string[] = ['ECM', 'BPM'];
 
-    public get host(): string {
+    public get ecmHost(): string {
-        return this._host;
+        return this._ecmHost;
     }
 
-    public set host(value: string) {
+    public set ecmHost(value: string) {
-        this._host = value;
+        this._ecmHost = value;
     }
 
-    getApiBaseUrl(): string {
+    public get bpmHost(): string {
-        return this._host + this._contextPath + this._apiBasePath;
+        return this._bpmHost;
+    }
+
+    public set bpmHost(value: string) {
+        this._bpmHost = value;
+    }
+
+    getBPMApiBaseUrl(): string {
+        return this._bpmHost + this._bpmContextPath + this._apiBPMBasePath;
+    }
+
+    getECMApiBaseUrl(): string {
+        return this._ecmHost + this._ecmContextPath + this._apiECMBasePath;
     }
 
     getProviders(): string [] {

ng2-components/ng2-alfresco-core/src/services/AlfrescoSettingsService.spec.ts

@@ -26,15 +26,27 @@ describe('AlfrescoSettingsService', () => {
         service = new AlfrescoSettingsService();
     });
 
-    it('should have default host', () => {
+    it('should have default ECM host', () => {
-        expect(service.host).toBe(AlfrescoSettingsService.DEFAULT_HOST_ADDRESS);
+        expect(service.ecmHost).toBe(AlfrescoSettingsService.DEFAULT_ECM_ADDRESS);
     });
 
-    it('should change host', () => {
+    it('should change host ECM', () => {
         // this test ensures 'host' getter/setter working properly
         let address = 'http://192.168.0.1';
-        service.host = address;
+        service.ecmHost = address;
-        expect(service.host).toBe(address);
+        expect(service.ecmHost).toBe(address);
     });
 
+    it('should have default BPM host', () => {
+        expect(service.ecmHost).toBe(AlfrescoSettingsService.DEFAULT_BPM_ADDRESS);
+    });
+
+    it('should change host BPM', () => {
+        // this test ensures 'host' getter/setter working properly
+        let address = 'http://192.168.0.1';
+        service.bpmHost = address;
+        expect(service.bpmHost).toBe(address);
+    });
+
+
 });

ng2-components/ng2-alfresco-documentlist/demo/src/main.ts

@@ -143,8 +143,8 @@ class DocumentListDemo implements OnInit {
     currentPath: string = '/';
     authenticated: boolean;
 
-    host: string = 'http://devproducts-platform.alfresco.me';
+    ecmHost: string = 'http://devproducts-platform.alfresco.me';
-    // host: string = 'http://127.0.0.1:8080';
+    // ecmHost: string = 'http://127.0.0.1:8080';
 
     token: string;
 
@@ -154,7 +154,7 @@ class DocumentListDemo implements OnInit {
         translation: AlfrescoTranslationService,
         private documentActions: DocumentActionsService) {
 
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
         if (this.authService.getTicket()) {
             this.token = this.authService.getTicket();
         }
@@ -167,7 +167,7 @@ class DocumentListDemo implements OnInit {
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
         this.login();
     }
 

ng2-components/ng2-alfresco-login/demo/src/main.ts

@@ -56,7 +56,7 @@ import {
 })
 export class AppComponent {
 
-    public host: string = 'http://devproducts-platform.alfresco.me';
+    public ecmHost: string = 'http://devproducts-platform.alfresco.me';
 
     public token: string;
 
@@ -66,11 +66,11 @@ export class AppComponent {
 
     constructor(public auth: AlfrescoAuthenticationService,
                 private alfrescoSettingsService: AlfrescoSettingsService) {
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
     }
 
     mySuccessMethod($event) {

ng2-components/ng2-alfresco-search/demo/src/main.ts

@@ -58,7 +58,7 @@ class SearchDemo implements OnInit {
 
     public searchTerm: string = 'test';
 
-    public host: string = 'http://devproducts-platform.alfresco.me';
+    public ecmHost: string = 'http://devproducts-platform.alfresco.me';
 
     token: string;
 
@@ -66,13 +66,13 @@ class SearchDemo implements OnInit {
                 private alfrescoSettingsService: AlfrescoSettingsService,
                 translation: AlfrescoTranslationService) {
 
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
 
         translation.addTranslationFolder();
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
         this.login();
     }
 

ng2-components/ng2-alfresco-upload/demo/src/main.ts

@@ -76,12 +76,12 @@ export class MyDemoApp implements OnInit {
 
     authenticated: boolean;
 
-    public host: string = 'http://devproducts-platform.alfresco.me';
+    public ecmHost: string = 'http://devproducts-platform.alfresco.me';
 
     token: string;
 
     constructor(private authService: AlfrescoAuthenticationService, private alfrescoSettingsService: AlfrescoSettingsService) {
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
 
         if (this.authService.getTicket()) {
             this.token = this.authService.getTicket();
@@ -93,7 +93,7 @@ export class MyDemoApp implements OnInit {
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
         this.login();
     }
 

ng2-components/ng2-alfresco-webscript/demo/src/main.ts

@@ -63,7 +63,7 @@ class WebscriptDemo implements OnInit {
 
     authenticated: boolean;
 
-    host: string = 'http://127.0.0.1:8080';
+    ecmHost: string = 'http://127.0.0.1:8080';
 
     scriptPath: string = 'sample/folder/Company%20Home';
 
@@ -78,7 +78,7 @@ class WebscriptDemo implements OnInit {
     constructor(private authService: AlfrescoAuthenticationService,
                 private alfrescoSettingsService: AlfrescoSettingsService) {
 
-        alfrescoSettingsService.host = this.host;
+        alfrescoSettingsService.ecmHost = this.ecmHost;
         if (this.authService.getTicket()) {
             this.token = this.authService.getTicket();
         }
@@ -89,7 +89,7 @@ class WebscriptDemo implements OnInit {
     }
 
     public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+        this.alfrescoSettingsService.ecmHost = this.ecmHost;
         this.login();
     }