[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, 16 insertions, 21 deletions

diff --git a/dcae_dmaapbc_webapp/README.md b/dcae_dmaapbc_webapp/README.md
index cfddeed..e515cbd 100644
--- a/dcae_dmaapbc_webapp/README.md
+++ b/dcae_dmaapbc_webapp/README.md
@@ -1,26 +1,21 @@
-DMaaP Bus Controller Application
-================================
+# DCAE DMaaP Bus Controller Web Application
 
-The DMaaP Bus Controller web application provides a front-end GUI to a subset of 
-the OpenDCAE DMaaP Bus Controller API. The GUI offers a user-friendly way for DMaaP 
-administrators to add, modify and remove Data Router feeds (transfers of large
-file-based data sets) and Message Router topics (low-latency transfers of small 
-messages).  Users can view all feeds and topics; add and remove feed  publishers; 
-add and remove feed subscribers; and add and remove topic clients. 
+## Maven Projects 
 
-The Data Bus Controller web application is a essentially proxy that passes thru 
-all requests to the DMaaP bus controller's REST API, and displays the results. 
-All data is stored in the DMaaP bus controller back-end; the application stores no 
-data on feeds or topics.  The application only stores user-entered access profiles. 
+This directory holds the maven projects for the DMaaP Bus Controller web application
+for internal and ONAP use:
 
-This application is planned for integration with ECOMP Portal in release 1610, 
-and is expected to run on the same virtual machines and the same Apache Tomcat web
-containers as the Portal application.
+- dbca-common: project with code resources for both internal and external use
+- dbca-overlay: project with web resources for both internal and external use
+- dbca-at_t: master web app with code and web resources specific to the internal
+  version of the application (only available in the internal CodeCloud repository)
+- dbca-os: master web app with code and web resources specific to the open-source
+  version of the application.
 
-This application is based on the ECOMP SDK.  Use Apache Maven to build and package
-this webapp for deployment.  See the file dbc-app-deployment-guide.txt for complete 
-details.
+## Configuration
 
-This application relies on the DBC Microservice to access DMaaP access profiles.
-A related Maven project contains the code and deployment instructions for that 
-micro service.
\ No newline at end of file
+Property files are managed in a separate CodeCloud git repository.
+
+## Release Notes
+
+Build and release notes are tracked in the master web app directories.