GUI2 Change gui2-fw-lib refs to abs paths

Change-Id: Iddc121c70ddf9fa69c8d9f99e9768de6c2143eab

apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts

@@ -23,7 +23,7 @@ import {
     LogService,
     WebSocketService,
     IconComponent
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { DebugElement } from '@angular/core';

apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts

@@ -21,7 +21,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * ONOS GUI -- Alarm Details Component extends TableBaseImpl

apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts

@@ -25,7 +25,7 @@ import {
     IconComponent,
     LogService,
     TableFilterPipe, LoadingComponent,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { of } from 'rxjs';
 import { } from 'jasmine';

apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts

@@ -20,7 +20,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * Model of the response from the WebSocket

apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts

@@ -19,7 +19,7 @@ import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 import {
   Gui2FwLibModule,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {AlarmTableComponent} from './alarmtable/alarmtable.component';
 import {AlarmDetailsComponent} from './alarmdetails/alarmdetails.component';
 

apps/roadm/web/roadm-gui/lib/port/port.component.ts

@@ -21,7 +21,7 @@ import {
     WebSocketService,
     IconService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 import {FormGroup, FormControl} from '@angular/forms';
 

apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts

@@ -17,7 +17,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import {RouterModule} from '@angular/router';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { RoadmDeviceComponent } from './roadm/roadm.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RoadmPortComponent } from './port/port.component';

apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts

@@ -25,7 +25,7 @@ import {
     IconService,
     LogService,
     Gui2FwLibModule,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {FormsModule} from '@angular/forms';
 import {RouterTestingModule} from '@angular/router/testing';

apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts

@@ -20,7 +20,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { ActivatedRoute, Router } from '@angular/router';
 

apps/yang-gui/yang-gui2-lib/lib/yang-gui2-lib.module.ts

@@ -20,7 +20,7 @@ import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 import {
     Gui2FwLibModule,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {YangTableComponent} from "./yangtable/yangtable.component";
 import {YangDetailsComponent} from "./yangdetails/yangdetails.component";
 

apps/yang-gui/yang-gui2-lib/lib/yangdetails/yangdetails.component.ts

@@ -29,7 +29,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 @Component({
     selector: 'onos-yangdetails',

apps/yang-gui/yang-gui2-lib/lib/yangtable/yangtable.component.ts

@@ -15,7 +15,7 @@
  */
 
 import {Component, OnInit, OnDestroy, Inject} from '@angular/core';
-import {WebSocketService, LogService, FnService, SortDir, TableBaseImpl} from 'gui2-fw-lib/public_api';
+import {WebSocketService, LogService, FnService, SortDir, TableBaseImpl} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { HttpClient } from '@angular/common/http';
 
 /**

web/gui2-fw-lib/BUILD.bazel

@@ -40,11 +40,10 @@ ng_module(
         ],
     ),
     assets = glob([
-        "src/lib/**/*.css",
-        "src/lib/**/*.html",
+        "lib/**/*.css",
+        "lib/**/*.html",
     ]),
-    entry_point = ":src/public_api.ts",
-    module_name = "gui2-fw-lib",
+    entry_point = ":public_api.ts",
     tsconfig = "//web/gui2:tsconfig.json",
     deps = [
         "@npm//@angular/animations",
@@ -106,7 +105,7 @@ karma_web_test(
     ],
 )
 
-# bazel run //web/gui2-fw-lib:gui2-fw-lib-pkg.pack to create a tgz
+# bazel run //web/gui2-fw-lib:npm_package.pack to create a tgz
 ng_package(
     name = "npm_package",
     srcs = ["package.json"],
@@ -114,8 +113,7 @@ ng_package(
         "**/*.css",
         "**/*.html",
     ]),
-    entry_point = ":index.ts",
-    entry_point_name = "gui2-fw-lib",
+    entry_point = ":public_api.ts",
     include_devmode_srcs = False,
     readme_md = ":README.md",
     deps = [

web/gui2-fw-lib/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020-present Open Networking Foundation
+ *
+ * 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 './public_api';

web/gui2-topo-lib/lib/gui2-topo-lib.module.ts

@@ -22,7 +22,7 @@ import { InstanceComponent } from './panel/instance/instance.component';
 import { SummaryComponent } from './panel/summary/summary.component';
 import { ToolbarComponent } from './panel/toolbar/toolbar.component';
 import { DetailsComponent } from './panel/details/details.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { BackgroundSvgComponent } from './layer/backgroundsvg/backgroundsvg.component';
 import { ForceSvgComponent } from './layer/forcesvg/forcesvg.component';
 import { MapSvgComponent } from './layer/mapsvg/mapsvg.component';

web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts

@@ -19,7 +19,7 @@ import { BackgroundSvgComponent } from './backgroundsvg.component';
 import {MapSvgComponent, TopoData} from '../mapsvg/mapsvg.component';
 import {from} from 'rxjs';
 import {HttpClient} from '@angular/common/http';
-import {LocMeta, LogService, ZoomUtils} from 'gui2-fw-lib/public_api';
+import {LocMeta, LogService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {MapObject} from '../maputils';
 import {ForceSvgComponent} from '../forcesvg/forcesvg.component';
 

web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.ts

@@ -15,7 +15,7 @@
  */
 import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {MapObject} from '../maputils';
-import {MapBounds, TopoZoomPrefs, LogService, ZoomUtils} from 'gui2-fw-lib/public_api';
+import {MapBounds, TopoZoomPrefs, LogService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * model of the topo2CurrentLayout attrs from BgZoom below

web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.spec.ts

@@ -16,7 +16,7 @@
 import { DraggableDirective } from './draggable.directive';
 import {inject, TestBed} from '@angular/core/testing';
 import {ElementRef} from '@angular/core';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 export class MockElementRef extends ElementRef {
     nativeElement = {};

web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.ts

@@ -22,7 +22,7 @@ import {
 } from '@angular/core';
 import {ForceDirectedGraph, Node} from '../models';
 import * as d3 from 'd3';
-import {LogService, MetaUi, ZoomUtils} from 'gui2-fw-lib/public_api';
+import {LogService, MetaUi, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {BackgroundSvgComponent} from '../../backgroundsvg/backgroundsvg.component';
 
 @Directive({

web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.spec.ts

@@ -22,7 +22,7 @@ import {
     LogService, SvgUtilService,
     UrlFnService,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {DraggableDirective} from './draggable/draggable.directive';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';

web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.ts

@@ -28,7 +28,7 @@ import {
     SimpleChanges,
     ViewChildren
 } from '@angular/core';
-import {LocMeta, LogService, MetaUi, WebSocketService, ZoomUtils} from 'gui2-fw-lib/public_api';
+import {LocMeta, LogService, MetaUi, WebSocketService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {
     Badge,
     Device, DeviceHighlight,

web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.spec.ts

@@ -16,7 +16,7 @@
 import {ForceDirectedGraph, Options} from './force-directed-graph';
 import {Node} from './node';
 import {Link} from './link';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {TestBed} from '@angular/core/testing';
 
 export class TestNode extends Node {

web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.ts

@@ -17,7 +17,7 @@ import { EventEmitter } from '@angular/core';
 import { Link } from './link';
 import { Node } from './node';
 import * as d3 from 'd3-force';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 const FORCES = {
     COLLISION: 1,

web/gui2-topo-lib/lib/layer/forcesvg/models/node.ts

@@ -16,7 +16,7 @@
 import * as d3 from 'd3';
 import {LocationType} from '../../backgroundsvg/backgroundsvg.component';
 import {LayerType, Location, NodeType, RegionProps} from './regions';
-import {LocMeta, MetaUi, ZoomUtils} from 'gui2-fw-lib/public_api';
+import {LocMeta, MetaUi, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 export interface UiElement {
     index?: number;

web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.spec.ts

@@ -16,7 +16,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DeviceNodeSvgComponent } from './devicenodesvg.component';
-import {FnService, IconService, LogService, SvgUtilService} from 'gui2-fw-lib/public_api';
+import {FnService, IconService, LogService, SvgUtilService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
 import {ChangeDetectorRef} from '@angular/core';

web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts

@@ -27,7 +27,7 @@ import {
     Device,
     LabelToggle,
 } from '../../models';
-import {IconService, LogService, SvgUtilService} from 'gui2-fw-lib/public_api';
+import {IconService, LogService, SvgUtilService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {NodeVisual, SelectedEvent} from '../nodevisual';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {TopologyService} from '../../../../topology.service';

web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.spec.ts

@@ -18,7 +18,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {HostNodeSvgComponent} from './hostnodesvg.component';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {Host, HostLabelToggle} from '../../models';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {ChangeDetectorRef} from '@angular/core';

web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.ts

@@ -22,7 +22,7 @@ import {
     SimpleChanges
 } from '@angular/core';
 import {Badge, Host, HostLabelToggle, Node} from '../../models';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {NodeVisual, SelectedEvent} from '../nodevisual';
 
 /**

web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.spec.ts

@@ -16,7 +16,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LinkSvgComponent } from './linksvg.component';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
 import {Device, Link, RegionLink, LinkType} from '../../models';

web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts

@@ -19,7 +19,7 @@ import {
     Input, OnChanges, Output, SimpleChanges,
 } from '@angular/core';
 import {Link, LinkHighlight, UiElement} from '../../models';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {NodeVisual, SelectedEvent} from '../nodevisual';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 

web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.spec.ts

@@ -18,7 +18,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MapSvgComponent } from './mapsvg.component';
 import {HttpClient} from '@angular/common/http';
 import {from} from 'rxjs';
-import {LogService} from 'gui2-fw-lib/public_api';
+import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockHttpClient {
     get() {

web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.ts

@@ -20,7 +20,7 @@ import {
     SimpleChanges
 } from '@angular/core';
 import { MapObject } from '../maputils';
-import {LogService, MapBounds} from 'gui2-fw-lib/public_api';
+import {LogService, MapBounds} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {HttpClient} from '@angular/common/http';
 import * as d3 from 'd3';
 import * as topojson from 'topojson-client';

web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts

@@ -27,7 +27,7 @@ import {
     TableFilterPipe,
     IconComponent,
     WebSocketService, SvgUtilService, PrefsService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { of } from 'rxjs';
 
 class MockActivatedRoute extends ActivatedRoute {

web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.ts

@@ -27,7 +27,7 @@ import {
     LogService,
     PrefsService,
     SvgUtilService, LionService, ZoomUtils, TopoZoomPrefs
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * ONOS GUI -- Topology No Connected Devices View.

web/gui2-topo-lib/lib/layer/viewcontroller.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FnService, LogService, PrefsService } from 'gui2-fw-lib/public_api';
+import { FnService, LogService, PrefsService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 export interface ViewControllerPrefs {
     visible: string;

web/gui2-topo-lib/lib/layout.service.spec.ts

@@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing';
 import { LayoutService } from './layout.service';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
-import {FnService, LogService} from 'gui2-fw-lib/public_api';
+import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2-topo-lib/lib/layout.service.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Injectable } from '@angular/core';
-import {LogService, WebSocketService} from 'gui2-fw-lib/public_api';
+import {LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 export enum LayoutType {
     LAYOUT_DEFAULT = 'default',

web/gui2-topo-lib/lib/panel/details/details.component.spec.ts

@@ -22,7 +22,7 @@ import { DetailsComponent } from './details.component';
 import {
     FnService, LionService,
     LogService, IconComponent
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {RouterTestingModule} from '@angular/router/testing';
 
 class MockActivatedRoute extends ActivatedRoute {

web/gui2-topo-lib/lib/panel/details/details.component.ts

@@ -15,7 +15,7 @@
  */
 import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core';
 import {animate, state, style, transition, trigger} from '@angular/animations';
-import {DetailsPanelBaseImpl, FnService, LionService, LogService, WebSocketService} from 'gui2-fw-lib/public_api';
+import {DetailsPanelBaseImpl, FnService, LionService, LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {Host, Link, LinkType, NodeType, UiElement} from '../../layer/forcesvg/models';
 import {Params, Router} from '@angular/router';
 

web/gui2-topo-lib/lib/panel/instance/instance.component.spec.ts

@@ -22,7 +22,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
     FnService,
     LogService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2-topo-lib/lib/panel/instance/instance.component.ts

@@ -26,7 +26,7 @@ import {
     PanelBaseImpl,
     IconService,
     SvgUtilService, LionService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * A model of instance information that drives each panel

web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.spec.ts

@@ -19,7 +19,7 @@ import { MapSelectorComponent } from './mapselector.component';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
-import {FnService, LogService} from 'gui2-fw-lib/public_api';
+import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.ts

@@ -10,7 +10,7 @@ import {
     LionService,
     LogService,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {FormControl, FormGroup} from '@angular/forms';
 import { MapObject } from '../../layer/maputils';
 

web/gui2-topo-lib/lib/panel/summary/summary.component.spec.ts

@@ -22,7 +22,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
     FnService,
     LogService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2-topo-lib/lib/panel/summary/summary.component.ts

@@ -28,7 +28,7 @@ import {
     FnService,
     WebSocketService,
     GlyphService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 export interface SummaryResponse {
     title: string;

web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.spec.ts

@@ -21,7 +21,7 @@ import { ToolbarComponent } from './toolbar.component';
 import {
     FnService, LionService,
     LogService, IconComponent
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
 class MockActivatedRoute extends ActivatedRoute {

web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.ts

@@ -18,7 +18,7 @@ import {
     LogService,
     FnService,
     PanelBaseImpl, LionService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import {animate, state, style, transition, trigger} from '@angular/animations';
 

web/gui2-topo-lib/lib/panel/topopanel.base.ts

@@ -17,7 +17,7 @@ import {
     FnService,
     LogService,
     PanelBaseImpl
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * Base model of panel view - implemented by Topology Panel components

web/gui2-topo-lib/lib/topology.service.spec.ts

@@ -21,7 +21,7 @@ import { TopologyService } from './topology.service';
 import {
     LogService,
     FnService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2-topo-lib/lib/topology.service.ts

@@ -16,7 +16,7 @@
 import {Injectable, SimpleChange} from '@angular/core';
 import {
     LogService, WebSocketService,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {Instance, InstanceComponent} from './panel/instance/instance.component';
 import { BackgroundSvgComponent } from './layer/backgroundsvg/backgroundsvg.component';
 import { ForceSvgComponent } from './layer/forcesvg/forcesvg.component';

web/gui2-topo-lib/lib/topology/topology.component.spec.ts

@@ -35,7 +35,7 @@ import {
     FnService,
     LogService,
     IconService, IconComponent, PrefsService, KeysService, LionService, ZoomableDirective
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {RouterTestingModule} from '@angular/router/testing';
 import {TrafficService} from '../traffic.service';
 import {ForceSvgComponent} from '../layer/forcesvg/forcesvg.component';

web/gui2-topo-lib/lib/topology/topology.component.ts

@@ -33,7 +33,7 @@ import {
     TopoZoomPrefs,
     WebSocketService,
     ZoomUtils
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {InstanceComponent} from '../panel/instance/instance.component';
 import {DetailsComponent} from '../panel/details/details.component';
 import {BackgroundSvgComponent} from '../layer/backgroundsvg/backgroundsvg.component';
@@ -67,7 +67,7 @@ import {
     ALARMS_TOGGLE
 } from '../panel/toolbar/toolbar.component';
 import {TrafficService, TrafficType} from '../traffic.service';
-import {ZoomableDirective} from 'gui2-fw-lib/public_api';
+import {ZoomableDirective} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {MapObject} from '../layer/maputils';
 import {LayoutService, LayoutType} from '../layout.service';
 import {SelectedEvent} from '../layer/forcesvg/visuals/nodevisual';

web/gui2-topo-lib/lib/traffic.service.spec.ts

@@ -16,7 +16,7 @@
 import { TestBed } from '@angular/core/testing';
 
 import { TrafficService } from './traffic.service';
-import {FnService, LogService} from 'gui2-fw-lib/public_api';
+import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {ActivatedRoute, Params} from '@angular/router';
 import {of} from 'rxjs';
 

web/gui2-topo-lib/lib/traffic.service.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Injectable } from '@angular/core';
-import {LogService, WebSocketService} from 'gui2-fw-lib/public_api';
+import {LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {ForceSvgComponent} from './layer/forcesvg/forcesvg.component';
 
 export namespace TrafficType {

web/gui2/BUILD

@@ -42,9 +42,10 @@ TEST_DEPS = TEST + [
 # This export allows targets in other packages to reference files that live
 # in this package.
 # TODO Try to move this in to /web/gui2-fw-lib when possible
-exports_files([
-    "tsconfig.json",
-])
+exports_files(
+    ["tsconfig.json"],
+    visibility = ["//visibility:public"],
+)
 
 ts_config(
     name = "tsconfig-test",

web/gui2/package.json

@@ -51,7 +51,6 @@
     "rollup": "^1.21.4",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-sourcemaps": "~0.5.0",
     "terser": "4.3.1",
     "typescript": "3.8.3"
   }

web/gui2/src/main/webapp/app/nav/nav.component.spec.ts

@@ -28,7 +28,7 @@ import {
     IconService,
     LionService,
     LogService,
-    NavService } from 'gui2-fw-lib/public_api';
+    NavService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { NavComponent } from './nav.component';
 
 class MockActivatedRoute extends ActivatedRoute {

web/gui2/src/main/webapp/app/nav/nav.component.ts

@@ -20,7 +20,7 @@ import {
     LionService,
     LogService,
     NavService,
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * ONOS GUI -- Navigation Module

web/gui2/src/main/webapp/app/onos.component.spec.ts

@@ -40,7 +40,7 @@ import {
     ThemeService,
     WebSocketService,
     WsOptions
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 class MockActivatedRoute extends ActivatedRoute {
     constructor(params: Params) {

web/gui2/src/main/webapp/app/onos.component.ts

@@ -30,7 +30,7 @@ import {
     WebSocketService,
     WsOptions,
     KeysService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { OnosService, View } from './onos.service';
 
 // secret sauce

web/gui2/src/main/webapp/app/onos.module.ts

@@ -25,7 +25,7 @@ import {
     Gui2FwLibModule,
     ConsoleLoggerService,
     LogService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { OnosService } from './onos.service';
 
 /**

web/gui2/src/main/webapp/app/onos.service.spec.ts

@@ -15,7 +15,7 @@
  */
 import { TestBed, inject } from '@angular/core/testing';
 
-import { LogService, ConsoleLoggerService } from 'gui2-fw-lib/public_api';
+import { LogService, ConsoleLoggerService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { OnosService } from './onos.service';
 
 /**

web/gui2/src/main/webapp/app/onos.service.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import {Inject, Injectable} from '@angular/core';
-import { LogService } from 'gui2-fw-lib/public_api';
+import { LogService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * A structure of View elements for the OnosService

web/gui2/src/main/webapp/app/view/apps/apps.module.ts

@@ -19,7 +19,7 @@ import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { AppsComponent } from './apps/apps.component';
 import { AppsDetailsComponent } from './appsdetails/appsdetails.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * ONOS GUI -- Apps View Module

web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts

@@ -24,7 +24,7 @@ import {
     TableBaseImpl, TableResponse, SortDir,
     UrlFnService,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 const INSTALLED = 'INSTALLED';
 const ACTIVE = 'ACTIVE';

web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.ts

@@ -21,7 +21,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { App, APPURLPREFIX, ICONURLSUFFIX } from '../apps/apps.component';
 

web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts

@@ -23,7 +23,7 @@ import {
     LionService,
     PanelService,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import * as d3 from 'd3';
 import {HostListener} from '@angular/core';
 

web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts

@@ -15,7 +15,7 @@
  */
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ClusterComponent } from './cluster/cluster.component';
 import { ClusterDetailsDirective } from './cluster-details.directive';
 import {RouterModule} from '@angular/router';

web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts

@@ -20,7 +20,7 @@ import {
     WebSocketService,
     LionService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * Model of the response from WebSocket

web/gui2/src/main/webapp/app/view/device/device.module.ts

@@ -17,7 +17,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { DeviceComponent } from './device/device.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { FormsModule } from '@angular/forms';
 import { DeviceDetailsComponent } from './devicedetails/devicedetails.component';
 

web/gui2/src/main/webapp/app/view/device/device/device.component.ts

@@ -20,7 +20,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { ActivatedRoute, Router } from '@angular/router';
 

web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.ts

@@ -21,7 +21,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * The details view when a device row is clicked from the Device view

web/gui2/src/main/webapp/app/view/flow/flow.module.ts

@@ -16,7 +16,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FlowComponent } from './flow/flow.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { FormsModule } from '@angular/forms';
 import { FlowDetailsComponent } from './flowdetails/flowdetails/flowdetails.component';
 import {RouterModule} from '@angular/router';

web/gui2/src/main/webapp/app/view/flow/flow/flow.component.ts

@@ -21,7 +21,7 @@ import {
     WebSocketService,
     LionService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.ts

@@ -20,7 +20,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 
 /**

web/gui2/src/main/webapp/app/view/group/group.module.ts

@@ -16,7 +16,7 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {GroupComponent} from './group/group.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 

web/gui2/src/main/webapp/app/view/group/group/group.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/host/host.module.ts

@@ -17,7 +17,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { HostComponent } from './host/host.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { HostDetailsComponent } from './hostdetails/hostdetails.component';
 import {RouterModule} from '@angular/router';
 

web/gui2/src/main/webapp/app/view/host/host/host.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 interface HostTableResponse extends TableResponse {
     hosts: Host[];

web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.ts

@@ -21,7 +21,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * The details view when a host row is clicked from the Host view

web/gui2/src/main/webapp/app/view/intent/intent.module.ts

@@ -17,7 +17,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { IntentComponent } from './intent/intent.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { RouterModule } from '@angular/router';
 
 @NgModule({

web/gui2/src/main/webapp/app/view/intent/intent/intent.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 const RESUBMITINTENT = 'resubmitIntent';
 const REMOVEINTENT = 'removeIntent';

web/gui2/src/main/webapp/app/view/link/link.module.ts

@@ -16,7 +16,7 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {LinkComponent} from './link/link.component';
-import {Gui2FwLibModule} from 'gui2-fw-lib/public_api';
+import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {RouterModule} from '@angular/router';
 
 @NgModule({

web/gui2/src/main/webapp/app/view/link/link/link.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * Model of the response from WebSocket

web/gui2/src/main/webapp/app/view/meter/meter.module.ts

@@ -15,7 +15,7 @@
 */
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {Gui2FwLibModule} from 'gui2-fw-lib/public_api';
+import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {MeterComponent} from './meter/meter.component';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';

web/gui2/src/main/webapp/app/view/meter/meter/meter.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/partition/partition.module.ts

@@ -15,7 +15,7 @@
  */
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import {Gui2FwLibModule} from 'gui2-fw-lib/public_api';
+import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 import { PartitionComponent } from './partition/partition.component';
 import {RouterModule} from '@angular/router';

web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/pipeconf/pipeconf.module.ts

@@ -18,7 +18,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {PipeconfComponent} from './pipeconf/pipeconf.component';
 import {PipeconfDetailsComponent} from './pipeconfdetails/pipeconfdetails.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 

web/gui2/src/main/webapp/app/view/pipeconf/pipeconf/pipeconf.component.ts

@@ -20,7 +20,7 @@ import {
     LogService, SortDir,
     TableBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {ActivatedRoute, Router} from '@angular/router';
 
 const pipeconfReq = 'pipeconfRequest';

web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.ts

@@ -26,7 +26,7 @@ import {
     FnService,
     IconService,
     LogService, WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {PipeconfAction, PipeconfTable} from '../pipeconf/pipeconf.component';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 

web/gui2/src/main/webapp/app/view/port/port.module.ts

@@ -16,7 +16,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { PortComponent } from './port/port.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { FormsModule } from '@angular/forms';
 import { PortDetailsComponent } from './portdetails/portdetails.component';
 import {RouterModule} from '@angular/router';

web/gui2/src/main/webapp/app/view/port/port/port.component.ts

@@ -20,7 +20,7 @@ import {
     PrefsService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.ts

@@ -21,7 +21,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * The details view when a port row is clicked from the Port view

web/gui2/src/main/webapp/app/view/processor/processor.module.ts

@@ -15,7 +15,7 @@
  */
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ProcessorComponent } from './processor/processor.component';
 import {RouterModule} from '@angular/router';
 

web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     TableBaseImpl
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { ActivatedRoute } from '@angular/router';
 
 /**

web/gui2/src/main/webapp/app/view/settings/settings.module.ts

@@ -17,7 +17,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { SettingsComponent } from './settings/settings.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { SettingsDetailsComponent } from './settingsdetails/settingsdetails.component';
 import {RouterModule} from '@angular/router';
 

web/gui2/src/main/webapp/app/view/settings/settings/settings.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 
 /**
  * Model of the data returned through the Web Socket about settings.

web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.ts

@@ -19,7 +19,7 @@ import {
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService
-} from 'gui2-fw-lib/public_api';
+} from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { Settings } from '../settings/settings.component';
 

web/gui2/src/main/webapp/app/view/tunnel/tunnel.module.ts

@@ -17,7 +17,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 
 import {TunnelComponent} from './tunnel/tunnel.component';
-import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api';
 import {RouterModule} from '@angular/router';
 
 @NgModule({