From ae4a935b835c0dc588c7a53aef846dd6506b732f Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Tue, 18 Jul 2017 01:06:39 -0500 Subject: [POLICY-66] self-contained features support installation/enable/disable of self contained package features: Feature 3rd party dependencies, configuration files, and custom installation scripts do not need to be packaged within the policy core base to be used. Change-Id: I35a472e63bd0f9f7aa6cd0c112d41d2b4604a892 Signed-off-by: Jorge Hernandez --- feature-healthcheck/pom.xml | 5 ++- feature-healthcheck/src/assembly/assemble_zip.xml | 46 +++++++++------------- .../feature/config/feature-healthcheck.properties | 44 +++++++++++++++++++++ 3 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 feature-healthcheck/src/main/feature/config/feature-healthcheck.properties (limited to 'feature-healthcheck') diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml index 58ea7681..12c6b4d8 100644 --- a/feature-healthcheck/pom.xml +++ b/feature-healthcheck/pom.xml @@ -82,8 +82,9 @@ false false false - org.opendaylight,com.brocade.odl - provided + runtime + provided + true diff --git a/feature-healthcheck/src/assembly/assemble_zip.xml b/feature-healthcheck/src/assembly/assemble_zip.xml index 51a752a3..fcbb652a 100644 --- a/feature-healthcheck/src/assembly/assemble_zip.xml +++ b/feature-healthcheck/src/assembly/assemble_zip.xml @@ -24,61 +24,51 @@ 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"> - runtime + feature-healthcheck-package zip - false target - lib/opt + lib/feature feature-healthcheck-${project.version}.jar - target/assembly/ - . - - - - - . - lib + target/assembly/lib + lib/dependencies *.jar - src/main/server-gen/bin - bin - 0744 - - + src/main/feature/config + config + 0644 + - src/main/server/bin + src/main/feature/bin bin 0744 - - + - src/main/server-gen/scripts - scripts - - - src/main/server/scripts - scripts + src/main/feature/db + db + 0744 + - src/main/server/config - config + src/main/feature/install + install + 0744 + diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties new file mode 100644 index 00000000..d91c2cc4 --- /dev/null +++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties @@ -0,0 +1,44 @@ +### +# ============LICENSE_START======================================================= +# policy-management +# ================================================================================ +# Copyright (C) 2017 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========================================================= +### + +http.server.services=HEALTHCHECK +http.server.services.HEALTHCHECK.host=0.0.0.0 +http.server.services.HEALTHCHECK.port=6969 +http.server.services.HEALTHCHECK.restClasses=org.openecomp.policy.drools.healthcheck.RestHealthCheck +http.server.services.HEALTHCHECK.managed=false +http.server.services.HEALTHCHECK.swagger=true + +http.client.services=PAP,PDP + +http.client.services.PAP.host=${{PAP_HOST}} +http.client.services.PAP.port=9091 +http.client.services.PAP.contextUriPath=pap/test +http.client.services.PAP.https=false +http.client.services.PAP.userName=${{PAP_USERNAME}} +http.client.services.PAP.password=${{PAP_PASSWORD}} +http.client.services.PAP.managed=true + +http.client.services.PDP.host=${{PDP_HOST}} +http.client.services.PDP.port=8081 +http.client.services.PDP.contextUriPath=pdp/test +http.client.services.PDP.https=false +http.client.services.PDP.userName=${{PDP_USERNAME}} +http.client.services.PDP.password=${{PDP_PASSWORD}} +http.client.services.PDP.managed=false -- cgit 1.2.3-korg