diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:22:43 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 08:24:16 -0400 |
| commit | 4031c6ae9074f898e768cbf5ccb5158a59a7072a (patch) | |
| tree | 1aa2ff6ce771d6f605f8d4e89db18240623545f2 /ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service | |
| parent | 3a2b5c60384feb490e878020bdb9c01f514d7856 (diff) | |
Repair redirect; correct javadoc site path
[PORTAL-53] Correct path for deployment of javadoc web site
[PORTAL-78] Prevent SDJ from redirecting multiples times during single signon
[St164634] Tone down the logging when communicating with the Partnering Applications
Add missing license headers; drop FusionLicenseImpl.
Issue: PORTAL-53 PORTAL-78
Change-Id: I3f8200d8e41754ade05e3f7b38d0db6bdd5e59e8
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service')
2 files changed, 2 insertions, 15 deletions
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java index d24bd503..e838e783 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java @@ -87,10 +87,10 @@ public class ElementMapService { // Used to build image file relative URLs final String iconRelPath = SystemProperties.getProperty("element_map_icon_path"); - Map<String, Domain> resultAICDomain = layout.getDomainRowCol(); + Map<String, Domain> resultDomain = layout.getDomainRowCol(); Map<String, List<Domain>> domainMap = new HashMap<>(); List<Domain> domainList = new ArrayList<>(); - for (Domain d : resultAICDomain.values()) { + for (Domain d : resultDomain.values()) { d.setWidth(10 * d.computeSize().getWidth()); d.setHeight(10 * d.computeSize().getHeight()); d.setLeft(10 * d.getP().getX()); diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java index 704cd39a..fb705728 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java @@ -96,17 +96,4 @@ public class ServiceLocatorImpl implements ServiceLocator { return dirContext; } - // Get an LDAP directory context - LDAPv3-style - /* - * public InitialLdapContext getLdapContext() { //throws NamingException { if - * (ldapContext == null) { Properties properties = new Properties(); // @todo - - * need to parameterize context factoy class and url - * properties.put(Context.INITIAL_CONTEXT_FACTORY, - * AttLdap.DIR_INITIAL_CONTEXT_FACTORY); properties.put(Context.PROVIDER_URL, - * AttLdap.DIR_PROVIDER_URL); properties.put(Context.SECURITY_PRINCIPAL, - * AttLdap.DIR_SECURITY_PRINCIPAL); Control[] ctrl = null; try { ldapContext = - * new InitialLdapContext(properties, ctrl); } catch (NamingException ne) { // - * MJ FIX log exception? } } return ldapContext; } - */ - } |