diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-26 11:49:07 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-26 13:47:31 -0400 |
| commit | a9627f8c54b7e9d5712320621e8a0b748ad9baf4 (patch) | |
| tree | 5d43d73ff9b0e47f74aed77be03bbf761e3b621b /ecomp-portal-BE-os | |
| parent | 134cb7f97684487cf8a0245617c339a3fe2d54b0 (diff) | |
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) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-os')
6 files changed, 29 insertions, 33 deletions
diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md index 47f1cfb9..829fd86f 100644 --- a/ecomp-portal-BE-os/README.md +++ b/ecomp-portal-BE-os/README.md @@ -16,6 +16,7 @@ https://www.eclipse.org/m2e-wtp/ Version 1.1.?, July 2017 - [Portal-30] Failed to communicate with the widget microservice: Fixed +- [Portal-35] Replaced the portal logo with onap logo on the login screen. Version 1.1.0, July 2017 - [Portal-7] Improvements added as part of the rebasing process diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index 1e64f7cd..1e4b4922 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -207,20 +207,6 @@ </execution> </executions> </plugin> - <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.10</version> <configuration> <encoding>UTF-8</encoding> <licenseName>my_license</licenseName> - <licenseResolver>${project.baseUri}/license</licenseResolver> <inceptionYear>2017</inceptionYear> - <organizationName>AT&T Intellectual Property</organizationName> <projectName>ECOMP - Portal</projectName> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> - <processStartTag>================================================================================</processStartTag> - <sectionDelimiter>================================================================================</sectionDelimiter> - <processEndTag>================================================================================</processEndTag> - <roots> <root>src/main</root> <root>src/test</root> </roots> <excludes> <exclude>*.png</exclude> - <exclude>*.drl</exclude> <exclude>*.gif</exclude> <exclude>*.jpeg</exclude> - <exclude>*.jpg</exclude> <exclude>*.bmp</exclude> <exclude>*.ico</exclude> - <exclude>*.svg</exclude> </excludes> </configuration> <executions> <execution> - <id>first</id> <goals> <goal>update-file-header</goal> </goals> <phase>process-sources</phase> - </execution> </executions> </plugin> --> </plugins> <testResources> 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<Object, Object> model = new HashMap<Object, Object>(); HashMap<Object, Object> additionalParamsMap = new HashMap<Object, Object>(); 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 @@ <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;"> <div align="center" id="errorInfo" style="display:none;float:left;font-size:12px;margin-left:5px"><span style="color:red">Invaild username or password, Please try again</span></div> <br/> - <div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;opacity:0.7;background-color:white"> - <img src="static/fusion/images/ecomp-login.jpg" height="250"/> + <div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;background-color:white"> + <img src="static/fusion/images/onap-portal-logo.png" height="250"/> <br> - <label> - <label class="form-field__label">Login ID:</label> - </label> - <input type="text" class="fn-ebz-text" ng-model="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" /> - <br/> - <br/> - <label > Password:</label> - <input type="password" class="span3" ng-model="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> - <br /> - <br /> - - <a class="login-btn" id="loginBtn" ng-click="loginExternal();">LOGIN</a> + <div style="opacity: 0.7;"> + <label> + <label class="form-field__label">Login ID:</label> + </label> + <input type="text" class="fn-ebz-text" ng-model="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" + maxlength="30" /> + <br/> + <br/> + <label > Password:</label> + <input type="password" class="span3" ng-model="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" + maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> + <br /> + <br /> + + <a class="login-btn" id="loginBtn" ng-click="loginExternal();">LOGIN</a> + </div> <br> </div> </div> |