From 11510b43c277b8e1dd7e58d79785544810118c8e Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 1 Dec 2020 11:26:31 -0800 Subject: Migrate sli-adaptor files Migrate sli-adaptor repo files into a new "adaptors" directory. Signed-off-by: Jessica Wagantall --- features/ccsdk-aai-service/pom.xml | 42 ---- features/ccsdk-ansible-adapter/pom.xml | 48 ---- features/ccsdk-base-http/pom.xml | 26 -- features/ccsdk-mdsal-resource/pom.xml | 41 ---- features/ccsdk-messagerouter-consumer/pom.xml | 28 --- features/ccsdk-messagerouter-publisher/pom.xml | 28 --- features/ccsdk-netbox-client/pom.xml | 65 ----- features/ccsdk-resource-assignment/pom.xml | 51 ---- features/ccsdk-saltstack-adapter/pom.xml | 44 ---- features/ccsdk-sli-adaptors-all/pom.xml | 84 ------- features/ccsdk-sql-resource/pom.xml | 48 ---- features/features-sli-adaptors/pom.xml | 33 --- features/installer/pom.xml | 265 --------------------- .../src/assembly/assemble_installer_zip.xml | 39 --- .../src/assembly/assemble_mvnrepo_zip.xml | 29 --- .../src/main/resources/scripts/install-feature.sh | 18 -- features/pom.xml | 34 --- 17 files changed, 923 deletions(-) delete mode 100644 features/ccsdk-aai-service/pom.xml delete mode 100644 features/ccsdk-ansible-adapter/pom.xml delete mode 100644 features/ccsdk-base-http/pom.xml delete mode 100644 features/ccsdk-mdsal-resource/pom.xml delete mode 100755 features/ccsdk-messagerouter-consumer/pom.xml delete mode 100755 features/ccsdk-messagerouter-publisher/pom.xml delete mode 100644 features/ccsdk-netbox-client/pom.xml delete mode 100644 features/ccsdk-resource-assignment/pom.xml delete mode 100644 features/ccsdk-saltstack-adapter/pom.xml delete mode 100644 features/ccsdk-sli-adaptors-all/pom.xml delete mode 100644 features/ccsdk-sql-resource/pom.xml delete mode 100644 features/features-sli-adaptors/pom.xml delete mode 100755 features/installer/pom.xml delete mode 100755 features/installer/src/assembly/assemble_installer_zip.xml delete mode 100755 features/installer/src/assembly/assemble_mvnrepo_zip.xml delete mode 100644 features/installer/src/main/resources/scripts/install-feature.sh delete mode 100755 features/pom.xml (limited to 'features') diff --git a/features/ccsdk-aai-service/pom.xml b/features/ccsdk-aai-service/pom.xml deleted file mode 100644 index 2870ea50f..000000000 --- a/features/ccsdk-aai-service/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-aai-service - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - - ${project.groupId} - aai-service-provider - ${project.version} - - - - - diff --git a/features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml deleted file mode 100644 index 652a3ee59..000000000 --- a/features/ccsdk-ansible-adapter/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-ansible-adapter - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - - ${project.groupId} - ansible-adapter-bundle - ${project.version} - - - powermock-api-mockito - org.powermock - - - - - - - diff --git a/features/ccsdk-base-http/pom.xml b/features/ccsdk-base-http/pom.xml deleted file mode 100644 index 4f83f5de1..000000000 --- a/features/ccsdk-base-http/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-base-http - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: base-http :: ${project.artifactId} - - - - ${project.groupId} - base-http-provider - ${project.version} - - - diff --git a/features/ccsdk-mdsal-resource/pom.xml b/features/ccsdk-mdsal-resource/pom.xml deleted file mode 100644 index fc5b9ae2f..000000000 --- a/features/ccsdk-mdsal-resource/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-mdsal-resource - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - - ${project.groupId} - mdsal-resource-provider - ${project.version} - - - - diff --git a/features/ccsdk-messagerouter-consumer/pom.xml b/features/ccsdk-messagerouter-consumer/pom.xml deleted file mode 100755 index 0030d92c8..000000000 --- a/features/ccsdk-messagerouter-consumer/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - org.onap.ccsdk.sli.adaptors.messagerouter - ccsdk-messagerouter-consumer - 1.1.1-SNAPSHOT - feature - - - - ${project.groupId} - consumer.api - ${project.version} - - - ${project.groupId} - consumer.provider - ${project.version} - - - diff --git a/features/ccsdk-messagerouter-publisher/pom.xml b/features/ccsdk-messagerouter-publisher/pom.xml deleted file mode 100755 index fcedcace0..000000000 --- a/features/ccsdk-messagerouter-publisher/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - org.onap.ccsdk.sli.adaptors.messagerouter - ccsdk-messagerouter-publisher - 1.1.1-SNAPSHOT - feature - - - - ${project.groupId} - publisher.api - ${project.version} - - - ${project.groupId} - publisher.provider - ${project.version} - - - diff --git a/features/ccsdk-netbox-client/pom.xml b/features/ccsdk-netbox-client/pom.xml deleted file mode 100644 index cff225740..000000000 --- a/features/ccsdk-netbox-client/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-netbox-client - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${ccsdk.sli.core.version} - xml - features - provided - - - - ${project.groupId} - netbox-client-provider - ${project.version} - - - diff --git a/features/ccsdk-resource-assignment/pom.xml b/features/ccsdk-resource-assignment/pom.xml deleted file mode 100644 index d73a1acda..000000000 --- a/features/ccsdk-resource-assignment/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-resource-assignment - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${ccsdk.sli.core.version} - xml - features - provided - - - - ${project.groupId} - resource-assignment-provider - ${project.version} - - - - - diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml deleted file mode 100644 index 3ac7fcf14..000000000 --- a/features/ccsdk-saltstack-adapter/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-saltstack-adapter - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} - - - ${project.version} - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - - - ${project.groupId} - saltstack-adapter-provider - ${project.version} - - - - powermock-api-mockito - org.powermock - - - - - diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml deleted file mode 100644 index 821f1cb12..000000000 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-sli-adaptors-all - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: features :: ${project.artifactId} - - - ${project.version} - - - - - ${project.groupId} - ccsdk-aai-service - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-ansible-adapter - ${project.version} - xml - features - - - - - ${project.groupId} - ccsdk-netbox-client - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-mdsal-resource - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-resource-assignment - ${project.version} - xml - features - - - ${project.groupId} - ccsdk-sql-resource - ${project.version} - xml - features - - - ${project.groupId}.messagerouter - ccsdk-messagerouter-publisher - ${project.version} - xml - features - - - diff --git a/features/ccsdk-sql-resource/pom.xml b/features/ccsdk-sql-resource/pom.xml deleted file mode 100644 index d8ff07047..000000000 --- a/features/ccsdk-sql-resource/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - ccsdk-sql-resource - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} - - - ${project.version} - - - - - - org.onap.ccsdk.sli.core - ccsdk-sli - ${ccsdk.sli.core.version} - xml - features - provided - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${ccsdk.sli.core.version} - xml - features - provided - - - ${project.groupId} - sql-resource-provider - ${project.version} - - - - diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml deleted file mode 100644 index 5e98da302..000000000 --- a/features/features-sli-adaptors/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - features-sli-adaptors - 1.1.1-SNAPSHOT - feature - - ccsdk-sli-adaptors :: features :: ${project.artifactId} - - - ${project.version} - - - - - ${project.groupId} - ccsdk-sli-adaptors-all - ${project.version} - xml - features - - - - diff --git a/features/installer/pom.xml b/features/installer/pom.xml deleted file mode 100755 index fab35b5f0..000000000 --- a/features/installer/pom.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - sliadaptors-features-installer - 1.1.1-SNAPSHOT - pom - - ccsdk-sli-adaptors :: features :: ${project.artifactId} - - - ccsdk-sli-adaptors-all - ${application.name} - mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features - false - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-aai-service - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-ansible-adapter - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-base-http - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-mdsal-resource - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors.messagerouter - ccsdk-messagerouter-consumer - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors.messagerouter - ccsdk-messagerouter-publisher - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-netbox-client - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-resource-assignment - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-saltstack-adapter - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ccsdk-sql-resource - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.adaptors - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.adaptors - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - - diff --git a/features/installer/src/assembly/assemble_installer_zip.xml b/features/installer/src/assembly/assemble_installer_zip.xml deleted file mode 100755 index a6a22a9ba..000000000 --- a/features/installer/src/assembly/assemble_installer_zip.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - bin - - - zip - - - - false - - - - target/stage/ - ${application.name} - 755 - - *.sh - - - - target/stage/ - ${application.name} - 644 - - *.sh - - - - - - - diff --git a/features/installer/src/assembly/assemble_mvnrepo_zip.xml b/features/installer/src/assembly/assemble_mvnrepo_zip.xml deleted file mode 100755 index 86b07f1f3..000000000 --- a/features/installer/src/assembly/assemble_mvnrepo_zip.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - repo - - - zip - - - - false - - - - target/assembly/ - . - - - - - - - - diff --git a/features/installer/src/main/resources/scripts/install-feature.sh b/features/installer/src/main/resources/scripts/install-feature.sh deleted file mode 100644 index e16e79a12..000000000 --- a/features/installer/src/main/resources/scripts/install-feature.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} -ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -INSTALLERDIR=$(dirname $0) - -REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip - -if [ -f ${REPOZIP} ] -then - unzip -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 -fi - -${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/features/pom.xml b/features/pom.xml deleted file mode 100755 index e57a639ac..000000000 --- a/features/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - - org.onap.ccsdk.sli.adaptors - sliadaptors-feature-aggregator - 1.1.1-SNAPSHOT - pom - - ccsdk-sli-adaptors :: features - - - ccsdk-aai-service - ccsdk-ansible-adapter - ccsdk-base-http - ccsdk-mdsal-resource - ccsdk-messagerouter-consumer - ccsdk-messagerouter-publisher - ccsdk-netbox-client - ccsdk-resource-assignment - ccsdk-saltstack-adapter - ccsdk-sql-resource - ccsdk-sli-adaptors-all - features-sli-adaptors - installer - - -- cgit 1.2.3-korg