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>

18 files changed, 150 insertions, 353 deletions

diff --git a/controlloop/packages/apps/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index db843b55b..03d726f39 100644
--- a/controlloop/packages/apps/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -29,9 +29,9 @@
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>apps</artifactId>
+  <artifactId>apps-controlloop</artifactId>
 
-  <name>Drools Applications Installation Package</name>
+  <name>apps-controlloop</name>
   <description>Drools Applications Installation Package</description>
 
   <build>
@@ -56,17 +56,17 @@
     </plugins>
   </build>
 
-  <!--  List any dependencies here that should be included in the installer zip -->
+  <!--  List any dependencies here that should be included in the control loop app zip -->
   <dependencies>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-      <artifactId>basex</artifactId>
+      <artifactId>basex-controlloop</artifactId>
       <version>${project.version}</version>
       <type>tar.gz</type>
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-      <artifactId>artifacts</artifactId>
+      <artifactId>artifacts-controlloop</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
@@ -82,6 +82,18 @@
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>feature-controlloop-amsterdam</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>feature-controlloop-beijing</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/controlloop/packages/apps/src/assembly/zip.xml b/controlloop/packages/apps-controlloop/src/assembly/zip.xml
index f3392e130..f3392e130 100644
--- a/controlloop/packages/apps/src/assembly/zip.xml
+++ b/controlloop/packages/apps-controlloop/src/assembly/zip.xml
diff --git a/controlloop/packages/apps-controlloop/src/files/README.controlloop.apps.txt b/controlloop/packages/apps-controlloop/src/files/README.controlloop.apps.txt
new file mode 100644
index 000000000..58f209310
--- /dev/null
+++ b/controlloop/packages/apps-controlloop/src/files/README.controlloop.apps.txt
@@ -0,0 +1,7 @@
+The Control Loop PDP-D application installation package contains:
+
+1. artifacts-controlloop-<version>.zip contains models and other jars to install in the PDP-D nexus instance.
+2. basex-controlloop-<version>.tar.gz contains scripts and additional files to support the application.
+
+The apps-<version>.zip must be placed in the same directory as the PDP-D installation package previous
+to its installation.
diff --git a/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer
new file mode 100644
index 000000000..b50f6efea
--- /dev/null
+++ b/controlloop/packages/apps-controlloop/src/files/apps-controlloop-installer
@@ -0,0 +1,45 @@
+#!/bin/bash -x
+
+###
+# ============LICENSE_START=======================================================
+# Apps Installation 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=========================================================
+###
+
+#
+# This file will be automatically invoked by the main pdp-d installer
+# for drools applications
+#
+
+echo
+echo "**********************************"
+echo "     CONTROL LOOP APP INSTALL     "
+echo "**********************************"
+echo
+
+source ${POLICY_HOME}/etc/build.info
+
+# nothing to do except enabling some features
+
+features install controlloop-trans
+features install controlloop-amsterdam
+features install controlloop-beijing
+
+features enable controlloop-trans
+features enable controlloop-amsterdam
+
+
diff --git a/controlloop/packages/apps/src/files/README.apps.txt b/controlloop/packages/apps/src/files/README.apps.txt
deleted file mode 100644
index aab021885..000000000
--- a/controlloop/packages/apps/src/files/README.apps.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-The PDP-D apps installation package contains:
-
-1. artifacts-<version>.zip contains models and other jars to support PDP-D applications.
-2. basex-<version>.tar.gz contains scripts and additional files to support the PDP-D models.
-
-The apps-<version>.zip must be placed in the same directory as the installation package
-before installation before installation is attempted.
diff --git a/controlloop/packages/apps/src/files/apps-installer b/controlloop/packages/apps/src/files/apps-installer
deleted file mode 100644
index cff4376f7..000000000
--- a/controlloop/packages/apps/src/files/apps-installer
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# Apps Installation 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=========================================================
-###
-
-#
-# This file will be automatically invoked by the main pdp-d installer
-# for drools applications
-#
-
-echo
-echo "*****************************"
-echo "     DROOLS APPS INSTALL     "
-echo "*****************************"
-echo
-
-source ${POLICY_HOME}/etc/build.info
-
-features install controlloop-trans
-features enable controlloop-trans
-
-# caching in local maven repo all dependencies to make it
-# easier for drools kie-ci - aether to fetch them
-
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=com.att.research.xacml:xacml-pdp:1.0.0:jar
-
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.templates:archetype-cl-amsterdam:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:events:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:appc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:appclcm:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:aai:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:so:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:trafficgenerator:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:controlloop.common:eventmanager:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common:guard:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actorServiceProvider:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.appc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.appclcm:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.so:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.vfc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.policy-yaml:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.templates:template.demo:${version}:jar -Dtransitive=false
diff --git a/controlloop/packages/artifacts-controlloop/pom.xml b/controlloop/packages/artifacts-controlloop/pom.xml
new file mode 100644
index 000000000..0d551265b
--- /dev/null
+++ b/controlloop/packages/artifacts-controlloop/pom.xml
@@ -0,0 +1,63 @@
+<!--
+  ============LICENSE_START=======================================================
+  PDP-D Application Installation Packages
+  ================================================================================
+  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=========================================================
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+    <artifactId>packages</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>artifacts-controlloop</artifactId>
+
+  <name>artifacts-controlloop</name>
+  <description>Companion artifacts for a drools application to install in nexus repository</description>
+
+  <build>
+    <plugins>
+      <plugin>
+	<artifactId>maven-assembly-plugin</artifactId>
+	<executions>
+	  <execution>
+	    <goals>
+	      <goal>single</goal>
+	    </goals>
+	    <phase>package</phase>
+	    <configuration>
+	      <descriptors>
+		        <descriptor>src/assembly/zip.xml</descriptor>
+	      </descriptors>
+	      <appendAssemblyId>false</appendAssemblyId>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+      <!-- Placed here any Control Loop Application Dependencies to be
+           installed in local nexus instance: currently none necessary -->
+  </dependencies>
+</project>
diff --git a/controlloop/packages/artifacts/src/assembly/zip.xml b/controlloop/packages/artifacts-controlloop/src/assembly/zip.xml
index 3c7c61973..6a14b8b93 100644
--- a/controlloop/packages/artifacts/src/assembly/zip.xml
+++ b/controlloop/packages/artifacts-controlloop/src/assembly/zip.xml
@@ -24,6 +24,13 @@
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>src/files</directory>
+			<outputDirectory>.</outputDirectory>
+			<fileMode>755</fileMode>
+		</fileSet>
+	</fileSets>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>artifacts</outputDirectory>
diff --git a/controlloop/packages/artifacts-controlloop/src/files/README.controlloop.artifacts.txt b/controlloop/packages/artifacts-controlloop/src/files/README.controlloop.artifacts.txt
new file mode 100644
index 000000000..f229dbf36
--- /dev/null
+++ b/controlloop/packages/artifacts-controlloop/src/files/README.controlloop.artifacts.txt
@@ -0,0 +1,2 @@
+The artifacts directory contains Control Loop Application Dependencies that are
+to be installed in the local nexus instance.
\ No newline at end of file
diff --git a/controlloop/packages/artifacts/pom.xml b/controlloop/packages/artifacts/pom.xml
deleted file mode 100644
index 3b49a75ce..000000000
--- a/controlloop/packages/artifacts/pom.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  PDP-D Application Installation Packages
-  ================================================================================
-  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=========================================================
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>pom</packaging>
-
-  <parent>
-    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>packages</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>artifacts</artifactId>
-
-  <name>Artifacts for Drools Applications</name>
-  <description>Drools Application models, rules and tooling</description>
-
-  <build>
-    <plugins>
-      <plugin>
-	<artifactId>maven-assembly-plugin</artifactId>
-	<executions>
-	  <execution>
-	    <goals>
-	      <goal>single</goal>
-	    </goals>
-	    <phase>package</phase>
-	    <configuration>
-	      <descriptors>
-		<descriptor>src/assembly/zip.xml</descriptor>
-	      </descriptors>
-	      <appendAssemblyId>false</appendAssemblyId>
-	    </configuration>
-	  </execution>
-	</executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!-- The following are placed in the local or remote repository at installation -->
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications</groupId>
-      <artifactId>drools-applications</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications</groupId>
-      <artifactId>controlloop</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop</groupId>
-      <artifactId>controlloop</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>model-impl</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-    </dependency>
-
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>events</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>appc</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>appclcm</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>vfc</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>aai</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>so</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>sdc</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-      <artifactId>trafficgenerator</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>eventmanager</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>guard</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actorServiceProvider</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actor.appc</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actor.appclcm</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actor.so</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
-      <artifactId>actor.vfc</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>policy-yaml</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.templates</groupId>
-      <artifactId>template.demo</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.att.research.xacml</groupId>
-      <artifactId>xacml-pdp</artifactId>
-      <version>1.0.1</version>
-      <type>jar</type>
-      <exclusions>
-        <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We
-        are not using that PIP and can safely exclude this jar to resolve CLM issue.
-         -->
-        <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/controlloop/packages/basex/pom.xml b/controlloop/packages/basex-controlloop/pom.xml
index ed5016bcb..9a6850f97 100644
--- a/controlloop/packages/basex/pom.xml
+++ b/controlloop/packages/basex-controlloop/pom.xml
@@ -29,10 +29,10 @@
     <version>1.2.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>basex</artifactId>
+  <artifactId>basex-controlloop</artifactId>
 
-  <name>Drools ApplicationsBase Package</name>
-  <description>Drools Applications Packaging</description>
+  <name>basex-controlloop</name>
+  <description>Control Loop Drools Applications Base Extension Package</description>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
 	    <phase>package</phase>
 	    <configuration>
 	      <descriptors>
-		<descriptor>src/assembly/zip.xml</descriptor>
+		    <descriptor>src/assembly/zip.xml</descriptor>
 	      </descriptors>
 	      <appendAssemblyId>false</appendAssemblyId>
 	    </configuration>
diff --git a/controlloop/packages/basex/src/assembly/zip.xml b/controlloop/packages/basex-controlloop/src/assembly/zip.xml
index a33f1b7e5..1020327ce 100644
--- a/controlloop/packages/basex/src/assembly/zip.xml
+++ b/controlloop/packages/basex-controlloop/src/assembly/zip.xml
@@ -19,7 +19,7 @@
   -->
 
 <assembly>
-	<id>basex</id>
+	<id>basex-controlloop</id>
 	<formats>
 		<format>tar.gz</format>
 	</formats>
@@ -28,7 +28,7 @@
 		<fileSet>
 			<directory>src/files</directory>
 			<outputDirectory>.</outputDirectory>
-			<fileMode>700</fileMode>
+			<fileMode>755</fileMode>
 			<directoryMode>700</directoryMode>
 		</fileSet>
 	</fileSets>
diff --git a/controlloop/packages/basex/src/files/bin/create-cl-amsterdam b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
index ad5585035..ad5585035 100644
--- a/controlloop/packages/basex/src/files/bin/create-cl-amsterdam
+++ b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
diff --git a/controlloop/packages/basex/src/files/bin/create-cl-beijing b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-beijing
index 6972fd0fb..6972fd0fb 100644
--- a/controlloop/packages/basex/src/files/bin/create-cl-beijing
+++ b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-beijing
diff --git a/controlloop/packages/basex/src/files/bin/push-policies-beijing b/controlloop/packages/basex-controlloop/src/files/bin/push-policies-beijing
index 92259790a..92259790a 100644
--- a/controlloop/packages/basex/src/files/bin/push-policies-beijing
+++ b/controlloop/packages/basex-controlloop/src/files/bin/push-policies-beijing
diff --git a/controlloop/packages/basex/src/files/config/controlloop.properties.environment b/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment
index 86fe1ed28..86fe1ed28 100644
--- a/controlloop/packages/basex/src/files/config/controlloop.properties.environment
+++ b/controlloop/packages/basex-controlloop/src/files/config/controlloop.properties.environment
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/pom.xml b/controlloop/packages/pom.xml
index 99e4beaa0..bdaa6a8a3 100644
--- a/controlloop/packages/pom.xml
+++ b/controlloop/packages/pom.xml
@@ -36,8 +36,8 @@
   <description>PDP-D Installation</description>
 
   <modules>
-    <module>basex</module>
-    <module>artifacts</module>
-    <module>apps</module>
+    <module>basex-controlloop</module>
+    <module>artifacts-controlloop</module>
+    <module>apps-controlloop</module>
   </modules>
 </project>