From 6c79ed1789e92a1d4d36e5a1deeeb29da34c706a Mon Sep 17 00:00:00 2001
From: mgoodrich <mark.goodrich@live.com>
Date: Mon, 24 Apr 2017 16:22:33 -0400
Subject: [PATCH] fix package structure

---
 .../org/openmrs/module/haiticore/HaitiCoreActivator.java    | 6 +++---
 .../module/haiticore => }/metadata/AddressBundle.java       | 3 +--
 .../module/haiticore => }/metadata/AddressComponent.java    | 2 +-
 .../module/haiticore => }/metadata/HaitiAddressBundle.java  | 6 ++----
 .../haiticore => }/metadata/HaitiEncounterTypeBundle.java   | 2 +-
 .../module/haiticore => }/metadata/HaitiEncounterTypes.java | 2 +-
 .../metadata/HaitiPersonAttributeTypeBundle.java            | 2 +-
 .../haiticore => }/metadata/HaitiPersonAttributeTypes.java  | 2 +-
 .../openmrs/module/haiticore/HaitiCoreActivatorTest.java    | 6 +++---
 9 files changed, 14 insertions(+), 17 deletions(-)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/AddressBundle.java (97%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/AddressComponent.java (95%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/HaitiAddressBundle.java (84%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/HaitiEncounterTypeBundle.java (83%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/HaitiEncounterTypes.java (93%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/HaitiPersonAttributeTypeBundle.java (88%)
 rename api/src/main/java/org/openmrs/module/haiticore/{org/openmrs/module/haiticore => }/metadata/HaitiPersonAttributeTypes.java (96%)

diff --git a/api/src/main/java/org/openmrs/module/haiticore/HaitiCoreActivator.java b/api/src/main/java/org/openmrs/module/haiticore/HaitiCoreActivator.java
index e6f927e..08bd619 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/HaitiCoreActivator.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/HaitiCoreActivator.java
@@ -13,9 +13,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.BaseModuleActivator;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypeBundle;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiEncounterTypeBundle;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiAddressBundle;
+import org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypeBundle;
+import org.openmrs.module.haiticore.metadata.HaitiEncounterTypeBundle;
+import org.openmrs.module.haiticore.metadata.HaitiAddressBundle;
 import org.openmrs.module.metadatadeploy.api.MetadataDeployService;
 
 /**
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressBundle.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/AddressBundle.java
similarity index 97%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressBundle.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/AddressBundle.java
index 781f1da..b070a57 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressBundle.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/AddressBundle.java
@@ -1,11 +1,10 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.beanutils.MethodUtils;
 import org.openmrs.api.SerializationService;
 import org.openmrs.api.context.Context;
 import org.openmrs.api.APIException;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.AddressComponent;
 import org.openmrs.module.addresshierarchy.AddressHierarchyLevel;
 import org.openmrs.module.addresshierarchy.service.AddressHierarchyService;
 import org.openmrs.module.addresshierarchy.util.AddressHierarchyImportUtil;
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressComponent.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/AddressComponent.java
similarity index 95%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressComponent.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/AddressComponent.java
index 6687d22..44ffb32 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/AddressComponent.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/AddressComponent.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.addresshierarchy.AddressField;
 
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java
similarity index 84%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java
index c0364a8..9b07771 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiAddressBundle.java
@@ -1,8 +1,6 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.addresshierarchy.AddressField;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.AddressBundle;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.AddressComponent;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -13,7 +11,7 @@ public class HaitiAddressBundle extends AddressBundle {
 
     @Override
     public int getVersion() {
-        return 9;
+        return 10;
     }
 
     @Override
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java
similarity index 83%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java
index 4c06bf3..4fed48a 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypeBundle.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.metadatadeploy.bundle.AbstractMetadataBundle;
 import org.springframework.stereotype.Component;
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java
similarity index 93%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java
index 0e31863..208d25d 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiEncounterTypes.java
@@ -12,7 +12,7 @@
  * Copyright (C) OpenMRS, LLC.  All Rights Reserved.
  */
 
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.emrapi.EmrApiConstants;
 import org.openmrs.module.metadatadeploy.descriptor.EncounterTypeDescriptor;
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java
similarity index 88%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java
index e99493c..0a78a6f 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypeBundle.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.metadatadeploy.bundle.AbstractMetadataBundle;
 import org.springframework.stereotype.Component;
diff --git a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java
similarity index 96%
rename from api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java
rename to api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java
index 63a972d..413257c 100644
--- a/api/src/main/java/org/openmrs/module/haiticore/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java
+++ b/api/src/main/java/org/openmrs/module/haiticore/metadata/HaitiPersonAttributeTypes.java
@@ -1,4 +1,4 @@
-package org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata;
+package org.openmrs.module.haiticore.metadata;
 
 import org.openmrs.module.emrapi.EmrApiConstants;
 import org.openmrs.module.metadatadeploy.descriptor.PersonAttributeTypeDescriptor;
diff --git a/api/src/test/java/org/openmrs/module/haiticore/HaitiCoreActivatorTest.java b/api/src/test/java/org/openmrs/module/haiticore/HaitiCoreActivatorTest.java
index 3b4c9c5..17bab54 100644
--- a/api/src/test/java/org/openmrs/module/haiticore/HaitiCoreActivatorTest.java
+++ b/api/src/test/java/org/openmrs/module/haiticore/HaitiCoreActivatorTest.java
@@ -6,9 +6,9 @@ import org.openmrs.api.context.Context;
 import org.openmrs.module.addresshierarchy.AddressField;
 import org.openmrs.module.addresshierarchy.AddressHierarchyLevel;
 import org.openmrs.module.addresshierarchy.service.AddressHierarchyService;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypeBundle;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypes;
-import org.openmrs.module.haiticore.org.openmrs.module.haiticore.metadata.HaitiAddressBundle;
+import org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypeBundle;
+import org.openmrs.module.haiticore.metadata.HaitiPersonAttributeTypes;
+import org.openmrs.module.haiticore.metadata.HaitiAddressBundle;
 import org.openmrs.module.metadatadeploy.api.MetadataDeployService;
 import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;