diff options
5 files changed, 1 insertions, 143 deletions
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp deleted file mode 100755 index c1bf19c75..000000000 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/viewlog.jsp +++ /dev/null @@ -1,33 +0,0 @@ -
-
-<div ng-controller="viewLogController">
-
- <h1 class="heading1"><center>View Log - Page under Construction...</center></h1>
- <br>
-
-
-</div>
-<!-- Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ViewLogController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ViewLogController.java deleted file mode 100644 index 5775b3cf3..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controller/ViewLogController.java +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controller; - -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import java.text.DateFormat; -import java.text.SimpleDateFormat; - - -/** - * The Class ViewLogController. - */ -@RestController -public class ViewLogController extends RestrictedBaseController{ - - /** The logger. */ - private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(ViewLogController.class); - - /** The Constant dateFormat. */ - public final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); - - - /** The servlet context. */ - private @Autowired ServletContext servletContext; - - /** - * Welcome. - * - * @param request the request - * @return the model and view - */ - @RequestMapping(value = {"/viewlog" }, method = RequestMethod.GET) - public ModelAndView welcome(HttpServletRequest request) { - - return new ModelAndView(getViewName()); - } - - -} diff --git a/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml b/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml index 0355f66c8..fafd1adbc 100755 --- a/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/vid-app-common/src/main/webapp/WEB-INF/defs/definitions.xml @@ -4,12 +4,7 @@ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
- <definition extends="ebz_template" name="viewlog">
- <put-attribute name="body" value="/WEB-INF/jsp/viewlog.jsp"></put-attribute>
- <put-attribute name="viewName" value="viewlog"></put-attribute>
- </definition>
-
- <definition extends="ebz_template" name="serviceModels">
+ <definition extends="ebz_template" name="serviceModels">
<put-attribute name="body" value="/WEB-INF/jsp/serviceModels.jsp"></put-attribute>
<put-attribute name="viewName" value="serviceModels"></put-attribute>
</definition>
diff --git a/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml index 3d4c701a4..3e0155b4f 100755 --- a/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml +++ b/vid-app-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml @@ -60,11 +60,6 @@ <put-attribute name="viewName" value="menu"></put-attribute>
</definition>
- <definition extends="ebz_template" name="viewlog">
- <put-attribute name="body" value="/WEB-INF/jsp/viewlog.jsp"></put-attribute>
- <put-attribute name="viewName" value="viewlog"></put-attribute>
- </definition>
-
<definition extends="ebz_template" name="serviceModels">
<put-attribute name="body" value="/WEB-INF/jsp/serviceModels.jsp"></put-attribute>
<put-attribute name="viewName" value="serviceModels"></put-attribute>
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp deleted file mode 100644 index 920298e18..000000000 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp +++ /dev/null @@ -1,33 +0,0 @@ - - -<div ng-controller="viewLogController"> - - <h1 class="heading1"><center>View Log - Page under Construction...</center></h1> - <br> - - -</div> -<!-- Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 --> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> - - |