Include impacted changes for APPC-346,APPC-348

Issue-ID: APPC-347
Change-Id: I399bc2a1e0dfd481e103032a373bb80fce5baf41
Signed-off-by: Anand <ac204h@att.com>

4 files changed, 45 insertions, 11 deletions

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
index 7d6f4abee..52bc57d18 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml
@@ -1,18 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-		<parent>
-	    <groupId>org.onap.appc</groupId>
-	    <artifactId>appc-license-manager</artifactId>
-	    <version>1.3.0-SNAPSHOT</version>
-	  </parent>
+    <parent>
+        <groupId>org.onap.appc</groupId>
+        <artifactId>appc-license-manager</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>appc-license-manager-core</artifactId>
     <packaging>bundle</packaging>
-
-    <name>APPC License Manager Bundle</name>
+    <name>APPC License Manager - Core</name>
     <description>appc-license-manager-core OSGi bundle project.</description>
 
+    <properties>
+        <licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.onap.appc</groupId>
@@ -35,6 +63,11 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
         </dependency>
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/onap/appc/licmgr/impl/LicenseDataAccessServiceImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/onap/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
index 8976d1332..43ad1c6ea 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/onap/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/onap/appc/licmgr/impl/LicenseDataAccessServiceImpl.java
@@ -44,7 +44,7 @@ import java.util.Map;
 @SuppressWarnings("JavaDoc")
 public class LicenseDataAccessServiceImpl implements LicenseDataAccessService {
 
-    private static EELFLogger logger = EELFManager.getInstance().getLogger(LicenseDataAccessServiceImpl.class);
+    private final EELFLogger logger = EELFManager.getInstance().getLogger(LicenseDataAccessServiceImpl.class);
 
     public void setSchema(String schema) {
         this.schema = schema;
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
index c8153a36c..2dcc1bdae 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/org/onap/appc/default.properties
@@ -32,6 +32,6 @@ appc.LCM.poolMembers=<DMAAP_IP>:3904
 appc.LCM.service=dmaap
 appc.LCM.topic.write=APPC-TEST2
 appc.LCM.client.name=APPC-TEST-CLIENT-LIC-MGR-TEST
-appc.LCM.provider.user=test
-appc.LCM.provider.pass=test
+appc.LCM.provider.user=admin
+appc.LCM.provider.pass=admin
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/onap/appc/licmgr/LicenseServiceMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/onap/appc/licmgr/LicenseServiceMock.java
index a52c463fc..0f77148ad 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/onap/appc/licmgr/LicenseServiceMock.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/onap/appc/licmgr/LicenseServiceMock.java
@@ -25,6 +25,7 @@
 package org.onap.appc.licmgr;
 
 import org.onap.appc.licmgr.exception.DataAccessException;
+
 import java.util.HashMap;
 import java.util.Map;