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

diff --git a/dcae_dmaapbc_webapp/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp b/dcae_dmaapbc_webapp/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
deleted file mode 100644
index 933b214..0000000
--- a/dcae_dmaapbc_webapp/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
+++ /dev/null
@@ -1,20 +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.
-  ================================================================================
-  --%>
-${model.output_string}