From 36bcd566167f2f91c0e8e7a304fce5f6bc150776 Mon Sep 17 00:00:00 2001 From: Anand Date: Thu, 4 Jan 2018 19:35:51 -0500 Subject: Include impacted changes for APPC-346,APPC-348 Issue-ID: APPC-347 Change-Id: I399bc2a1e0dfd481e103032a373bb80fce5baf41 Signed-off-by: Anand --- .../appc-license-manager-api/pom.xml | 71 +++++-- .../appc-license-manager-core/pom.xml | 49 ++++- .../licmgr/impl/LicenseDataAccessServiceImpl.java | 2 +- .../resources/org/onap/appc/default.properties | 4 +- .../org/onap/appc/licmgr/LicenseServiceMock.java | 1 + .../appc-license-manager-features/pom.xml | 228 ++++++++++++--------- appc-dispatcher/appc-license-manager/pom.xml | 62 ++++-- 7 files changed, 267 insertions(+), 150 deletions(-) (limited to 'appc-dispatcher/appc-license-manager') diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml index 03abbc54b..ac7c344a1 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml @@ -1,26 +1,51 @@ - - 4.0.0 - - org.onap.appc - appc-license-manager - 1.3.0-SNAPSHOT - - appc-license-manager-api - bundle + + + + 4.0.0 + + org.onap.appc + appc-license-manager + 1.3.0-SNAPSHOT + + appc-license-manager-api + APPC License Manager - API + bundle + http://maven.apache.org + + + UTF-8 + + + + + org.onap.ccsdk.sli.core + dblib-provider + + @@ -30,7 +55,11 @@ ${project.artifactId} ${project.version} - org.onap.appc.licmgr,org.onap.appc.licmgr.exception,org.onap.appc.licmgr.objects + + org.onap.appc.licmgr, + org.onap.appc.licmgr.exception, + org.onap.appc.licmgr.objects + 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 @@ - + + 4.0.0 - - org.onap.appc - appc-license-manager - 1.3.0-SNAPSHOT - + + org.onap.appc + appc-license-manager + 1.3.0-SNAPSHOT + + appc-license-manager-core bundle - - APPC License Manager Bundle + APPC License Manager - Core appc-license-manager-core OSGi bundle project. + + ${project.parent.parent.parent.basedir} + + org.onap.appc @@ -34,6 +62,11 @@ sli-common compile + + junit + junit + test + org.onap.ccsdk.sli.core sli-provider 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=: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; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml index 5d962c637..bd3eecf83 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml @@ -1,107 +1,133 @@ - - 4.0.0 - - appc-license-manager - org.onap.appc - 1.3.0-SNAPSHOT - - appc-license-manager-features - appc-license-manager-features + - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - + ECOMP is a trademark and service mark of AT&T Intellectual Property. + ============LICENSE_END========================================================= + --> + + 4.0.0 + + appc-license-manager + org.onap.appc + 1.3.0-SNAPSHOT + - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - + APPC License Manager - Features + appc-license-manager-features + jar + + + + + org.onap.appc + appc-license-manager-api + ${project.version} + + + org.onap.appc + appc-license-manager-core + ${project.version} + + + + + + + true + src/main/resources + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter + + resources + + generate-resources + + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + diff --git a/appc-dispatcher/appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/pom.xml index 77ac63508..ad9fbc08c 100644 --- a/appc-dispatcher/appc-license-manager/pom.xml +++ b/appc-dispatcher/appc-license-manager/pom.xml @@ -1,22 +1,50 @@ - - 4.0.0 - - org.onap.appc - appc-dispatcher - 1.3.0-SNAPSHOT - - appc-license-manager - pom - APPC License Manager - APPC License Manager + + - - - + 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========================================================= + --> + + 4.0.0 + + org.onap.appc + appc-dispatcher + 1.3.0-SNAPSHOT + + + appc-license-manager + pom + APPC License Manager + APPC License Manager + + + + + + appc-license-manager-api appc-license-manager-core - appc-license-manager-features - + appc-license-manager-features + -- cgit 1.2.3-korg