From 116667df3977935f02206b3ce16e8d117ffa7545 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 29 Aug 2019 10:49:50 -0400
Subject: Revert "Proposal to remove OSGi dependencies from the CCSDK project"

This reverts commit b1dd81ede363508f83c86ed497b8c0815045f8e5.
This commit contains a significant amount of new code with no
jUnit testing, which drives our code coverage for this repo
below mandatory 55% line coverage.  Thus, this is not acceptable.

Change-Id: I8a3196df31d0c86747bdb3facd963983276a66e2
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 mdsal-resource/lighty/pom.xml                      | 47 ------------------
 .../resource/mdsal/lighty/MdsalResourceModule.java | 58 ----------------------
 mdsal-resource/pom.xml                             |  1 -
 3 files changed, 106 deletions(-)
 delete mode 100755 mdsal-resource/lighty/pom.xml
 delete mode 100644 mdsal-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/lighty/MdsalResourceModule.java

(limited to 'mdsal-resource')

diff --git a/mdsal-resource/lighty/pom.xml b/mdsal-resource/lighty/pom.xml
deleted file mode 100755
index e2a5e6af..00000000
--- a/mdsal-resource/lighty/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.adaptors</groupId>
-	<artifactId>mdsal-resource-lighty</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
-	<url>http://maven.apache.org</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.onap.ccsdk.sli.core</groupId>
-				<artifactId>ccsdk-lighty-dependency-versions</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>io.lighty.core</groupId>
-			<artifactId>lighty-controller</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
-			<artifactId>mdsal-resource-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/mdsal-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/lighty/MdsalResourceModule.java b/mdsal-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/lighty/MdsalResourceModule.java
deleted file mode 100644
index 44faa876..00000000
--- a/mdsal-resource/lighty/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/lighty/MdsalResourceModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * Copyright (c) 2019 PANTHEON.tech s.r.o.
- * ===================================================================
- * 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============================================
- *
- */
-package org.onap.ccsdk.sli.adaptors.resource.mdsal.lighty;
-
-import io.lighty.core.controller.api.AbstractLightyModule;
-import org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource;
-import org.onap.ccsdk.sli.adaptors.resource.mdsal.MdsalResourcePropertiesProviderImpl;
-import org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource;
-
-/**
- * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
- * the mdsal-resource-provider artifact.
- */
-public class MdsalResourceModule extends AbstractLightyModule {
-
-    private MdsalResourcePropertiesProviderImpl mdsalResourcePropertiesProvider;
-    private ConfigResource configResource;
-    private OperationalResource operationalResource;
-
-    @Override
-    protected boolean initProcedure() {
-        this.mdsalResourcePropertiesProvider = new MdsalResourcePropertiesProviderImpl();
-        this.configResource = new ConfigResource(mdsalResourcePropertiesProvider);
-        this.operationalResource = new OperationalResource(mdsalResourcePropertiesProvider);
-        return true;
-    }
-
-    @Override
-    protected boolean stopProcedure() {
-        return true;
-    }
-
-    public MdsalResourcePropertiesProviderImpl getMdsalResourcePropertiesProviderImpl() {
-        return this.mdsalResourcePropertiesProvider;
-    }
-
-    public ConfigResource getConfigResource() {
-        return configResource;
-    }
-
-    public OperationalResource getOperationalResource() {
-        return this.operationalResource;
-    }
-}
diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index 4c18bd59..87565f71 100755
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/pom.xml
@@ -21,7 +21,6 @@
         <module>provider</module>
         <module>features</module>
         <module>installer</module>
-        <module>lighty</module>
     </modules>
 
 
-- 
cgit 1.2.3-korg