diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java index 4bb3b4ca0..02aa41f83 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java @@ -71,14 +71,19 @@ public class TomcatJdbcDataSourcePerTenantService implements DataSourcePerTenant poolConfiguration.setUsername(tenant.getSchemaUsername()); poolConfiguration.setPassword(tenant.getSchemaPassword()); - poolConfiguration.setInitialSize(5); - poolConfiguration.setMaxActive(5); - poolConfiguration.setMinIdle(1); - poolConfiguration.setMaxIdle(4); + //poolConfiguration.setInitialSize(5); + //poolConfiguration.setMaxActive(5); + //poolConfiguration.setMinIdle(1); + //poolConfiguration.setMaxIdle(4); + + poolConfiguration.setInitialSize(15); + //poolConfiguration.setMaxActive(5); + //poolConfiguration.setMinIdle(1); + //poolConfiguration.setMaxIdle(4); - poolConfiguration.setSuspectTimeout(60); - poolConfiguration.setTimeBetweenEvictionRunsMillis(30000); - poolConfiguration.setMinEvictableIdleTimeMillis(60000); + //poolConfiguration.setSuspectTimeout(60); + //poolConfiguration.setTimeBetweenEvictionRunsMillis(30000); + //poolConfiguration.setMinEvictableIdleTimeMillis(60000); poolConfiguration.setTestOnBorrow(true); poolConfiguration.setValidationQuery("SELECT 1"); diff --git a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt b/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt index 8823b4b49..a4367e628 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt and b/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt b/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt index 5a1447b74..93a4afd38 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt and b/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Listing (Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Listing (Pentaho).prpt deleted file mode 100644 index 9f3e4ce9b..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Listing (Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/resources/balanceSheet.properties b/mifosng-provider/src/main/pentahoReports/balanceSheet.properties similarity index 100% rename from mifosng-provider/src/main/resources/balanceSheet.properties rename to mifosng-provider/src/main/pentahoReports/balanceSheet.properties diff --git a/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties b/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties new file mode 100644 index 000000000..0cd5fe3c9 --- /dev/null +++ b/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties @@ -0,0 +1,21 @@ +BranchExpectedCashFlow=Branch Expected Cash Flow +From=From : +To=To: +Office=Office: +Currency=Currency : +Date=Date +ExpectedCashIn=Expected Cash In +ExpectedCashOut=Expected Cash Out +Principle=Principle +Interest=Interest +ClientFees=CLient Fees +LoanFees=Loan Fees +Penalty=Penalty +LoanDisbursals=Loan Disbursals +NetExpectedCashOut=Net Expected Cash Out +Total=Total : +PrintedBy\:=Printed by: +On\:=On: +MFIName\:=MFI Name: +Page=Page +VersionAt=Version 1.3.1 \ No newline at end of file diff --git a/mifosng-provider/src/main/resources/incomeStatement.properties b/mifosng-provider/src/main/pentahoReports/incomeStatement.properties similarity index 100% rename from mifosng-provider/src/main/resources/incomeStatement.properties rename to mifosng-provider/src/main/pentahoReports/incomeStatement.properties diff --git a/mifosng-provider/src/main/resources/trialBalance.properties b/mifosng-provider/src/main/pentahoReports/trialBalance.properties similarity index 100% rename from mifosng-provider/src/main/resources/trialBalance.properties rename to mifosng-provider/src/main/pentahoReports/trialBalance.properties