From a9627f8c54b7e9d5712320621e8a0b748ad9baf4 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 26 Jul 2017 11:49:07 -0400 Subject: Repair Portal defects; upgrade Docker build. PORTAL-39 Remove MojoHaus Maven plug-in from pom file PORTAL-38 VID tab is not showing portal for VID PORTAL-37 Portal cannot resolve UEB host vm1-message-router; use ueb.api.simpledemo.openecomp.org instead PORTAL-36 Show Portal app version number in footer; unpack war file instead of copying directory PORTAL-35 update ECOMP Portal to ONAP logo on login page PORTAL-34 Portal partners (Policy, VID) got 404 on landing page; recognize process_csp as valid endpoint in Portal PORTAL-30 Failed to communicate with the widget microservice; add configuration properties with widget-ms host name and protocol. Issue: PORTAL-30, PORTAL-34, PORTAL-35, PORTAL-36, PORTAL-37, PORTAL-38, PORTAL-39 Change-Id: I1e53e4985266f736ddad4ed49b287a23178ea3c3 Signed-off-by: Christopher Lott (cl778h) --- .../portalapp/controller/LoginController.java | 9 +++++- .../portalapp/controller/LoginService.java | 2 +- ecomp-portal-BE-os/src/main/resources/cache.ccf | 2 +- .../src/main/webapp/WEB-INF/jsp/login.jsp | 34 ++++++++++++---------- 4 files changed, 28 insertions(+), 19 deletions(-) (limited to 'ecomp-portal-BE-os/src') diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java index 09e10e38..6f3d2278 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java @@ -174,8 +174,15 @@ public class LoginController extends EPUnRestrictedBaseController implements Log } + /* Work around a bug in ecompsdkos version 1.1.0 which hard-codes this endpoint. */ + @RequestMapping(value = {"/process_csp" }, method = RequestMethod.GET) + public ModelAndView processCsp(HttpServletRequest request, HttpServletResponse response) throws Exception { + return processSingleSignOn(request, response); + } + /* Remove this method after epsdk-app-common/.../SingleSignOnController.java is repaired. */ + @RequestMapping(value = {"/processSingleSignOn" }, method = RequestMethod.GET) - public ModelAndView processSingelSignOn(HttpServletRequest request, HttpServletResponse response) throws Exception{ + public ModelAndView processSingleSignOn(HttpServletRequest request, HttpServletResponse response) throws Exception{ Map model = new HashMap(); HashMap additionalParamsMap = new HashMap(); diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginService.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginService.java index 7d2e4518..d2c53028 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginService.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginService.java @@ -31,6 +31,6 @@ public interface LoginService { public @ResponseBody String loginValidate(HttpServletRequest request, HttpServletResponse response) throws Exception; - public ModelAndView processSingelSignOn(HttpServletRequest request, HttpServletResponse response) throws Exception; + public ModelAndView processSingleSignOn(HttpServletRequest request, HttpServletResponse response) throws Exception; } diff --git a/ecomp-portal-BE-os/src/main/resources/cache.ccf b/ecomp-portal-BE-os/src/main/resources/cache.ccf index 6f5c6f92..d21404b0 100644 --- a/ecomp-portal-BE-os/src/main/resources/cache.ccf +++ b/ecomp-portal-BE-os/src/main/resources/cache.ccf @@ -20,7 +20,7 @@ jcs.default.elementattributes.IsSpool=true # AUXILLARY CACHE CONFIGURATION jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes -jcs.auxiliary.DC.attributes.DiskPath=c:/projects/fusion/war/WEB-INF/cache +jcs.auxiliary.DC.attributes.DiskPath=/tmp # PRE-DEFINED REGION FOR LOOKUP DATA diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp index 7ca8531c..c37d6d6f 100644 --- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp @@ -75,23 +75,25 @@

-
- +
+
- - -
-
- - -
-
-                - +
+ + +
+
+ + +
+
+                + +

-- cgit 1.2.3-korg