From: Jorge Hernandez Date: Mon, 7 Jan 2019 17:21:18 +0000 (-0600) Subject: Restructuring packaged features installation X-Git-Tag: 1.4.0~48 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F75396%2F7;p=policy%2Fdrools-applications.git Restructuring packaged features installation Some cleaning on the installation. feature-controlloop-management will be installed by default and will contain new capabilities plus common functionality from amsterdam and casablanca. Change-Id: Ic751d3002b5b05342138c77f61209b6c32010ce9 Issue-ID: POLICY-1367 Signed-off-by: Jorge Hernandez --- diff --git a/controlloop/common/controller-casablanca/pom.xml b/controlloop/common/controller-casablanca/pom.xml index 078f0f46a..076938616 100644 --- a/controlloop/common/controller-casablanca/pom.xml +++ b/controlloop/common/controller-casablanca/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -76,101 +76,121 @@ org.onap.policy.drools-applications.controlloop.common.model-impl events ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl appc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl appclcm ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl sdnr ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl vfc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl sdnc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl so ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl aai ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl sdc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.model-impl trafficgenerator ${project.version} + provided org.onap.policy.drools-applications.controlloop.common eventmanager ${project.version} + provided org.onap.policy.drools-applications.controlloop.common guard ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actorServiceProvider ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.appc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.appclcm ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.sdnr ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.so ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.vfc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common.actors actor.sdnc ${project.version} + provided org.onap.policy.drools-applications.controlloop.common policy-yaml ${project.version} + provided com.att.research.xacml diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml index 167272861..ef67282d6 100644 --- a/controlloop/common/feature-controlloop-amsterdam/pom.xml +++ b/controlloop/common/feature-controlloop-amsterdam/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -89,199 +89,11 @@ - - org.onap.policy.drools-applications.controlloop.common.model-impl - events - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - appc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - appclcm - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdnr - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdnc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - vfc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - so - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - aai - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - trafficgenerator - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common - eventmanager - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common - guard - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.actors - actorServiceProvider - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appclcm - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.sdnr - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.so - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.vfc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.sdnc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common - policy-yaml - ${project.version} - - - guava - com.google.guava - - - snakeyaml - org.yaml - - - - - com.att.research.xacml - xacml-pdp - 1.0.2 - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - guava - com.google.guava - - - commons-lang3 - org.apache.commons - - - jackson-databind - com.fasterxml.jackson.core - - - commons-collections - commons-collections - - - commons-lang - commons-lang - - - org.onap.policy.drools-pdp policy-management ${version.policy.drools-pdp} provided - true junit diff --git a/controlloop/common/feature-controlloop-casablanca/pom.xml b/controlloop/common/feature-controlloop-casablanca/pom.xml index 4cee383be..a72a44d58 100644 --- a/controlloop/common/feature-controlloop-casablanca/pom.xml +++ b/controlloop/common/feature-controlloop-casablanca/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ false false runtime - false + true @@ -95,199 +95,16 @@ - - org.onap.policy.drools-applications.controlloop.common.model-impl - events - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - appc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - appclcm - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdnr - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - vfc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdnc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - so - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - aai - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdc - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.model-impl - trafficgenerator - ${project.version} - org.onap.policy.drools-applications.controlloop.common - eventmanager + controller-casablanca ${project.version} - - org.onap.policy.drools-applications.controlloop.common - guard - ${project.version} - - - org.onap.policy.drools-applications.controlloop.common.actors - actorServiceProvider - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.appclcm - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.sdnr - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.so - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.vfc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common.actors - actor.sdnc - ${project.version} - - - guava - com.google.guava - - - - - org.onap.policy.drools-applications.controlloop.common - policy-yaml - ${project.version} - - - guava - com.google.guava - - - snakeyaml - org.yaml - - - - - com.att.research.xacml - xacml-pdp - 1.0.2 - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - guava - com.google.guava - - - commons-lang3 - org.apache.commons - - - jackson-databind - com.fasterxml.jackson.core - - - commons-collections - commons-collections - - - commons-lang - commons-lang - - - org.onap.policy.drools-pdp policy-management ${version.policy.drools-pdp} provided - true junit diff --git a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml index 7cb637918..9bee6bcd2 100644 --- a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml +++ b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -39,12 +39,22 @@ feature-controlloop-casablanca-${project.version}.jar + + target/assembly/lib + artifacts + + controller-casablanca-${project.version}.jar + + target/assembly/lib lib/dependencies *.jar + + controller-casablanca-${project.version}.jar + target/classes/config diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index aed6563b2..ed145ac6a 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -112,17 +112,17 @@ org.onap.policy.drools-applications.controlloop.common.model-impl - sdnr + sdnc ${project.version} org.onap.policy.drools-applications.controlloop.common.model-impl - vfc + sdnr ${project.version} org.onap.policy.drools-applications.controlloop.common.model-impl - sdnc + vfc ${project.version} @@ -287,7 +287,6 @@ policy-management ${version.policy.drools-pdp} provided - true junit diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam similarity index 98% rename from controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam index 5beb6e134..b26c04c76 100644 --- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam +++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam @@ -2,9 +2,9 @@ ### # ============LICENSE_START======================================================= -# PDP-D APPS Base Package +# ONAP # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ echo GROUP_ID="org.onap.policy.rules.amsterdam" ARTIFACT_ID="amsterdam" -VERSION="${version:-1.1.1}" +VERSION="${version:-1.3.4}" PACKAGE="org.onap.policy.rules.amsterdam" CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e" POLICY_SCOPE="amsterdam" diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca similarity index 99% rename from controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca index 5e3d26cf3..b1924d54f 100644 --- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-casablanca +++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca @@ -1,10 +1,10 @@ -#! /bin/bash +#!/bin/bash ### # ============LICENSE_START======================================================= -# PDP-D APPS Base Package +# ONAP # ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ echo GROUP_ID="org.onap.policy.rules.casablanca" ARTIFACT_ID="casablanca" -VERSION="${version:-1.2.0}" +VERSION="${version:-1.3.4}" PACKAGE="org.onap.policy.rules.casablanca" # vCPE Policy Parameters diff --git a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca similarity index 98% rename from controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca rename to controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca index 97c437328..2289aea1f 100644 --- a/controlloop/packages/basex-controlloop/src/files/bin/push-policies-casablanca +++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca @@ -1,10 +1,10 @@ -#! /bin/bash +#!/usr/bin/env bash ### # ============LICENSE_START======================================================= -# PDP-D APPS Base Package +# ONAP # ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment similarity index 94% rename from controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment rename to controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index 4e53b3ed6..2b63d51ad 100644 --- a/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -1,15 +1,15 @@ ### # ============LICENSE_START======================================================= -# ONAP APPS Base Package +# ONAP # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # 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. diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml index 31875fc3e..22f67646e 100644 --- a/controlloop/packages/apps-controlloop/pom.xml +++ b/controlloop/packages/apps-controlloop/pom.xml @@ -1,15 +1,15 @@ - - 4.0.0 - pom - - - org.onap.policy.drools-applications.controlloop.packages - packages - 1.4.0-SNAPSHOT - - - basex-controlloop - - basex-controlloop - Control Loop Drools Applications Base Extension Package - - - - - maven-assembly-plugin - - - - single - - package - - - src/assembly/zip.xml - - false - - - - - - + + 4.0.0 + pom + + + org.onap.policy.drools-applications.controlloop.packages + packages + 1.4.0-SNAPSHOT + + + basex-controlloop + + basex-controlloop + Control Loop Drools Applications Base Extension Package + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${project.basedir}/target + + + src/main/resources + + apps-controlloop-version + + true + + + + + + + + + maven-assembly-plugin + + + + single + + package + + + src/assembly/zip.xml + + false + + + + + + + + diff --git a/controlloop/packages/basex-controlloop/src/assembly/zip.xml b/controlloop/packages/basex-controlloop/src/assembly/zip.xml index 1020327ce..caa943c21 100644 --- a/controlloop/packages/basex-controlloop/src/assembly/zip.xml +++ b/controlloop/packages/basex-controlloop/src/assembly/zip.xml @@ -1,15 +1,15 @@ - basex-controlloop - - tar.gz - - false - - - src/files - . - 755 - 700 - - + basex-controlloop + + tar.gz + + false + + + src/files + . + 755 + 700 + + + target + etc/apps + 755 + 700 + + apps-controlloop-version + + + - diff --git a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version b/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version new file mode 100644 index 000000000..066e5712e --- /dev/null +++ b/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version @@ -0,0 +1,21 @@ +### +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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========================================================= +### + +APPS_CONTROLLOOP_VERSION=${project.version} diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml index 5d9f9c0c1..2eadf96ba 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,16 +1,16 @@