From: Timoney, Dan (dt5972) Date: Thu, 29 Aug 2019 15:18:43 +0000 (-0400) Subject: Revert "Proposal to remove OSGi dependencies from the CCSDK project" X-Git-Tag: 0.6.1~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=8d3a2693ec1b5f326cd6028673ff063c0d93369f;p=ccsdk%2Fsli%2Fplugins.git Revert "Proposal to remove OSGi dependencies from the CCSDK project" This reverts commit 7a37199ebccccd03bbea9b37df09ef610f89bb01. This must be reverted due to lack of jUnit testing Change-Id: I0050a6052d5daddb0a5e8474d96c1f6b1055d1a4 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/ccsdk-plugins-lighty/pom.xml b/ccsdk-plugins-lighty/pom.xml deleted file mode 100755 index 8ac8ffcc..00000000 --- a/ccsdk-plugins-lighty/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - ccsdk-plugins-lighty - 0.6.1-SNAPSHOT - jar - - - - org.onap.ccsdk.sli.core - ccsdk-core-lighty - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-lighty - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-lighty - ${project.version} - - - org.onap.ccsdk.sli.plugins - restconf-client-lighty - ${project.version} - - - org.onap.ccsdk.sli.plugins - sshapi-call-node-lighty - ${project.version} - - - org.onap.ccsdk.sli.plugins - template-node-lighty - ${project.version} - - - diff --git a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java b/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java deleted file mode 100644 index a6d662b8..00000000 --- a/ccsdk-plugins-lighty/src/main/java/org/onap/ccsdk/sli/plugins/lighty/CcsdkPluginsLightyModule.java +++ /dev/null @@ -1,133 +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.plugins.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import org.onap.ccsdk.sli.core.lighty.common.CcsdkLightyUtils; -import org.onap.ccsdk.sli.plugins.prop.lighty.PropertiesNodeModule; -import org.onap.ccsdk.sli.plugins.prop.lighty.RestApiCallNodeModule; -import org.onap.ccsdk.sli.plugins.restconf.lighty.RestconfClientModule; -import org.onap.ccsdk.sli.plugins.sshapicall.lighty.SshApiCallModule; -import org.onap.ccsdk.sli.plugins.template.lighty.TemplateNodeModule; -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-plugins 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 CcsdkPluginsLightyModule extends AbstractLightyModule { - - private static final Logger LOG = LoggerFactory.getLogger(CcsdkPluginsLightyModule.class); - - private PropertiesNodeModule propertiesNodeModule; - private RestApiCallNodeModule restApiCallNodeModule; - private RestconfClientModule restconfClientModule; - private SshApiCallModule sshApiCallModule; - private TemplateNodeModule templateNodeModule; - - protected boolean initProcedure() { - LOG.debug("Initializing CCSDK Plugins Lighty module..."); - - this.propertiesNodeModule = new PropertiesNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(propertiesNodeModule)) { - LOG.error("Unable to start PropertiesNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restApiCallNodeModule = new RestApiCallNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(restApiCallNodeModule)) { - LOG.error("Unable to start RestApiCallNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.restconfClientModule = new RestconfClientModule(restApiCallNodeModule.getPropertiesNode()); - if (!CcsdkLightyUtils.startLightyModule(restconfClientModule)) { - LOG.error("Unable to start RestconfClientModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.sshApiCallModule = new SshApiCallModule(); - if (!CcsdkLightyUtils.startLightyModule(sshApiCallModule)) { - LOG.error("Unable to start SshApiCallModule in CCSDK Plugins Lighty module!"); - return false; - } - - this.templateNodeModule = new TemplateNodeModule(); - if (!CcsdkLightyUtils.startLightyModule(templateNodeModule)) { - LOG.error("Unable to start TemplateNodeModule in CCSDK Plugins Lighty module!"); - return false; - } - - LOG.debug("CCSDK Plugins Lighty module was initialized successfully"); - return true; - } - - protected boolean stopProcedure() { - LOG.debug("Stopping CCSDK Plugins Lighty module..."); - - boolean stopSuccessful = true; - - if (!CcsdkLightyUtils.stopLightyModule(templateNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(sshApiCallModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restconfClientModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(restApiCallNodeModule)) { - stopSuccessful = false; - } - - if (!CcsdkLightyUtils.stopLightyModule(propertiesNodeModule)) { - stopSuccessful = false; - } - - if (stopSuccessful) { - LOG.debug("CCSDK Plugins Lighty module was stopped successfully"); - } else { - LOG.error("CCSDK Plugins Lighty module was not stopped successfully!"); - } - return stopSuccessful; - } - - public PropertiesNodeModule getPropertiesNodeModule() { - return propertiesNodeModule; - } - - public RestApiCallNodeModule getRestApiCallNodeModule() { - return restApiCallNodeModule; - } - - public RestconfClientModule getRestconfClientModule() { - return restconfClientModule; - } - - public SshApiCallModule getSshApiCallModule() { - return sshApiCallModule; - } - - public TemplateNodeModule getTemplateNodeModule() { - return templateNodeModule; - } -} diff --git a/pom.xml b/pom.xml index a8f8584f..8e9cc52d 100755 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,6 @@ grToolkit features artifacts - ccsdk-plugins-lighty diff --git a/properties-node/lighty/pom.xml b/properties-node/lighty/pom.xml deleted file mode 100755 index 6a5023d5..00000000 --- a/properties-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - properties-node-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - diff --git a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java b/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java deleted file mode 100644 index 34538112..00000000 --- a/properties-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/PropertiesNodeModule.java +++ /dev/null @@ -1,45 +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.plugins.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.prop.PropertiesNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the properties-node-provider artifact. - */ -public class PropertiesNodeModule extends AbstractLightyModule implements LightyModule { - - private PropertiesNode propertiesNode; - - @Override - protected boolean initProcedure() { - this.propertiesNode = new PropertiesNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public PropertiesNode getPropertiesNode() { - return this.propertiesNode; - } -} diff --git a/properties-node/pom.xml b/properties-node/pom.xml index 53fa2b2d..0e5d576d 100755 --- a/properties-node/pom.xml +++ b/properties-node/pom.xml @@ -21,6 +21,5 @@ provider features installer - lighty diff --git a/restapi-call-node/lighty/pom.xml b/restapi-call-node/lighty/pom.xml deleted file mode 100755 index f6af499c..00000000 --- a/restapi-call-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - restapi-call-node-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - - diff --git a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java b/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java deleted file mode 100644 index 01fa03e5..00000000 --- a/restapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/prop/lighty/RestApiCallNodeModule.java +++ /dev/null @@ -1,46 +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.plugins.prop.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the restapi-call-node-provider artifact. - */ -public class RestApiCallNodeModule extends AbstractLightyModule implements LightyModule { - - private RestapiCallNode restapiCallNode; - - @Override - protected boolean initProcedure() { - this.restapiCallNode = new RestapiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public RestapiCallNode getPropertiesNode() { - return this.restapiCallNode; - } - -} diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml index ece6a569..5bbd4d7b 100755 --- a/restapi-call-node/pom.xml +++ b/restapi-call-node/pom.xml @@ -20,6 +20,5 @@ provider features installer - lighty diff --git a/restconf-client/lighty/pom.xml b/restconf-client/lighty/pom.xml deleted file mode 100755 index 84e940bb..00000000 --- a/restconf-client/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - restconf-client-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.plugins - restconf-client-provider - ${project.version} - - - diff --git a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java b/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java deleted file mode 100644 index bb0fc90d..00000000 --- a/restconf-client/lighty/src/main/java/org/onap/ccsdk/sli/plugins/restconf/lighty/RestconfClientModule.java +++ /dev/null @@ -1,59 +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.plugins.restconf.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; -import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; -import org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the restconf-client-provider artifact. - */ -public class RestconfClientModule extends AbstractLightyModule implements LightyModule { - - private final RestapiCallNode restapiCallNode; - - private RestconfApiCallNode restconfApiCallNode; - private RestconfDiscoveryNode restconfDiscoveryNode; - - public RestconfClientModule(final RestapiCallNode restapiCallNode) { - this.restapiCallNode = restapiCallNode; - } - - @Override - protected boolean initProcedure() { - this.restconfApiCallNode = new RestconfApiCallNode(restapiCallNode); - this.restconfDiscoveryNode = new RestconfDiscoveryNode(restconfApiCallNode); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public RestconfApiCallNode getRestconfApiCallNode() { - return this.restconfApiCallNode; - } - - public RestconfDiscoveryNode getRestconfDiscoveryNode() { - return this.restconfDiscoveryNode; - } -} diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml index 1da628e8..2d1893f6 100755 --- a/restconf-client/pom.xml +++ b/restconf-client/pom.xml @@ -20,6 +20,5 @@ provider features installer - lighty diff --git a/sshapi-call-node/lighty/pom.xml b/sshapi-call-node/lighty/pom.xml deleted file mode 100755 index 13c11cd1..00000000 --- a/sshapi-call-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - sshapi-call-node-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.plugins - sshapi-call-node-provider - ${project.version} - - - diff --git a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java b/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java deleted file mode 100644 index d8f1932d..00000000 --- a/sshapi-call-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/sshapicall/lighty/SshApiCallModule.java +++ /dev/null @@ -1,45 +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.plugins.sshapicall.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.sshapicall.SshApiCallNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the sshapi-call-node-provider artifact. - */ -public class SshApiCallModule extends AbstractLightyModule implements LightyModule { - - private SshApiCallNode sshApiCallNode; - - @Override - protected boolean initProcedure() { - this.sshApiCallNode = new SshApiCallNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public SshApiCallNode getSshApiCallNode() { - return this.sshApiCallNode; - } -} diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml index 1494def3..d46da197 100755 --- a/sshapi-call-node/pom.xml +++ b/sshapi-call-node/pom.xml @@ -20,6 +20,5 @@ provider features installer - lighty diff --git a/template-node/lighty/pom.xml b/template-node/lighty/pom.xml deleted file mode 100755 index 8759f027..00000000 --- a/template-node/lighty/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 1.4.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - template-node-lighty - 0.6.1-SNAPSHOT - jar - - ccsdk-sli-plugins :: template-node :: ${project.artifactId} - http://maven.apache.org - - - UTF-8 - - - - - - org.onap.ccsdk.sli.core - ccsdk-lighty-dependency-versions - ${project.version} - pom - import - - - - - - - io.lighty.core - lighty-controller - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - - diff --git a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java b/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java deleted file mode 100644 index 1cd836bb..00000000 --- a/template-node/lighty/src/main/java/org/onap/ccsdk/sli/plugins/template/lighty/TemplateNodeModule.java +++ /dev/null @@ -1,45 +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.plugins.template.lighty; - -import io.lighty.core.controller.api.AbstractLightyModule; -import io.lighty.core.controller.api.LightyModule; -import org.onap.ccsdk.sli.plugins.template.TemplateNode; - -/** - * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from - * the template-node-provider artifact. - */ -public class TemplateNodeModule extends AbstractLightyModule implements LightyModule { - - private TemplateNode templateNode; - - @Override - protected boolean initProcedure() { - this.templateNode = new TemplateNode(); - return true; - } - - @Override - protected boolean stopProcedure() { - return true; - } - - public TemplateNode getTemplateNode() { - return this.templateNode; - } -} diff --git a/template-node/pom.xml b/template-node/pom.xml index 959d119c..58a83c84 100644 --- a/template-node/pom.xml +++ b/template-node/pom.xml @@ -17,6 +17,5 @@ provider features installer - lighty