[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, 35 insertions, 0 deletions

diff --git a/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java
new file mode 100644
index 0000000..8748f29
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-common/src/main/java/org/openecomp/dcae/dmaapbc/dbcapp/controller/DataBusHomeController.java
@@ -0,0 +1,35 @@
+package org.openecomp.dcae.dmaapbc.dbcapp.controller;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * This controller maps requests for the DMaaP-BC-App's landing page, which is
+ * an Angular single-page application.
+ */
+@Controller
+@RequestMapping("/")
+public class DataBusHomeController extends DbcappRestrictedBaseController {
+
+	public static final String APP_NAME = "dmaap-bc-app";
+	public static final DateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+
+	/**
+	 * At one time I published the landing page as simply "/dbc", but it can
+	 * also be accessed with a default suffix; e.g., "/dbc.htm".
+	 * 
+	 * @return View name key, which is resolved to a file using an Apache tiles
+	 *         "definitions.xml" file.
+	 */
+	@RequestMapping(value = { "/dbc" }, method = RequestMethod.GET)
+	public ModelAndView dbcDefaultController() {
+		// a model is only useful for JSP; this app is angular.
+		return new ModelAndView("dbc_home_tdkey");
+	}
+
+}