You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2025/06/22 20:41:38 UTC
(fineract) branch develop updated: FINERACT-2181: Gradle task rework - Optimized weaving across all modules
This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new db28259b1a FINERACT-2181: Gradle task rework - Optimized weaving across all modules
db28259b1a is described below
commit db28259b1ae6867fa2dd17f5f12fac16d0f5d97f
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Sat Jun 21 00:48:05 2025 +0200
FINERACT-2181: Gradle task rework - Optimized weaving across all modules
---
STATIC_WEAVING.md | 30 ++
build.gradle | 9 +-
fineract-accounting/build.gradle | 23 +-
.../main/resources/jpa/accounting/persistence.xml | 51 ---
.../module/fineract-accounting}/persistence.xml | 83 +++--
fineract-branch/build.gradle | 29 +-
.../module/fineract-branch}/persistence.xml | 90 +++--
fineract-charge/build.gradle | 29 +-
.../module/fineract-charge}/persistence.xml | 81 +++--
fineract-command/dependencies.gradle | 4 +-
.../command/persistence/CommandRepository.java | 2 +-
.../{model => domain}/CommandEntity.java | 2 +-
.../command/persistence/mapping/CommandMapper.java | 2 +-
.../module/fineract-command}/persistence.xml | 10 +-
fineract-core/build.gradle | 21 +-
.../module/fineract-core}/persistence.xml | 67 ++--
fineract-document/build.gradle | 19 +-
.../module/fineract-document}/persistence.xml | 71 ++--
fineract-investor/build.gradle | 23 +-
.../module/fineract-investor}/persistence.xml | 141 ++++----
fineract-loan/build.gradle | 29 +-
.../module/fineract-loan}/persistence.xml | 126 +++----
fineract-progressive-loan/build.gradle | 23 +-
.../fineract-progressive-loan}/persistence.xml | 121 ++++---
fineract-provider/build.gradle | 116 +++----
.../module/fineract-provider/persistence.xml | 375 +++++++++++++++++++++
fineract-rates/build.gradle | 29 +-
.../module/fineract-rates}/persistence.xml | 67 ++--
fineract-report/build.gradle | 29 +-
.../module/fineract-report}/persistence.xml | 66 ++--
fineract-savings/build.gradle | 29 +-
.../src/main/resources/jpa/savings/persistence.xml | 74 ----
.../module/fineract-savings}/persistence.xml | 112 ++++--
fineract-tax/build.gradle | 29 +-
.../module/fineract-tax}/persistence.xml | 70 ++--
static-weaving.gradle | 65 ++++
36 files changed, 1177 insertions(+), 970 deletions(-)
diff --git a/STATIC_WEAVING.md b/STATIC_WEAVING.md
new file mode 100644
index 0000000000..ae8ba7805a
--- /dev/null
+++ b/STATIC_WEAVING.md
@@ -0,0 +1,30 @@
+# Static Weaving Configuration
+
+This document explains the static weaving setup for JPA entities in the Fineract project.
+
+## Overview
+
+Static weaving is a process that enhances JPA entities at build time to improve runtime performance. This is done using the `org.eclipse.persistence.tools.weaving.jpa.StaticWeave` which processes the compiled classes and applies the necessary bytecode transformations.
+
+## Configuration
+
+The static weaving is configured in `static-weaving.gradle` and applied to all Java projects that contain JPA entities.
+
+## How It Works
+
+1. **Compilation**: Java source files are compiled to the standard classes directory (`build/classes/java/main`).
+2. **Weaving**: Weaving happens as last step of **compileJava** task, which outputs them to the standard classes directory (`build/classes/java/main`).
+
+## Adding Static Weaving to a Module
+
+1. Add JPA entities to `src/main/java`
+2. Ensure there's a `persistence.xml` file in `src/main/resources/jpa/static-weaving/module/[module-name]/`
+3. The build will automatically detect and apply static weaving
+
+## Troubleshooting
+
+If you encounter issues with static weaving:
+
+1. Check that the `persistence.xml` file exists in the correct location
+2. Verify that the output directories are being created correctly
+3. Check the build logs for any weaving-related errors
diff --git a/build.gradle b/build.gradle
index 077ad067f9..2d5252c93c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,6 +146,11 @@ gitVersioning.apply {
ext['groovy.version'] = '4.0.17'
ext['swaggerFile'] = "$rootDir/fineract-provider/build/classes/java/main/static/fineract.json".toString()
+// Apply static weaving configuration to all subprojects
+subprojects { subproject ->
+ apply from: rootProject.file('static-weaving.gradle')
+}
+
allprojects {
group = 'org.apache.fineract'
@@ -406,10 +411,6 @@ configure(project.fineractJavaProjects) {
group = 'org.apache.fineract'
- /* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
- sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
- sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
configurations.named('spotbugs').configure {
resolutionStrategy.eachDependency {
if (it.requested.group == 'org.ow2.asm') {
diff --git a/fineract-accounting/build.gradle b/fineract-accounting/build.gradle
index 916069b1f9..9f7ab3ab4e 100644
--- a/fineract-accounting/build.gradle
+++ b/fineract-accounting/build.gradle
@@ -21,23 +21,8 @@ description = 'Fineract Accounting'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/accounting/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- mainClass = 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
configurations {
@@ -85,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-accounting/src/main/resources/jpa/accounting/persistence.xml b/fineract-accounting/src/main/resources/jpa/accounting/persistence.xml
deleted file mode 100644
index 3e2aa17434..0000000000
--- a/fineract-accounting/src/main/resources/jpa/accounting/persistence.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
--->
-
-
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-
- <!-- This file is only used for static weaving, nothing more. -->
- <!-- You can find the runtime configuration in the JPAConfig class -->
- <persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <!-- Fineract Charge module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="eclipselink.weaving" value="static" />
- </properties>
- </persistence-unit>
-</persistence>
diff --git a/fineract-loan/src/main/resources/jpa/loan/persistence.xml b/fineract-accounting/src/main/resources/jpa/static-weaving/module/fineract-accounting/persistence.xml
similarity index 74%
copy from fineract-loan/src/main/resources/jpa/loan/persistence.xml
copy to fineract-accounting/src/main/resources/jpa/static-weaving/module/fineract-accounting/persistence.xml
index bb2388765b..60e55ff84b 100644
--- a/fineract-loan/src/main/resources/jpa/loan/persistence.xml
+++ b/fineract-accounting/src/main/resources/jpa/static-weaving/module/fineract-accounting/persistence.xml
@@ -22,56 +22,69 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
<class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Charge Module Entities -->
<class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-branch/build.gradle b/fineract-branch/build.gradle
index 04a3b10e4e..068ca03aef 100644
--- a/fineract-branch/build.gradle
+++ b/fineract-branch/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Branch'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/branch/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-loan/src/main/resources/jpa/loan/persistence.xml b/fineract-branch/src/main/resources/jpa/static-weaving/module/fineract-branch/persistence.xml
similarity index 69%
copy from fineract-loan/src/main/resources/jpa/loan/persistence.xml
copy to fineract-branch/src/main/resources/jpa/static-weaving/module/fineract-branch/persistence.xml
index bb2388765b..5e972e532d 100644
--- a/fineract-loan/src/main/resources/jpa/loan/persistence.xml
+++ b/fineract-branch/src/main/resources/jpa/static-weaving/module/fineract-branch/persistence.xml
@@ -22,56 +22,76 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
<class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Charge Module Entities -->
<class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Branch Module Entities -->
+ <class>org.apache.fineract.organisation.teller.domain.CashierTransaction</class>
+ <class>org.apache.fineract.organisation.teller.domain.Teller</class>
+ <class>org.apache.fineract.organisation.teller.domain.Cashier</class>
+ <class>org.apache.fineract.organisation.teller.domain.TellerTransaction</class>
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-charge/build.gradle b/fineract-charge/build.gradle
index 636fc048af..2bc9d7e294 100644
--- a/fineract-charge/build.gradle
+++ b/fineract-charge/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Charge'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/charge/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-rates/src/main/resources/jpa/rates/persistence.xml b/fineract-charge/src/main/resources/jpa/static-weaving/module/fineract-charge/persistence.xml
similarity index 72%
rename from fineract-rates/src/main/resources/jpa/rates/persistence.xml
rename to fineract-charge/src/main/resources/jpa/static-weaving/module/fineract-charge/persistence.xml
index b76d09e1a9..6957901476 100644
--- a/fineract-rates/src/main/resources/jpa/rates/persistence.xml
+++ b/fineract-charge/src/main/resources/jpa/static-weaving/module/fineract-charge/persistence.xml
@@ -22,54 +22,69 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Charge Module Entities -->
<class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-command/dependencies.gradle b/fineract-command/dependencies.gradle
index 8186f11815..5d914cfe84 100644
--- a/fineract-command/dependencies.gradle
+++ b/fineract-command/dependencies.gradle
@@ -41,7 +41,9 @@ dependencies {
'com.ibm.icu:icu4j',
'org.yakworks:spring-icu4j',
)
-
+ implementation('org.eclipse.persistence:org.eclipse.persistence.jpa') {
+ exclude group: 'org.eclipse.persistence', module: 'jakarta.persistence'
+ }
compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
annotationProcessor 'org.mapstruct:mapstruct-processor'
diff --git a/fineract-command/src/main/java/org/apache/fineract/command/persistence/CommandRepository.java b/fineract-command/src/main/java/org/apache/fineract/command/persistence/CommandRepository.java
index 98e4b3bd0b..3b261553fd 100644
--- a/fineract-command/src/main/java/org/apache/fineract/command/persistence/CommandRepository.java
+++ b/fineract-command/src/main/java/org/apache/fineract/command/persistence/CommandRepository.java
@@ -18,7 +18,7 @@
*/
package org.apache.fineract.command.persistence;
-import org.apache.fineract.command.persistence.model.CommandEntity;
+import org.apache.fineract.command.persistence.domain.CommandEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/fineract-command/src/main/java/org/apache/fineract/command/persistence/model/CommandEntity.java b/fineract-command/src/main/java/org/apache/fineract/command/persistence/domain/CommandEntity.java
similarity index 97%
rename from fineract-command/src/main/java/org/apache/fineract/command/persistence/model/CommandEntity.java
rename to fineract-command/src/main/java/org/apache/fineract/command/persistence/domain/CommandEntity.java
index 06b78eec7a..e7d5e4e86b 100644
--- a/fineract-command/src/main/java/org/apache/fineract/command/persistence/model/CommandEntity.java
+++ b/fineract-command/src/main/java/org/apache/fineract/command/persistence/domain/CommandEntity.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fineract.command.persistence.model;
+package org.apache.fineract.command.persistence.domain;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.Column;
diff --git a/fineract-command/src/main/java/org/apache/fineract/command/persistence/mapping/CommandMapper.java b/fineract-command/src/main/java/org/apache/fineract/command/persistence/mapping/CommandMapper.java
index 45487722de..31a2c43510 100644
--- a/fineract-command/src/main/java/org/apache/fineract/command/persistence/mapping/CommandMapper.java
+++ b/fineract-command/src/main/java/org/apache/fineract/command/persistence/mapping/CommandMapper.java
@@ -22,7 +22,7 @@ import static org.mapstruct.InjectionStrategy.CONSTRUCTOR;
import static org.mapstruct.MappingConstants.ComponentModel.SPRING;
import org.apache.fineract.command.core.Command;
-import org.apache.fineract.command.persistence.model.CommandEntity;
+import org.apache.fineract.command.persistence.domain.CommandEntity;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
diff --git a/fineract-core/src/main/resources/jpa/core/persistence.xml b/fineract-command/src/main/resources/jpa/static-weaving/module/fineract-command/persistence.xml
similarity index 74%
rename from fineract-core/src/main/resources/jpa/core/persistence.xml
rename to fineract-command/src/main/resources/jpa/static-weaving/module/fineract-command/persistence.xml
index 105688157f..465ba382f9 100644
--- a/fineract-core/src/main/resources/jpa/core/persistence.xml
+++ b/fineract-command/src/main/resources/jpa/static-weaving/module/fineract-command/persistence.xml
@@ -22,13 +22,19 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+
+ <!-- Command Module Entities -->
+ <class>org.apache.fineract.command.persistence.domain.CommandEntity</class>
+ <class>org.apache.fineract.command.persistence.converter.JsonAttributeConverter</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-core/build.gradle b/fineract-core/build.gradle
index c05ff72886..1a7d533afa 100644
--- a/fineract-core/build.gradle
+++ b/fineract-core/build.gradle
@@ -21,25 +21,6 @@ description = 'Fineract Core'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/core/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main = 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
-}
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -64,7 +45,7 @@ configurations {
apply from: 'dependencies.gradle'
compileJava {
- dependsOn ':fineract-avro-schemas:jar'
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
options.compilerArgs += ['-parameters']
}
diff --git a/fineract-tax/src/main/resources/jpa/taxes/persistence.xml b/fineract-core/src/main/resources/jpa/static-weaving/module/fineract-core/persistence.xml
similarity index 76%
rename from fineract-tax/src/main/resources/jpa/taxes/persistence.xml
rename to fineract-core/src/main/resources/jpa/static-weaving/module/fineract-core/persistence.xml
index d3ba0d405e..aeb8e65229 100644
--- a/fineract-tax/src/main/resources/jpa/taxes/persistence.xml
+++ b/fineract-core/src/main/resources/jpa/static-weaving/module/fineract-core/persistence.xml
@@ -22,52 +22,51 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-document/build.gradle b/fineract-document/build.gradle
index 6eeb13ada5..37ddda8ab5 100644
--- a/fineract-document/build.gradle
+++ b/fineract-document/build.gradle
@@ -21,23 +21,8 @@ description = 'Fineract Document'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/document/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, '-classpath', sourceSets.main.runtimeClasspath, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
configurations {
diff --git a/fineract-branch/src/main/resources/jpa/branch/persistence.xml b/fineract-document/src/main/resources/jpa/static-weaving/module/fineract-document/persistence.xml
similarity index 75%
rename from fineract-branch/src/main/resources/jpa/branch/persistence.xml
rename to fineract-document/src/main/resources/jpa/static-weaving/module/fineract-document/persistence.xml
index ef4086d55c..7b03250072 100644
--- a/fineract-branch/src/main/resources/jpa/branch/persistence.xml
+++ b/fineract-document/src/main/resources/jpa/static-weaving/module/fineract-document/persistence.xml
@@ -22,53 +22,54 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract core module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Document Module Entities -->
+ <class>org.apache.fineract.infrastructure.documentmanagement.domain.Document</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-investor/build.gradle b/fineract-investor/build.gradle
index 22187772f0..29c9846ff2 100644
--- a/fineract-investor/build.gradle
+++ b/fineract-investor/build.gradle
@@ -21,23 +21,8 @@ description = 'Fineract Investor'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/investor/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
configurations {
@@ -85,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-provider/src/main/resources/jpa/persistence.xml b/fineract-investor/src/main/resources/jpa/static-weaving/module/fineract-investor/persistence.xml
similarity index 72%
rename from fineract-provider/src/main/resources/jpa/persistence.xml
rename to fineract-investor/src/main/resources/jpa/static-weaving/module/fineract-investor/persistence.xml
index eba5ded16a..656e3f3ea6 100644
--- a/fineract-provider/src/main/resources/jpa/persistence.xml
+++ b/fineract-investor/src/main/resources/jpa/static-weaving/module/fineract-investor/persistence.xml
@@ -22,59 +22,76 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
<class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
+ <class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
<class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
<class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
<class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
<class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <!-- Fineract investor module -->
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Charge Module Entities -->
+ <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+
+ <!-- Investor Module Entities -->
<class>org.apache.fineract.investor.domain.ExternalAssetOwner</class>
- <class>org.apache.fineract.investor.domain.ExternalAssetOwnerJournalEntryMapping</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerLoanProductAttributes</class>
<class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer</class>
<class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails</class>
<class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferJournalEntryMapping</class>
<class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMapping</class>
- <!-- Fineract loan module -->
- <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerJournalEntryMapping</class>
+
+ <!-- Investor Module Converters -->
+ <class>org.apache.fineract.investor.domain.ExternalIdConverter</class>
+
+ <!-- Loan Module Entities -->
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyTagHistory</class>
@@ -85,7 +102,6 @@
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanChargePaidBy</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanCollateralManagement</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanCreditAllocationRule</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCreditAllocationRule</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanDisbursementDetails</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanInstallmentCharge</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanInterestRecalcualtionAdditionalDetails</class>
@@ -104,13 +120,8 @@
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelation</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionToRepaymentScheduleMapping</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanRepaymentScheduleHistory</class>
<class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.CreditAllocationTransactionType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.DueType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.FutureInstallmentAllocationRule</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProduct</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductBorrowerCycleVariations</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductConfigurableAttributes</class>
@@ -120,48 +131,30 @@
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductInterestRecalculationDetails</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationType</class>
+ <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
+
+ <!-- Loan Module Converters -->
+ <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
- <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
- <!-- Fineract Savings module -->
- <class>org.apache.fineract.interoperation.domain.InteropIdentifier</class>
- <class>org.apache.fineract.portfolio.interestratechart.domain.InterestIncentives</class>
- <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart</class>
- <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentives</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChart</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChartSlabs</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositAccountOnHoldTransaction</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositAccountTermAndPreClosure</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositProductRecurringDetail</class>
- <class>org.apache.fineract.portfolio.savings.domain.DepositProductTermAndPreClosure</class>
- <class>org.apache.fineract.portfolio.savings.domain.FixedDepositAccount</class>
- <class>org.apache.fineract.portfolio.savings.domain.FixedDepositProduct</class>
- <class>org.apache.fineract.portfolio.savings.domain.GroupSavingsIndividualMonitoring</class>
- <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositAccount</class>
- <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositProduct</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsAccount</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountCharge</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountChargePaidBy</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionTaxDetails</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsOfficerAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.savings.domain.SavingsProduct</class>
- <!-- Fineract Accounting module -->
- <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
- <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
- <!-- Fineract Document module -->
- <class>org.apache.fineract.infrastructure.documentmanagement.domain.Document</class>
- <!-- Fineract Charge module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Tax module -->
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Rates Module Entities -->
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-loan/build.gradle b/fineract-loan/build.gradle
index 33b087fafd..38821283d4 100644
--- a/fineract-loan/build.gradle
+++ b/fineract-loan/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Loan'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/loan/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-progressive-loan/src/main/resources/jpa/progressiveloan/persistence.xml b/fineract-loan/src/main/resources/jpa/static-weaving/module/fineract-loan/persistence.xml
similarity index 86%
rename from fineract-progressive-loan/src/main/resources/jpa/progressiveloan/persistence.xml
rename to fineract-loan/src/main/resources/jpa/static-weaving/module/fineract-loan/persistence.xml
index a5ff252eb4..0a8b7e2fec 100644
--- a/fineract-progressive-loan/src/main/resources/jpa/progressiveloan/persistence.xml
+++ b/fineract-loan/src/main/resources/jpa/static-weaving/module/fineract-loan/persistence.xml
@@ -22,57 +22,68 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract loan module -->
- <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Charge Module Entities -->
+ <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+
+ <!-- Loan Module Entities -->
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyTagHistory</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanInstallmentDelinquencyTag</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.GroupLoanIndividualMonitoringAccount</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.Loan</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanCharge</class>
@@ -96,6 +107,9 @@
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelation</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionToRepaymentScheduleMapping</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanRepaymentScheduleHistory</class>
+ <class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProduct</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductBorrowerCycleVariations</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductConfigurableAttributes</class>
@@ -105,35 +119,31 @@
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductInterestRecalculationDetails</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.DueType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.FutureInstallmentAllocationRule</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType</class>
+ <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
+
+ <!-- Loan Module Converters -->
<class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCreditAllocationRule</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.CreditAllocationTransactionType</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
- <class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
- <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
- <!-- Fineract Charge module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Accounting module -->
- <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
- <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
- <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
- <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Rates Module Entities -->
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
+
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-progressive-loan/build.gradle b/fineract-progressive-loan/build.gradle
index 20e9f20b4b..58969916df 100644
--- a/fineract-progressive-loan/build.gradle
+++ b/fineract-progressive-loan/build.gradle
@@ -21,23 +21,8 @@ description = 'Fineract Progressive Loan'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/progressiveloan/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
configurations {
@@ -85,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-investor/src/main/resources/jpa/investor/persistence.xml b/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/fineract-progressive-loan/persistence.xml
similarity index 81%
rename from fineract-investor/src/main/resources/jpa/investor/persistence.xml
rename to fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/fineract-progressive-loan/persistence.xml
index e2d5a0b006..9020127fa9 100644
--- a/fineract-investor/src/main/resources/jpa/investor/persistence.xml
+++ b/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/fineract-progressive-loan/persistence.xml
@@ -22,61 +22,68 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
<class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract loan module -->
- <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
- <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Charge Module Entities -->
+ <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+
+ <!-- Loan Module Entities -->
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyTagHistory</class>
<class>org.apache.fineract.portfolio.delinquency.domain.LoanInstallmentDelinquencyTag</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.GroupLoanIndividualMonitoringAccount</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.Loan</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanCharge</class>
@@ -100,6 +107,9 @@
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelation</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionToRepaymentScheduleMapping</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanRepaymentScheduleHistory</class>
+ <class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProduct</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductBorrowerCycleVariations</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductConfigurableAttributes</class>
@@ -109,20 +119,33 @@
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductInterestRecalculationDetails</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.DueType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationType</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.FutureInstallmentAllocationRule</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTransactionType</class>
+ <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
+
+ <!-- Loan Module Converters -->
<class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCreditAllocationRule</class>
- <class>org.apache.fineract.portfolio.loanproduct.domain.CreditAllocationTransactionType</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
<class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
- <class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
- <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
+ <!-- Tax Module Entities -->
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Rates Module Entities -->
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
+
+ <!-- Progressive Loan Module Entities -->
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCapitalizedIncomeBalance</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.ProgressiveLoanModel</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 9606ce545b..c13a1865d0 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -30,30 +30,19 @@ apply plugin: 'se.thinkcode.cucumber-runner'
check.dependsOn('cucumber')
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+// Static weaving is now configured in gradle/static-weaving.gradle
+// This ensures consistent configuration across all modules with JPA entities
+
+// Add dependency on avro schemas
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
// Configuration for Swagger documentation generation task
// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
import org.apache.tools.ant.filters.ReplaceTokens
-task prepareInputYaml {
+tasks.register('prepareInputYaml') {
outputs.file("${buildDir}/tmp/swagger/fineract-input.yaml")
doLast {
@@ -139,10 +128,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
@@ -176,57 +161,57 @@ configurations.driver.each {File file ->
loader.addURL(file.toURL())
}
-task createDB {
- description= "Creates the MariaDB Database. Needs database name to be passed (like: -PdbName=someDBname)"
+tasks.register('createDB') {
+ description = "Creates the MariaDB Database. Needs database name to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver' )
- sql.execute( 'CREATE DATABASE '+"`$dbName` CHARACTER SET utf8mb4" )
+ def sql = Sql.newInstance('jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver')
+ sql.execute('CREATE DATABASE ' + "`$dbName` CHARACTER SET utf8mb4")
}
}
-task dropDB {
- description= "Drops the specified MariaDB database. The database name has to be passed (like: -PdbName=someDBname)"
+tasks.register('dropDB') {
+ description = "Drops the specified MariaDB database. The database name has to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver' )
- sql.execute( 'DROP DATABASE '+"`$dbName`")
+ def sql = Sql.newInstance('jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver')
+ sql.execute('DROP DATABASE ' + "`$dbName`")
}
}
-task createPGDB {
- description= "Creates the PostgreSQL Database. Needs database name to be passed (like: -PdbName=someDBname)"
+tasks.register('createPGDB') {
+ description = "Creates the PostgreSQL Database. Needs database name to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:postgresql://localhost:5432/', pgUser, pgPassword, 'org.postgresql.Driver' )
- sql.execute( 'create database '+"$dbName" )
+ def sql = Sql.newInstance('jdbc:postgresql://localhost:5432/', pgUser, pgPassword, 'org.postgresql.Driver')
+ sql.execute('create database ' + "$dbName")
}
}
-task dropPGDB {
- description= "Drops the specified PostgreSQL database. The database name has to be passed (like: -PdbName=someDBname)"
+tasks.register('dropPGDB') {
+ description = "Drops the specified PostgreSQL database. The database name has to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:postgresql://localhost:5432/', pgUser, pgPassword, 'org.postgresql.Driver' )
- sql.execute( 'DROP DATABASE '+ "$dbName")
+ def sql = Sql.newInstance('jdbc:postgresql://localhost:5432/', pgUser, pgPassword, 'org.postgresql.Driver')
+ sql.execute('DROP DATABASE ' + "$dbName")
}
}
-task createMySQLDB {
- description= "Creates the MySQL Database. Needs database name to be passed (like: -PdbName=someDBname)"
+tasks.register('createMySQLDB') {
+ description = "Creates the MySQL Database. Needs database name to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:mysql://localhost:3306/', mysqlUser, mysqlPassword, 'com.mysql.cj.jdbc.Driver' )
- sql.execute( 'CREATE DATABASE '+"`$dbName` CHARACTER SET utf8mb4" )
+ def sql = Sql.newInstance('jdbc:mysql://localhost:3306/', mysqlUser, mysqlPassword, 'com.mysql.cj.jdbc.Driver')
+ sql.execute('CREATE DATABASE ' + "`$dbName` CHARACTER SET utf8mb4")
}
}
-task dropMySQLDB {
- description= "Drops the specified MySQL database. The database name has to be passed (like: -PdbName=someDBname)"
+tasks.register('dropMySQLDB') {
+ description = "Drops the specified MySQL database. The database name has to be passed (like: -PdbName=someDBname)"
doLast {
- def sql = Sql.newInstance( 'jdbc:mysql://localhost:3306/', mysqlUser, mysqlPassword, 'com.mysql.cj.jdbc.Driver' )
- sql.execute( 'DROP DATABASE '+"`$dbName`")
+ def sql = Sql.newInstance('jdbc:mysql://localhost:3306/', mysqlUser, mysqlPassword, 'com.mysql.cj.jdbc.Driver')
+ sql.execute('DROP DATABASE ' + "`$dbName`")
}
}
-task setBlankPassword {
+tasks.register('setBlankPassword') {
doLast {
- def sql = Sql.newInstance( 'jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver' )
+ def sql = Sql.newInstance('jdbc:mariadb://localhost:3306/', mysqlUser, mysqlPassword, 'org.mariadb.jdbc.Driver')
sql.execute('USE `fineract_tenants`')
sql.execute('UPDATE fineract_tenants.tenants SET schema_server = \'localhost\', schema_server_port = \'3306\', schema_username = \'mifos\', schema_password = \'mysql\' WHERE id=1;')
}
@@ -234,7 +219,7 @@ task setBlankPassword {
bootRun {
jvmArgs = [
- "-Dspring.output.ansi.enabled=ALWAYS"
+ "-Dspring.output.ansi.enabled=ALWAYS"
]
dependencies {
@@ -290,6 +275,15 @@ jib {
user = 'nobody:nogroup'
}
+ extraDirectories {
+ paths {
+ path {
+ from = layout.buildDirectory.dir("resources/main").get().asFile
+ into = '/app/classes'
+ }
+ }
+ }
+
allowInsecureRegistries = true
dependencies {
@@ -311,12 +305,12 @@ jib {
}
}
-task migrateDatabase {
+tasks.register('migrateDatabase') {
doFirst {
- println 'Executing liquibase database migration to version '+"$dbVersion"
+ println 'Executing liquibase database migration to version ' + "$dbVersion"
- def dbUrl='jdbc:'+"$dbType"+'://'+"$dbHost"+':'+"$dbPort"+'/'+"$dbName"
- def changeLogFilePath='fineract-provider/src/main/resources/db/changelog/tenant/upgrades/0000_upgrade_to_'+"$dbVersion"+'.xml'
+ def dbUrl = 'jdbc:' + "$dbType" + '://' + "$dbHost" + ':' + "$dbPort" + '/' + "$dbName"
+ def changeLogFilePath = 'fineract-provider/src/main/resources/db/changelog/tenant/upgrades/0000_upgrade_to_' + "$dbVersion" + '.xml'
liquibase {
activities {
@@ -372,20 +366,20 @@ javadoc {
dependsOn resolve
}
-task devRun(type: org.springframework.boot.gradle.tasks.run.BootRun) {
+tasks.register('devRun', org.springframework.boot.gradle.tasks.run.BootRun) {
description = 'Runs the application quickly for development by skipping quality checks'
group = 'Application'
// Configure the build to skip quality checks
gradle.taskGraph.whenReady { graph ->
if (graph.hasTask(devRun)) {
- tasks.matching { task ->
+ tasks.matching { task ->
task.name in ['checkstyle', 'checkstyleMain', 'checkstyleTest',
- 'spotlessCheck', 'spotlessApply',
- 'spotbugsMain', 'spotbugsTest',
- 'javadoc', 'javadocJar',
- 'modernizer',
- 'testClasses']
+ 'spotlessCheck', 'spotlessApply',
+ 'spotbugsMain', 'spotbugsTest',
+ 'javadoc', 'javadocJar',
+ 'modernizer',
+ 'testClasses']
}.configureEach {
enabled = false
}
@@ -400,7 +394,7 @@ task devRun(type: org.springframework.boot.gradle.tasks.run.BootRun) {
classpath = bootRun.classpath
mainClass = bootRun.mainClass
jvmArgs = bootRun.jvmArgs
-
+
doFirst {
println "Running in development mode - quality checks are disabled"
}
diff --git a/fineract-provider/src/main/resources/jpa/static-weaving/module/fineract-provider/persistence.xml b/fineract-provider/src/main/resources/jpa/static-weaving/module/fineract-provider/persistence.xml
new file mode 100644
index 0000000000..7c7b5dd9cd
--- /dev/null
+++ b/fineract-provider/src/main/resources/jpa/static-weaving/module/fineract-provider/persistence.xml
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+
+-->
+
+
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+
+ <!-- This file is only used for static weaving, nothing more. -->
+ <!-- You can find the runtime configuration in the JPAConfig class -->
+ <persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
+ <class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
+ <class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
+ <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+ <!-- Credit Bureau Module Entities -->
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.CreditBureauToken</class>
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.CreditReport</class>
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.CreditBureau</class>
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.CreditBureauLoanProductMapping</class>
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.CreditBureauConfiguration</class>
+ <class>org.apache.fineract.infrastructure.creditbureau.domain.OrganisationCreditBureau</class>
+
+ <!-- Configuration Module Entities -->
+ <class>org.apache.fineract.infrastructure.configuration.domain.ExternalService</class>
+ <class>org.apache.fineract.infrastructure.configuration.domain.GlobalConfigurationProperty</class>
+ <class>org.apache.fineract.infrastructure.configuration.domain.ExternalServicesProperties</class>
+
+ <!-- Bulk Import Module Entities -->
+ <class>org.apache.fineract.infrastructure.bulkimport.domain.ImportDocument</class>
+
+ <!-- Survey Module Entities -->
+ <class>org.apache.fineract.infrastructure.survey.domain.Likelihood</class>
+
+ <!-- Entity Access Module Entities -->
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityRelation</class>
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityToEntityMapping</class>
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityAccess</class>
+
+ <!-- SMS Module Entities -->
+ <class>org.apache.fineract.infrastructure.sms.domain.SmsMessage</class>
+ <class>org.apache.fineract.infrastructure.campaigns.sms.domain.SmsCampaign</class>
+
+ <!-- Security Module Entities -->
+ <class>org.apache.fineract.infrastructure.security.domain.TFAccessToken</class>
+ <class>org.apache.fineract.infrastructure.security.domain.TwoFactorConfiguration</class>
+
+ <!-- Email Campaign Module Entities -->
+ <class>org.apache.fineract.infrastructure.campaigns.email.domain.EmailCampaign</class>
+ <class>org.apache.fineract.infrastructure.campaigns.email.domain.EmailConfiguration</class>
+ <class>org.apache.fineract.infrastructure.campaigns.email.domain.EmailMessage</class>
+
+ <!-- Account Number Format Module Entities -->
+ <class>org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormat</class>
+
+ <!-- Client Module Entities -->
+ <class>org.apache.fineract.portfolio.client.domain.ClientFamilyMembers</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientNonPerson</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientTransferDetails</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientAddress</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientCharge</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientTransaction</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientChargePaidBy</class>
+
+ <!-- Meeting Module Entities -->
+ <class>org.apache.fineract.portfolio.meeting.domain.Meeting</class>
+ <class>org.apache.fineract.portfolio.meeting.attendance.domain.ClientAttendance</class>
+
+ <!-- Hooks Module Entities -->
+ <class>org.apache.fineract.infrastructure.hooks.domain.Hook</class>
+ <class>org.apache.fineract.infrastructure.hooks.domain.HookResource</class>
+ <class>org.apache.fineract.infrastructure.hooks.domain.HookTemplate</class>
+ <class>org.apache.fineract.infrastructure.hooks.domain.Schema</class>
+ <class>org.apache.fineract.infrastructure.hooks.domain.HookConfiguration</class>
+
+ <!-- Address Module Entities -->
+ <class>org.apache.fineract.portfolio.address.domain.FieldConfiguration</class>
+ <class>org.apache.fineract.portfolio.address.domain.Address</class>
+
+ <!-- Entity Access Module Entities -->
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityRelation</class>
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityToEntityMapping</class>
+ <class>org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityAccess</class>
+
+ <!-- Self Service Module Entities -->
+ <class>org.apache.fineract.portfolio.self.account.domain.SelfBeneficiariesTPT</class>
+ <class>org.apache.fineract.portfolio.self.device.domain.DeviceRegistration</class>
+ <class>org.apache.fineract.portfolio.self.pockets.domain.Pocket</class>
+ <class>org.apache.fineract.portfolio.self.pockets.domain.PocketAccountMapping</class>
+ <class>org.apache.fineract.portfolio.self.registration.domain.SelfServiceRegistration</class>
+
+ <!-- Command Module Entities -->
+
+ <class>org.apache.fineract.command.persistence.domain.CommandEntity</class>
+ <class>org.apache.fineract.command.persistence.converter.JsonAttributeConverter</class>
+
+ <!-- Charge Module Entities -->
+ <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+
+ <!-- Branch Module Entities -->
+ <class>org.apache.fineract.organisation.teller.domain.CashierTransaction</class>
+ <class>org.apache.fineract.organisation.teller.domain.Teller</class>
+ <class>org.apache.fineract.organisation.teller.domain.Cashier</class>
+ <class>org.apache.fineract.organisation.teller.domain.TellerTransaction</class>
+
+ <!-- Investor Module Entities -->
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwner</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerLoanProductAttributes</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferJournalEntryMapping</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMapping</class>
+ <class>org.apache.fineract.investor.domain.ExternalAssetOwnerJournalEntryMapping</class>
+
+ <!-- Investor Module Converters -->
+ <class>org.apache.fineract.investor.domain.ExternalIdConverter</class>
+
+ <!-- Loan Module Entities -->
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyTagHistory</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.LoanInstallmentDelinquencyTag</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.GroupLoanIndividualMonitoringAccount</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.Loan</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCharge</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanChargePaidBy</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCollateralManagement</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCreditAllocationRule</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanDisbursementDetails</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanInstallmentCharge</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanInterestRecalcualtionAdditionalDetails</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanInterestRecalculationDetails</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanOfficerAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanOverdueInstallmentCharge</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanPaymentAllocationRule</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRescheduleRequestToTermVariationMapping</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusChangeHistory</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTopupDetails</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheCharge</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheDisbursementCharge</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRelation</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionToRepaymentScheduleMapping</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.reaging.LoanReAgeParameter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanRepaymentScheduleHistory</class>
+ <class>org.apache.fineract.portfolio.loanaccount.rescheduleloan.domain.LoanRescheduleRequest</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProduct</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductBorrowerCycleVariations</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductConfigurableAttributes</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductCreditAllocationRule</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductFloatingRates</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductGuaranteeDetails</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductInterestRecalculationDetails</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
+ <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
+ <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
+ <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
+
+ <!-- Loan Module Converters -->
+ <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
+ <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
+ <!-- Document Module Entities -->
+ <class>org.apache.fineract.infrastructure.documentmanagement.domain.Document</class>
+
+ <!-- Tax Module Entities -->
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Rates Module Entities -->
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
+ <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
+
+ <!-- Savings Module Entities -->
+ <class>org.apache.fineract.interoperation.domain.InteropIdentifier</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestIncentives</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentive</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentives</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChart</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChartSlabs</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountOnHoldTransaction</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountTermAndPreClosure</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositProductRecurringDetail</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositProductTermAndPreClosure</class>
+ <class>org.apache.fineract.portfolio.savings.domain.FixedDepositProduct</class>
+ <class>org.apache.fineract.portfolio.savings.domain.GroupSavingsIndividualMonitoring</class>
+ <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositProduct</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccount</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountCharge</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountChargePaidBy</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionTaxDetails</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsOfficerAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsProduct</class>
+
+ <!-- Progressive Loan Module Entities -->
+ <class>org.apache.fineract.portfolio.loanaccount.domain.LoanCapitalizedIncomeBalance</class>
+ <class>org.apache.fineract.portfolio.loanaccount.domain.ProgressiveLoanModel</class>
+
+ <!-- Account Module Entities -->
+ <class>org.apache.fineract.portfolio.account.domain.AccountAssociations</class>
+ <class>org.apache.fineract.portfolio.account.domain.AccountTransferDetails</class>
+ <class>org.apache.fineract.portfolio.account.domain.AccountTransferStandingInstruction</class>
+ <class>org.apache.fineract.portfolio.account.domain.AccountTransferTransaction</class>
+
+ <!-- Provider Module Entities -->
+ <!-- Notification -->
+ <class>org.apache.fineract.notification.domain.NotificationMapper</class>
+ <class>org.apache.fineract.notification.domain.Notification</class>
+
+ <!-- AdHocQuery -->
+ <class>org.apache.fineract.adhocquery.domain.AdHoc</class>
+
+ <!-- Mix -->
+ <class>org.apache.fineract.mix.domain.MixTaxonomyMapping</class>
+
+ <!-- COB (Chunk of Business) -->
+ <class>org.apache.fineract.cob.domain.LoanAccountLock</class>
+ <class>org.apache.fineract.cob.domain.BatchBusinessStep</class>
+
+ <!-- Template -->
+ <class>org.apache.fineract.template.domain.Template</class>
+ <class>org.apache.fineract.template.domain.TemplateMapper</class>
+
+ <!-- Accounting/Provisioning -->
+ <class>org.apache.fineract.accounting.provisioning.domain.LoanProductProvisioningEntry</class>
+ <class>org.apache.fineract.accounting.provisioning.domain.ProvisioningEntry</class>
+
+ <!-- User Administration -->
+ <class>org.apache.fineract.useradministration.domain.AppUserPreviousPassword</class>
+ <class>org.apache.fineract.useradministration.domain.PasswordValidationPolicy</class>
+
+ <!-- SPM (Smart Pilot Module) -->
+ <class>org.apache.fineract.spm.domain.Question</class>
+ <class>org.apache.fineract.spm.domain.LookupTable</class>
+ <class>org.apache.fineract.spm.domain.Component</class>
+ <class>org.apache.fineract.spm.domain.Scorecard</class>
+ <class>org.apache.fineract.spm.domain.Survey</class>
+ <class>org.apache.fineract.spm.domain.Response</class>
+
+ <!-- Product Mix -->
+ <class>org.apache.fineract.portfolio.loanproduct.productmix.domain.ProductMix</class>
+
+ <!-- Provisioning -->
+ <class>org.apache.fineract.organisation.provisioning.domain.ProvisioningCriteria</class>
+ <class>org.apache.fineract.organisation.provisioning.domain.LoanProductProvisionCriteria</class>
+ <class>org.apache.fineract.organisation.provisioning.domain.ProvisioningCriteriaDefinition</class>
+ <class>org.apache.fineract.organisation.provisioning.domain.ProvisioningCategory</class>
+
+ <!-- Office -->
+ <class>org.apache.fineract.organisation.office.domain.OfficeTransaction</class>
+
+ <!-- Self Registration -->
+ <class>org.apache.fineract.portfolio.self.registration.domain.SelfServiceRegistration</class>
+
+ <!-- Note -->
+ <class>org.apache.fineract.portfolio.note.domain.Note</class>
+
+ <!-- Savings -->
+ <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositScheduleInstallment</class>
+ <class>org.apache.fineract.portfolio.savings.domain.FixedDepositAccount</class>
+ <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositAccount</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountRecurringDetail</class>
+
+ <!-- Share Products -->
+ <class>org.apache.fineract.portfolio.shareproducts.domain.ShareProductDividendPayOutDetails</class>
+ <class>org.apache.fineract.portfolio.shareproducts.domain.ShareProduct</class>
+ <class>org.apache.fineract.portfolio.shareproducts.domain.ShareProductMarketPrice</class>
+
+ <!-- Share Accounts -->
+ <class>org.apache.fineract.portfolio.shareaccounts.domain.ShareAccount</class>
+ <class>org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountCharge</class>
+ <class>org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountChargePaidBy</class>
+ <class>org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountDividendDetails</class>
+ <class>org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountTransaction</class>
+
+ <!-- Report Mailing Job -->
+ <class>org.apache.fineract.infrastructure.reportmailingjob.domain.ReportMailingJob</class>
+ <class>org.apache.fineract.infrastructure.reportmailingjob.domain.ReportMailingJobConfiguration</class>
+ <class>org.apache.fineract.infrastructure.reportmailingjob.domain.ReportMailingJobRunHistory</class>
+
+ <!-- Data Queries -->
+ <class>org.apache.fineract.infrastructure.dataqueries.domain.RegisteredDatatable</class>
+ <class>org.apache.fineract.infrastructure.dataqueries.domain.Report</class>
+ <class>org.apache.fineract.infrastructure.dataqueries.domain.ReportParameterUsage</class>
+ <class>org.apache.fineract.infrastructure.dataqueries.domain.ReportParameter</class>
+ <class>org.apache.fineract.infrastructure.dataqueries.domain.EntityDatatableChecks</class>
+
+ <!-- Guarantor -->
+ <class>org.apache.fineract.portfolio.loanaccount.guarantor.domain.GuarantorFundingDetails</class>
+ <class>org.apache.fineract.portfolio.loanaccount.guarantor.domain.GuarantorFundingTransaction</class>
+ <class>org.apache.fineract.portfolio.loanaccount.guarantor.domain.Guarantor</class>
+
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="eclipselink.weaving" value="static" />
+ </properties>
+ </persistence-unit>
+</persistence>
diff --git a/fineract-rates/build.gradle b/fineract-rates/build.gradle
index 279cd9d991..dfd595ac61 100644
--- a/fineract-rates/build.gradle
+++ b/fineract-rates/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Rates'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/rates/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-report/src/main/resources/jpa/report/persistence.xml b/fineract-rates/src/main/resources/jpa/static-weaving/module/fineract-rates/persistence.xml
similarity index 80%
rename from fineract-report/src/main/resources/jpa/report/persistence.xml
rename to fineract-rates/src/main/resources/jpa/static-weaving/module/fineract-rates/persistence.xml
index d3ba0d405e..f6aa615816 100644
--- a/fineract-report/src/main/resources/jpa/report/persistence.xml
+++ b/fineract-rates/src/main/resources/jpa/static-weaving/module/fineract-rates/persistence.xml
@@ -22,52 +22,55 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Rates Module Entities -->
<class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
<class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-report/build.gradle b/fineract-report/build.gradle
index f7239ebd4b..b3e50678fb 100644
--- a/fineract-report/build.gradle
+++ b/fineract-report/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Report'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/report/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-document/src/main/resources/jpa/document/persistence.xml b/fineract-report/src/main/resources/jpa/static-weaving/module/fineract-report/persistence.xml
similarity index 75%
rename from fineract-document/src/main/resources/jpa/document/persistence.xml
rename to fineract-report/src/main/resources/jpa/static-weaving/module/fineract-report/persistence.xml
index 0c3e741c37..aeb8e65229 100644
--- a/fineract-document/src/main/resources/jpa/document/persistence.xml
+++ b/fineract-report/src/main/resources/jpa/static-weaving/module/fineract-report/persistence.xml
@@ -22,49 +22,51 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
- <class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
- <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
<class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
<class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
<class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
+ <class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
+ <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
+ <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-savings/build.gradle b/fineract-savings/build.gradle
index df6fa6f3a7..c4dd74560e 100644
--- a/fineract-savings/build.gradle
+++ b/fineract-savings/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Savings'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/savings/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-savings/src/main/resources/jpa/savings/persistence.xml b/fineract-savings/src/main/resources/jpa/savings/persistence.xml
deleted file mode 100644
index fcd1b4aa36..0000000000
--- a/fineract-savings/src/main/resources/jpa/savings/persistence.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
-
--->
-
-
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-
- <!-- This file is only used for static weaving, nothing more. -->
- <!-- You can find the runtime configuration in the JPAConfig class -->
- <persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
- <class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
- <class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
- <class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
- <class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
- <class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="eclipselink.weaving" value="static" />
- </properties>
- </persistence-unit>
-</persistence>
diff --git a/fineract-loan/src/main/resources/jpa/loan/persistence.xml b/fineract-savings/src/main/resources/jpa/static-weaving/module/fineract-savings/persistence.xml
similarity index 54%
rename from fineract-loan/src/main/resources/jpa/loan/persistence.xml
rename to fineract-savings/src/main/resources/jpa/static-weaving/module/fineract-savings/persistence.xml
index bb2388765b..1e6e6db5b1 100644
--- a/fineract-loan/src/main/resources/jpa/loan/persistence.xml
+++ b/fineract-savings/src/main/resources/jpa/static-weaving/module/fineract-savings/persistence.xml
@@ -22,56 +22,98 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
- <class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
<class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.organisation.staff.domain.Staff</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Accounting Module Entities -->
+ <class>org.apache.fineract.accounting.closure.domain.GLClosure</class>
+ <class>org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.TrialBalance</class>
+ <class>org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGLAccountMapping</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingRule</class>
+ <class>org.apache.fineract.accounting.rule.domain.AccountingTagRule</class>
+ <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
+
+
+ <!-- Tax Module Entities -->
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
+ <!-- Rates Module Entities -->
<class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
<class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Charge module -->
+
+ <!-- Savings Module Entities -->
+ <class>org.apache.fineract.interoperation.domain.InteropIdentifier</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestIncentives</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart</class>
+ <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentive</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentives</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChart</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChartSlabs</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountOnHoldTransaction</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositAccountTermAndPreClosure</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositProductRecurringDetail</class>
+ <class>org.apache.fineract.portfolio.savings.domain.DepositProductTermAndPreClosure</class>
+ <class>org.apache.fineract.portfolio.savings.domain.FixedDepositProduct</class>
+ <class>org.apache.fineract.portfolio.savings.domain.GroupSavingsIndividualMonitoring</class>
+ <class>org.apache.fineract.portfolio.savings.domain.RecurringDepositProduct</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccount</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountCharge</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountChargePaidBy</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransaction</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsAccountTransactionTaxDetails</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsOfficerAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.savings.domain.SavingsProduct</class>
+
+ <!-- Charge Module Entities -->
<class>org.apache.fineract.portfolio.charge.domain.Charge</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
- <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/fineract-tax/build.gradle b/fineract-tax/build.gradle
index 1d0844df62..e7fe509f14 100644
--- a/fineract-tax/build.gradle
+++ b/fineract-tax/build.gradle
@@ -21,31 +21,10 @@ description = 'Fineract Taxes'
apply plugin: 'java'
apply plugin: 'eclipse'
-compileJava.doLast {
- def mainSS = sourceSets.main
- def source = mainSS.java.classesDirectory.get()
- copy {
- from file("src/main/resources/jpa/taxes/persistence.xml")
- into "${source}/META-INF/"
- }
- javaexec {
- description = 'Performs EclipseLink static weaving of entity classes'
- def target = source
- main 'org.eclipse.persistence.tools.weaving.jpa.StaticWeave'
- args '-persistenceinfo', source, source, target
- classpath sourceSets.main.runtimeClasspath
- }
- delete {
- delete "${source}/META-INF/persistence.xml"
- }
+compileJava {
+ dependsOn ':fineract-avro-schemas:buildJavaSdk'
}
-// Configuration for Swagger documentation generation task
-// https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
-import org.apache.tools.ant.filters.ReplaceTokens
-
-
-
configurations {
providedRuntime // needed for Spring Boot executable WAR
providedCompile
@@ -91,10 +70,6 @@ eclipse {
}
}
-/* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
-sourceSets.main.output.resourcesDir = sourceSets.main.java.classesDirectory
-sourceSets.test.output.resourcesDir = sourceSets.test.java.classesDirectory
-
if (!(project.hasProperty('env') && project.getProperty('env') == 'dev')) {
sourceSets {
test {
diff --git a/fineract-charge/src/main/resources/jpa/charge/persistence.xml b/fineract-tax/src/main/resources/jpa/static-weaving/module/fineract-tax/persistence.xml
similarity index 81%
rename from fineract-charge/src/main/resources/jpa/charge/persistence.xml
rename to fineract-tax/src/main/resources/jpa/static-weaving/module/fineract-tax/persistence.xml
index 9d04d96a05..5a440edccc 100644
--- a/fineract-charge/src/main/resources/jpa/charge/persistence.xml
+++ b/fineract-tax/src/main/resources/jpa/static-weaving/module/fineract-tax/persistence.xml
@@ -22,53 +22,57 @@
<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<!-- This file is only used for static weaving, nothing more. -->
<!-- You can find the runtime configuration in the JPAConfig class -->
<persistence-unit name="jpa-pu" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <!-- Fineract core module -->
- <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
- <class>org.apache.fineract.accounting.journalentry.domain.JournalEntry</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom</class>
- <class>org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom</class>
- <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
- <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Core Module Entities -->
+ <class>org.apache.fineract.useradministration.domain.Role</class>
+ <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Image</class>
+ <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
+ <class>org.apache.fineract.useradministration.domain.Permission</class>
+ <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
+ <class>org.apache.fineract.commands.domain.CommandSource</class>
+ <class>org.apache.fineract.useradministration.domain.AppUser</class>
+ <class>org.apache.fineract.accounting.glaccount.domain.GLAccount</class>
+ <class>org.apache.fineract.organisation.monetary.domain.OrganisationCurrency</class>
<class>org.apache.fineract.organisation.staff.domain.Staff</class>
- <class>org.apache.fineract.organisation.office.domain.Office</class>
- <class>org.apache.fineract.organisation.office.domain.OrganisationCurrency</class>
+ <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
<class>org.apache.fineract.organisation.monetary.domain.ApplicationCurrency</class>
- <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
- <class>org.apache.fineract.organisation.workingdays.domain.WorkingDays</class>
- <class>org.apache.fineract.portfolio.group.domain.Group</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
- <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
- <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
- <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
+ <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
+ <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
<class>org.apache.fineract.portfolio.client.domain.ClientIdentifier</class>
- <class>org.apache.fineract.portfolio.rate.domain.Rate</class>
- <class>org.apache.fineract.portfolio.fund.domain.Fund</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucket</class>
<class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyRange</class>
+ <class>org.apache.fineract.portfolio.group.domain.StaffAssignmentHistory</class>
+ <class>org.apache.fineract.portfolio.group.domain.Group</class>
+ <class>org.apache.fineract.portfolio.client.domain.Client</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEventConfiguration</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupRole</class>
<class>org.apache.fineract.portfolio.paymenttype.domain.PaymentType</class>
- <class>org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRate</class>
- <class>org.apache.fineract.portfolio.floatingrates.domain.FloatingRatePeriod</class>
- <class>org.apache.fineract.portfolio.calendar.domain.Calendar</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarHistory</class>
- <class>org.apache.fineract.portfolio.calendar.domain.CalendarInstance</class>
- <class>org.apache.fineract.useradministration.domain.AppUser</class>
- <class>org.apache.fineract.useradministration.domain.Role</class>
- <class>org.apache.fineract.useradministration.domain.Permission</class>
- <class>org.apache.fineract.useradministration.domain.AppUserClientMapping</class>
- <!-- Fineract Tax module -->
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
- <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+ <class>org.apache.fineract.portfolio.group.domain.GroupLevel</class>
+ <class>org.apache.fineract.infrastructure.event.external.repository.domain.ExternalEvent</class>
+ <class>org.apache.fineract.organisation.office.domain.Office</class>
+ <class>org.apache.fineract.organisation.holiday.domain.Holiday</class>
+ <class>org.apache.fineract.infrastructure.cache.domain.PlatformCache</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.Code</class>
+ <class>org.apache.fineract.infrastructure.businessdate.domain.BusinessDate</class>
+ <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
+
+ <!-- Tax Module Entities -->
<class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
<class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroup</class>
+ <class>org.apache.fineract.portfolio.tax.domain.TaxGroupMappings</class>
+
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
<property name="eclipselink.weaving" value="static" />
diff --git a/static-weaving.gradle b/static-weaving.gradle
new file mode 100644
index 0000000000..7d462ae207
--- /dev/null
+++ b/static-weaving.gradle
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+// In static-weaving.gradle
+
+// Wait until after project evaluation to ensure all plugins are applied
+project.afterEvaluate {
+ // Only configure if this is a Java project
+ if (!project.plugins.hasPlugin('java')) {
+ logger.lifecycle("ℹ Skipping static weaving configuration for non-Java project: ${project.name}")
+ return
+ }
+
+ // Check if the module contains JPA entities
+ def persistenceXmlFile = file("src/main/resources/jpa/static-weaving/module/${project.name}/persistence.xml")
+ def hasJpaEntities = persistenceXmlFile.exists()
+
+ if (hasJpaEntities) {
+ logger.lifecycle("Configuring EclipseLink static weaving for ${project.name}")
+
+ compileJava.doLast {
+ def source = sourceSets.main.java.classesDirectory.get()
+
+ File weavingRoot = new File(temporaryDir, "static-weaving")
+ File metaInf = new File(weavingRoot, "META-INF")
+ metaInf.mkdirs()
+
+ copy {
+ from persistenceXmlFile.toPath()
+ into metaInf.toPath()
+ }
+
+ javaexec {
+ description = 'Performs EclipseLink static weaving of entity classes'
+ mainClass.set("org.eclipse.persistence.tools.weaving.jpa.StaticWeave")
+ classpath = project.sourceSets.main.runtimeClasspath
+ args = [
+ "-persistenceinfo",
+ weavingRoot.absolutePath,
+ source,
+ source
+ ]
+ }
+ }
+
+ logger.lifecycle("✓ EclipseLink static weaving configured for ${project.name}")
+ } else {
+ logger.lifecycle("ℹ No JPA entities found in ${project.name}, skipping static weaving configuration")
+ }
+}