From 268ef0de1095a30c74a0ff8144cb49b157253658 Mon Sep 17 00:00:00 2001 From: Peyton Puckett Date: Wed, 11 Mar 2020 11:09:56 -0500 Subject: Delete template.demo submodule, amsterdam controller Issue-ID: POLICY-2421 Change-Id: I0e61e7b3272f5c7babceb41e4e249716af4529cf Signed-off-by: Peyton Puckett --- .../common/feature-controlloop-amsterdam/pom.xml | 100 --------- .../src/assembly/assemble_zip.xml | 75 ------- .../feature/config/amsterdam-controller.properties | 76 ------- .../feature/config/logback-include-amsterdam.xml | 56 ----- .../feature/amsterdam/AmsterdamFeature.java | 48 ----- ...p.policy.drools.features.PolicyEngineFeatureApi | 1 - .../feature/amsterdam/AmsterdamFeatureTest.java | 31 --- .../src/main/feature/bin/create-cl-amsterdam | 231 --------------------- controlloop/common/pom.xml | 1 - 9 files changed, 619 deletions(-) delete mode 100644 controlloop/common/feature-controlloop-amsterdam/pom.xml delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/assembly/assemble_zip.xml delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/main/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeature.java delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureApi delete mode 100644 controlloop/common/feature-controlloop-amsterdam/src/test/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeatureTest.java delete mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam (limited to 'controlloop/common') diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml deleted file mode 100644 index 8d7b3ec1c..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.drools-applications.controlloop.common - drools-applications-common - 1.6.0-SNAPSHOT - - - feature-controlloop-amsterdam - - - Load Amsterdam Control Loop Use Cases Controller as a feature. - - - - 1.8 - 1.8 - - - - - - maven-assembly-plugin - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - false - - - - - - - - - - org.onap.policy.drools-pdp - policy-management - ${version.policy.drools-pdp} - provided - - - diff --git a/controlloop/common/feature-controlloop-amsterdam/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-amsterdam/src/assembly/assemble_zip.xml deleted file mode 100644 index 7d9d32ff9..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/assembly/assemble_zip.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - feature-controlloop-amsterdam-package - - zip - - - false - - - - target - lib/feature - - feature-controlloop-amsterdam-${project.version}.jar - - - - target/assembly/lib - lib/dependencies - - *.jar - - - - src/main/feature/config - config - 0644 - - - - src/main/feature/bin - bin - 0744 - - - - src/main/feature/db - db - 0744 - - - - src/main/feature/install - install - 0744 - - - - - diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties deleted file mode 100644 index 1feb7ce60..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties +++ /dev/null @@ -1,76 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# 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. -# 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========================================================= -### - -controller.name=amsterdam - -dmaap.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP - -dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} -dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} -dmaap.source.topics.DCAE_TOPIC.events=org.onap.policy.controlloop.VirtualControlLoopEvent -dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)] -dmaap.source.topics.DCAE_TOPIC.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson -dmaap.source.topics.DCAE_TOPIC.https=true - -dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response -dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)] -dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty -dmaap.source.topics.APPC-CL.servers.https=true - -dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper -dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.AppcLcmDmaapWrapper.filter=[?($.type == 'response')] -dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson -dmaap.source.topics.APPC-LCM-WRITE.https=true - -dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper -dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')] -dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson -dmaap.source.topics.SDNR-CL-RSP.https=true - -dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL - -dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request -dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty -dmaap.sink.topics.APPC-CL.https=true - -dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper -dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson -dmaap.sink.topics.APPC-LCM-READ.https=true - -dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification -dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty -dmaap.sink.topics.POLICY-CL-MGT.https=true - -dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS} -dmaap.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper -dmaap.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson -dmaap.sink.topics.SDNR-CL.https=true - -rules.groupId= -rules.artifactId= -rules.version= - diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml deleted file mode 100644 index 780fbdb3a..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - ${logDir}/${amsterdamLog}.log - - ${logDir}/${amsterdamLog}.%d{yyyy-MM-dd}.%i.log.zip - 50MB - 30 - 10GB - - - ${networkPattern} - - - - - - - - - - - - \ No newline at end of file diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeature.java b/controlloop/common/feature-controlloop-amsterdam/src/main/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeature.java deleted file mode 100644 index 72b34d010..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/main/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeature.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * 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. - * 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.policy.drools.apps.controlloop.feature.amsterdam; - -import org.onap.policy.drools.features.PolicyEngineFeatureApi; - -/** - * Amsterdam installation as a feature saves time - * loading the Amsterdam controller at runtime over the - * usual installation from nexus. It also reduces - * potential for errors in the pom.xml generated in - * the brmsgw side. - * - *

There is no impact on other components as the brmsgw - * etc .. they will continue operating as usual. - * - *

This class will be expanded in the future for additional - * functionality - * - */ -public class AmsterdamFeature implements PolicyEngineFeatureApi { - - public static final int SEQNO = 1000; - - @Override - public int getSequenceNumber() { - return SEQNO; - } - -} diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureApi b/controlloop/common/feature-controlloop-amsterdam/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureApi deleted file mode 100644 index b9caa4e1c..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureApi +++ /dev/null @@ -1 +0,0 @@ -org.onap.policy.drools.apps.controlloop.feature.amsterdam.AmsterdamFeature diff --git a/controlloop/common/feature-controlloop-amsterdam/src/test/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeatureTest.java b/controlloop/common/feature-controlloop-amsterdam/src/test/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeatureTest.java deleted file mode 100644 index 0deeff5f6..000000000 --- a/controlloop/common/feature-controlloop-amsterdam/src/test/java/org/onap/policy/drools/apps/controlloop/feature/amsterdam/AmsterdamFeatureTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * Copyright (C) 2018 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========================================================= - */ - -package org.onap.policy.drools.apps.controlloop.feature.amsterdam; - -import static org.junit.Assert.assertTrue; - -public class AmsterdamFeatureTest { - - @org.junit.Test - public void getSequenceNumber() { - assertTrue(new AmsterdamFeature().getSequenceNumber() == AmsterdamFeature.SEQNO); - } -} \ No newline at end of file diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam deleted file mode 100644 index b26c04c76..000000000 --- a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-amsterdam +++ /dev/null @@ -1,231 +0,0 @@ -#! /bin/bash - -### -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# 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. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -# Interactive script to generate and install in a pdp-d control loops demo rules -# for a standalone PDP-D usage - -source "${POLICY_HOME}"/etc/build.info - -echo "Control Loop CLI Generator for R1 Amsterdam Release" -echo "---------------------------------------------------" -echo - -GROUP_ID="org.onap.policy.rules.amsterdam" -ARTIFACT_ID="amsterdam" -VERSION="${version:-1.3.4}" -PACKAGE="org.onap.policy.rules.amsterdam" -CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e" -POLICY_SCOPE="amsterdam" -POLICY_NAME="vcpe" -POLICY_VERSION="v0.0.1" -CONTROL_LOOP_YAML="controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+true%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" -DMAAP_SERVERS="vm1.mr.simpledemo.openecomp.org" -DCAE_TOPIC="unauthenticated.DCAE_CL_OUTPUT" -DCAE_SERVERS="vm1.mr.simpledemo.openecomp.org" - -read -e -i "${GROUP_ID}" -p "Target Rules Group Id> " GROUP_ID -read -e -i "${ARTIFACT_ID}" -p "Target Rules Artifact Id> " ARTIFACT_ID -read -e -i "${VERSION}" -p "Target Rules Version> " VERSION -read -e -i "${PACKAGE}" -p "Target Rules Java Package> " PACKAGE - -read -e -i "${CONTROL_LOOP_NAME}" -p "Template Control Loop Name> " CONTROL_LOOP_NAME -read -e -i "${POLICY_SCOPE}" -p "Template Policy Scope> " POLICY_SCOPE -read -e -i "${POLICY_NAME}" -p "Template Policy Name> " POLICY_NAME -read -e -i "${POLICY_VERSION}" -p "Template Policy Version> " POLICY_VERSION - -read -e -i "${CONTROL_LOOP_YAML}" -p "Control Loop Yaml> " CONTROL_LOOP_YAML - -read -e -i "${DCAE_SERVERS}" -p "Configuration DCAE DMaaP Servers> " DCAE_SERVERS -read -e -i "${DMAAP_SERVERS}" -p "Configuration Open DMaaP Servers> " DMAAP_SERVERS -read -e -i "${DCAE_TOPIC}" -p "Template DCAE Topic> " DCAE_TOPIC - -echo -echo - -if [ -z "${GROUP_ID}" ]; then echo "Aborting: Rules Maven Group Id not provided"; exit 1; fi -if [ -z "${ARTIFACT_ID}" ]; then echo "Aborting: Rules Maven Coordinates Artifact Id not provided"; exit 1; fi -if [ -z "${VERSION}" ]; then echo "Aborting: Rules Maven Coordinates Version not provided"; exit 1; fi -if [ -z "${PACKAGE}" ]; then echo "Aborting: Rules Package not provided"; exit 1; fi -if [ -z "${CONTROL_LOOP_NAME}" ]; then echo "Aborting: Template Control Loop Name not provided"; exit 1; fi -if [ -z "${POLICY_SCOPE}" ]; then echo "Aborting: Template Policy Scope not provided"; exit 1; fi -if [ -z "${POLICY_NAME}" ]; then echo "Aborting: Template Policy Name not provided"; exit 1; fi -if [ -z "${POLICY_VERSION}" ]; then echo "Aborting: Template Policy Version not provided"; exit 1; fi -if [ -z "${CONTROL_LOOP_YAML}" ]; then echo "Aborting: Control Loop Yaml not provided"; exit 1; fi - -if [ -z "${DCAE_TOPIC}" ]; then echo "Aborting: Configuration DCAE DMaaP Topic not provided"; exit 1; fi -if [ -z "${DMAAP_SERVERS}" ]; then echo "Aborting: Configuration Open DMaaP Servers not provided"; exit 1; fi -if [ -z "${DCAE_SERVERS}" ]; then echo "Aborting: Configuration DCAE DMaaP Servers not provided"; exit 1; fi - -DEPENDENCIES_VERSION="${version}" - -read -e -i "${DEPENDENCIES_VERSION}" -p "Control Loop Jar Dependencies Version (ie: 1.1.1-SNAPSHOT, or 1.1.1) > " DEPENDENCIES_VERSION -if [ -z "${DEPENDENCIES_VERSION}" ]; then echo "Aborting: Control Loop Jar Dependencies Version not provided"; exit 1; fi - -echo "---------------------------------------------------------------------------------------" -echo "Please review the Control Loop Rules, Template, and Configuration Parameters:" -echo -echo "The generated rules jar will be installed in a local Maven Repository" -echo -echo "Rules Maven Artifact Generation: Group Id: ${GROUP_ID}" -echo "Rules Maven Artifact Generation: Artifact Id: ${ARTIFACT_ID}" -echo "Rules Maven Artifact Generation: Version: ${VERSION}" -echo "Rules Maven Artifact Generation: Java Package: ${PACKAGE}" -echo "Rules Maven Artifact Generation: pom: Java Libraries Dependencies Version: ${DEPENDENCIES_VERSION}" -echo -echo "Template Drools DRL Expansion: Control Loop Control Name: ${CONTROL_LOOP_NAME}" -echo "Template Drools DRL Expansion: Control Loop Policy Scope: ${POLICY_SCOPE}" -echo "Template Drools DRL Expansion: Control Loop Policy Name: ${POLICY_NAME}" -echo "Template Drools DRL Expansion: Control Loop Policy Version: ${POLICY_VERSION}" -echo "Template Drools DRL Expansion: Control Loop Yaml: ${CONTROL_LOOP_YAML}" -echo -echo "Configuration Policy Controller: Rules: Group Id: ${GROUP_ID}" -echo "Configuration Policy Controller: Rules: Artifact Id: ${ARTIFACT_ID}" -echo "Configuration Policy Controller: Rules: Version: ${VERSION}" -echo -echo "Configuration Policy Controller: DCAE DMaaP Topic: ${DCAE_TOPIC}" -echo "Configuration Policy Controller: DCAE DMaaP Servers: ${DCAE_SERVERS}" -echo -echo "Configuration Policy Controller: Open DMaaP Servers: ${DMAAP_SERVERS}" -echo "---------------------------------------------------------------------------------------" -echo - -HAPPY="Y" -read -e -i "${HAPPY}" -p "Are the previous parameters correct (Y/N)? " HAPPY -if [[ ${HAPPY} != "Y" ]]; then - exit 1 -fi - -echo -DIR_TMP="/tmp" -echo "The Control Loop Rules Maven Project Source Rules will be installed at ${DIR_TMP}" -read -e -i "${DIR_TMP}" -p "Do you want to change the Rules Source Project install directory? " DIR_TMP - -if [ ! -w "${DIR_TMP}" ]; then - echo "Aborting. ${DIR_TMP} is not writable" - exit 1 -fi - -ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications.controlloop.templates" -ARCHETYPE_ARTIFACT_ID="archetype-cl-amsterdam" -ARCHETYPE_VERSION="${VERSION}" - -if [ -d "${DIR_TMP}/${ARTIFACT_ID}/" ]; then - if [ "$(ls -A "${DIR_TMP}/${ARTIFACT_ID}"/)" ]; then - echo "${DIR_TMP} already contains a ${ARTIFACT_ID}/ directory, saving it to ${DIR_TMP}/${ARTIFACT_ID}.arch.bak/" - if [ -d "${DIR_TMP}/${ARTIFACT_ID}.arch.bak"/ ]; then - ( - echo "${DIR_TMP}/${ARTIFACT_ID}.arch.bak/ also exists, deleting it .." - cd "${DIR_TMP}"/ - rm -fr "${ARTIFACT_ID}.arch.bak" - ) - fi - /bin/mv --force "${DIR_TMP}/${ARTIFACT_ID}/" "${DIR_TMP}/${ARTIFACT_ID}.arch.bak" - if [ "${?}" -ne 0 ]; then - echo - echo - echo "Aborting: ${DIR_TMP}/${ARTIFACT_ID}/ cannot be moved" - exit 1 - fi - else - ( cd "${DIR_TMP}/" ; rmdir "${DIR_TMP}/${ARTIFACT_ID}/" ) - fi -fi - -CREATEARTIFACT="Y" -read -e -i "${CREATEARTIFACT}" -p "Create Maven Artifact (Y/N)? " CREATEARTIFACT -if [[ ${CREATEARTIFACT} != "Y" ]]; then - exit 1 -fi - -( -cd "${DIR_TMP}" - -mvn archetype:generate \ - -B \ - -DarchetypeCatalog=local \ - -DarchetypeGroupId="${ARCHETYPE_GROUP_ID}" \ - -DarchetypeArtifactId="${ARCHETYPE_ARTIFACT_ID}" \ - -DarchetypeVersion="${ARCHETYPE_VERSION}" \ - -Dpackage="${PACKAGE}" \ - -DgroupId="${GROUP_ID}" \ - -DartifactId="${ARTIFACT_ID}" \ - -Dversion="${VERSION}" \ - -DclosedLoopControlName="${CONTROL_LOOP_NAME}" \ - -DcontrolLoopYaml="${CONTROL_LOOP_YAML}" \ - -DpolicyScope="${POLICY_SCOPE}" \ - -DpolicyName="${POLICY_NAME}" \ - -DpolicyVersion="${POLICY_VERSION}" \ - -DdmaapServers="${DMAAP_SERVERS}" \ - -DdcaeTopic="${DCAE_TOPIC}" \ - -DdcaeServers="${DCAE_SERVERS}" \ - -DdependenciesVersion="${DEPENDENCIES_VERSION}" - -if [ "${?}" -ne 0 ]; then - echo - echo - echo "Aborting: ${ARTIFACT_ID} has not been successfully generated" - exit 1 -fi - -echo - -cd "${DIR_TMP}/${ARTIFACT_ID}"/ - -mv src/main/config/* . - -echo -echo "Control Loop Rules from templates have been successfully created under ${DIR_TMP}/${ARTIFACT_ID}/" -echo "You have to option to further tweak this project or deploy it as is to the local maven repository." -echo "If you decide to customize the source rules project, please enter 'N' below," -echo "and when finished type 'mvn install' at ${DIR_TMP}/${ARTIFACT_ID}/ to install the Control Loop." - -INSTALLREPO="Y" -read -e -i "${INSTALLREPO}" -p "Do you want to deploy ${ARTIFACT_ID} rules into maven repository (Y/N)? " INSTALLREPO -if [[ ${INSTALLREPO} != "Y" ]]; then - exit 1 -fi - -echo -echo "installing the rules ${ARTIFACT_ID} maven artifact .." - -mvn install - -if [ "${?}" -ne 0 ]; then - echo - echo - echo "Aborting: ${ARTIFACT_ID} deployable jar cannot be installed" - echo "Fix the source rules project issues, and issue 'mvn install'" - echo "at ${DIR_TMP}/${ARTIFACT_ID}/ when done to install it." - exit 1 -fi - - -echo -echo "${ARTIFACT_ID} has been successfully installed in user's (${USER}) local repository" -echo "Find configuration files at ${DIR_TMP}/${ARTIFACT_ID}/" -echo -echo "To deploy this Control Loop into the PDP-D, follow one of these methods: " -echo "1. copy ${DIR_TMP}/${ARTIFACT_ID}/${ARTIFACT_ID}-controller.properties under '${POLICY_HOME}/config'" -echo " and restart the pdp-d (policy stop; policy start)" -echo "2. cd ${DIR_TMP}/${ARTIFACT_ID}/; rest-add-controller ${ARTIFACT_ID}" -echo -) diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml index 934dbcd03..431ab94e6 100644 --- a/controlloop/common/pom.xml +++ b/controlloop/common/pom.xml @@ -42,7 +42,6 @@ feature-controlloop-utils feature-controlloop-trans feature-controlloop-management - feature-controlloop-amsterdam feature-controlloop-frankfurt feature-controlloop-usecases -- cgit 1.2.3-korg