Rename maven modules to mirror directory structure

The naming of Maven modules in drools-applications was not
aligned with the directory structure in the git repository
of drools-applications. Therefore it was difficult to
see the strucutre of the repository in Eclipse and other
IDEs. This change amends the Maven module IDs to
reflect the repository directory structure.

This patch reset fixes the previos patch set, where many
references to maven modules internally in drools-applciations
were missed. See also changes in engine and docker repos.

Updated to reflect repo directory structure in maven
artifact groups.

Issue-ID: POLICY-238
Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

4 files changed, 214 insertions, 214 deletions

diff --git a/controlloop/common/model-impl/vfc/pom.xml b/controlloop/common/model-impl/vfc/pom.xml
index ffd45cf9e..913fe7881 100644
--- a/controlloop/common/model-impl/vfc/pom.xml
+++ b/controlloop/common/model-impl/vfc/pom.xml
@@ -17,51 +17,51 @@
   -->
 
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>vfc</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-	<parent>
-		<groupId>org.onap.policy.drools-applications</groupId>
-		<artifactId>model-impl</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
+  <artifactId>vfc</artifactId>
 
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>2.13.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-applications</groupId>
-			<artifactId>rest</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.drools</groupId>
-			<artifactId>drools-core</artifactId>
-			<version>6.5.0.Final</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.drools-pdp</groupId>
-			<artifactId>policy-management</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
index dd1ccfdd5..a8004203e 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
@@ -1,54 +1,54 @@
-/*-

- * ============LICENSE_START=======================================================

- * Copyright (C) 2017 Intel Corp. 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.vfc;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class VFCHealActionVmInfo implements Serializable {

-

+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealActionVmInfo implements Serializable {
+
 	private static final long serialVersionUID = 3208673205100673119L;
-

-	@SerializedName("vmid")

-	private String vmid;

-

-	@SerializedName("vmname")

-	private String vmname;

-

-	public VFCHealActionVmInfo() {

-		// Default constructor for VFCHealActionVmInfo

-	}

-

-	public String getVmid() {

-		return vmid;

-	}

-

-	public void setVmid(String vmid) {

-		this.vmid = vmid;

-	}

-

-	public String getVmname() {

-		return vmname;

-	}

-

-	public void setVmname(String vmname) {

-		this.vmname = vmname;

-	}

-}

+
+	@SerializedName("vmid")
+	private String vmid;
+
+	@SerializedName("vmname")
+	private String vmname;
+
+	public VFCHealActionVmInfo() {
+		// Default constructor for VFCHealActionVmInfo
+	}
+
+	public String getVmid() {
+		return vmid;
+	}
+
+	public void setVmid(String vmid) {
+		this.vmid = vmid;
+	}
+
+	public String getVmname() {
+		return vmname;
+	}
+
+	public void setVmname(String vmname) {
+		this.vmname = vmname;
+	}
+}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
index 4ffdb5b31..5c7555383 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
@@ -1,54 +1,54 @@
-/*-

- * ============LICENSE_START=======================================================

- * Copyright (C) 2017 Intel Corp. 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.vfc;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class VFCHealAdditionalParams implements Serializable {

-

+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealAdditionalParams implements Serializable {
+
 	private static final long serialVersionUID = 2656694137285096191L;
-

-	@SerializedName("action")

-	private String action;

-

-	@SerializedName("actionvminfo")

-	private VFCHealActionVmInfo actionInfo;

-

-	public VFCHealAdditionalParams() {

-		// Default constructor for VFCHealAdditionalParams

-	}

-

-	public String getAction() {

-		return action;

-	}

-

-	public void setAction(String action) {

-		this.action = action;

-	}

-

-	public VFCHealActionVmInfo getActionInfo() {

-		return actionInfo;

-	}

-

-	public void setActionInfo(VFCHealActionVmInfo actionInfo) {

-		this.actionInfo = actionInfo;

-	}

-}

+
+	@SerializedName("action")
+	private String action;
+
+	@SerializedName("actionvminfo")
+	private VFCHealActionVmInfo actionInfo;
+
+	public VFCHealAdditionalParams() {
+		// Default constructor for VFCHealAdditionalParams
+	}
+
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public VFCHealActionVmInfo getActionInfo() {
+		return actionInfo;
+	}
+
+	public void setActionInfo(VFCHealActionVmInfo actionInfo) {
+		this.actionInfo = actionInfo;
+	}
+}
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
index 787e341de..11ea495a8 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
@@ -1,65 +1,65 @@
-/*-

- * ============LICENSE_START=======================================================

- * Copyright (C) 2017 Intel Corp. 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.vfc;

-

-import java.io.Serializable;

-

-import com.google.gson.annotations.SerializedName;

-

-public class VFCHealRequest implements Serializable {

-

+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealRequest implements Serializable {
+
 	private static final long serialVersionUID = -7341931593089709247L;
-

-	@SerializedName("vnfInstanceId")

-	private String vnfInstanceId;

-

-	@SerializedName("cause")

-	private String cause;

-

-	@SerializedName("additionalParams")

-	private VFCHealAdditionalParams additionalParams;

-

-	public VFCHealRequest() {

-		// Default constructor for VFCHealRequest

-	}

-

-	public String getVnfInstanceId() {

-		return vnfInstanceId;

-	}

-

-	public void setVnfInstanceId(String vnfInstanceId) {

-		this.vnfInstanceId = vnfInstanceId;

-	}

-

-	public String getCause() {

-		return cause;

-	}

-

-	public void setCause(String cause) {

-		this.cause = cause;

-	}

-

-	public VFCHealAdditionalParams getAdditionalParams() {

-		return additionalParams;

-	}

-

-	public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {

-		this.additionalParams = additionalParams;

-	}

-}

+
+	@SerializedName("vnfInstanceId")
+	private String vnfInstanceId;
+
+	@SerializedName("cause")
+	private String cause;
+
+	@SerializedName("additionalParams")
+	private VFCHealAdditionalParams additionalParams;
+
+	public VFCHealRequest() {
+		// Default constructor for VFCHealRequest
+	}
+
+	public String getVnfInstanceId() {
+		return vnfInstanceId;
+	}
+
+	public void setVnfInstanceId(String vnfInstanceId) {
+		this.vnfInstanceId = vnfInstanceId;
+	}
+
+	public String getCause() {
+		return cause;
+	}
+
+	public void setCause(String cause) {
+		this.cause = cause;
+	}
+
+	public VFCHealAdditionalParams getAdditionalParams() {
+		return additionalParams;
+	}
+
+	public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {
+		this.additionalParams = additionalParams;
+	}
+}