From ad7ea1271a5eb1bb56b48a2fb1b35d8ddfed2d12 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 27 Feb 2018 13:34:16 -0500 Subject: Nitrogen port : sli/plugins Update properties-node and restapi-call-node to compile against ODL Nitrogen Change-Id: I21f06abb008562d6e351cb780302ed4375f5d3d2 Issue-ID: CCSDK-178 Signed-off-by: Dan Timoney --- pom.xml | 115 ++++++++--------- .../features/ccsdk-properties-node/pom.xml | 44 +++++++ .../features/features-properties-node/pom.xml | 29 +++++ properties-node/features/pom.xml | 137 ++------------------ .../features/src/main/resources/features.xml | 39 ------ properties-node/installer/pom.xml | 30 +++-- .../src/main/resources/scripts/install-feature.sh | 9 +- properties-node/pom.xml | 36 ++---- properties-node/provider/pom.xml | 68 ++-------- .../META-INF/spring/properties-node-context.xml | 32 ----- .../spring/properties-node-osgi-context.xml | 32 ----- .../blueprint/properties-node-blueprint.xml | 16 +++ .../features/ccsdk-restapi-call-node/pom.xml | 53 ++++++++ .../features/features-restapi-call-node/pom.xml | 29 +++++ restapi-call-node/features/pom.xml | 143 +++------------------ restapi-call-node/installer/pom.xml | 39 +++--- .../src/main/resources/scripts/install-feature.sh | 9 +- restapi-call-node/pom.xml | 36 ++---- restapi-call-node/provider/pom.xml | 56 ++------ 19 files changed, 339 insertions(+), 613 deletions(-) create mode 100644 properties-node/features/ccsdk-properties-node/pom.xml create mode 100644 properties-node/features/features-properties-node/pom.xml delete mode 100644 properties-node/features/src/main/resources/features.xml delete mode 100644 properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml delete mode 100644 properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml create mode 100755 properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml create mode 100644 restapi-call-node/features/ccsdk-restapi-call-node/pom.xml create mode 100644 restapi-call-node/features/features-restapi-call-node/pom.xml diff --git a/pom.xml b/pom.xml index cf84ab7ae..0a01af400 100755 --- a/pom.xml +++ b/pom.xml @@ -1,27 +1,29 @@ - + + 4.0.0 org.onap.ccsdk.parent - odlparent-carbon-sr1 - 0.1.0 + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.sli.plugins ccsdk-sli-plugins + 0.2.1-SNAPSHOT + pom ccsdk-sli-plugins - https://wiki.onap.org CCSDK Java Plugins + https://wiki.onap.org + + ONAP + - - - JIRA - https://jira.onap.org/ - - + + properties-node + restapi-call-node + scm:git:ssh://git@${onap.git.host}/ccsdk/sli/plugins.git @@ -29,13 +31,14 @@ ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/ccsdk/sli/plugins/browse HEAD - + + JIRA + https://jira.onap.org/ + Jenkins https://jenkins.onap.org - - sdnc-javadoc @@ -43,43 +46,6 @@ - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - - - - @@ -102,16 +68,43 @@ - - - properties-node - restapi-call-node - - - AT&T - - 0.2.0-SNAPSHOT + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + + + + diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml new file mode 100644 index 000000000..992e1099b --- /dev/null +++ b/properties-node/features/ccsdk-properties-node/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.plugins + ccsdk-properties-node + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + + + true + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + properties-node-provider + ${project.version} + + + + diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml new file mode 100644 index 000000000..b39826221 --- /dev/null +++ b/properties-node/features/features-properties-node/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.plugins + features-properties-node + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-properties-node + ${project.version} + xml + features + + + + diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml index 0f1e662d9..0d4476585 100755 --- a/properties-node/features/pom.xml +++ b/properties-node/features/pom.xml @@ -1,135 +1,22 @@ 4.0.0 + - properties-node - org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT properties-node-features - Properties Node - Features - - jar - - - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - + 0.2.1-SNAPSHOT + pom - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + ccsdk-properties-node + features-properties-node + diff --git a/properties-node/features/src/main/resources/features.xml b/properties-node/features/src/main/resources/features.xml deleted file mode 100644 index 9abacf0b8..000000000 --- a/properties-node/features/src/main/resources/features.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - - - sdnc-sli - spring - spring-dm - mvn:org.onap.ccsdk.sli.plugins/properties-node-provider/${project.version} - - - - diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml index 8a3330a8f..359c8fb83 100755 --- a/properties-node/installer/pom.xml +++ b/properties-node/installer/pom.xml @@ -1,20 +1,24 @@ - + 4.0.0 + - properties-node - org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.plugins properties-node-installer - Properties node - Karaf Installer + 0.2.1-SNAPSHOT pom + ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + - sdnc-properties-node - sdnc-properties-node - mvn:org.onap.ccsdk.sli.plugins/properties-node-features/${project.version}/xml/features + ccsdk-properties-node + ${application.name} + mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features false @@ -22,10 +26,10 @@ org.onap.ccsdk.sli.plugins - properties-node-features + ${application.name} ${project.version} - features xml + features * @@ -99,8 +103,7 @@ true false false - org.onap.ccsdk.sli - sli-common,sli-provider,dblib-provider + org.onap.ccsdk.sli.plugins provided @@ -135,5 +138,4 @@ - diff --git a/properties-node/installer/src/main/resources/scripts/install-feature.sh b/properties-node/installer/src/main/resources/scripts/install-feature.sh index df03392c8..0eab001d5 100644 --- a/properties-node/installer/src/main/resources/scripts/install-feature.sh +++ b/properties-node/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # 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. @@ -23,7 +23,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -36,5 +35,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/properties-node/pom.xml b/properties-node/pom.xml index ea03a6423..8e99cf6cf 100755 --- a/properties-node/pom.xml +++ b/properties-node/pom.xml @@ -1,43 +1,25 @@ - + + 4.0.0 + - org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom - org.onap.ccsdk.sli.plugins properties-node - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Properties Node + ccsdk-sli-plugins :: properties-node This is an implementation of DG Execute Node that reads property file and puts the properties in the DG context - - - - org.onap.ccsdk.sli.plugins - properties-node-features - features - xml - ${project.version} - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - - provider features installer - diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml index d622e59e9..c354dc1fc 100755 --- a/properties-node/provider/pom.xml +++ b/properties-node/provider/pom.xml @@ -1,89 +1,43 @@ 4.0.0 + - org.onap.ccsdk.sli.plugins - properties-node - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT properties-node-provider + 0.2.1-SNAPSHOT bundle - Properties Node - Provider + + ccsdk-sli-plugins :: properties-node :: ${project.artifactId} http://maven.apache.org + UTF-8 + junit junit test - - org.springframework - spring-test - ${spring.version} - test - org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} - compile org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} - compile org.slf4j slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.springframework - spring-beans - ${spring.version} - - org.springframework - spring-context - ${spring.version} - - - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.sli.prop - org.onap.ccsdk.sli.prop - * - - - - - - - - - - + diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml deleted file mode 100644 index 52d1cd96a..000000000 --- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml deleted file mode 100644 index a46e37c7b..000000000 --- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - diff --git a/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml new file mode 100755 index 000000000..6e1d48efd --- /dev/null +++ b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml @@ -0,0 +1,16 @@ + + + + + + + + + + org.onap.ccsdk.sli.plugins.prop.PropertiesNode + + + + \ No newline at end of file diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml new file mode 100644 index 000000000..aa54b4cf7 --- /dev/null +++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + + + + true + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + restapi-call-node-provider + ${project.version} + + + com.sun.jersey + jersey-client + + + org.codehaus.jettison + jettison + + + diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml new file mode 100644 index 000000000..3347502b9 --- /dev/null +++ b/restapi-call-node/features/features-restapi-call-node/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.plugins + features-restapi-call-node + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-restapi-call-node + ${project.version} + xml + features + + + + diff --git a/restapi-call-node/features/pom.xml b/restapi-call-node/features/pom.xml index 41af12507..98494089c 100755 --- a/restapi-call-node/features/pom.xml +++ b/restapi-call-node/features/pom.xml @@ -1,135 +1,22 @@ - 4.0.0 - - restapi-call-node - org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT - - org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT - restapi-call-node-features - RESTAPI Call Node - Features + 4.0.0 - jar + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - + org.onap.ccsdk.sli.plugins + restapi-call-node-features + 0.2.1-SNAPSHOT + pom - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - + ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + ccsdk-restapi-call-node + features-restapi-call-node + diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml index aedb3b705..68fe477d9 100755 --- a/restapi-call-node/installer/pom.xml +++ b/restapi-call-node/installer/pom.xml @@ -1,20 +1,24 @@ - + 4.0.0 + - restapi-call-node - org.onap.ccsdk.sli.plugins - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.plugins restapi-call-node-installer - Properties node - Karaf Installer + 0.2.1-SNAPSHOT pom + ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + - sdnc-restapi-call-node - sdnc-restapi-call-node - mvn:org.onap.ccsdk.sli.plugins/restapi-call-node-features/${project.version}/xml/features + ccsdk-restapi-call-node + ${application.name} + mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features false @@ -22,10 +26,10 @@ org.onap.ccsdk.sli.plugins - restapi-call-node-features + ${application.name} ${project.version} - features xml + features * @@ -39,7 +43,14 @@ restapi-call-node-provider ${project.version} - + + org.springframework + spring-beans + + + org.springframework + spring-context + @@ -99,8 +110,7 @@ true false false - org.onap.ccsdk.sli - sli-common,sli-provider,dblib-provider + org.onap.ccsdk.sli.core provided @@ -135,5 +145,4 @@ - diff --git a/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh b/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh index e986764b9..cee4a4952 100644 --- a/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh +++ b/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # 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. @@ -23,7 +23,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -36,5 +35,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml index d48253e08..e55fd29a9 100755 --- a/restapi-call-node/pom.xml +++ b/restapi-call-node/pom.xml @@ -1,42 +1,24 @@ - + + 4.0.0 + - org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom - org.onap.ccsdk.sli.plugins restapi-call-node - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - RESTAPI Call Node + ccsdk-sli-plugins :: restapi-call-node This is an implementation of DG Execute Node that makes a call to an external REST API - - - - org.onap.ccsdk.sli.plugins - restapi-call-node-features - features - xml - ${project.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${project.version} - - - - provider features installer - diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index 0d6b3fb86..aae29ead0 100755 --- a/restapi-call-node/provider/pom.xml +++ b/restapi-call-node/provider/pom.xml @@ -1,20 +1,25 @@ 4.0.0 + - org.onap.ccsdk.sli.plugins - restapi-call-node - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + org.onap.ccsdk.sli.plugins restapi-call-node-provider - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT bundle - RESTAPI Call Node - Provider + + ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} http://maven.apache.org + UTF-8 + junit @@ -24,78 +29,37 @@ org.springframework spring-test - ${spring.version} test org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} - compile org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} - compile org.slf4j slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} org.springframework spring-beans - ${spring.version} org.springframework spring-context - ${spring.version} com.sun.jersey jersey-client - ${jersey.version} provided org.codehaus.jettison jettison - ${jettison.version} provided - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.sli.restapicall - org.onap.ccsdk.sli.plugins.restapicall - * - - - - - - - - - - - -- cgit 1.2.3-korg