[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, 118 deletions

diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html b/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html
deleted file mode 100644
index 74b369d..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/view-models/profile-page/role.html
+++ /dev/null
@@ -1,118 +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.
-  ================================================================================
-  -->
-<div>
-	<div class="bc-style" style="margin-left:-60px;">
-	    <ul class="breadcrumb">
-	        <li><a href="welcome">Home</a></li>
-	        <li><a href="admin#/role_list">Roles</a></li>
-	        <li class="active">Role</li>
-	    </ul>
-	</div>
-	<h1 class="heading1">Role Edit</h1>
-	<div ng-controller="roleController" >
-		<br>
-	     Please edit the role details below:&nbsp;<br>
-	
-		<div class="fn-ebz-container" >
-			<label class="fn-ebz-text-label"><sup><b>*</b></sup>Name:</label><BR>
-			<input type="text" class="fn-ebz-text" ng-model="role.name"
-				maxlength="30" /> 
-		</div>
-	
-		<div class="fn-ebz-container" >
-			<label class="fn-ebz-text-label">Priority:</label><BR>
-			<input type="text" class="fn-ebz-text" ng-model="role.priority"
-				maxlength="30" /> 
-		</div>
-		
-		<div align="left" >
-			<button type="submit" ng-click="saveRole();" att-button
-				btn-type="primary" size="small">Save</button>
-		</div>
-		
-		<br>
-		<div class="pageTitle">
-			<label>Role Functions</label>
-			<a ng-click="addNewRoleFunctionModalPopup();" class="ion-plus" size="small"></a>
-		</div>
-	
-		<table table-data="role.roleFunctions" att-table >
-		     <thead att-table-row type="header">
-	  		<tr>
-	  			<th att-table-header sortable="false" align="left"  width="90%">Name</th>
-	  			<th att-table-header sortable="false"  width="10%">Remove?</th>
-	  		</tr>
-	  		 </thead>
-	  		 <tbody att-table-row type="body" row-repeat="roleFunction in role.roleFunctions" style="max-height: 980px;" ><!-- background colors will alternate not properly with multiple tbody-->
-			  <tr>
-			    <td att-table-body width="90%" >{{ roleFunction.name }}</td>
-			    <td att-table-body width="10%">
-			    	<div ng-click="removeRoleFunction(roleFunction);" style="font-size:20px;"><a href="javascript:void(0)" class="ion-trash-b"></a></div>
-			     </td>
-			  </tr>
-			 </tbody>
-		</table>
-		<a href="admin#/role_function_list">Manage Role Functions</a><br><br>
-		
-		<div class="pageTitle">
-			<label>Child Roles</label>
-			<a ng-click="addNewChildRoleModalPopup();" class="ion-plus-round" size="small"></a>
-		</div>
-		
-		<table table-data="role.childRoles" att-table >
-		     <thead att-table-row type="header">
-	  		<tr>
-	  			<th att-table-header sortable="false" align="left"  width="90%">Name</th>
-	  			<th att-table-header sortable="false"  width="10%">Remove?</th>
-	  		</tr>
-	  		 </thead>
-	  		 <tbody att-table-row type="body" row-repeat="role in role.childRoles" style="max-height: 980px;" >
-			  <tr>
-			    <td att-table-body width="90%" >{{ role.name }}</td>
-			    <td att-table-body width="10%">
-			        <div ng-click="removeChildRole(role);" style="font-size:20px;"><a href="javascript:void(0)" class="ion-trash-b"></a></div>
-			    </td>
-			  </tr>
-			 </tbody>
-		</table>
-		
-		<div id="dialogChildRole" title="Select Child Roles">
-		  <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;" ><!-- background colors will alternate not properly with multiple tbody-->
-			  	<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>
-</div>