[ADF-1103] Add custom tslint rules to avoid unwanted Class and File name prefix (#2087)

* custom tslint rules adf project name files

* filename and class prefix rule

* filename process service mock

* fix spec filename

* fix demo shell

* rename mock

* alias deprecated name class

* core rename services

* fix pacakge.json adf-rules

* add exclude in whitelist

ng2-components/ng2-activiti-processlist/README.md

@@ -298,10 +298,10 @@ Displays comments associated with a particular process instances and allows the
 This component displays attached documents on a specified process instance
 
 ```html
-<adf-process-attachment-list 
+<process-attachment-list 
     [processInstanceId]="YOUR_PROCESS_INSTANCE_ID"
     (attachmentClick="YOUR_ATTACHMENT_CLICK_EMITTER_HANDLER">
-</adf-process-attachment-list>
+</process-attachment-list>
 ```
 ![process-attachment-list-sample](docs/assets/process-attachment-list.png)
 

ng2-components/ng2-activiti-processlist/index.ts

@@ -22,53 +22,93 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
 import { CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule } from 'ng2-alfresco-datatable';
 
-import {
-    ActivitiCreateProcessAttachmentComponent,
-    ActivitiProcessAttachmentListComponent,
-    ActivitiProcessCommentsComponent,
-    ActivitiProcessFiltersComponent,
-    ActivitiProcessInstanceDetailsComponent,
-    ActivitiProcessInstanceHeaderComponent,
-    ActivitiProcessInstanceListComponent,
-    ActivitiProcessInstanceTasksComponent,
-    ActivitiProcessInstanceVariablesComponent,
-    ActivitiStartProcessInstanceComponent
-} from './src/components/index';
+import {CreateProcessAttachmentComponent} from './src/components/create-process-attachment.component';
+import {ProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+import {ProcessCommentsComponent} from './src/components/process-comments.component';
+import {ProcessFiltersComponent} from './src/components/process-filters.component';
+import {ProcessInstanceDetailsComponent} from './src/components/process-instance-details.component';
+import {ProcessInstanceHeaderComponent} from './src/components/process-instance-header.component';
+import {ProcessInstanceTasksComponent} from './src/components/process-instance-tasks.component';
+import {ProcessInstanceVariablesComponent} from './src/components/process-instance-variables.component';
+import {ProcessInstanceListComponent} from './src/components/processlist.component';
+import {StartProcessInstanceComponent} from './src/components/start-process.component';
+export {ProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+export {ProcessCommentsComponent} from './src/components/process-comments.component';
+export {ProcessFiltersComponent} from './src/components/process-filters.component';
+export {ProcessInstanceDetailsComponent} from './src/components/process-instance-details.component';
+export {ProcessInstanceHeaderComponent} from './src/components/process-instance-header.component';
+export {ProcessInstanceTasksComponent} from './src/components/process-instance-tasks.component';
+export {ProcessInstanceVariablesComponent} from './src/components/process-instance-variables.component';
+export {ProcessInstanceListComponent} from './src/components/processlist.component';
+export {StartProcessInstanceComponent} from './src/components/start-process.component';
 
-import { ActivitiProcessService } from './src/services/activiti-process.service';
 import { ProcessUploadService } from './src/services/process-upload.service';
-
-// components
-export * from './src/components/activiti-processlist.component';
-export * from './src/components/activiti-filters.component';
-export * from './src/components/activiti-process-instance-details.component';
-export * from './src/components/activiti-start-process.component';
-export * from './src/components/adf-process-attachment-list.component';
-export * from './src/components/adf-create-process-attachment.component';
-export * from './src/services/process-upload.service';
+import { ProcessService } from './src/services/process.service';
+export { ProcessService } from './src/services/process.service';
+export { ProcessUploadService } from './src/services/process-upload.service';
 
 // models
-export * from './src/models/index';
+export * from './src/models/filter-process.model';
+export * from './src/models/process-definition.model';
+export * from './src/models/process-instance.model';
+export * from './src/models/process-instance-filter.model';
+export * from './src/models/process-instance-variable.model';
 
-// services
-export * from './src/services/activiti-process.service';
+// Old derprecate export
+import {CreateProcessAttachmentComponent as ActivitiCreateProcessAttachmentComponent } from './src/components/create-process-attachment.component';
+import {ProcessAttachmentListComponent as ActivitiProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+import {ProcessCommentsComponent as ActivitiProcessComments } from './src/components/process-comments.component';
+import {ProcessFiltersComponent as ActivitiProcessFilters} from './src/components/process-filters.component';
+import {ProcessInstanceDetailsComponent as ActivitiProcessInstanceDetails} from './src/components/process-instance-details.component';
+import {ProcessInstanceHeaderComponent as ActivitiProcessInstanceHeader} from './src/components/process-instance-header.component';
+import {ProcessInstanceTasksComponent as ActivitiProcessInstanceTasks} from './src/components/process-instance-tasks.component';
+import {ProcessInstanceVariablesComponent as ActivitiProcessInstanceVariables} from './src/components/process-instance-variables.component';
+import {ProcessInstanceListComponent as ActivitiProcessInstanceListComponent} from './src/components/processlist.component';
+import {StartProcessInstanceComponent as ActivitiStartProcessInstance} from './src/components/start-process.component';
+import {ProcessService as ActivitiProcessService} from './src/services/process.service';
+export {CreateProcessAttachmentComponent as ActivitiCreateProcessAttachmentComponent } from './src/components/create-process-attachment.component';
+export {ProcessAttachmentListComponent as ActivitiProcessAttachmentListComponent} from './src/components/process-attachment-list.component';
+export {ProcessCommentsComponent as ActivitiProcessComments } from './src/components/process-comments.component';
+export {ProcessFiltersComponent as ActivitiProcessFilters} from './src/components/process-filters.component';
+export {ProcessInstanceDetailsComponent as ActivitiProcessInstanceDetails} from './src/components/process-instance-details.component';
+export {ProcessInstanceHeaderComponent as ActivitiProcessInstanceHeader} from './src/components/process-instance-header.component';
+export {ProcessInstanceTasksComponent as ActivitiProcessInstanceTasks} from './src/components/process-instance-tasks.component';
+export {ProcessInstanceVariablesComponent as ActivitiProcessInstanceVariables} from './src/components/process-instance-variables.component';
+export {ProcessInstanceListComponent as ActivitiProcessInstanceListComponent} from './src/components/processlist.component';
+export {StartProcessInstanceComponent as ActivitiStartProcessInstance} from './src/components/start-process.component';
+export {ProcessService as ActivitiProcessService} from './src/services/process.service';
 
 export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
+    ProcessInstanceListComponent,
+    ProcessFiltersComponent,
+    ProcessInstanceDetailsComponent,
+    ProcessInstanceHeaderComponent,
+    ProcessInstanceTasksComponent,
+    ProcessInstanceVariablesComponent,
+    ProcessCommentsComponent,
+    StartProcessInstanceComponent,
+    ProcessAttachmentListComponent,
+    CreateProcessAttachmentComponent,
+
+    // Old Deprecated export
     ActivitiProcessInstanceListComponent,
-    ActivitiProcessFiltersComponent,
-    ActivitiProcessInstanceDetailsComponent,
-    ActivitiProcessInstanceHeaderComponent,
-    ActivitiProcessInstanceTasksComponent,
-    ActivitiProcessInstanceVariablesComponent,
-    ActivitiProcessCommentsComponent,
-    ActivitiStartProcessInstanceComponent,
+    ActivitiProcessFilters,
+    ActivitiProcessInstanceHeader,
+    ActivitiProcessInstanceTasks,
+    ActivitiProcessInstanceVariables,
+    ActivitiProcessComments,
+    ActivitiProcessInstanceDetails,
+    ActivitiStartProcessInstance,
     ActivitiProcessAttachmentListComponent,
     ActivitiCreateProcessAttachmentComponent
 ];
 
 export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
-    ActivitiProcessService,
-    ProcessUploadService
+    ProcessService,
+    ProcessUploadService,
+
+    // Old Deprecated import
+    ActivitiProcessService
 ];
 
 @NgModule({

ng2-components/ng2-activiti-processlist/src/assets/process.service.mock.ts

@@ -21,7 +21,8 @@ import {
     TaskDetailsModel,
     User
 } from 'ng2-activiti-tasklist';
-import { FilterProcessRepresentationModel, ProcessDefinitionRepresentation } from '../models/index';
+import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
+import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 
 export let fakeFilters = {
     size: 1, total: 1, start: 0,
@@ -66,7 +67,7 @@ export let fakeApp2 = new AppDefinitionRepresentationModel({
 });
 
 export let fakeTaskList = {
-    data: [ new TaskDetailsModel({
+    data: [new TaskDetailsModel({
         id: 1,
         name: 'Task 1',
         processInstanceId: 1000,

ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.spec.ts

@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
-import { ActivitiCreateProcessAttachmentComponent } from './adf-create-process-attachment.component';
+import { CreateProcessAttachmentComponent } from './create-process-attachment.component';
 
 declare let jasmine: any;
 
@@ -27,8 +27,8 @@ describe('Activiti Process Create Attachment', () => {
 
     let componentHandler: any;
     let service: ActivitiContentService;
-    let component: ActivitiCreateProcessAttachmentComponent;
-    let fixture: ComponentFixture<ActivitiCreateProcessAttachmentComponent>;
+    let component: CreateProcessAttachmentComponent;
+    let fixture: ComponentFixture<CreateProcessAttachmentComponent>;
     let element: HTMLElement;
 
     let file = new File([new Blob()], 'Test');
@@ -55,7 +55,7 @@ describe('Activiti Process Create Attachment', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiCreateProcessAttachmentComponent
+                CreateProcessAttachmentComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService },
@@ -65,7 +65,7 @@ describe('Activiti Process Create Attachment', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(ActivitiCreateProcessAttachmentComponent);
+        fixture = TestBed.createComponent(CreateProcessAttachmentComponent);
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ActivitiContentService);
         element = fixture.nativeElement;

ng2-components/ng2-activiti-processlist/src/components/create-process-attachment.component.ts

@@ -21,10 +21,10 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'adf-create-process-attachment',
-    styleUrls: ['./adf-create-process-attachment.component.css'],
-    templateUrl: './adf-create-process-attachment.component.html'
+    styleUrls: ['./create-process-attachment.component.css'],
+    templateUrl: './create-process-attachment.component.html'
 })
-export class ActivitiCreateProcessAttachmentComponent implements OnChanges {
+export class CreateProcessAttachmentComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;

ng2-components/ng2-activiti-processlist/src/components/index.ts

@@ -1,27 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './activiti-processlist.component';
-export * from './activiti-filters.component';
-export * from './activiti-process-instance-header.component';
-export * from './activiti-process-instance-tasks.component';
-export * from './activiti-process-instance-variables.component';
-export * from './activiti-process-comments.component';
-export * from './activiti-process-instance-details.component';
-export * from './activiti-start-process.component';
-export * from './adf-process-attachment-list.component';
-export * from './adf-create-process-attachment.component';

ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts

@@ -26,14 +26,14 @@ import { DataTableModule } from 'ng2-alfresco-datatable';
 import { Observable } from 'rxjs/Rx';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessAttachmentListComponent } from './adf-process-attachment-list.component';
+import { ProcessAttachmentListComponent } from './process-attachment-list.component';
 
-describe('ActivitiProcessAttachmentListComponent', () => {
+describe('ProcessAttachmentListComponent', () => {
 
     let componentHandler: any;
     let service: ActivitiContentService;
-    let component: ActivitiProcessAttachmentListComponent;
-    let fixture: ComponentFixture<ActivitiProcessAttachmentListComponent>;
+    let component: ProcessAttachmentListComponent;
+    let fixture: ComponentFixture<ProcessAttachmentListComponent>;
     let getProcessRelatedContentSpy: jasmine.Spy;
     let deleteContentSpy: jasmine.Spy;
     let getFileRawContentSpy: jasmine.Spy;
@@ -47,7 +47,7 @@ describe('ActivitiProcessAttachmentListComponent', () => {
                 MdProgressSpinnerModule
             ],
             declarations: [
-                ActivitiProcessAttachmentListComponent
+                ProcessAttachmentListComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
@@ -58,7 +58,7 @@ describe('ActivitiProcessAttachmentListComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessAttachmentListComponent);
+        fixture = TestBed.createComponent(ProcessAttachmentListComponent);
         component = fixture.componentInstance;
         service = fixture.debugElement.injector.get(ActivitiContentService);
 

ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts

@@ -20,11 +20,11 @@ import { ActivitiContentService } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, ContentService, ThumbnailService } from 'ng2-alfresco-core';
 
 @Component({
-    selector: 'adf-process-attachment-list',
-    styleUrls: ['./adf-process-attachment-list.component.css'],
-    templateUrl: './adf-process-attachment-list.component.html'
+    selector: 'process-attachment-list',
+    styleUrls: ['./process-attachment-list.component.css'],
+    templateUrl: './process-attachment-list.component.html'
 })
-export class ActivitiProcessAttachmentListComponent implements OnChanges {
+export class ProcessAttachmentListComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;

ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts

@@ -24,15 +24,15 @@ import { ActivitiFormModule } from 'ng2-activiti-form';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessCommentsComponent } from './activiti-process-comments.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessCommentsComponent } from './process-comments.component';
 
 describe('ActivitiProcessInstanceComments', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
-    let component: ActivitiProcessCommentsComponent;
-    let fixture: ComponentFixture<ActivitiProcessCommentsComponent>;
+    let service: ProcessService;
+    let component: ProcessCommentsComponent;
+    let fixture: ComponentFixture<ProcessCommentsComponent>;
     let getCommentsSpy: jasmine.Spy;
     let addCommentSpy: jasmine.Spy;
 
@@ -43,20 +43,20 @@ describe('ActivitiProcessInstanceComments', () => {
                 ActivitiFormModule
             ],
             declarations: [
-                ActivitiProcessCommentsComponent
+                ProcessCommentsComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessCommentsComponent);
+        fixture = TestBed.createComponent(ProcessCommentsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
 
         getCommentsSpy = spyOn(service, 'getProcessInstanceComments').and.returnValue(Observable.of([{
             message: 'Test1'

ng2-components/ng2-activiti-processlist/src/components/process-comments.component.ts

@@ -20,18 +20,18 @@ import { Comment } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-comments, activiti-process-instance-comments',
-    templateUrl: './activiti-process-comments.component.html',
-    styleUrls: ['./activiti-process-comments.component.css'],
-    providers: [ActivitiProcessService]
+    templateUrl: './process-comments.component.html',
+    styleUrls: ['./process-comments.component.css'],
+    providers: [ProcessService]
 })
-export class ActivitiProcessCommentsComponent implements OnChanges {
+export class ProcessCommentsComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
@@ -56,7 +56,7 @@ export class ActivitiProcessCommentsComponent implements OnChanges {
      * @param activitiProcess Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');

ng2-components/ng2-activiti-processlist/src/components/process-filters.component.spec.ts

@@ -19,13 +19,13 @@ import { SimpleChange } from '@angular/core';
 import { LogServiceMock } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
-import { ActivitiProcessService } from '../services/activiti-process.service';
-import { ActivitiProcessFiltersComponent } from './activiti-filters.component';
+import { ProcessService } from '../services/process.service';
+import { ProcessFiltersComponent } from './process-filters.component';
 
 describe('ActivitiFilters', () => {
 
-    let filterList: ActivitiProcessFiltersComponent;
-    let activitiService: ActivitiProcessService;
+    let filterList: ProcessFiltersComponent;
+    let activitiService: ProcessService;
     let logService: LogServiceMock;
 
     let fakeGlobalFilter = [];
@@ -52,8 +52,8 @@ describe('ActivitiFilters', () => {
 
     beforeEach(() => {
         logService = new LogServiceMock();
-        activitiService = new ActivitiProcessService(null, logService);
-        filterList = new ActivitiProcessFiltersComponent(null, activitiService, logService);
+        activitiService = new ProcessService(null, logService);
+        filterList = new ProcessFiltersComponent(null, activitiService, logService);
     });
 
     it('should return the filter task list', (done) => {

ng2-components/ng2-activiti-processlist/src/components/process-filters.component.ts

@@ -19,16 +19,16 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChange
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { FilterParamsModel, FilterProcessRepresentationModel } from './../models/filter-process.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 
 @Component({
     selector: 'adf-process-instance-filters, activiti-process-instance-filters',
-    templateUrl: './activiti-filters.component.html',
-    styleUrls: ['activiti-filters.component.css']
+    templateUrl: './process-filters.component.html',
+    styleUrls: ['process-filters.component.css']
 })
-export class ActivitiProcessFiltersComponent implements OnInit, OnChanges {
+export class ProcessFiltersComponent implements OnInit, OnChanges {
 
     @Input()
     filterParam: FilterParamsModel;
@@ -59,7 +59,7 @@ export class ActivitiProcessFiltersComponent implements OnInit, OnChanges {
     filters: FilterProcessRepresentationModel [] = [];
 
     constructor(private translate: AlfrescoTranslationService,
-                private activiti: ActivitiProcessService,
+                private activiti: ProcessService,
                 private logService: LogService) {
         this.filter$ = new Observable<FilterProcessRepresentationModel>(observer => this.filterObserver = observer).share();
 

ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.spec.ts

@@ -25,18 +25,18 @@ import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 
 import { ProcessInstance } from '../models/process-instance.model';
-import { exampleProcess, exampleProcessNoName } from './../assets/activiti-process.model.mock';
+import { exampleProcess, exampleProcessNoName } from './../assets/process.model.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceDetailsComponent } from './activiti-process-instance-details.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceDetailsComponent } from './process-instance-details.component';
 
-describe('ActivitiProcessInstanceDetailsComponent', () => {
+describe('ProcessInstanceDetailsComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let formService: FormService;
-    let component: ActivitiProcessInstanceDetailsComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceDetailsComponent>;
+    let component: ProcessInstanceDetailsComponent;
+    let fixture: ComponentFixture<ProcessInstanceDetailsComponent>;
     let getProcessSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -47,11 +47,11 @@ describe('ActivitiProcessInstanceDetailsComponent', () => {
                 ActivitiTaskListModule
             ],
             declarations: [
-                ActivitiProcessInstanceDetailsComponent
+                ProcessInstanceDetailsComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ],
             schemas: [ NO_ERRORS_SCHEMA ]
         }).compileComponents();
@@ -59,9 +59,9 @@ describe('ActivitiProcessInstanceDetailsComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceDetailsComponent);
+        fixture = TestBed.createComponent(ProcessInstanceDetailsComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
         formService = fixture.debugElement.injector.get(FormService);
 
         getProcessSpy = spyOn(service, 'getProcess').and.returnValue(Observable.of(exampleProcess));

ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.ts

@@ -21,25 +21,25 @@ import {TaskDetailsEvent} from 'ng2-activiti-tasklist';
 import {AlfrescoTranslationService, LogService} from 'ng2-alfresco-core';
 
 import {ProcessInstance} from '../models/process-instance.model';
-import {ActivitiProcessService} from './../services/activiti-process.service';
-import {ActivitiProcessInstanceHeaderComponent} from './activiti-process-instance-header.component';
-import {ActivitiProcessInstanceTasksComponent} from './activiti-process-instance-tasks.component';
+import {ProcessService} from './../services/process.service';
+import {ProcessInstanceHeaderComponent} from './process-instance-header.component';
+import {ProcessInstanceTasksComponent} from './process-instance-tasks.component';
 
 @Component({
     selector: 'adf-process-instance-details, activiti-process-instance-details',
-    templateUrl: './activiti-process-instance-details.component.html',
-    styleUrls: ['./activiti-process-instance-details.component.css']
+    templateUrl: './process-instance-details.component.html',
+    styleUrls: ['./process-instance-details.component.css']
 })
-export class ActivitiProcessInstanceDetailsComponent implements OnChanges {
+export class ProcessInstanceDetailsComponent implements OnChanges {
 
     @Input()
     processInstanceId: string;
 
-    @ViewChild(ActivitiProcessInstanceHeaderComponent)
-    processInstanceHeader: ActivitiProcessInstanceHeaderComponent;
+    @ViewChild(ProcessInstanceHeaderComponent)
+    processInstanceHeader: ProcessInstanceHeaderComponent;
 
-    @ViewChild(ActivitiProcessInstanceTasksComponent)
-    tasksList: ActivitiProcessInstanceTasksComponent;
+    @ViewChild(ProcessInstanceTasksComponent)
+    tasksList: ProcessInstanceTasksComponent;
 
     @Input()
     showTitle: boolean = true;
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceDetailsComponent implements OnChanges {
      * @param activitiProcess   Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService,
+                private activitiProcess: ProcessService,
                 private logService: LogService) {
 
         if (translate) {

ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.spec.ts

@@ -18,18 +18,18 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
-import { exampleProcess, processEnded } from './../assets/activiti-process.model.mock';
+import { exampleProcess, processEnded } from './../assets/process.model.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessCommentsComponent } from './activiti-process-comments.component';
-import { ActivitiProcessInstanceHeaderComponent } from './activiti-process-instance-header.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessCommentsComponent } from './process-comments.component';
+import { ProcessInstanceHeaderComponent } from './process-instance-header.component';
 
-describe('ActivitiProcessInstanceHeaderComponent', () => {
+describe('ProcessInstanceHeaderComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiProcessInstanceHeaderComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceHeaderComponent>;
+    let component: ProcessInstanceHeaderComponent;
+    let fixture: ComponentFixture<ProcessInstanceHeaderComponent>;
     let element: HTMLElement;
 
     beforeEach(async(() => {
@@ -38,11 +38,11 @@ describe('ActivitiProcessInstanceHeaderComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiProcessInstanceHeaderComponent,
-                ActivitiProcessCommentsComponent
+                ProcessInstanceHeaderComponent,
+                ProcessCommentsComponent
             ],
             providers: [
-                ActivitiProcessService,
+                ProcessService,
                 {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents();
@@ -50,7 +50,7 @@ describe('ActivitiProcessInstanceHeaderComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceHeaderComponent);
+        fixture = TestBed.createComponent(ProcessInstanceHeaderComponent);
         component = fixture.componentInstance;
         element = fixture.nativeElement;
 

ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.ts

@@ -24,10 +24,10 @@ declare let componentHandler: any;
 
 @Component({
     selector: 'adf-process-instance-header, activiti-process-instance-header',
-    templateUrl: './activiti-process-instance-header.component.html',
-    styleUrls: ['./activiti-process-instance-header.component.css']
+    templateUrl: './process-instance-header.component.html',
+    styleUrls: ['./process-instance-header.component.css']
 })
-export class ActivitiProcessInstanceHeaderComponent {
+export class ProcessInstanceHeaderComponent {
 
     @Input()
     showDiagram: boolean = true;

ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts

@@ -26,16 +26,16 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { taskDetailsMock } from './../assets/task-details.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceTasksComponent } from './activiti-process-instance-tasks.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceTasksComponent } from './process-instance-tasks.component';
 
-describe('ActivitiProcessInstanceTasksComponent', () => {
+describe('ProcessInstanceTasksComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiProcessInstanceTasksComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceTasksComponent>;
+    let component: ProcessInstanceTasksComponent;
+    let fixture: ComponentFixture<ProcessInstanceTasksComponent>;
     let debugElement: DebugElement;
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let getProcessTasksSpy: jasmine.Spy;
 
     let exampleProcessInstance = new ProcessInstance({ id: '123' });
@@ -46,11 +46,11 @@ describe('ActivitiProcessInstanceTasksComponent', () => {
                 CoreModule.forRoot()
             ],
             declarations: [
-                ActivitiProcessInstanceTasksComponent
+                ProcessInstanceTasksComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ],
             schemas: [NO_ERRORS_SCHEMA]
         }).compileComponents();
@@ -58,10 +58,10 @@ describe('ActivitiProcessInstanceTasksComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceTasksComponent);
+        fixture = TestBed.createComponent(ProcessInstanceTasksComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
         getProcessTasksSpy = spyOn(service, 'getProcessTasks').and.returnValue(Observable.of([new TaskDetailsModel(taskDetailsMock)]));
 
         componentHandler = jasmine.createSpyObj('componentHandler', [

ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts

@@ -21,17 +21,17 @@ import { TaskDetailsEvent, TaskDetailsModel } from 'ng2-activiti-tasklist';
 import { AlfrescoTranslationService, LogService } from 'ng2-alfresco-core';
 import { Observable, Observer } from 'rxjs/Rx';
 import { ProcessInstance } from '../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-tasks, activiti-process-instance-tasks',
-    templateUrl: './activiti-process-instance-tasks.component.html',
-    styleUrls: ['./activiti-process-instance-tasks.component.css']
+    templateUrl: './process-instance-tasks.component.html',
+    styleUrls: ['./process-instance-tasks.component.css']
 })
-export class ActivitiProcessInstanceTasksComponent implements OnInit, OnChanges {
+export class ProcessInstanceTasksComponent implements OnInit, OnChanges {
 
     @Input()
     processInstanceDetails: ProcessInstance;
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceTasksComponent implements OnInit, OnChanges
     taskClick: EventEmitter<TaskDetailsEvent> = new EventEmitter<TaskDetailsEvent>();
 
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService,
+                private activitiProcess: ProcessService,
                 private logService: LogService) {
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');

ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts

@@ -25,15 +25,15 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataTableModule, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiProcessService } from './../services/activiti-process.service';
-import { ActivitiProcessInstanceVariablesComponent } from './activiti-process-instance-variables.component';
+import { ProcessService } from './../services/process.service';
+import { ProcessInstanceVariablesComponent } from './process-instance-variables.component';
 
-describe('ActivitiProcessInstanceVariablesComponent', () => {
+describe('ProcessInstanceVariablesComponent', () => {
 
     let componentHandler: any;
-    let service: ActivitiProcessService;
-    let component: ActivitiProcessInstanceVariablesComponent;
-    let fixture: ComponentFixture<ActivitiProcessInstanceVariablesComponent>;
+    let service: ProcessService;
+    let component: ProcessInstanceVariablesComponent;
+    let fixture: ComponentFixture<ProcessInstanceVariablesComponent>;
     let getVariablesSpy: jasmine.Spy;
     let createOrUpdateProcessInstanceVariablesSpy: jasmine.Spy;
     let deleteProcessInstanceVariableSpy: jasmine.Spy;
@@ -46,20 +46,20 @@ describe('ActivitiProcessInstanceVariablesComponent', () => {
                 MdProgressSpinnerModule
             ],
             declarations: [
-                ActivitiProcessInstanceVariablesComponent
+                ProcessInstanceVariablesComponent
             ],
             providers: [
                 { provide: AlfrescoTranslationService, useClass: TranslationMock },
-                ActivitiProcessService
+                ProcessService
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiProcessInstanceVariablesComponent);
+        fixture = TestBed.createComponent(ProcessInstanceVariablesComponent);
         component = fixture.componentInstance;
-        service = fixture.debugElement.injector.get(ActivitiProcessService);
+        service = fixture.debugElement.injector.get(ProcessService);
 
         getVariablesSpy = spyOn(service, 'getProcessInstanceVariables').and.returnValue(Observable.of([{
             name: 'var1',

ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.ts

@@ -20,18 +20,18 @@ import { Component, DebugElement, EventEmitter, Input, OnChanges, OnInit, Output
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { DataCellEvent, DataTableAdapter, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-process-instance-variables, activiti-process-instance-variables',
-    templateUrl: './activiti-process-instance-variables.component.html',
-    styleUrls: ['./activiti-process-instance-variables.component.css'],
-    providers: [ActivitiProcessService]
+    templateUrl: './process-instance-variables.component.html',
+    styleUrls: ['./process-instance-variables.component.css'],
+    providers: [ProcessService]
 })
-export class ActivitiProcessInstanceVariablesComponent implements OnInit, OnChanges {
+export class ProcessInstanceVariablesComponent implements OnInit, OnChanges {
 
     @Input()
     processInstanceId: string;
@@ -69,7 +69,7 @@ export class ActivitiProcessInstanceVariablesComponent implements OnInit, OnChan
      * @param activitiProcess Process service
      */
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');

ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts

@@ -19,21 +19,21 @@ import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MdProgressSpinnerModule } from '@angular/material';
 import { Observable } from 'rxjs/Rx';
-import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component';
+import { ProcessInstanceListComponent } from './processlist.component';
 
 import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { DataRowEvent, DataSorting, DataTableModule, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
-import { fakeProcessInstances, fakeProcessInstancesWithNoName } from '../assets/activiti-process-instances-list.mock';
-import { ActivitiProcessService } from '../services/activiti-process.service';
+import { fakeProcessInstances, fakeProcessInstancesWithNoName } from '../assets/process-instances-list.mock';
+import { ProcessService } from '../services/process.service';
 import { TranslationMock } from './../assets/translation.service.mock';
 
-describe('ActivitiProcessInstanceListComponent', () => {
+describe('ProcessInstanceListComponent', () => {
 
     let componentHandler: any;
-    let fixture: ComponentFixture<ActivitiProcessInstanceListComponent>;
-    let component: ActivitiProcessInstanceListComponent;
-    let service: ActivitiProcessService;
+    let fixture: ComponentFixture<ProcessInstanceListComponent>;
+    let component: ProcessInstanceListComponent;
+    let service: ProcessService;
     let getProcessInstancesSpy: jasmine.Spy;
 
     beforeEach(async(() => {
@@ -43,15 +43,15 @@ describe('ActivitiProcessInstanceListComponent', () => {
                 DataTableModule.forRoot(),
                 MdProgressSpinnerModule
             ],
-            declarations: [ ActivitiProcessInstanceListComponent ],
+            declarations: [ ProcessInstanceListComponent ],
             providers: [
-                ActivitiProcessService,
+                ProcessService,
                 {provide: AlfrescoTranslationService, useClass: TranslationMock}
             ]
         }).compileComponents().then(() => {
-            fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent);
+            fixture = TestBed.createComponent(ProcessInstanceListComponent);
             component = fixture.componentInstance;
-            service = fixture.debugElement.injector.get(ActivitiProcessService);
+            service = fixture.debugElement.injector.get(ProcessService);
 
             getProcessInstancesSpy = spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeProcessInstances));
 

ng2-components/ng2-activiti-processlist/src/components/processlist.component.ts

@@ -21,14 +21,14 @@ import { AlfrescoTranslationService, DataColumnListComponent } from 'ng2-alfresc
 import { DataColumn, DataRowEvent, DataSorting, DataTableAdapter, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
 import { ProcessInstance } from '../models/process-instance.model';
-import { ActivitiProcessService } from '../services/activiti-process.service';
+import { ProcessService } from '../services/process.service';
 
 @Component({
     selector: 'adf-process-instance-list, activiti-process-instance-list',
-    styleUrls: ['./activiti-processlist.component.css'],
-    templateUrl: './activiti-processlist.component.html'
+    styleUrls: ['./processlist.component.css'],
+    templateUrl: './processlist.component.html'
 })
-export class ActivitiProcessInstanceListComponent implements OnChanges, AfterContentInit {
+export class ProcessInstanceListComponent implements OnChanges, AfterContentInit {
 
     @ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
 
@@ -69,7 +69,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
         { type: 'text', key: 'created', title: 'Created', cssClass: 'hidden', sortable: true }
     ];
 
-    constructor(private processService: ActivitiProcessService,
+    constructor(private processService: ProcessService,
                 private translate: AlfrescoTranslationService) {
         if (translate !== null) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');

ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts

@@ -23,17 +23,17 @@ import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Rx';
 
 import { RestVariable } from 'alfresco-js-api';
-import { ActivitiProcessService } from '../services/activiti-process.service';
-import { fakeProcessDefs, fakeProcessDefWithForm, newProcess, taskFormMock } from './../assets/activiti-start-process.component.mock';
+import { ProcessService } from '../services/process.service';
+import { fakeProcessDefs, fakeProcessDefWithForm, newProcess, taskFormMock } from './../assets/start-process.component.mock';
 import { TranslationMock } from './../assets/translation.service.mock';
-import { ActivitiStartProcessInstanceComponent } from './activiti-start-process.component';
+import { StartProcessInstanceComponent } from './start-process.component';
 
-describe('ActivitiStartProcessInstanceComponent', () => {
+describe('StartProcessInstanceComponent', () => {
 
     let componentHandler: any;
-    let component: ActivitiStartProcessInstanceComponent;
-    let fixture: ComponentFixture<ActivitiStartProcessInstanceComponent>;
-    let processService: ActivitiProcessService;
+    let component: StartProcessInstanceComponent;
+    let fixture: ComponentFixture<StartProcessInstanceComponent>;
+    let processService: ProcessService;
     let formService: FormService;
     let getDefinitionsSpy: jasmine.Spy;
     let getStartFormDefinitionSpy: jasmine.Spy;
@@ -47,11 +47,11 @@ describe('ActivitiStartProcessInstanceComponent', () => {
                 ActivitiFormModule.forRoot()
             ],
             declarations: [
-                ActivitiStartProcessInstanceComponent
+                StartProcessInstanceComponent
             ],
             providers: [
                 {provide: AlfrescoTranslationService, useClass: TranslationMock},
-                ActivitiProcessService,
+                ProcessService,
                 FormService
             ]
         }).compileComponents();
@@ -59,10 +59,10 @@ describe('ActivitiStartProcessInstanceComponent', () => {
 
     beforeEach(() => {
 
-        fixture = TestBed.createComponent(ActivitiStartProcessInstanceComponent);
+        fixture = TestBed.createComponent(StartProcessInstanceComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;
-        processService = fixture.debugElement.injector.get(ActivitiProcessService);
+        processService = fixture.debugElement.injector.get(ProcessService);
         formService = fixture.debugElement.injector.get(FormService);
 
         getDefinitionsSpy = spyOn(processService, 'getProcessDefinitions').and.returnValue(Observable.of(fakeProcessDefs));

ng2-components/ng2-activiti-processlist/src/components/start-process.component.ts

@@ -17,21 +17,21 @@
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { RestVariable } from 'alfresco-js-api';
-import { ActivitiStartFormComponent } from 'ng2-activiti-form';
+import { StartFormComponent } from 'ng2-activiti-form';
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ProcessDefinitionRepresentation } from './../models/process-definition.model';
 import { ProcessInstance } from './../models/process-instance.model';
-import { ActivitiProcessService } from './../services/activiti-process.service';
+import { ProcessService } from './../services/process.service';
 
 declare let componentHandler: any;
 declare let dialogPolyfill: any;
 
 @Component({
     selector: 'adf-start-process, activiti-start-process',
-    templateUrl: './activiti-start-process.component.html',
-    styleUrls: ['./activiti-start-process.component.css']
+    templateUrl: './start-process.component.html',
+    styleUrls: ['./start-process.component.css']
 })
-export class ActivitiStartProcessInstanceComponent implements OnChanges {
+export class StartProcessInstanceComponent implements OnChanges {
 
     @Input()
     appId: string;
@@ -45,8 +45,8 @@ export class ActivitiStartProcessInstanceComponent implements OnChanges {
     @Output()
     error: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
 
-    @ViewChild(ActivitiStartFormComponent)
-    startForm: ActivitiStartFormComponent;
+    @ViewChild(StartFormComponent)
+    startForm: StartFormComponent;
 
     processDefinitions: ProcessDefinitionRepresentation[] = [];
 
@@ -57,7 +57,7 @@ export class ActivitiStartProcessInstanceComponent implements OnChanges {
     errorMessageId: string = '';
 
     constructor(private translate: AlfrescoTranslationService,
-                private activitiProcess: ActivitiProcessService) {
+                private activitiProcess: ProcessService) {
 
         if (translate) {
             translate.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');

ng2-components/ng2-activiti-processlist/src/models/index.ts

@@ -1,22 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './filter-process.model';
-export * from './process-definition.model';
-export * from './process-instance.model';
-export * from './process-instance-filter.model';
-export * from './process-instance-variable.model';

ng2-components/ng2-activiti-processlist/src/services/process.service.spec.ts

@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
 import { async } from '@angular/core/testing';
 import { AlfrescoApi } from 'alfresco-js-api';
 import { AlfrescoApiService, CoreModule } from 'ng2-alfresco-core';
-import { exampleProcess } from '../assets/activiti-process.model.mock';
+import { exampleProcess } from '../assets/process.model.mock';
 import {
     fakeApp1,
     fakeApp2,
@@ -28,16 +28,16 @@ import {
     fakeFilters,
     fakeProcessDef,
     fakeTaskList
-} from '../assets/activiti-process.service.mock';
+} from '../assets/process.service.mock';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
 import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
-import { ActivitiProcessService } from './activiti-process.service';
+import { ProcessService } from './process.service';
 
 declare let jasmine: any;
-describe('ActivitiProcessService', () => {
+describe('ProcessService', () => {
 
-    let service: ActivitiProcessService;
+    let service: ProcessService;
     let apiService: AlfrescoApiService;
     let alfrescoApi: AlfrescoApi;
 
@@ -47,10 +47,10 @@ describe('ActivitiProcessService', () => {
                 CoreModule.forRoot()
             ],
             providers: [
-                ActivitiProcessService
+                ProcessService
             ]
         });
-        service = TestBed.get(ActivitiProcessService);
+        service = TestBed.get(ProcessService);
         apiService = TestBed.get(AlfrescoApiService);
         alfrescoApi = apiService.getInstance();
     });

ng2-components/ng2-activiti-processlist/src/services/process.service.ts

@@ -21,14 +21,15 @@ import { AppDefinitionRepresentationModel, Comment, TaskDetailsModel, User } fro
 import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
 import { Observable } from 'rxjs/Observable';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
-import { ProcessDefinitionRepresentation, ProcessInstance } from '../models/index';
+import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
 import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
+import { ProcessInstance } from '../models/process-instance.model';
 import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
 
 declare let moment: any;
 
 @Injectable()
-export class ActivitiProcessService {
+export class ProcessService {
 
     constructor(private apiService: AlfrescoApiService,
                 private logService: LogService) {