2 files changed, 75 insertions, 0 deletions

diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/controller/WelcomeV2Controller.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/controller/WelcomeV2Controller.java
new file mode 100644
index 00000000..5873e0bf
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/controller/WelcomeV2Controller.java
@@ -0,0 +1,71 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software 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.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ *
+ * ============LICENSE_END============================================
+ *
+ * 
+ */
+package org.onap.portalapp.controller;
+
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+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;
+
+/**
+ * Controller for welcome view. The view is restricted to authenticated users.
+ * The view name defaults to the request name with no suffix, "welcome", which
+ * resolves to page welcome.jsp.
+ */
+@Controller
+@RequestMapping("/")
+public class WelcomeV2Controller extends RestrictedBaseController {
+	final String defaultViewName = "v2";
+	
+	@RequestMapping(value = { "/v2/*" }, method = RequestMethod.GET)
+	public ModelAndView welcome3() {
+		return new ModelAndView(defaultViewName);
+	}
+	
+	@RequestMapping(value = { "/v2/*/*" }, method = RequestMethod.GET)
+	public ModelAndView welcome() {
+		return new ModelAndView(defaultViewName);
+	}
+	
+	@RequestMapping(value = { "/v2" }, method = RequestMethod.GET)
+	public ModelAndView welcome2() {
+		return new ModelAndView(defaultViewName);
+		
+	}
+}
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/defs/definitions.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/defs/definitions.xml
index 22f75c9d..898b26bb 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -13,5 +13,9 @@
 <tiles-definitions>
 
 	<definition name="tileKey" template="/path/to/page_template.html"/>
+	
+			 
+	<definition name="welcome" template="/app/fusion/scripts/DS2-view-models/welcome.html" />
+	<definition name="v2" template="/ngwelcome.html" />
 		
 </tiles-definitions>