Fix prefix adf- import (#2657)

* fix prefix adf- import

* missing conf file prefix replacement

* fix demo shell start

demo-shell/.angular-cli.json

@@ -24,23 +24,43 @@
         },
         {
           "glob": "**/*",
-          "input": "../node_modules/core/bundles/assets",
+          "input": "../node_modules/@alfresco/adf-core/bundles/assets",
-          "output": "./assets/"
+          "output": "./core/assets/"
         },
         {
           "glob": "**/*",
-          "input": "../node_modules/insights/bundles/assets",
+          "input": "../node_modules/@alfresco/adf-insights/bundles/assets",
-          "output": "./assets/"
+          "output": "./insights/assets/"
         },
         {
           "glob": "**/*",
-          "input": "../node_modules/process-services/bundles/assets",
+          "input": "../node_modules/@alfresco/adf-process-services/bundles/assets",
-          "output": "./assets/"
+          "output": "./process-services/assets/"
         },
         {
           "glob": "**/*",
-          "input": "../node_modules/content-services/bundles/assets",
+          "input": "../node_modules/@alfresco/adf-content-services/bundles/assets",
-          "output": "./assets/"
+          "output": "./content-services/assets/"
+        },
+        {
+          "glob": "**/*",
+          "input": "../node_modules/@alfresco/adf-core/i18n",
+          "output": "./assets/@alfresco/core/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../node_modules/@alfresco/adf-insights/i18n",
+          "output": "./assets/@alfresco/insights/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../node_modules/@alfresco/adf-process-services/i18n",
+          "output": "./assets/@alfresco/process-services/i18n"
+        },
+        {
+          "glob": "**/*",
+          "input": "../node_modules/@alfresco/adf-content-services/i18n",
+          "output": "./assets/@alfresco/content-services/i18n"
         },
         { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
       ],
@@ -108,22 +128,22 @@
         {
           "glob": "**/*",
           "input": "../../lib/core/i18n",
-          "output": "./assets/@adf/core/i18n"
+          "output": "./@alfresco/core/i18n"
         },
         {
           "glob": "**/*",
           "input": "../../lib/insights/i18n",
-          "output": "./assets/@adf/insights/i18n"
+          "output": "./@alfresco/insights/i18n"
         },
         {
           "glob": "**/*",
           "input": "../../lib/process-services/i18n",
-          "output": "./assets/@adf/process-services/i18n"
+          "output": "./@alfresco/process-services/i18n"
         },
         {
           "glob": "**/*",
           "input": "../../lib/content-services/i18n",
-          "output": "./assets/@adf/content-services/i18n"
+          "output": "./@alfresco/content-services/i18n"
         },
         { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" }
       ],

demo-shell/package.json

@@ -7,7 +7,7 @@
     "ng": "ng",
     "start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --app=0 --open --aot=true",
     "start:dev": "npm run style:dev & npm run clean-lib-angular && npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --app=1 pp-dev --proxy-config proxy.conf.js --open",
-    "start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --prod --app=0",
+    "start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --app=0",
     "build": "npm run server-versions && rimraf dist && ng build  -app=0",
     "build:dev": "npm run style:dev & npm run server-versions && rimraf dist && ng build -app=1",
     "style:dev": "npm run webpack -- --config  config/webpack.style.js --progress --profile --bail --watch",
@@ -72,11 +72,11 @@
     "@angular/platform-browser-dynamic": "5.0.0",
     "@angular/router": "5.0.0",
     "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0",
+    "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0",
-    "@alfresco/adf-content-services": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda",
+    "@alfresco/adf-content-services": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc",
-    "@alfresco/adf-process-services": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda",
+    "@alfresco/adf-process-services": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc",
-    "@alfresco/adf-core": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda",
+    "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc",
-    "@alfresco/adf-insights": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda",
+    "@alfresco/adf-insights": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",
     "core-js": "2.4.1",

demo-shell/src/app/adf.module.ts

@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 
-import { ContentModule } from '@alfresco/content-services';
+import { ContentModule } from '@alfresco/adf-content-services';
-import { ProcessModule } from '@alfresco/process-services';
+import { ProcessModule } from '@alfresco/adf-process-services';
-import { CoreModule } from '@alfresco/core';
+import { CoreModule } from '@alfresco/adf-core';
-import { InsightsModule } from '@alfresco/insights';
+import { InsightsModule } from '@alfresco/adf-insights';
 
 export function modules() {
     return [

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

@@ -17,7 +17,7 @@
 
 import { Component, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SettingsService, PageTitleService, StorageService, TranslationService } from '@alfresco/core';
+import { SettingsService, PageTitleService, StorageService, TranslationService } from '@alfresco/adf-core';
 
 @Component({
   selector: 'app-root',

demo-shell/src/app/app.module.ts

@@ -7,7 +7,7 @@ import { ChartsModule } from 'ng2-charts';
 import { HttpClientModule } from '@angular/common/http';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AppConfigService, TRANSLATION_PROVIDER } from '@alfresco/core';
+import { AppConfigService, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 import { AppComponent } from './app.component';
 import { AdfModule } from './adf.module';
 import { MaterialModule } from './material.module';

demo-shell/src/app/app.routes.ts

@@ -17,7 +17,7 @@
 
 import { ModuleWithProviders } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard, AuthGuardBpm, AuthGuardEcm } from '@alfresco/core';
+import { AuthGuard, AuthGuardBpm, AuthGuardEcm } from '@alfresco/adf-core';
 import { AppLayoutComponent } from './components/app-layout/app-layout.component';
 import { LoginComponent } from './components/login/login.component';
 import { SettingsComponent } from './components/settings/settings.component';
@@ -37,7 +37,7 @@ import { SocialComponent } from './components/social/social.component';
 import { FilesComponent } from './components/files/files.component';
 import { FormComponent } from './components/form/form.component';
 
-import { UploadButtonComponent } from '@alfresco/content-services';
+import { UploadButtonComponent } from '@alfresco/adf-content-services';
 import { FileViewComponent } from './components/file-view/file-view.component';
 import { CustomSourcesComponent } from './components/files/custom-sources.component';
 import { FormListComponent } from './components/form/form-list.component';

demo-shell/src/app/components/about/about.component.ts

@@ -24,7 +24,7 @@ import {
     DiscoveryApiService,
     EcmProductVersionModel,
     ObjectDataTableAdapter
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-about-page',
@@ -123,7 +123,7 @@ export class AboutComponent implements OnInit {
 
     private gitHubLinkCreation(alfrescoPackagesTableRepresentation): void {
         let corePackage = alfrescoPackagesTableRepresentation.find((packageUp) => {
-            return packageUp.name === '@alfresco/core';
+            return packageUp.name === '@alfresco/adf-core';
         });
 
         if (corePackage) {

demo-shell/src/app/components/activiti/activiti-process-attachments.component.ts

@@ -17,8 +17,8 @@
 
 import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
 import { ProcessInstance, ProcessService ,
-    ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/process-services';
+    ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/adf-process-services';
-import { UploadService } from '@alfresco/core';
+import { UploadService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'activiti-process-attachments',

demo-shell/src/app/components/activiti/activiti-task-attachments.component.ts

@@ -16,8 +16,8 @@
  */
 
 import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
-import { ProcessUploadService, TaskListService, TaskAttachmentListComponent } from '@alfresco/process-services';
+import { ProcessUploadService, TaskListService, TaskAttachmentListComponent } from '@alfresco/adf-process-services';
-import { UploadService } from '@alfresco/core';
+import { UploadService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'activiti-task-attachments',

demo-shell/src/app/components/activiti/activiti.component.ts

@@ -31,9 +31,9 @@ import { Pagination, ProcessInstanceFilterRepresentation } from 'alfresco-js-api
 import {
     FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService, FormService,
     DynamicTableRow, ValidateDynamicTableRowEvent
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 
-import { AnalyticsReportListComponent } from '@alfresco/insights';
+import { AnalyticsReportListComponent } from '@alfresco/adf-insights';
 
 import {
     ProcessFiltersComponent,
@@ -41,7 +41,7 @@ import {
     ProcessInstanceDetailsComponent,
     ProcessInstanceListComponent,
     StartProcessInstanceComponent
-} from '@alfresco/process-services';
+} from '@alfresco/adf-process-services';
 import {
     AppsListComponent,
     FilterRepresentationModel,
@@ -50,14 +50,14 @@ import {
     TaskFiltersComponent,
     TaskListComponent,
     TaskListService
-} from '@alfresco/process-services';
+} from '@alfresco/adf-process-services';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
-import { AlfrescoApiService } from '@alfresco/core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import {
     DataSorting,
     ObjectDataRow,
     ObjectDataTableAdapter
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 import { Subscription } from 'rxjs/Rx';
 import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
 import { DemoFieldValidator } from './demo-field-validator';

demo-shell/src/app/components/activiti/apps-view.component.ts

@@ -17,7 +17,7 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { AppDefinitionRepresentationModel } from '@alfresco/process-services';
+import { AppDefinitionRepresentationModel } from '@alfresco/adf-process-services';
 
 @Component({
     selector: 'activiti-apps-view',

demo-shell/src/app/components/activiti/custom-editor/custom-editor.component.ts

@@ -18,7 +18,7 @@
 /* tslint:disable */
 
 import { Component, NgModule } from '@angular/core';
-import { WidgetComponent } from '@alfresco/core';
+import { WidgetComponent } from '@alfresco/adf-core';
 
 @Component({
     selector: 'custom-editor',

demo-shell/src/app/components/activiti/demo-field-validator.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FormFieldModel, FormFieldTypes, FormFieldValidator } from '@alfresco/core';
+import { FormFieldModel, FormFieldTypes, FormFieldValidator } from '@alfresco/adf-core';
 
 export class DemoFieldValidator implements FormFieldValidator {
 

demo-shell/src/app/components/datatable/datatable.component.ts

@@ -16,8 +16,8 @@
  */
 
 import { Component, Input } from '@angular/core';
-import { AlfrescoApiService, LogService } from '@alfresco/core';
+import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
-import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core';
+import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
 
 @Component({

demo-shell/src/app/components/file-view/file-view.component.ts

@@ -17,7 +17,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AlfrescoApiService } from '@alfresco/core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-file-view',

demo-shell/src/app/components/files/custom-sources.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, ViewChild } from '@angular/core';
-import { DocumentListComponent } from '@alfresco/content-services';
+import { DocumentListComponent } from '@alfresco/adf-content-services';
 
 @Component({
     selector: 'adf-custom-sources',

demo-shell/src/app/components/files/files.component.ts

@@ -26,9 +26,9 @@ import {
     AlfrescoApiService, ContentService, TranslationService,
     FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
     SiteModel, UploadService, DataColumn, DataRow
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 
-import { DocumentListComponent, PermissionStyleModel, DownloadZipDialogComponent } from '@alfresco/content-services';
+import { DocumentListComponent, PermissionStyleModel, DownloadZipDialogComponent } from '@alfresco/adf-content-services';
 
 import { VersionManagerDialogAdapterComponent } from './version-manager-dialog-adapter.component';
 import { Subscription } from 'rxjs/Rx';

demo-shell/src/app/components/form/form-list.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, ViewChild } from '@angular/core';
-import { FormComponent, FormModel, FormService, LogService } from '@alfresco/core';
+import { FormComponent, FormModel, FormService, LogService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'form-list',

demo-shell/src/app/components/form/form.component.ts

@@ -16,7 +16,7 @@
 */
 
 import { Component, Inject, OnInit } from '@angular/core';
-import { FormModel, FormService, LogService } from '@alfresco/core';
+import { FormModel, FormService, LogService } from '@alfresco/adf-core';
 import { InMemoryFormService } from '../../services/in-memory-form.service';
 import { DemoForm } from './demo-form';
 

demo-shell/src/app/components/home/home.component.spec.ts

@@ -18,7 +18,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { HomeComponent } from './home.component';
-import { CoreModule } from '@alfresco/core';
+import { CoreModule } from '@alfresco/adf-core';
 
 describe('HomeComponent', () => {
   beforeEach(() => {

demo-shell/src/app/components/login/login.component.ts

@@ -18,7 +18,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Validators } from '@angular/forms';
 import { Router } from '@angular/router';
-import { LogService, StorageService } from '@alfresco/core';
+import { LogService, StorageService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'login',

demo-shell/src/app/components/search/search-bar.component.ts

@@ -18,7 +18,7 @@
 import { Component, EventEmitter, Output, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { MinimalNodeEntity } from 'alfresco-js-api';
-import { AuthenticationService } from '@alfresco/core';
+import { AuthenticationService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-bar',

demo-shell/src/app/components/search/search-result.component.ts

@@ -18,7 +18,7 @@
 import { Component, OnInit, Optional, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute, Params } from '@angular/router';
 import { NodePaging } from 'alfresco-js-api';
-import { SearchComponent } from '@alfresco/content-services';
+import { SearchComponent } from '@alfresco/adf-content-services';
 
 @Component({
     selector: 'adf-search-result-component',

demo-shell/src/app/components/settings/settings.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-settings',

demo-shell/src/app/components/webscript/webscript.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'alfresco-webscript',

demo-shell/src/app/services/debug-app-config.service.ts

@@ -17,7 +17,7 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { AppConfigService, StorageService } from '@alfresco/core';
+import { AppConfigService, StorageService } from '@alfresco/adf-core';
 
 @Injectable()
 export class DebugAppConfigService extends AppConfigService {

demo-shell/src/app/services/in-memory-form.service.ts

@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService } from '@alfresco/core';
+import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
 
 interface ActivitiData {

demo-shell/src/custom-style.scss

@@ -1,9 +1,9 @@
 @import './app/components/app-layout/app-layout.component.scss';
 
-@import 'content-services/styles/index';
+@import '~@alfresco/adf-content-services/styles/index';
-@import 'process-services/styles/index';
+@import '~@alfresco/adf-process-services/styles/index';
-@import 'insights/styles/index';
+@import '~@alfresco/adf-insights/styles/index';
-@import 'core/styles/index';
+@import '~@alfresco/adf-core/styles/index';
 
 @import '~@angular/material/theming';
 

demo-shell/src/tsconfig.dev.json

@@ -17,8 +17,17 @@
       "@angular/*": [
         "../node_modules/@angular/*"
       ],
-      "@alfresco/*": [
+      "@alfresco/adf-core": [
-        "../../lib/*"
+        "../../lib/core"
+      ],
+      "@alfresco/adf-content-services": [
+        "../../lib/content-services"
+      ],
+      "@alfresco/adf-process-services": [
+        "../../lib/process-services"
+      ],
+      "@alfresco/adf-insights": [
+        "../../lib/insights"
       ]
     }
   },

lib/config/karma-test-shim.js

@@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac
 
 const TestBed = require('@angular/core/testing').TestBed;
 const browser = require('@angular/platform-browser-dynamic/testing');
-const CoreModule = require('@alfresco/core').CoreModule;
+const CoreModule = require('@alfresco/adf-core').CoreModule;
-const AppConfigService = require('@alfresco/core').AppConfigService;
+const AppConfigService = require('@alfresco/adf-core').AppConfigService;
-const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock;
+const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock;
-const TranslationService = require('@alfresco/core').TranslationService;
+const TranslationService = require('@alfresco/adf-core').TranslationService;
-const TranslationMock = require('@alfresco/core').TranslationMock;
+const TranslationMock = require('@alfresco/adf-core').TranslationMock;
 const TranslateModule = require('@ngx-translate/core').TranslateModule;
 const CommonModule = require('@angular/common').CommonModule;
 const FormsModule = require('@angular/forms').FormsModule;

lib/config/webpack.common.js

@@ -26,14 +26,14 @@ module.exports = {
 
     resolve: {
         alias: {
-            "@alfresco/content-services": path.resolve(__dirname, '../content-services/'),
+            "@alfresco/adf-content-services": path.resolve(__dirname, '../content-services/'),
-            "@alfresco/content-services$": path.resolve(__dirname, '../content-services/index.ts'),
+            "@alfresco/adf-content-services$": path.resolve(__dirname, '../content-services/index.ts'),
-            "@alfresco/process-services": path.resolve(__dirname, '../process-services/'),
+            "@alfresco/adf-process-services": path.resolve(__dirname, '../process-services/'),
-            "@alfresco/process-services$": path.resolve(__dirname, '../process-services/index.ts'),
+            "@alfresco/adf-process-services$": path.resolve(__dirname, '../process-services/index.ts'),
-            "@alfresco/core": path.resolve(__dirname, '../core/'),
+            "@alfresco/adf-core": path.resolve(__dirname, '../core/'),
-            "@alfresco/core$": path.resolve(__dirname, '../core/index.ts'),
+            "@alfresco/adf-core$": path.resolve(__dirname, '../core/index.ts'),
-            "@alfresco/insights": path.resolve(__dirname, '../insights/'),
+            "@alfresco/adf-insights": path.resolve(__dirname, '../insights/'),
-            "@alfresco/insights": path.resolve(__dirname, '../insights/index.ts')
+            "@alfresco/adf-insights": path.resolve(__dirname, '../insights/index.ts')
         },
         extensions: ['.ts', '.js', '.scss'],
         modules: [helpers.root('node_modules')]

lib/content-services/.npmignore

@@ -0,0 +1,19 @@
+npm-debug.log
+.idea
+.npmrc
+
+coverage/
+demo/
+dist/
+node_modules
+typings/
+fonts/
+
+/.editorconfig
+/.travis.yml
+/*.json
+/karma-test-shim.js
+/karma.conf.js
+/gulpfile.ts
+/.npmignore
+/.happypack

lib/content-services/breadcrumb/breadcrumb.component.spec.ts

@@ -18,7 +18,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { PathElementEntity } from 'alfresco-js-api';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { fakeNodeWithCreatePermission } from '../mock';
 import { MaterialModule } from '../material.module';
 import { DocumentListService, DocumentListComponent } from '../document-list';

lib/content-services/breadcrumb/dropdown-breadcrumb.component.spec.ts

@@ -18,7 +18,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { fakeNodeWithCreatePermission } from '../mock';
 import { MaterialModule } from '../material.module';
 import { DocumentListComponent, DocumentListService } from '../document-list';

lib/content-services/content-node-selector/content-node-selector.component.spec.ts

@@ -20,8 +20,8 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { By } from '@angular/platform-browser';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { ContentService, TranslationService, SearchService, SiteModel, SitesApiService } from '@alfresco/core';
+import { ContentService, TranslationService, SearchService, SiteModel, SitesApiService } from '@alfresco/adf-core';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { MaterialModule } from '../material.module';
 import { EmptyFolderContentDirective, DocumentListComponent, DocumentListService } from '../document-list';

lib/content-services/content-node-selector/content-node-selector.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output, ViewChild, ViewEncapsulation } from '@angular/core';
-import { ContentService, HighlightDirective, SiteModel } from '@alfresco/core';
+import { ContentService, HighlightDirective, SiteModel } from '@alfresco/adf-core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { MinimalNodeEntryEntity, NodePaging, Pagination } from 'alfresco-js-api';
 import { DocumentListComponent, PaginationStrategy  } from '../document-list/components/document-list.component';

lib/content-services/content-node-selector/content-node-selector.module.ts

@@ -24,7 +24,7 @@ import { ContentNodeSelectorComponent } from './content-node-selector.component'
 import { ContentNodeSelectorService } from './content-node-selector.service';
 import { SitesDropdownModule } from '../site-dropdown';
 import { BreadcrumbModule } from '../breadcrumb';
-import { PaginationModule, ToolbarModule } from '@alfresco/core';
+import { PaginationModule, ToolbarModule } from '@alfresco/adf-core';
 import { DocumentListModule } from '../document-list';
 
 @NgModule({

lib/content-services/content-node-selector/content-node-selector.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SearchOptions, SearchService } from '@alfresco/core';
+import { SearchOptions, SearchService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { NodePaging } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Rx';

lib/content-services/content.module.ts

@@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/core';
+import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 
 import { MaterialModule } from './material.module';
 
@@ -62,8 +62,8 @@ import { DirectiveModule } from './directive';
             provide: TRANSLATION_PROVIDER,
             multi: true,
             useValue: {
-                name: '@adf/content-services',
+                name: '@alfresco/content-services',
-                source: 'assets/@adf/content-services'
+                source: '@alfresco/content-services'
             }
         }
     ],

lib/content-services/dialogs/dialog.module.ts

@@ -24,7 +24,7 @@ import { FolderDialogComponent } from './folder.dialog';
 
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
-import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core';
+import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [

lib/content-services/dialogs/download-zip.dialog.ts

@@ -18,7 +18,7 @@
 import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { DownloadEntry, MinimalNodeEntity } from 'alfresco-js-api';
-import { LogService, AlfrescoApiService } from '@alfresco/core';
+import { LogService, AlfrescoApiService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-download-zip-dialog',

lib/content-services/dialogs/folder.dialog.spec.ts

@@ -23,7 +23,7 @@ import { MaterialModule } from '../material.module';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { Observable } from 'rxjs/Rx';
 
-import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core';
+import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core';
 import { FolderDialogComponent } from './folder.dialog';
 
 describe('FolderDialogComponent', () => {

lib/content-services/dialogs/folder.dialog.ts

@@ -22,7 +22,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core';
+import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core';
 
 import { forbidEndingDot, forbidOnlySpaces, forbidSpecialCharacters } from './folder-name.validators';
 

lib/content-services/directive/folder-create.directive.spec.ts

@@ -24,7 +24,7 @@ import { By } from '@angular/platform-browser';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs/Rx';
 
-import { AppConfigService, DirectiveModule, ContentService, TranslateLoaderService } from '@alfresco/core';
+import { AppConfigService, DirectiveModule, ContentService, TranslateLoaderService } from '@alfresco/adf-core';
 import { FolderCreateDirective } from './folder-create.directive';
 
 @Component({

lib/content-services/directive/folder-create.directive.ts

@@ -19,7 +19,7 @@ import { Directive, HostListener, Input } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { FolderDialogComponent } from '../dialogs/folder.dialog';
-import { ContentService } from '@alfresco/core';
+import { ContentService } from '@alfresco/adf-core';
 
 const DEFAULT_FOLDER_PARENT_ID = '-my-';
 

lib/content-services/directive/folder-edit.directive.spec.ts

@@ -25,7 +25,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs/Rx';
 
-import { AppConfigService, ContentService, TranslateLoaderService, DirectiveModule } from '@alfresco/core';
+import { AppConfigService, ContentService, TranslateLoaderService, DirectiveModule } from '@alfresco/adf-core';
 import { FolderEditDirective } from './folder-edit.directive';
 
 @Component({

lib/content-services/directive/folder-edit.directive.ts

@@ -21,7 +21,7 @@ import { MatDialog, MatDialogConfig } from '@angular/material';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 import { FolderDialogComponent } from '../dialogs/folder.dialog';
-import { ContentService } from '@alfresco/core';
+import { ContentService } from '@alfresco/adf-core';
 
 @Directive({
     selector: '[adf-edit-folder]'

lib/content-services/document-list/components/content-action/content-action-list.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../../../material.module';
 import { DocumentListService } from '../../services/document-list.service';
 import { ContentActionModel } from './../../models/content-action.model';

lib/content-services/document-list/components/content-action/content-action.component.spec.ts

@@ -18,8 +18,8 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { ContentService, TranslationService, NotificationService } from '@alfresco/core';
+import { ContentService, TranslationService, NotificationService } from '@alfresco/adf-core';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../../../material.module';
 
 import { DocumentListService } from '../../services/document-list.service';

lib/content-services/document-list/components/content-column/content-column-list.component.spec.ts

@@ -17,10 +17,10 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { DataColumn, DataTableModule } from '@alfresco/core';
+import { DataColumn, DataTableModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../../../material.module';
 
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
 import { DocumentListService } from '../../services/document-list.service';
 import { DocumentListComponent } from './../document-list.component';
 import { ContentColumnListComponent } from './content-column-list.component';

lib/content-services/document-list/components/content-column/content-column-list.component.ts

@@ -17,8 +17,8 @@
 
  /* tslint:disable:component-selector  */
 
-import { DataColumn } from '@alfresco/core';
+import { DataColumn } from '@alfresco/adf-core';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
 import { Component } from '@angular/core';
 
 import { DocumentListComponent } from './../document-list.component';

lib/content-services/document-list/components/content-column/content-column.component.spec.ts

@@ -17,8 +17,8 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../../../material.module';
 import { DocumentListService } from '../../services/document-list.service';
 import { DocumentListComponent } from './../document-list.component';

lib/content-services/document-list/components/content-column/content-column.component.ts

@@ -17,8 +17,8 @@
 
  /* tslint:disable:component-selector  */
 
-import { DataColumn } from '@alfresco/core';
+import { DataColumn } from '@alfresco/adf-core';
-import { LogService } from '@alfresco/core';
+import { LogService } from '@alfresco/adf-core';
 import { AfterContentInit, Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core';
 
 import { ContentColumnListComponent } from './content-column-list.component';

lib/content-services/document-list/components/document-list.component.spec.ts

@@ -18,9 +18,9 @@
 import { CUSTOM_ELEMENTS_SCHEMA, NgZone, SimpleChange, TemplateRef } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Pagination } from 'alfresco-js-api';
-import { AlfrescoApiService, TranslationService, AppConfigService, UserPreferencesService } from '@alfresco/core';
+import { AlfrescoApiService, TranslationService, AppConfigService, UserPreferencesService } from '@alfresco/adf-core';
-import { DataColumn, DataTableComponent } from '@alfresco/core';
+import { DataColumn, DataTableComponent } from '@alfresco/adf-core';
-import { DataTableModule } from '@alfresco/core';
+import { DataTableModule } from '@alfresco/adf-core';
 import { Observable, Subject } from 'rxjs/Rx';
 import { FileNode, FolderNode } from '../../mock';
 import {

lib/content-services/document-list/components/document-list.component.ts

@@ -22,8 +22,8 @@ import {
     DataSorting,
     DataTableComponent,
     ObjectDataColumn
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
-import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from '@alfresco/core';
+import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from '@alfresco/adf-core';
 import {
     AfterContentInit, Component, ContentChild, ElementRef, EventEmitter, HostListener, Input, NgZone,
     OnChanges, OnInit, Output, SimpleChanges, TemplateRef, ViewChild, ViewEncapsulation

lib/content-services/document-list/components/empty-folder/empty-folder-content.directive.spec.ts

@@ -17,7 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
-import { DataTableComponent, DataTableModule } from '@alfresco/core';
+import { DataTableComponent, DataTableModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../../../material.module';
 import { DocumentListService } from '../../services/document-list.service';
 

lib/content-services/document-list/components/no-permission/no-permission-content.directive.spec.ts

@@ -17,7 +17,7 @@
 
 import { async, TestBed } from '@angular/core/testing';
 import { MatProgressSpinnerModule } from '@angular/material';
-import { DataTableComponent, DataTableModule } from '@alfresco/core';
+import { DataTableComponent, DataTableModule } from '@alfresco/adf-core';
 import { DocumentListService } from '../../services/document-list.service';
 import { MaterialModule } from '../../../material.module';
 

lib/content-services/document-list/components/node.event.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { BaseEvent } from '@alfresco/core';
+import { BaseEvent } from '@alfresco/adf-core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api';
 
 export class NodeEntityEvent extends BaseEvent<MinimalNodeEntity> {

lib/content-services/document-list/data/image-resolver.model.ts

@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 
-import { DataColumn, DataRow } from '@alfresco/core';
+import { DataColumn, DataRow } from '@alfresco/adf-core';
 
 export type ImageResolver = (row: DataRow, column: DataColumn) => string;

lib/content-services/document-list/data/share-data-row.model.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { DataRow } from '@alfresco/core';
+import { DataRow } from '@alfresco/adf-core';
-import { ObjectUtils } from '@alfresco/core';
+import { ObjectUtils } from '@alfresco/adf-core';
 import { MinimalNode, MinimalNodeEntity } from 'alfresco-js-api';
 import { PermissionStyleModel } from './../models/permissions-style.model';
 import { DocumentListService } from './../services/document-list.service';

lib/content-services/document-list/data/share-datatable-adapter.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { DataColumn, DataRow, DataSorting } from '@alfresco/core';
+import { DataColumn, DataRow, DataSorting } from '@alfresco/adf-core';
 import { FileNode, FolderNode } from './../../mock';
 import { DocumentListService } from './../services/document-list.service';
 import { ShareDataRow } from './share-data-row.model';

lib/content-services/document-list/data/share-datatable-adapter.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { DataColumn, DataRow, DataSorting, DataTableAdapter } from '@alfresco/core';
+import { DataColumn, DataRow, DataSorting, DataTableAdapter } from '@alfresco/adf-core';
-import { TimeAgoPipe } from '@alfresco/core';
+import { TimeAgoPipe } from '@alfresco/adf-core';
 import { DatePipe } from '@angular/common';
 import { NodePaging } from 'alfresco-js-api';
 import { PermissionStyleModel } from './../models/permissions-style.model';

lib/content-services/document-list/document-list.module.ts

@@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { TranslateModule } from '@ngx-translate/core';
-import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/core';
+import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/adf-core';
 
 import { MaterialModule } from '../material.module';
 import { UploadModule } from '../upload';

lib/content-services/document-list/models/permissions-style.model.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { PermissionsEnum } from '@alfresco/core';
+import { PermissionsEnum } from '@alfresco/adf-core';
 
 export class PermissionStyleModel {
     css: string;

lib/content-services/document-list/services/document-actions.service.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ContentService, TranslationService, NotificationService } from '@alfresco/core';
+import { ContentService, TranslationService, NotificationService } from '@alfresco/adf-core';
 import { FileNode, FolderNode, DocumentListServiceMock } from '../../mock';
 import { ContentActionHandler } from '../models/content-action.model';
 import { DocumentActionsService } from './document-actions.service';

lib/content-services/document-list/services/document-actions.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ContentService } from '@alfresco/core';
+import { ContentService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { Observable } from 'rxjs/Observable';

lib/content-services/document-list/services/document-list.service.spec.ts

@@ -16,8 +16,8 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { CookieService, LogService } from '@alfresco/core';
+import { CookieService, LogService } from '@alfresco/adf-core';
-import { CookieServiceMock } from '@alfresco/core';
+import { CookieServiceMock } from '@alfresco/adf-core';
 import { DocumentListService } from './document-list.service';
 
 declare let jasmine: any;

lib/content-services/document-list/services/document-list.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, AuthenticationService, ContentService, LogService, PermissionsEnum, ThumbnailService } from '@alfresco/core';
+import { AlfrescoApiService, AuthenticationService, ContentService, LogService, PermissionsEnum, ThumbnailService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api';

lib/content-services/document-list/services/folder-actions.service.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { TranslationService, AppConfigService, NotificationService } from '@alfresco/core';
+import { TranslationService, AppConfigService, NotificationService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { FileNode, FolderNode } from '../../mock';
 import { ContentActionHandler } from '../models/content-action.model';

lib/content-services/document-list/services/folder-actions.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ContentService } from '@alfresco/core';
+import { ContentService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';
 import { Observable, Subject } from 'rxjs/Rx';

lib/content-services/document-list/services/node-actions.service.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { DataColumn } from '@alfresco/core';
+import { DataColumn } from '@alfresco/adf-core';
-import { ContentService } from '@alfresco/core';
+import { ContentService } from '@alfresco/adf-core';
 import { EventEmitter, Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';

lib/content-services/karma-test-shim.js

@@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac
 
 const TestBed = require('@angular/core/testing').TestBed;
 const browser = require('@angular/platform-browser-dynamic/testing');
-const CoreModule = require('@alfresco/core').CoreModule;
+const CoreModule = require('@alfresco/adf-core').CoreModule;
-const AppConfigService = require('@alfresco/core').AppConfigService;
+const AppConfigService = require('@alfresco/adf-core').AppConfigService;
-const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock;
+const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock;
-const TranslationService = require('@alfresco/core').TranslationService;
+const TranslationService = require('@alfresco/adf-core').TranslationService;
-const TranslationMock = require('@alfresco/core').TranslationMock;
+const TranslationMock = require('@alfresco/adf-core').TranslationMock;
 
 TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
 

lib/content-services/mock/document-list.service.mock.ts

@@ -22,7 +22,7 @@ import {
     SettingsService,
     LogService,
     ThumbnailService
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { NodePaging, DocumentListService } from '../document-list';
 import { PageNode } from './document-library.model.mock';

lib/content-services/package.json

@@ -26,8 +26,8 @@
     "@angular/platform-browser-dynamic": "5.0.0",
     "@angular/router": "5.0.0",
     "@ngx-translate/core": "8.0.0",
-    "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0",
+    "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0",
-    "@alfresco/adf-core":"v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda",
+    "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc",
     "chart.js": "2.5.0",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",

lib/content-services/search/components/search-control.component.spec.ts

@@ -19,8 +19,8 @@ import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '../../material.module';
 import { By } from '@angular/platform-browser';
-import { AuthenticationService, SearchService } from '@alfresco/core';
+import { AuthenticationService, SearchService } from '@alfresco/adf-core';
-import { ThumbnailService } from '@alfresco/core';
+import { ThumbnailService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Observable';
 import { noResult, results } from '../../mock';
 import { SearchControlComponent } from './search-control.component';

lib/content-services/search/components/search-control.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AuthenticationService, ThumbnailService } from '@alfresco/core';
+import { AuthenticationService, ThumbnailService } from '@alfresco/adf-core';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { MinimalNodeEntity } from 'alfresco-js-api';

lib/content-services/search/components/search.component.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SearchService } from '@alfresco/core';
+import { SearchService } from '@alfresco/adf-core';
 import { SearchModule } from '../../index';
 import { differentResult, result, SimpleSearchTestComponent } from '../../mock';
 

lib/content-services/search/components/search.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SearchOptions, SearchService } from '@alfresco/core';
+import { SearchOptions, SearchService } from '@alfresco/adf-core';
 import {
     AfterContentInit,
     ChangeDetectionStrategy,

lib/content-services/search/search.module.ts

@@ -21,7 +21,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 
-import { PipeModule, SearchService } from '@alfresco/core';
+import { PipeModule, SearchService } from '@alfresco/adf-core';
 
 import { SearchTriggerDirective } from './components/search-trigger.directive';
 

lib/content-services/site-dropdown/sites-dropdown.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SiteModel, SitesApiService } from '@alfresco/core';
+import { SiteModel, SitesApiService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
 @Component({

lib/content-services/social/services/rating.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService } from '@alfresco/core';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
 import { Response } from '@angular/http';
 import { RatingBody } from 'alfresco-js-api';

lib/content-services/tag/services/tag.service.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { async, TestBed } from '@angular/core/testing';
-import { AppConfigService, CoreModule } from '@alfresco/core';
+import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { TagService } from './tag.service';
 
 declare let jasmine: any;

lib/content-services/tag/services/tag.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AlfrescoApiService, LogService } from '@alfresco/core';
+import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { EventEmitter, Injectable, Output } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 

lib/content-services/tag/tag-actions.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AppConfigService, CoreModule } from '@alfresco/core';
+import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { TagActionsComponent } from './tag-actions.component';
 import { TagService } from './services/tag.service';
 import { MaterialModule } from '../material.module';

lib/content-services/tag/tag-actions.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { TranslationService } from '@alfresco/core';
+import { TranslationService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core';
 import { TagService } from './services/tag.service';
 

lib/content-services/tag/tag-list.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AppConfigService, CoreModule } from '@alfresco/core';
+import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { TagService } from './services/tag.service';
 import { TagListComponent } from '././tag-list.component';
 import { MaterialModule } from '../material.module';

lib/content-services/tag/tag-node-list.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AppConfigService, CoreModule } from '@alfresco/core';
+import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { TagNodeListComponent } from './tag-node-list.component';
 import { TagService } from './services/tag.service';
 import { MaterialModule } from '../material.module';

lib/content-services/tsconfig.json

@@ -19,9 +19,9 @@
     "outDir": "./dist",
     "baseUrl" :  "./",
     "paths": {
-      "@alfresco/process-services": ["../process-services"],
+      "@alfresco/adf-process-services": ["../process-services"],
-      "@alfresco/content-services": ["../content-services"],
+      "@alfresco/adf-content-services": ["../content-services"],
-      "@alfresco/core": ["../core"],
+      "@alfresco/adf-core": ["../core"],
       "@angular/*": ["../node_modules/@angular/*"]
     },
     "lib": [

lib/content-services/upload/components/file-uploading-dialog.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { EventEmitter } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FileModel, FileUploadCompleteEvent, FileUploadErrorEvent, UploadService } from '@alfresco/core';
+import { FileModel, FileUploadCompleteEvent, FileUploadErrorEvent, UploadService } from '@alfresco/adf-core';
 import { UploadModule } from '../upload.module';
 import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
 

lib/content-services/upload/components/file-uploading-dialog.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { FileModel, FileUploadCompleteEvent, FileUploadDeleteEvent,
-         FileUploadErrorEvent, FileUploadStatus, UploadService } from '@alfresco/core';
+         FileUploadErrorEvent, FileUploadStatus, UploadService } from '@alfresco/adf-core';
 import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { Observable, Subscription } from 'rxjs/Rx';
 import { FileUploadingListComponent } from './file-uploading-list.component';

lib/content-services/upload/components/file-uploading-list-row.component.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FileModel } from '@alfresco/core';
+import { FileModel } from '@alfresco/adf-core';
 import { UploadModule } from '../upload.module';
 import { FileUploadingListRowComponent } from './file-uploading-list-row.component';
 

lib/content-services/upload/components/file-uploading-list-row.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FileModel, FileUploadStatus } from '@alfresco/core';
+import { FileModel, FileUploadStatus } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 
 @Component({

lib/content-services/upload/components/file-uploading-list.component.spec.ts

@@ -16,7 +16,7 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslationService, FileUploadStatus, NodesApiService, NotificationService, UploadService } from '@alfresco/core';
+import { TranslationService, FileUploadStatus, NodesApiService, NotificationService, UploadService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { UploadModule } from '../upload.module';
 import { FileUploadingListComponent } from './file-uploading-list.component';

lib/content-services/upload/components/file-uploading-list.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FileModel, FileUploadStatus, NodesApiService, NotificationService, TranslationService, UploadService } from '@alfresco/core';
+import { FileModel, FileUploadStatus, NodesApiService, NotificationService, TranslationService, UploadService } from '@alfresco/adf-core';
 import { Component, ContentChild, Input, TemplateRef } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 

lib/content-services/upload/components/upload-button.component.spec.ts

@@ -18,10 +18,10 @@
 import { DebugElement, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '../../material.module';
-import { ContentService, UploadService, TranslationService } from '@alfresco/core';
+import { ContentService, UploadService, TranslationService } from '@alfresco/adf-core';
 import { Observable } from 'rxjs/Rx';
 import { UploadButtonComponent } from './upload-button.component';
-import { TranslationMock } from '@alfresco/core';
+import { TranslationMock } from '@alfresco/adf-core';
 
 describe('UploadButtonComponent', () => {
 

lib/content-services/upload/components/upload-button.component.ts

@@ -25,7 +25,7 @@ import {
     NotificationService,
     TranslationService,
     UploadService
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 import {
     Component,
     EventEmitter,

lib/content-services/upload/components/upload-drag-area.component.spec.ts

@@ -17,7 +17,7 @@
 
 import { DebugElement } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FileModel, LogService, UploadService } from '@alfresco/core';
+import { FileModel, LogService, UploadService } from '@alfresco/adf-core';
 
 import { FileDraggableDirective } from '../directives/file-draggable.directive';
 import { UploadDragAreaComponent } from './upload-drag-area.component';

lib/content-services/upload/components/upload-drag-area.component.ts

@@ -24,7 +24,7 @@ import {
     NotificationService,
     TranslationService,
     UploadService
-} from '@alfresco/core';
+} from '@alfresco/adf-core';
 import { Component, EventEmitter, forwardRef, Input, Output, ViewEncapsulation } from '@angular/core';
 
 @Component({

lib/content-services/upload/directives/file-draggable.directive.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FileUtils } from '@alfresco/core';
+import { FileUtils } from '@alfresco/adf-core';
 import { Directive, ElementRef, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core';
 
 @Directive({

lib/content-services/upload/upload.module.ts

@@ -26,7 +26,7 @@ import { FileUploadingListComponent } from './components/file-uploading-list.com
 import { UploadButtonComponent } from './components/upload-button.component';
 import { UploadDragAreaComponent } from './components/upload-drag-area.component';
 
-import { PipeModule } from '@alfresco/core';
+import { PipeModule } from '@alfresco/adf-core';
 import { FileDraggableDirective } from './directives/file-draggable.directive';
 
 @NgModule({