From bd678bd2b203f10c40a85727ac1ecbe79e08319f Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Tue, 27 Nov 2012 13:54:53 +0000
Subject: [PATCH] ensure spring data jpa repositories in accounting package are
 picked up correctly for spring wiring. keep ordering on patches.

---
 ... => patch-03-permissions-maker-checker-related.sql} |  0
 ...nting_tables.sql => patch-04_accounting_tables.sql} | 10 +++-------
 .../src/main/resources/META-INF/spring/appContext.xml  |  1 +
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename mifosng-db/patches/{patch-02-permissions-maker-checker-related.sql => patch-03-permissions-maker-checker-related.sql} (100%)
 rename mifosng-db/patches/{00001_accounting_tables.sql => patch-04_accounting_tables.sql} (94%)
 mode change 100755 => 100644

diff --git a/mifosng-db/patches/patch-02-permissions-maker-checker-related.sql b/mifosng-db/patches/patch-03-permissions-maker-checker-related.sql
similarity index 100%
rename from mifosng-db/patches/patch-02-permissions-maker-checker-related.sql
rename to mifosng-db/patches/patch-03-permissions-maker-checker-related.sql
diff --git a/mifosng-db/patches/00001_accounting_tables.sql b/mifosng-db/patches/patch-04_accounting_tables.sql
old mode 100755
new mode 100644
similarity index 94%
rename from mifosng-db/patches/00001_accounting_tables.sql
rename to mifosng-db/patches/patch-04_accounting_tables.sql
index 3ec71c0d1..f1c87f4f6
--- a/mifosng-db/patches/00001_accounting_tables.sql
+++ b/mifosng-db/patches/patch-04_accounting_tables.sql
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS `m_acc_coa`;
 
+DROP TABLE IF EXISTS `acc_gl_account`;
 CREATE TABLE `acc_gl_account` (
 	`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
 	`name` VARCHAR(45) NOT NULL,
@@ -16,10 +17,9 @@ CREATE TABLE `acc_gl_account` (
 	CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
 )
 COLLATE='utf8_general_ci'
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
-
 CREATE TABLE `acc_gl_closure` (
 	`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
 	`office_id` BIGINT(20) NOT NULL,
@@ -40,8 +40,4 @@ CREATE TABLE `acc_gl_closure` (
 	CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
 )
 COLLATE='utf8_general_ci'
-ENGINE=InnoDB;
-
-
-
-
+ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml
index 53208b4a9..75c5187d2 100644
--- a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml
+++ b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml
@@ -27,6 +27,7 @@
     <jpa:repositories base-package="org.mifosng.platform.*.domain" />
     <jpa:repositories base-package="org.mifosplatform.commands.domain" />
     <jpa:repositories base-package="org.mifosplatform.infrastructure.*.domain" />
+    <jpa:repositories base-package="org.mifosplatform.accounting.domain" />
 
     <import resource="infrastructure.xml" />