Revert "Proposal to remove OSGi dependencies from the CCSDK project"

This reverts commit 85041dd8795b84a48d0b48dd746bfbcb230c8794.
This needs to be reverted due to insufficient testing (no
jUnit tests provided)

Change-Id: I011f3eb7ab27ba9946f04d4d528dd4d91b593685
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

5 files changed, 0 insertions, 343 deletions

diff --git a/lighty/ccsdk-core-lighty/pom.xml b/lighty/ccsdk-core-lighty/pom.xml
deleted file mode 100755
index 98c6a7f8..00000000
--- a/lighty/ccsdk-core-lighty/pom.xml
+++ /dev/null
@@ -1,39 +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>odlparent-lite</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>ccsdk-core-lighty</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>dblib-lighty</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sli-lighty</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sliapi-lighty</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>sliPluginUtil-lighty</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/CcsdkCoreLightyModule.java b/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/CcsdkCoreLightyModule.java
deleted file mode 100644
index 578d1824..00000000
--- a/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/CcsdkCoreLightyModule.java
+++ /dev/null
@@ -1,148 +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.core.lighty;
-
-import io.lighty.core.controller.api.AbstractLightyModule;
-import org.onap.ccsdk.sli.core.dblib.lighty.DblibModule;
-import org.onap.ccsdk.sli.core.lighty.common.CcsdkLightyUtils;
-import org.onap.ccsdk.sli.core.sli.SvcLogicAdaptor;
-import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
-import org.onap.ccsdk.sli.core.sli.SvcLogicRecorder;
-import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
-import org.onap.ccsdk.sli.core.sli.lighty.SliModule;
-import org.onap.ccsdk.sli.core.sliapi.lighty.SliApiModule;
-import org.onap.ccsdk.sli.core.slipluginutils.lighty.SliPluginUtilsModule;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that groups all other LightyModules
- * from the ccsdk-sli-core repository so they can be all treated as one component (for example started/stopped at once).
- * For more information about the lighty.io visit the website https://lighty.io.
- */
-public class CcsdkCoreLightyModule extends AbstractLightyModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CcsdkCoreLightyModule.class);
-
-    private final DataBroker dataBroker;
-    private final NotificationPublishService notificationPublishService;
-    private final RpcProviderRegistry rpcProviderRegistry;
-    private final AAAEncryptionService aaaEncryptionService;
-    private final SvcLogicResource svcLogicResource;
-    private final SvcLogicRecorder svcLogicRecorder;
-    private final SvcLogicJavaPlugin svcLogicJavaPlugin;
-    private final SvcLogicAdaptor svcLogicAdaptor;
-
-    private DblibModule dblibModule;
-    private SliModule sliModule;
-    private SliApiModule sliApiModule;
-    private SliPluginUtilsModule sliPluginUtilsModule;
-
-    // FIXME cyclic dependency - implementation of SvcLogicResource is located in adaptors and CcsdkAdaptorsLightyModule
-    //  is depencent on DbLibService from core
-    public CcsdkCoreLightyModule(DataBroker dataBroker, NotificationPublishService notificationPublishService,
-            RpcProviderRegistry rpcProviderRegistry, AAAEncryptionService aaaEncryptionService,
-            SvcLogicResource svcLogicResource, SvcLogicRecorder svcLogicRecorder, SvcLogicJavaPlugin svcLogicJavaPlugin,
-            SvcLogicAdaptor svcLogicAdaptor) {
-        this.dataBroker = dataBroker;
-        this.notificationPublishService = notificationPublishService;
-        this.rpcProviderRegistry = rpcProviderRegistry;
-        this.aaaEncryptionService = aaaEncryptionService;
-        this.svcLogicResource = svcLogicResource;
-        this.svcLogicRecorder = svcLogicRecorder;
-        this.svcLogicJavaPlugin = svcLogicJavaPlugin;
-        this.svcLogicAdaptor = svcLogicAdaptor;
-    }
-
-    protected boolean initProcedure() {
-        LOG.debug("Initializing CCSDK Core Lighty module...");
-
-        this.dblibModule = new DblibModule(aaaEncryptionService);
-        if (!CcsdkLightyUtils.startLightyModule(dblibModule)) {
-            return false;
-        }
-
-        this.sliModule = new SliModule(dblibModule.getDbLibService(), svcLogicResource, svcLogicRecorder,
-                svcLogicJavaPlugin, svcLogicAdaptor);
-        if (!CcsdkLightyUtils.startLightyModule(sliModule)) {
-            return false;
-        }
-
-        this.sliApiModule = new SliApiModule(dataBroker, notificationPublishService, rpcProviderRegistry, sliModule.getSvcLogicServiceImpl());
-        if (!CcsdkLightyUtils.startLightyModule(sliApiModule)) {
-            return false;
-        }
-
-        this.sliPluginUtilsModule = new SliPluginUtilsModule();
-        if (!CcsdkLightyUtils.startLightyModule(sliPluginUtilsModule)) {
-            return false;
-        }
-
-        LOG.debug("CCSDK Core Lighty module was initialized successfully");
-        return true;
-    }
-
-    protected boolean stopProcedure() {
-        LOG.debug("Stopping CCSDK Core Lighty module...");
-
-        boolean stopSuccessful = true;
-
-        if (!CcsdkLightyUtils.stopLightyModule(sliPluginUtilsModule)) {
-            stopSuccessful = false;
-        }
-
-        if (!CcsdkLightyUtils.stopLightyModule(sliApiModule)) {
-            stopSuccessful = false;
-        }
-
-        if (!CcsdkLightyUtils.stopLightyModule(sliModule)) {
-            stopSuccessful = false;
-        }
-
-        if (!CcsdkLightyUtils.stopLightyModule(dblibModule)) {
-            stopSuccessful = false;
-        }
-
-        if (stopSuccessful) {
-            LOG.debug("CCSDK Core Lighty module was stopped successfully");
-        } else {
-            LOG.error("CCSDK Core Lighty module was not stopped successfully!");
-        }
-        return stopSuccessful;
-    }
-
-    public DblibModule getDblibModule() {
-        return dblibModule;
-    }
-
-    public SliModule getSliModule() {
-        return sliModule;
-    }
-
-    public SliApiModule getSliApiModule() {
-        return sliApiModule;
-    }
-
-    public SliPluginUtilsModule getSliPluginUtilsModule() {
-        return sliPluginUtilsModule;
-    }
-}
diff --git a/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/common/CcsdkLightyUtils.java b/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/common/CcsdkLightyUtils.java
deleted file mode 100644
index bfbcb135..00000000
--- a/lighty/ccsdk-core-lighty/src/main/java/org/onap/ccsdk/sli/core/lighty/common/CcsdkLightyUtils.java
+++ /dev/null
@@ -1,78 +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.core.lighty.common;
-
-import io.lighty.core.controller.api.LightyModule;
-import java.util.concurrent.ExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Utils class containing methods to start/stop LightyModules easier.
- */
-public class CcsdkLightyUtils {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CcsdkLightyUtils.class);
-
-    private CcsdkLightyUtils() {
-        throw new IllegalStateException("This class should not be instantiated!");
-    }
-
-    /**
-     * Starts provided LightyModule
-     * @param lightyModule LightyModule to start
-     * @return true if start was successful; false otherwise
-     */
-    public static boolean startLightyModule(LightyModule lightyModule) {
-        LOG.debug("Starting Lighty module: {} ...", lightyModule.getClass());
-        try {
-            if (lightyModule.start().get()) {
-                LOG.debug("Lighty module: {} was started successfully", lightyModule.getClass());
-                return true;
-            } else {
-                LOG.error("Unable to start Lighty Module: {}!", lightyModule.getClass());
-                return false;
-            }
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Exception thrown while initializing Lighty Module: {}!", lightyModule.getClass(), e);
-            return false;
-        }
-    }
-
-    /**
-     * Stops provided LightyModule
-     * @param lightyModule LightyModule to stop
-     * @return true if stop was successful; false otherwise
-     */
-    public static boolean stopLightyModule(LightyModule lightyModule) {
-        LOG.debug("Stopping Lighty Module: {}...", lightyModule.getClass());
-        try {
-            if (lightyModule.shutdown().get()) {
-                LOG.debug("Lighty Module: {} was stopped successfully", lightyModule.getClass());
-                return true;
-            } else {
-                LOG.error("Unable to stop Lighty Module: {}!", lightyModule.getClass());
-                return false;
-            }
-        } catch (Exception e) {
-            LOG.error("Exception thrown while shutting down {} in CCSDK Core Lighty module!", lightyModule.getClass(),
-                    e);
-            return false;
-        }
-    }
-}
diff --git a/lighty/ccsdk-lighty-dependency-versions/pom.xml b/lighty/ccsdk-lighty-dependency-versions/pom.xml
deleted file mode 100755
index 9c4e63b2..00000000
--- a/lighty/ccsdk-lighty-dependency-versions/pom.xml
+++ /dev/null
@@ -1,57 +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>odlparent-lite</artifactId>
-		<version>1.4.1-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>ccsdk-lighty-dependency-versions</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<properties>
-		<lighty.version>10.1.0</lighty.version>
-		<odl.aaa.version>0.9.0</odl.aaa.version>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.lighty.core</groupId>
-				<artifactId>lighty-controller</artifactId>
-				<version>${lighty.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.lighty.modules</groupId>
-				<artifactId>lighty-restconf-nb-community</artifactId>
-				<version>${lighty.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.lighty.modules</groupId>
-				<artifactId>lighty-netconf-sb</artifactId>
-				<version>${lighty.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.lighty.resources</groupId>
-				<artifactId>singlenode-configuration</artifactId>
-				<version>${lighty.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.opendaylight.aaa</groupId>
-				<artifactId>aaa-artifacts</artifactId>
-				<version>${odl.aaa.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.opendaylight.aaa</groupId>
-				<artifactId>aaa-encrypt-service</artifactId>
-				<version>${odl.aaa.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-</project>
diff --git a/lighty/pom.xml b/lighty/pom.xml
deleted file mode 100644
index f6df30ac..00000000
--- a/lighty/pom.xml
+++ /dev/null
@@ -1,21 +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>odlparent-lite</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.sli.core</groupId>
-    <artifactId>ccsdk-core-lighty-aggregator</artifactId>
-    <version>0.6.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-core-lighty</module>
-        <module>ccsdk-lighty-dependency-versions</module>
-    </modules>
-</project>