[ONAP-rebase] Rebase as 1.1.0-SNAPSHOT

Consolidate into a single maven project; no more separate model and client jars.

Change-Id: Ibbba982250b74c0dfd09ee1c65c0fb6c158dd632
Signed-off-by: Christopher Lott <cl778h@att.com>
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 0 insertions, 82 deletions

diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html b/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html
deleted file mode 100644
index f20d7af..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/popup_modal_role.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-  ================================================================================
-  DCAE DMaaP Bus Controller Web Application
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  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.
-  ================================================================================
-  -->
-
-<script type="text/ng-template" id="role_functions_popup.html">
-          <div class="modal__informative font-showcase" style="width:700px;height:500px;overflow:scroll">
-            <div class="modal__header">
-                <h2 class="font-showcase-font-name" style="width: 500px;">Select Role Functions</h2>
-            </div>
-            <button align="right" class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
-            <div class="divider-container"><hr> </div>      
-            <div class="modal__content">           	 	
-				<table table-data="availableRoleFunctions" att-table>
-					<thead att-table-row type="header">
-						<tr>
-							<th att-table-header sortable="false" width="10%"> </th>
-							<th att-table-header sortable="false" width="90%">Role Function</th>
-						</tr>
-					</thead>
-					<tbody att-table-row type="body" row-repeat="availableRoleFunction in availableRoleFunctions" style="max-height: 980px;" >
-					  <tr>
-					  
-						<td width="10%">
-							<div ng-click="toggleRoleFunction(availableRoleFunction.selected,availableRoleFunction);">
-							<input type="checkbox" ng-model="availableRoleFunction.selected" att-toggle-main>
-							</div>
-						</td>
-						<td width="90%">{{ availableRoleFunction.name }}</td>
-						
-					  </tr>
-					</tbody>
-				</table>	
-            </div>
-        </div>
-</script>
-
-
-<script type="text/ng-template" id="child_roles_popup.html">
-          <div class="modal__informative font-showcase" style="width:700px;height:500px;overflow:scroll">
-            <div class="modal__header">
-                <h2 class="font-showcase-font-name" style="width: 500px;">Select Child Roles</h2>
-            </div>
-            <button align="right" class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
-            <div class="divider-container"><hr> </div>      
-            <div class="modal__content">           	 	
-					<table table-data="availableRoles" att-table>
-						<thead att-table-row type="header">
-							<tr>
-								<th att-table-header sortable="false" width="10%"> </th>
-								<th att-table-header sortable="false" width="90%">Role</th>
-							</tr>
-						</thead>
-						<tbody att-table-row type="body" row-repeat="availableRole in availableRoles" style="max-height: 980px;" >
-							<tr>
-							<td att-table-body width="10%">
-								<div ng-click="toggleChildRole(availableRole.selected,availableRole);">
-								<input type="checkbox" ng-model="availableRole.selected" att-toggle-main>
-								</div>
-							</td>
-							<td att-table-body width="90%">{{ availableRole.name }}</td>
-							</tr>
-						</tbody>
-					</table>	
-            </div>
-        </div>
-</script>