[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>

3 files changed, 0 insertions, 142 deletions

diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/dummy.txt b/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/dummy.txt
deleted file mode 100644
index e69de29..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/dummy.txt
+++ /dev/null
diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/page-resource.js b/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/page-resource.js
deleted file mode 100644
index 18b10f4..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/page-resource.js
+++ /dev/null
@@ -1,114 +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.
- * ================================================================================
- */
-function loadjscssfile(filename, filetype){
-    if (filetype=="js"){ //if filename is a external JavaScript file
-    	var done = false;
-        var script = document.createElement('script');	
-  		script.src = filename;
-  		script.async = false; 			
- 		document.head.appendChild(script);
-    }else if (filetype=="css"){ //if filename is an external CSS file
-        var fileref=document.createElement("link")
-        fileref.setAttribute("rel", "stylesheet")
-        fileref.setAttribute("type", "text/css")
-        fileref.setAttribute("async", false)
-        fileref.setAttribute("href", filename)
-        document.head.appendChild(fileref);
-    } 
-}
-
-function loadResource(){
-	//css
-	loadjscssfile("app/fusion/external/ebz/fn-ebz.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/demo.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/base.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/btn.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/dtpk.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/frms.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/sldr.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/style.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/sandbox/styles/tbs.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/portal_ebz_header.css", "css");	
-	loadjscssfile("static/fusion/css/jquery-ui.css", "css");	
-	
-	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/header.css", "css");	
-	loadjscssfile("app/fusion/external/ebz/ebz_header/footer.css", "css");	
-	// Basic AngularJS -->
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-sanitize.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-route.min.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/angular-cookies.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/gestures.js", "js");
-	loadjscssfile("app/fusion/external/ebz/angular_js/app.js", "js");
-
-	loadjscssfile("app/fusion/external/ebz/sandbox/att-abs-tpls.js", "js");
-		
-	// jQuery -->	
-	loadjscssfile("static/js/jquery-1.10.2.js", "js");
-	loadjscssfile("static/js/jquery.mask.min.js", "js");	
-	loadjscssfile("static/js/jquery-ui.js", "js");
-	
-	// AngularJS Gridster -->
-	loadjscssfile("static/fusion/js/att_angular_gridster/ui-gridster-tpls.js", "js");
-	loadjscssfile("static/fusion/js/att_angular_gridster/angular-gridster.js", "js");
-	
-	// AngularJS Config -->
-	loadjscssfile("app/fusion/external/ebz/angular_js/checklist-model.js", "js");
-	
-	// Utility -->
-	loadjscssfile("app/fusion/scripts/modalService.js", "js");
-	loadjscssfile("app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js", "js");	
-	
-	// Controller js -->
-	loadjscssfile("app/fusion/scripts/controllers/profile-search-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/profile-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/post-search-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/self-profile-controller.js", "js");
-	loadjscssfile("app/fusion/scripts/controllers/rolefunctionpopupController.js", "js");	
-	loadjscssfile("app/fusion/scripts/controllers/modelpopupController.js", "js");
-	
-	// Header and Footer -->
-	loadjscssfile("app/fusion/scripts/directives/footer.js", "js");
-	loadjscssfile("app/fusion/external/ebz/js/footer.js", "js");
-	loadjscssfile("app/fusion/scripts/directives/header.js", "js");		
-	loadjscssfile("app/fusion/scripts/directives/leftMenu.js", "js");
-	
-	// Services -->
-	loadjscssfile("app/fusion/scripts/services/profileService.js", "js");	
-	loadjscssfile("app/fusion/scripts/services/userInfoService.js", "js");
-	loadjscssfile("app/fusion/scripts/services/leftMenuService.js", "js");	
-	loadjscssfile("app/fusion/scripts/controllers/profileController.js", "js");			
-}
-
-window.onload = loadResource();
-window.onload = function(){
-	var appLoadingInterval = setInterval(function(){ loadApp() }, 500);
-	var count=0;
-	function loadApp(){	
-		count++
-		if(typeof angular !== 'undefined') {
-			angular.bootstrap(document, ['abs']);
-			clearInterval(appLoadingInterval);
-		}else if(count>10){
-			clearInterval(appLoadingInterval);
-		}
-	}
-}
diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html b/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html
deleted file mode 100644
index c1c9f11..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/app/fusion/scripts/utils/sandbox-resources.html
+++ /dev/null
@@ -1,28 +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.
-  ================================================================================
-  -->
-
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/demo.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/base.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/btn.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/dtpk.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/frms.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/sldr.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
-	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/tbs.css" >