summaryrefslogtreecommitdiffstats
path: root/sliPluginUtils
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-29 11:11:24 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-29 11:12:11 -0400
commite1b15a3b62259a0a7e8da3561b044dabf3c5e9d4 (patch)
tree950be407a977db8174d98b62bebef86e3b84b150 /sliPluginUtils
parentc4ed9e1fce217d171afd569676e625b0be51cbfb (diff)
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>
Diffstat (limited to 'sliPluginUtils')
-rwxr-xr-xsliPluginUtils/lighty/pom.xml48
-rw-r--r--sliPluginUtils/lighty/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/lighty/SliPluginUtilsModule.java51
-rwxr-xr-xsliPluginUtils/pom.xml1
3 files changed, 0 insertions, 100 deletions
diff --git a/sliPluginUtils/lighty/pom.xml b/sliPluginUtils/lighty/pom.xml
deleted file mode 100755
index 57c8b3cdb..000000000
--- a/sliPluginUtils/lighty/pom.xml
+++ /dev/null
@@ -1,48 +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.core</groupId>
- <artifactId>sliPluginUtil-lighty</artifactId>
- <version>0.6.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>ccsdk-sli-core :: sliPluginUtil :: ${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.core</groupId>
- <artifactId>sliPluginUtils-provider</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/sliPluginUtils/lighty/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/lighty/SliPluginUtilsModule.java b/sliPluginUtils/lighty/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/lighty/SliPluginUtilsModule.java
deleted file mode 100644
index 41b63f535..000000000
--- a/sliPluginUtils/lighty/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/lighty/SliPluginUtilsModule.java
+++ /dev/null
@@ -1,51 +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.slipluginutils.lighty;
-
-import io.lighty.core.controller.api.AbstractLightyModule;
-import org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils;
-import org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils;
-
-/**
- * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
- * the sliPluginUtils-provider artifact.
- */
-public class SliPluginUtilsModule extends AbstractLightyModule {
-
- private SliPluginUtils sliPluginUtils;
- private SliStringUtils sliStringUtils;
-
- @Override
- protected boolean initProcedure() {
- this.sliPluginUtils = new SliPluginUtils();
- this.sliStringUtils = new SliStringUtils();
- return true;
- }
-
- @Override
- protected boolean stopProcedure() {
- return true;
- }
-
- public SliPluginUtils getSliPluginUtils() {
- return this.sliPluginUtils;
- }
-
- public SliStringUtils getSliStringUtils() {
- return sliStringUtils;
- }
-}
diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 4ad33be12..a6b8b83a7 100755
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -21,6 +21,5 @@
<module>provider</module>
<module>features</module>
<module>installer</module>
- <module>lighty</module>
</modules>
</project>