summaryrefslogtreecommitdiffstats
path: root/asdcApi
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-29 11:16:02 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-29 14:11:03 -0400
commit6a146258879e64344b5837dfa6dee566edba4dda (patch)
tree39e8046e59048ed295ce136fdf490945e37c9ed2 /asdcApi
parentb9de9b7836dc88ca6cf746b1199014850b04e853 (diff)
Revert "Proposal to remove OSGi dependencies from the CCSDK project"
This reverts commit 7b76725b56304435b01c5b97c3424da0605119ee. This must be reverted due to lack of jUnit test cases. Change-Id: I0a9116e3ed95553505cd7517f8f3aca53d0c9c5d Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'asdcApi')
-rwxr-xr-xasdcApi/lighty/pom.xml47
-rw-r--r--asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java61
-rwxr-xr-xasdcApi/pom.xml1
3 files changed, 0 insertions, 109 deletions
diff --git a/asdcApi/lighty/pom.xml b/asdcApi/lighty/pom.xml
deleted file mode 100755
index 5bfbf2bf2..000000000
--- a/asdcApi/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.northbound</groupId>
- <artifactId>asdcApi-lighty</artifactId>
- <version>0.6.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>ccsdk-sli-northbound :: asdcApi :: ${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.northbound</groupId>
- <artifactId>asdcApi-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java b/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java
deleted file mode 100644
index 2895e17e4..000000000
--- a/asdcApi/lighty/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/lighty/AsdcApiModule.java
+++ /dev/null
@@ -1,61 +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.northbound.asdcapi.lighty;
-
-import io.lighty.core.controller.api.AbstractLightyModule;
-import io.lighty.core.controller.api.LightyModule;
-import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
-import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiProvider;
-import org.onap.ccsdk.sli.northbound.asdcapi.AsdcApiSliClient;
-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;
-
-/**
- * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
- * the asdcApi-provicer artifact.
- */
-public class AsdcApiModule extends AbstractLightyModule implements LightyModule {
-
- private final SvcLogicService svcLogicService;
- private final DataBroker dataBroker;
- private final NotificationPublishService publishService;
- private final RpcProviderRegistry rpcRegistry;
- private AsdcApiSliClient asdcApiClient;
- private AsdcApiProvider asdcApiProvider;
-
- public AsdcApiModule(SvcLogicService svcLogicService, DataBroker dataBroker,
- NotificationPublishService publishService, RpcProviderRegistry rpcRegistry) {
- this.svcLogicService = svcLogicService;
- this.dataBroker = dataBroker;
- this.publishService = publishService;
- this.rpcRegistry = rpcRegistry;
- }
-
- @Override
- protected boolean initProcedure() {
- this.asdcApiClient = new AsdcApiSliClient(svcLogicService);
- this.asdcApiProvider = new AsdcApiProvider(dataBroker, publishService, rpcRegistry, asdcApiClient);
- return true;
- }
-
- @Override
- protected boolean stopProcedure() {
- return true;
- }
-
-}
diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml
index e6e6af694..4f2b816f4 100755
--- a/asdcApi/pom.xml
+++ b/asdcApi/pom.xml
@@ -25,7 +25,6 @@
<module>features</module>
<module>provider</module>
<module>installer</module>
- <module>lighty</module>
</modules>