installation enhancements

The following changes aim to have a quicker start of the drools container:

1.  For both amsterdam (and the experimental beijing) controllers
    dependencies are pre-installed, so the loading of 3rd party
    dependencies are faster.

2.  Further enhancements in installation.

3.  Make sure that the naming of the generated control loop
    artifacts have a "control loop" label associated with it,
    so in the future, if other applications are added (non
    control loop related) do not conflict and is clear.

Change-Id: Iecb84d186fcc34069aa5c4a175a8a4521b38499d
Issue-ID: POLICY-534
Signed-off-by: Jorge Hernandez <jh1730@att.com>

2 files changed, 0 insertions, 118 deletions

diff --git a/controlloop/packages/basex/src/files/config/amsterdam-controller.properties b/controlloop/packages/basex/src/files/config/amsterdam-controller.properties
deleted file mode 100644
index c0032dd94..000000000
--- a/controlloop/packages/basex/src/files/config/amsterdam-controller.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# 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=========================================================
-###
-
-controller.name=amsterdam
-
-ueb.source.topics=${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
-
-ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
-ueb.source.topics.${{DCAE_TOPIC}}.apiKey=
-ueb.source.topics.${{DCAE_TOPIC}}.apiSecret=
-ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
-ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
-
-ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-CL.apiKey=
-ueb.source.topics.APPC-CL.apiSecret=
-ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-ueb.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
-ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-
-ueb.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-LCM-WRITE.apiKey=
-ueb.source.topics.APPC-LCM-WRITE.apiSecret=
-ueb.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LCMResponseWrapper
-ueb.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LCMResponseWrapper.filter=type\=response
-ueb.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
-
-ueb.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
-
-ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-CL.apiKey=
-ueb.sink.topics.APPC-CL.apiSecret=
-ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
-ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
-
-ueb.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-LCM-READ.apiKey=
-ueb.sink.topics.APPC-LCM-READ.apiSecret=
-ueb.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LCMRequestWrapper
-ueb.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
-
-ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.POLICY-CL-MGT.apiKey=
-ueb.sink.topics.POLICY-CL-MGT.apiSecret=
-ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
-ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-
-rules.groupId=
-rules.artifactId=
-rules.version=
diff --git a/controlloop/packages/basex/src/files/config/controlloop.properties.environment b/controlloop/packages/basex/src/files/config/controlloop.properties.environment
deleted file mode 100644
index 86fe1ed28..000000000
--- a/controlloop/packages/basex/src/files/config/controlloop.properties.environment
+++ /dev/null
@@ -1,50 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP APPS Base Package
-# ================================================================================
-# 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=========================================================
-###
-
-# Environment file (.environment) for control loop applications in this
-# directory, it will be automatically loaded by PDP-D, after being expanded
-# by installation scripts.
-
-sql.db.host=${{SQL_HOST}}
-sql.db.username=${{SQL_USER}}
-sql.db.password=${{SQL_PASSWORD}}
-
-aai.url=${{AAI_URL}}
-aai.username=${{AAI_USERNAME}}
-aai.password=${{AAI_PASSWORD}}
-
-so.url=${{SO_URL}}
-so.username=${{SO_USERNAME}}
-so.password=${{SO_PASSWORD}}
-
-vfc.url=${{VFC_URL}}
-vfc.username=${{VFC_USERNAME}}
-vfc.password=${{VFC_PASSWORD}}
-
-pdpx.host=${{PDP_HOST}}
-pdpx.username=${{PDP_USERNAME}}
-pdpx.password=${{PDP_PASSWORD}}
-pdpx.environment=${{PDP_ENVIRONMENT}}
-pdpx.client.username=${{PDP_CLIENT_USERNAME}}
-pdpx.client.password=${{PDP_CLIENT_PASSWORD}}
-
-guard.url=http://${{PDP_HOST}}:8081/pdp/api/getDecision
-guard.jdbc.url=mariadb://${{SQL_HOST}}:3306/operationshistory10
-guard.disabled=true