Docker container implementation

This change contains following items:
1) Update b2b-library.js to remove non-compliant code
2) Format source code for ccsdk-app-os module
3) Add Dockerfile and artifacts to create docker container
4) Update POM files for docker maven plugin and version changes

Issue-ID: CCSDK-1011
Change-Id: Iae93b32e1d8c2e7b911b044bc07bba6b720742a5
Signed-off-by: ramprasad kotagiri <rp5662@att.com>

8 files changed, 595 insertions, 567 deletions

diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index ecd312a..2f328eb 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -1,164 +1,174 @@
-/*-

- * ================================================================================

- * ECOMP Portal SDK

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property

- * ================================================================================

- * 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.

- * ================================================================================

- */

-package org.onap.portalapp.conf;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.onap.portalapp.lm.FusionLicenseManagerImpl;

-import org.onap.portalapp.login.LoginStrategyImpl;

-import org.onap.portalapp.controller.core.SingleSignOnController;

-import org.onap.portalapp.controller.sample.ElasticSearchController;

-import org.onap.portalapp.controller.sample.PostDroolsController;

-import org.onap.portalapp.scheduler.LogRegistry;

-import org.onap.portalsdk.core.auth.LoginStrategy;

-import org.onap.portalsdk.core.conf.AppConfig;

-import org.onap.portalsdk.core.conf.Configurable;

-//import org.onap.portalsdk.core.lm.FusionLicenseManager;

-//import org.onap.portalsdk.core.lm.FusionLicenseManagerUtils;

-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;

-import org.onap.portalsdk.core.objectcache.AbstractCacheManager;

-import org.onap.portalsdk.core.scheduler.CoreRegister;

-import org.onap.portalsdk.core.scheduler.CronRegistry;

-import org.onap.portalsdk.core.service.DataAccessService;

-import org.onap.portalsdk.core.service.PostDroolsService;

-import org.onap.portalsdk.core.util.CacheManager;

-import org.onap.portalsdk.core.util.SystemProperties;

-import org.springframework.context.annotation.Bean;

-import org.springframework.context.annotation.ComponentScan;

-import org.springframework.context.annotation.Configuration;

-import org.springframework.context.annotation.FilterType;

-import org.springframework.context.annotation.Import;

-import org.springframework.context.annotation.Profile;

-import org.springframework.scheduling.annotation.EnableAsync;

-import org.springframework.scheduling.annotation.EnableScheduling;

-import org.springframework.web.servlet.ViewResolver;

-import org.springframework.web.servlet.config.annotation.EnableWebMvc;

-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

-

-/**

- * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to

- * reuse interceptors, view resolvers and other features defined there.

- */

-@Configuration

-@EnableWebMvc

-@ComponentScan(basePackages = { "org.onap", "org.openecomp" },

-		// Exclude unused annotated classes with heavy dependencies.

-		excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = { CoreRegister.class,

-				CronRegistry.class, ElasticSearchController.class, LogRegistry.class, PostDroolsController.class,

-				PostDroolsService.class, SingleSignOnController.class }))

-@Profile("src")

-@EnableAsync

-@EnableScheduling

-public class ExternalAppConfig extends AppConfig implements Configurable {

-

-	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);

-

-	@Configuration

-	@Import(SystemProperties.class)

-	static class InnerConfiguration {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver()

-	 */

-	public ViewResolver viewResolver() {

-		return super.viewResolver();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry)

-	 */

-	@Override

-	public void addResourceHandlers(ResourceHandlerRegistry registry) {

-		super.addResourceHandlers(registry);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService()

-	 */

-	@Override

-	public DataAccessService dataAccessService() {

-		// Echo the JDBC URL to assist developers when starting the app.

-		systemProperties();

-		System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is "

-				+ SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL));

-		return super.dataAccessService();

-	}

-

-	/**

-	 * Creates a new list with a single entry that is the external app

-	 * definitions.xml path.

-	 * 

-	 * @return List of String, size 1

-	 */

-	@Override

-	public List<String> addTileDefinitions() {

-		List<String> definitions = new ArrayList<String>();

-		// DBC does not need the sample page:

-		// definitions.add("/WEB-INF/defs/definitions.xml");

-		definitions.add("/WEB-INF/oom-app-definitions.xml");

-		if (logger.isDebugEnabled())

-			logger.debug(EELFLoggerDelegate.debugLogger, "addTileDefinitions: list is " + definitions);

-		return definitions;

-	}

-

-	/**

-	 * Adds request interceptors to the specified registry by calling

-	 * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes

-	 * certain paths from the session timeout interceptor.

-	 */

-	@Override

-	public void addInterceptors(InterceptorRegistry registry) {

-		super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm",

-				"/api*", "/single_signon.htm", "/single_signon");

-		super.addInterceptors(registry);

-	}

-

-	/**

-	 * Creates and returns a new instance of a {@link CacheManager} class.

-	 * 

-	 * @return New instance of {@link CacheManager}

-	 */

-	@Bean

-	public AbstractCacheManager cacheManager() {

-		return new CacheManager();

-	}

-

-	/*

-        @Bean

-        public FusionLicenseManager fusionLicenseManager() {

-            return new FusionLicenseManagerImpl();

-        }

-

-        @Bean

-        public FusionLicenseManagerUtils fusionLicenseManagerUtils() {

-            return new FusionLicenseManagerUtils();

-        }

-    */

-	@Bean

-	public LoginStrategy loginStrategy() {

-		return new LoginStrategyImpl();

-	}

-}

+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+package org.onap.portalapp.conf;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.portalapp.lm.FusionLicenseManagerImpl;
+import org.onap.portalapp.login.LoginStrategyImpl;
+import org.onap.portalapp.controller.core.SingleSignOnController;
+import org.onap.portalapp.controller.sample.ElasticSearchController;
+import org.onap.portalapp.controller.sample.PostDroolsController;
+import org.onap.portalapp.scheduler.LogRegistry;
+import org.onap.portalsdk.core.auth.LoginStrategy;
+import org.onap.portalsdk.core.conf.AppConfig;
+import org.onap.portalsdk.core.conf.Configurable;
+// import org.onap.portalsdk.core.lm.FusionLicenseManager;
+// import org.onap.portalsdk.core.lm.FusionLicenseManagerUtils;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.objectcache.AbstractCacheManager;
+import org.onap.portalsdk.core.scheduler.CoreRegister;
+import org.onap.portalsdk.core.scheduler.CronRegistry;
+import org.onap.portalsdk.core.service.DataAccessService;
+import org.onap.portalsdk.core.service.PostDroolsService;
+import org.onap.portalsdk.core.util.CacheManager;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+
+/**
+ * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to
+ * reuse interceptors, view resolvers and other features defined there.
+ */
+@Configuration
+@EnableWebMvc
+@ComponentScan(
+    basePackages = {"org.onap", "org.openecomp"},
+    // Exclude unused annotated classes with heavy dependencies.
+    excludeFilters = @ComponentScan.Filter(
+        type = FilterType.ASSIGNABLE_TYPE,
+        value = {CoreRegister.class, CronRegistry.class, ElasticSearchController.class,
+            LogRegistry.class, PostDroolsController.class, PostDroolsService.class,
+            SingleSignOnController.class}))
+@Profile("src")
+@EnableAsync
+@EnableScheduling
+public class ExternalAppConfig extends AppConfig implements Configurable {
+
+    private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
+
+    @Configuration
+    @Import(SystemProperties.class)
+    static class InnerConfiguration {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver()
+     */
+    public ViewResolver viewResolver() {
+        return super.viewResolver();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(org.springframework.web.servlet.
+     * config.annotation.ResourceHandlerRegistry)
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        super.addResourceHandlers(registry);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService()
+     */
+    @Override
+    public DataAccessService dataAccessService() {
+        // Echo the JDBC URL to assist developers when starting the app.
+        systemProperties();
+        System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is "
+            + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL));
+        return super.dataAccessService();
+    }
+
+    /**
+     * Creates a new list with a single entry that is the external app
+     * definitions.xml path.
+     * 
+     * @return List of String, size 1
+     */
+    @Override
+    public List<String> addTileDefinitions() {
+        List<String> definitions = new ArrayList<String>();
+        // DBC does not need the sample page:
+        // definitions.add("/WEB-INF/defs/definitions.xml");
+        definitions.add("/WEB-INF/oom-app-definitions.xml");
+        if (logger.isDebugEnabled())
+            logger.debug(EELFLoggerDelegate.debugLogger,
+                "addTileDefinitions: list is " + definitions);
+        return definitions;
+    }
+
+    /**
+     * Adds request interceptors to the specified registry by calling
+     * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes
+     * certain paths from the session timeout interceptor.
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm",
+            "login", "/login.htm", "/api*", "/single_signon.htm", "/single_signon", "/health*",
+            "/ecomp-api/**");
+        super.addInterceptors(registry);
+    }
+
+    /**
+     * Creates and returns a new instance of a {@link CacheManager} class.
+     * 
+     * @return New instance of {@link CacheManager}
+     */
+    @Bean
+    public AbstractCacheManager cacheManager() {
+        return new CacheManager();
+    }
+
+    /*
+     * @Bean
+     * public FusionLicenseManager fusionLicenseManager() {
+     * return new FusionLicenseManagerImpl();
+     * }
+     * 
+     * @Bean
+     * public FusionLicenseManagerUtils fusionLicenseManagerUtils() {
+     * return new FusionLicenseManagerUtils();
+     * }
+     */
+    @Bean
+    public LoginStrategy loginStrategy() {
+        return new LoginStrategyImpl();
+    }
+}
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 3edcf23..b49add1 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -1,47 +1,48 @@
-/*-

- * ================================================================================

- * ECOMP Portal SDK

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property

- * ================================================================================

- * 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.

- * ================================================================================

- */

-package org.onap.portalapp.conf;

-

-import org.onap.portalsdk.core.conf.AppInitializer;

-

-public class ExternalAppInitializer extends AppInitializer {

-

-	@Override

-	protected Class<?>[] getRootConfigClasses() {

-		return super.getRootConfigClasses();

-	}

-

-	@Override

-	protected Class<?>[] getServletConfigClasses() {

-		Class<?> appConfigClass = ExternalAppConfig.class;

-		// Show something on stdout to indicate the app is starting.

-		System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName());

-		return new Class[] { appConfigClass };

-	}

-

-	/*

-	 * URL request will direct to the Spring dispatcher for processing

-	 */

-	@Override

-	protected String[] getServletMappings() {

-		return super.getServletMappings();

-	}

-

-}

+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+package org.onap.portalapp.conf;
+
+import org.onap.portalsdk.core.conf.AppInitializer;
+
+public class ExternalAppInitializer extends AppInitializer {
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return super.getRootConfigClasses();
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        Class<?> appConfigClass = ExternalAppConfig.class;
+        // Show something on stdout to indicate the app is starting.
+        System.out.println(
+            "ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName());
+        return new Class[] {appConfigClass};
+    }
+
+    /*
+     * URL request will direct to the Spring dispatcher for processing
+     */
+    @Override
+    protected String[] getServletMappings() {
+        return super.getServletMappings();
+    }
+
+}
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index 68ef057..673fc8d 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -1,62 +1,61 @@
-/*-

- * ================================================================================

- * ECOMP Portal SDK

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property

- * ================================================================================

- * 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.

- * ================================================================================

- */

-package org.onap.portalapp.conf;

-

-import org.springframework.context.annotation.Profile;

-import org.springframework.core.io.ClassPathResource;

-import org.springframework.core.io.Resource;

-import org.springframework.stereotype.Component;

-

-import org.onap.portalsdk.core.conf.HibernateMappingLocatable;

-

-@Component

-@Profile("src")

-public class HibernateMappingLocations implements HibernateMappingLocatable {

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.onap.portalsdk.core.conf.HibernateMappingLocatable#

-	 * getMappingLocations()

-	 */

-	@Override

-	public Resource[] getMappingLocations() {

-		return new Resource[] {

-				// Path is relative to WEB-INF/conf;

-				// a leading slash gets stripped so don't bother.

-				// new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),

-				// This is a COPY to work around a bug in the 1.1.0 release.

-				new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),

-				new ClassPathResource("../oom-app.hbm.xml")

-		};

-	}

-

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.onap.portalsdk.core.conf.HibernateMappingLocatable#

-	 * getPackagesToScan()

-	 */

-	@Override

-	public String[] getPackagesToScan() {

-		return new String[] { "org.onap", "org.openecomp" };

-	}

-

-}

+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+package org.onap.portalapp.conf;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
+
+import org.onap.portalsdk.core.conf.HibernateMappingLocatable;
+
+@Component
+@Profile("src")
+public class HibernateMappingLocations implements HibernateMappingLocatable {
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.onap.portalsdk.core.conf.HibernateMappingLocatable#
+     * getMappingLocations()
+     */
+    @Override
+    public Resource[] getMappingLocations() {
+        return new Resource[] {
+            // Path is relative to WEB-INF/conf;
+            // a leading slash gets stripped so don't bother.
+            // new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
+            // This is a COPY to work around a bug in the 1.1.0 release.
+            new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
+            new ClassPathResource("../oom-app.hbm.xml")};
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.onap.portalsdk.core.conf.HibernateMappingLocatable#
+     * getPackagesToScan()
+     */
+    @Override
+    public String[] getPackagesToScan() {
+        return new String[] {"org.onap", "org.openecomp"};
+    }
+
+}
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index 4eb00c6..cb3ba19 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
@@ -1,120 +1,124 @@
-/*******************************************************************************

- * =============LICENSE_START=========================================================

- *

- * =================================================================================

- *  Copyright (c) 2017 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=========================================================

- *

- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.

- *******************************************************************************/

-package org.onap.portalapp.lm;

-

-import java.util.Date;

-import java.util.List;

-import java.util.Map;

-

-import javax.servlet.ServletContext;

-

-//import org.onap.portalsdk.core.lm.FusionLicenseManager;

-interface FusionLicenseManager {

-	public void initKeyStoreParam();

-

-	public void initCipherParam();

-

-	public void initLicenseParam();

-

-	public int installLicense();

-

-	public int verifyLicense(ServletContext context);

-

-	public void setExpiredDate(Date expiredDate);

-

-	public void doInitWork();

-

-	public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList) throws Exception;

-

-	public String nvl(String s);

-

-	public Date getExpiredDate();

-}

-public class FusionLicenseManagerImpl implements FusionLicenseManager {

-

-	private Date expiredDate;

-

-	public FusionLicenseManagerImpl() {

-	}

-

-	/**

-	 * An implementation of the KeyStoreParam interface that returns the

-	 * information required to work with the keystore containing the private key.

-	 */

-	@Override

-	public void initKeyStoreParam() {

-	}

-

-	@Override

-	public void initCipherParam() {

-	}

-

-	/**

-	 * Create/populate the "licenseParm" field.

-	 */

-	@Override

-	public void initLicenseParam() {

-	}

-

-	@Override

-	public void doInitWork() {

-	}

-

-	/**

-	 * Prompt the user for the location of their license file, get the filename,

-	 * then try to install the file.

-	 * 

-	 * @return true if the license installed properly, false otherwise.

-	 */

-	@Override

-	public int installLicense() {

-		//return INVALID_LICENSE;

-		return -1;

-	}

-

-	@Override

-	public synchronized int verifyLicense(ServletContext context) {

-

-		//return INVALID_LICENSE;

-		return -1;

-	}

-

-	@Override

-	public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList) throws Exception {

-	}

-

-	@Override

-	public String nvl(String s) {

-		return (s == null) ? "" : s;

-	}

-

-	@Override

-	public Date getExpiredDate() {

-		return expiredDate;

-	}

-

-	@Override

-	public void setExpiredDate(Date expiredDate) {

-		this.expiredDate = expiredDate;

-	}

-

-}

+/*******************************************************************************
+ * =============LICENSE_START=========================================================
+ *
+ * =================================================================================
+ * Copyright (c) 2017 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *******************************************************************************/
+package org.onap.portalapp.lm;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+// import org.onap.portalsdk.core.lm.FusionLicenseManager;
+interface FusionLicenseManager {
+    public void initKeyStoreParam();
+
+    public void initCipherParam();
+
+    public void initLicenseParam();
+
+    public int installLicense();
+
+    public int verifyLicense(ServletContext context);
+
+    public void setExpiredDate(Date expiredDate);
+
+    public void doInitWork();
+
+    public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList)
+        throws Exception;
+
+    public String nvl(String s);
+
+    public Date getExpiredDate();
+}
+
+
+public class FusionLicenseManagerImpl implements FusionLicenseManager {
+
+    private Date expiredDate;
+
+    public FusionLicenseManagerImpl() {
+    }
+
+    /**
+     * An implementation of the KeyStoreParam interface that returns the
+     * information required to work with the keystore containing the private key.
+     */
+    @Override
+    public void initKeyStoreParam() {
+    }
+
+    @Override
+    public void initCipherParam() {
+    }
+
+    /**
+     * Create/populate the "licenseParm" field.
+     */
+    @Override
+    public void initLicenseParam() {
+    }
+
+    @Override
+    public void doInitWork() {
+    }
+
+    /**
+     * Prompt the user for the location of their license file, get the filename,
+     * then try to install the file.
+     * 
+     * @return true if the license installed properly, false otherwise.
+     */
+    @Override
+    public int installLicense() {
+        // return INVALID_LICENSE;
+        return -1;
+    }
+
+    @Override
+    public synchronized int verifyLicense(ServletContext context) {
+
+        // return INVALID_LICENSE;
+        return -1;
+    }
+
+    @Override
+    public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList)
+        throws Exception {
+    }
+
+    @Override
+    public String nvl(String s) {
+        return (s == null) ? "" : s;
+    }
+
+    @Override
+    public Date getExpiredDate() {
+        return expiredDate;
+    }
+
+    @Override
+    public void setExpiredDate(Date expiredDate) {
+        this.expiredDate = expiredDate;
+    }
+
+}
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 88bce2d..b3af63a 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
@@ -1,91 +1,92 @@
-/*-

- * ================================================================================

- * ECOMP Portal SDK

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property

- * ================================================================================

- * 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.

- * ================================================================================

- */

-

-package org.onap.portalapp.login;

-

-import javax.servlet.http.Cookie;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.onap.portalsdk.core.auth.LoginStrategy;

-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;

-import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;

-import org.onap.portalsdk.core.onboarding.util.CipherUtil;

-import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;

-import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;

-import org.springframework.web.servlet.ModelAndView;

-

-public class LoginStrategyImpl extends LoginStrategy {

-

-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LoginStrategyImpl.class);

-

-	@Override

-	public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {

-		// 'login' for opensource is same as 'external' login.

-		return doExternalLogin(request, response);

-	}

-

-	@Override

-	public String getUserId(HttpServletRequest request) throws PortalAPIException {

-		// Check ECOMP Portal cookie

-		if (!isLoginCookieExist(request))

-			return null;

-

-		String userid = null;

-		try {

-			userid = getUserIdFromCookie(request);

-		} catch (Exception e) {

-			logger.error(EELFLoggerDelegate.errorLogger, "getUserId failed", e);

-		}

-		return userid;

-	}

-

-	private static String getUserIdFromCookie(HttpServletRequest request) throws Exception {

-		String userId = "";

-		Cookie[] cookies = request.getCookies();

-		Cookie userIdcookie = null;

-		if (cookies != null)

-			for (Cookie cookie : cookies)

-				if (cookie.getName().equals(USER_ID))

-					userIdcookie = cookie;

-		if (userIdcookie != null) {

-			userId = ""; //CipherUtil.decrypt(userIdcookie.getValue(),

-			//PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));

-		}

-		return userId;

-

-	}

-

-	private static boolean isLoginCookieExist(HttpServletRequest request) {

-		Cookie ep = getCookie(request, EP_SERVICE);

-		return (ep != null);

-	}

-

-	private static Cookie getCookie(HttpServletRequest request, String cookieName) {

-		Cookie[] cookies = request.getCookies();

-		if (cookies != null)

-			for (Cookie cookie : cookies)

-				if (cookie.getName().equals(cookieName))

-					return cookie;

-

-		return null;

-	}

-

-}

+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+
+package org.onap.portalapp.login;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.onap.portalsdk.core.auth.LoginStrategy;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
+import org.springframework.web.servlet.ModelAndView;
+
+public class LoginStrategyImpl extends LoginStrategy {
+
+    EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LoginStrategyImpl.class);
+
+    @Override
+    public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response)
+        throws Exception {
+        // 'login' for opensource is same as 'external' login.
+        return doExternalLogin(request, response);
+    }
+
+    @Override
+    public String getUserId(HttpServletRequest request) throws PortalAPIException {
+        // Check ECOMP Portal cookie
+        if (!isLoginCookieExist(request))
+            return null;
+
+        String userid = null;
+        try {
+            userid = getUserIdFromCookie(request);
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "getUserId failed", e);
+        }
+        return userid;
+    }
+
+    private static String getUserIdFromCookie(HttpServletRequest request) throws Exception {
+        String userId = "";
+        Cookie[] cookies = request.getCookies();
+        Cookie userIdcookie = null;
+        if (cookies != null)
+            for (Cookie cookie : cookies)
+                if (cookie.getName().equals(USER_ID))
+                    userIdcookie = cookie;
+        if (userIdcookie != null) {
+            userId = ""; // CipherUtil.decrypt(userIdcookie.getValue(),
+            // PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
+        }
+        return userId;
+
+    }
+
+    private static boolean isLoginCookieExist(HttpServletRequest request) {
+        Cookie ep = getCookie(request, EP_SERVICE);
+        return (ep != null);
+    }
+
+    private static Cookie getCookie(HttpServletRequest request, String cookieName) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null)
+            for (Cookie cookie : cookies)
+                if (cookie.getName().equals(cookieName))
+                    return cookie;
+
+        return null;
+    }
+
+}
diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
index fdda960..da306f6 100644
--- a/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
+++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
@@ -1,68 +1,75 @@
-/*-

- * ================================================================================

- * ECOMP Portal SDK

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property

- * ================================================================================

- * 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.

- * ================================================================================

- */

-package org.onap.portalapp.service;

-

-import java.util.Set;

-

-import org.onap.portalapp.service.IAdminAuthExtension;

-import org.onap.portalsdk.core.domain.Role;

-import org.onap.portalsdk.core.domain.User;

-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;

-import org.springframework.stereotype.Service;

-import org.springframework.transaction.annotation.Transactional;

-

-

-@Service("adminAuthExtension")

-@Transactional

-/**

- * Provides empty implementations of the methods in IAdminAuthExtension.

- */

-public class AdminAuthExtension implements IAdminAuthExtension {

-

-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminAuthExtension.class);

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.onap.portalsdk.core.domain.User)

-	 */

-	@Override

-	public void saveUserExtension(User user) {

-		logger.debug("saveUserExtension");

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.onap.portalsdk.core.domain.User)

-	 */

-	@Override

-	public void editUserExtension(User user) {

-		logger.debug("editUserExtension");

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.onap.portalsdk.core.domain.User)

-	 */

-	@Override

-	public void saveUserRoleExtension(Set<Role> roles, User user) {

-		logger.debug("saveUserRoleExtension");

-	}

-

-}

+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * 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.
+ * ================================================================================
+ */
+package org.onap.portalapp.service;
+
+import java.util.Set;
+
+import org.onap.portalapp.service.IAdminAuthExtension;
+import org.onap.portalsdk.core.domain.Role;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service("adminAuthExtension")
+@Transactional
+/**
+ * Provides empty implementations of the methods in IAdminAuthExtension.
+ */
+public class AdminAuthExtension implements IAdminAuthExtension {
+
+    EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminAuthExtension.class);
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.onap.portalsdk.core.
+     * domain.User)
+     */
+    @Override
+    public void saveUserExtension(User user) {
+        logger.debug("saveUserExtension");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.onap.portalsdk.core.
+     * domain.User)
+     */
+    @Override
+    public void editUserExtension(User user) {
+        logger.debug("editUserExtension");
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set,
+     * org.onap.portalsdk.core.domain.User)
+     */
+    @Override
+    public void saveUserRoleExtension(Set<Role> roles, User user) {
+        logger.debug("saveUserRoleExtension");
+    }
+
+}
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
index 735afe6..2496647 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
@@ -1,18 +1,24 @@
-# ONAP dashboard.properties
+# ATT dashboard.properties
 
-# Properties for the OOM Dashboard webapp
+# Properties for the ONAP Controller Dashboard webapp
 
-# Controllers - one KEY for each set of properties "KEY.property" below.
-controller.key.list = dev, qa
+# Set to true to use local copies of controller data 
+controller.mock.data = false
 
-dev.name = Development host
-dev.url = http://127.0.0.1:8080
-dev.username = user
-dev.password = pass
-dev.is_encrypted = false
+# for ONAP or other type
+controller.type = os
+
+controller.env = dev
+
+# YAML would represent this more elegantly, but Spring likes properties.
+controller.key.list = dev
 
-qa.name = QA host
-qa.url = http://1.2.3.4:8080
-qa.username = user
-qa.password = pass
-qa.is_encrypted = false
+dev.name = Local
+dev.url = https://orcl.com/api/v3.1
+dev.inventory.url = https://inventory.com:30123/
+dev.dhandler.url = https://dplh.com:30125/
+dev.consul.url = http://consul.com:8500/
+
+dev.username = admin
+dev.password =  admin
+dev.is_encrypted = false
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
index a4e0d5d..4d66dba 100644
--- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
+++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
@@ -21,7 +21,7 @@
 ###############################################################################
 # OS system.properties
 
-app_display_name = OOM Dashboard
+app_display_name = ONAP Operations UI
 
 # Postgres
 db.driver=org.postgresql.Driver