From 37d6468cc670045ab4ff1ee23315739a429aa5e3 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 21 Sep 2017 16:07:02 -0400 Subject: Install sdnc-core utils as karaf package New utils jar was added in another change, but wasn't bundled as a karaf feature and was not being installed in container. This broke odlsli docker container. This change wraps that util package as a new feature (sdnc-core-utils). Change-Id: Ie8c1d608e2c67aa1635837bc400cec942761c81c Issue-ID: CCSDK-54 Signed-off-by: Dan Timoney --- .../src/assembly/assemble_installer_zip.xml | 39 ++++++++++++++++++++++ .../src/assembly/assemble_mvnrepo_zip.xml | 29 ++++++++++++++++ .../src/main/resources/scripts/install-feature.sh | 19 +++++++++++ 3 files changed, 87 insertions(+) create mode 100755 utils/installer/src/assembly/assemble_installer_zip.xml create mode 100755 utils/installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100644 utils/installer/src/main/resources/scripts/install-feature.sh (limited to 'utils/installer/src') diff --git a/utils/installer/src/assembly/assemble_installer_zip.xml b/utils/installer/src/assembly/assemble_installer_zip.xml new file mode 100755 index 000000000..a6a22a9ba --- /dev/null +++ b/utils/installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,39 @@ + + + + bin + + + zip + + + + false + + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + + + + + diff --git a/utils/installer/src/assembly/assemble_mvnrepo_zip.xml b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100755 index 000000000..d96c9f402 --- /dev/null +++ b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,29 @@ + + + + bin + + + zip + + + + false + + + + target/assembly/ + . + + + + + + + + diff --git a/utils/installer/src/main/resources/scripts/install-feature.sh b/utils/installer/src/main/resources/scripts/install-feature.sh new file mode 100644 index 000000000..16b5be8c4 --- /dev/null +++ b/utils/installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +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 + +if [ -f ${REPOZIP} ] +then + unzip -d ${ODL_HOME} ${REPOZIP} +else + echo "ERROR : repo zip ($REPOZIP) not found" + 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} -- cgit 1.2.3-korg From d873c2251b596c5dc15c0899b22ea0b7fdd6a286 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 14 Feb 2018 14:28:47 -0500 Subject: Fix install issues Fixed issues in installation scripts Change-Id: I4bd59ab16b55555ded8d9c2b0e8486d3df88fb44 Issue-ID: CCSDK-175 Signed-off-by: Dan Timoney --- dblib/installer/pom.xml | 10 +++++++--- .../installer/src/main/resources/scripts/install-feature.sh | 5 ++--- filters/installer/pom.xml | 6 +++--- .../installer/src/main/resources/scripts/install-feature.sh | 9 ++++----- sli/installer/pom.xml | 10 +++++++--- sli/installer/src/main/resources/scripts/install-feature.sh | 9 ++++----- sliPluginUtils/installer/pom.xml | 13 ++++++++----- .../installer/src/main/resources/scripts/install-feature.sh | 9 ++++----- sliPluginUtils/provider/pom.xml | 2 +- sliapi/installer/pom.xml | 3 +-- .../installer/src/main/resources/scripts/install-feature.sh | 9 ++++----- .../installer/src/main/resources/scripts/install-feature.sh | 5 ++--- 12 files changed, 47 insertions(+), 43 deletions(-) (limited to 'utils/installer/src') diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 8d6147b72..3f581957a 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -46,7 +46,11 @@ ${project.version} - + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + org.apache.tomcat tomcat-jdbc @@ -110,8 +114,8 @@ true false false - org.onap.ccsdk.sli,org.apache.tomcat - sli-common,sli-provider + org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j + utils-provider,slf4j-api provided diff --git a/dblib/installer/src/main/resources/scripts/install-feature.sh b/dblib/installer/src/main/resources/scripts/install-feature.sh index 16b5be8c4..e16e79a12 100644 --- a/dblib/installer/src/main/resources/scripts/install-feature.sh +++ b/dblib/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,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 @@ -15,5 +14,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/filters/installer/pom.xml b/filters/installer/pom.xml index a16b6a60c..6cc9e5e34 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -19,7 +19,7 @@ ccsdk-filters ${application.name} - mvn:org.onap.ccsdk.sli.core/filters-features/${project.version}/xml/features + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features false @@ -104,8 +104,8 @@ true false false - org.onap.ccsdk.sli - sli-common,sli-provider + org.onap.ccsdk.sli.core + sli-common,sli-provider,utils-provider,dblib-provider provided diff --git a/filters/installer/src/main/resources/scripts/install-feature.sh b/filters/installer/src/main/resources/scripts/install-feature.sh index 70cd85162..74b95b5c8 100644 --- a/filters/installer/src/main/resources/scripts/install-feature.sh +++ b/filters/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/sli/installer/pom.xml b/sli/installer/pom.xml index ec2b43cff..e84ae6d09 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -56,7 +56,11 @@ sli-recording ${project.version} - + + org.antlr + antlr4 + ${antlr.version} + @@ -115,8 +119,8 @@ true false false - org.onap.ccsdk.sli - dblib-provider + org.onap.ccsdk.sli.core,org.antlr + utils-provider,dblib-provider provided diff --git a/sli/installer/src/main/resources/scripts/install-feature.sh b/sli/installer/src/main/resources/scripts/install-feature.sh index 70cd85162..74b95b5c8 100644 --- a/sli/installer/src/main/resources/scripts/install-feature.sh +++ b/sli/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/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 1c0704af6..f11b27ca3 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -9,7 +9,7 @@ - org.onap.ccsdl.sli.core + org.onap.ccsdk.sli.core sliPluginUtils-installer 0.2.1-SNAPSHOT pom @@ -19,7 +19,7 @@ ccsdk-sliPluginUtils ${application.name} - mvn:org.onap.ccsdk.sli.core/sliPluginUtils-features/${project.version}/xml/features + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features false @@ -45,7 +45,11 @@ ${project.version} - + + org.apache.commons + commons-text + 1.1 + @@ -104,8 +108,7 @@ true false false - org.onap.ccsdk.sli - sli-common,sli-provider,dblib-provider + sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils,commons-text provided diff --git a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh index 70cd85162..74b95b5c8 100644 --- a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh +++ b/sliPluginUtils/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/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index 0a274edd0..c09029fa0 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -58,7 +58,7 @@ com.google.code.gson gson - 2.6.2 + 2.7 org.apache.commons diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index 290524e32..d9da9794e 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -104,8 +104,7 @@ true false false - org.onap.ccsdk.sli.core - sli-common,sli-provider,dblib-provider + sliapi-model,sliapi-provider,ccsdk-sliapi,features-sliapi provided diff --git a/sliapi/installer/src/main/resources/scripts/install-feature.sh b/sliapi/installer/src/main/resources/scripts/install-feature.sh index 70cd85162..74b95b5c8 100644 --- a/sliapi/installer/src/main/resources/scripts/install-feature.sh +++ b/sliapi/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/utils/installer/src/main/resources/scripts/install-feature.sh b/utils/installer/src/main/resources/scripts/install-feature.sh index 16b5be8c4..e16e79a12 100644 --- a/utils/installer/src/main/resources/scripts/install-feature.sh +++ b/utils/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,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 @@ -15,5 +14,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} -- cgit 1.2.3-korg From 84eab50f627a1a8c1a4362d373986718eefcecbc Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 22 Jun 2018 15:48:39 -0400 Subject: Add feature aggregator Add feature aggregator ccsdk-sli-core-all to install all sli-core features. Change-Id: I11174fc693a9275d712312145c03abb0d4f88b41 Issue-ID: CCSDK-280 Signed-off-by: Timoney, Dan (dt5972) --- dblib/installer/pom.xml | 4 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- features/ccsdk-sli-core-all/pom.xml | 83 +++++++ features/features-sli-core/pom.xml | 29 +++ features/installer/pom.xml | 138 +++++++++++ .../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 | 24 ++ filters/installer/pom.xml | 4 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- pom.xml | 1 + sli/installer/pom.xml | 4 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- sliPluginUtils/installer/pom.xml | 4 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- sliapi/installer/pom.xml | 4 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- utils/installer/pom.xml | 260 +++++++++++---------- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- 20 files changed, 508 insertions(+), 145 deletions(-) create mode 100644 features/ccsdk-sli-core-all/pom.xml create mode 100644 features/features-sli-core/pom.xml create mode 100755 features/installer/pom.xml create mode 100755 features/installer/src/assembly/assemble_installer_zip.xml create mode 100755 features/installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100644 features/installer/src/main/resources/scripts/install-feature.sh create mode 100755 features/pom.xml (limited to 'utils/installer/src') diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index e0710b8fd..6544f20a5 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -70,12 +70,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true diff --git a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml index d96c9f402..86b07f1f3 100755 --- a/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/dblib/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml new file mode 100644 index 000000000..ef5da1200 --- /dev/null +++ b/features/ccsdk-sli-core-all/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.1.0-SNAPSHOT + + + + org.onap.ccsdk.sli.core + ccsdk-sli-core-all + 0.3.0-SNAPSHOT + feature + + ccsdk-sli-core :: features :: ${project.artifactId} + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${odl.mdsal.model.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${odl.mdsal.version} + pom + import + + + + + + + ${project.groupId} + ccsdk-slicore-utils + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-dblib + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-filters + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sli + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliapi + ${project.version} + xml + features + + + ${project.groupId} + ccsdk-sliPluginUtils + ${project.version} + xml + features + + + diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml new file mode 100644 index 000000000..843e27d9e --- /dev/null +++ b/features/features-sli-core/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.1.0-SNAPSHOT + + + + org.onap.ccsdk.sli.core + features-sli-core + 0.3.0-SNAPSHOT + feature + + ccsdk-sli-core :: features :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-sli-core-all + ${project.version} + xml + features + + + + diff --git a/features/installer/pom.xml b/features/installer/pom.xml new file mode 100755 index 000000000..eb6344bd3 --- /dev/null +++ b/features/installer/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.1.0-SNAPSHOT + + + + org.onap.ccsdk.sli.core + slicore-features-installer + 0.3.0-SNAPSHOT + pom + + ccsdk-sli-core :: features :: ${project.artifactId} + + + ccsdk-sli-core-all + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + + + + + + org.onap.ccsdk.sli.core + ${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.core,org.apache.tomcat,org.slf4j + utils-provider,slf4j-api + 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 new file mode 100755 index 000000000..a6a22a9ba --- /dev/null +++ b/features/installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100755 index 000000000..86b07f1f3 --- /dev/null +++ b/features/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,29 @@ + + + + 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 new file mode 100644 index 000000000..e16e79a12 --- /dev/null +++ b/features/installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,18 @@ +#!/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 new file mode 100755 index 000000000..f7ff3fdd4 --- /dev/null +++ b/features/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.1.0-SNAPSHOT + + + + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 0.3.0-SNAPSHOT + pom + + ccsdk-sli-core :: features + + + ccsdk-sli-core-all + features-sli-core + installer + + diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index d03afaaa2..76e055def 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -60,12 +60,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true diff --git a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml index f000fd074..69e9e2909 100644 --- a/filters/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/filters/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,7 +25,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip diff --git a/pom.xml b/pom.xml index 9dc52969d..d2f9d39fe 100755 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ filters sliPluginUtils sliapi + features diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 83f059c54..4a3eeff74 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -87,12 +87,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true diff --git a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml index a1be36792..6a21012dc 100644 --- a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -19,7 +19,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index a1737a86d..5a22e4953 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -64,12 +64,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true diff --git a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml index b8a6dde62..63ef515a0 100644 --- a/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sliPluginUtils/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,7 +25,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index 145169ba0..de5c6a684 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -60,12 +60,12 @@ package - false + true stage/${application.name}-${project.version} src/assembly/assemble_mvnrepo_zip.xml - false + true diff --git a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml index 5f3e3af31..c4eb9aa25 100644 --- a/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sliapi/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,7 +25,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index 4b445936a..389927256 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/pom.xml @@ -1,143 +1,145 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.1.0-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.1.0-SNAPSHOT + + - org.onap.ccsdk.sli.core - utils-installer - 0.3.0-SNAPSHOT - pom + org.onap.ccsdk.sli.core + utils-installer + 0.3.0-SNAPSHOT + pom - ccsdk-sli-core :: utils :: ${project.artifactId} + ccsdk-sli-core :: utils :: ${project.artifactId} - - ccsdk-slicore-utils - ${application.name} - mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features - false - + + ccsdk-slicore-utils + ${application.name} + mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features + false + - + - - org.onap.ccsdk.sli.core - ${application.name} - ${project.version} - xml - features - - - * - * - - - + + org.onap.ccsdk.sli.core + ${application.name} + ${project.version} + xml + features + + + * + * + + + - - org.onap.ccsdk.sli.core - utils-provider - ${project.version} - + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + - + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - false - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - false - - - - 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,org.apache.tomcat - sli-common,sli-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + + + 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,org.apache.tomcat + sli-common,sli-provider + 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/utils/installer/src/assembly/assemble_mvnrepo_zip.xml b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml index d96c9f402..86b07f1f3 100755 --- a/utils/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -4,7 +4,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - bin + repo zip -- cgit 1.2.3-korg