You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by my...@apache.org on 2018/01/22 15:48:54 UTC
[fineract-cn-demo-server] branch develop updated (41f0b47 ->
ba85aa2)
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git.
from 41f0b47 Moving accounts.csv and ledgers.csv to new default-setup project.
new 2cb96ac Merge pull request #25 from myrle-krantz/develop
new 950e603 Adding logging.
new 59a4abf Merge pull request #1 from myrlen/develop
new f536d56 added missing services fixed retrieving of csv resources
new 47a693d Merge pull request #2 from markusgeiss/develop
new 66f14b2 Add missing customer service
new d608a49 Add cheque service
new eb25cce Merge pull request #3 from markvanveen/develop
new 7804ebb Updated property name after change.
new 5e1ba75 Merge pull request #4 from myrlen/develop
new 2384b0a Merge branch 'develop' of https://github.com/KuelapInc/demo-server into develop
new 3920c30 Merge pull request #5 from markvanveen/develop
new e527347 Add payroll service
new b96130e Merge pull request #6 from markvanveen/develop
new fcb6cfd Refactored code to remove boilerplate
new e2c820c Merge pull request #26 from ivange94/develop
new e54354c Merge branch 'develop' of https://github.com/mifosio/demo-server into develop
new 75e4edc Log build failures and provide summary at end of run
new 38683ab fixed the use of tail, added more info
new 58fa4d1 Final changes
new b65f84d Merge pull request #27 from Whoever57/develop
new 8859b5b Merge pull request #7 from myrlen/develop
new a113360 Refactor some Shell scripts
new cd6c0d9 Merge pull request #28 from Androbin/shell
new 60f81b3 Refactor pull-all.sh Script
new ba85aa2 Merge pull request #29 from Androbin/gci
The 26 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 8 +
scripts/Unix/initial-setup.sh | 337 +++++----------------
scripts/Unix/pull-all.sh | 287 ++----------------
scripts/windows/initial-setup.bat | 9 +
scripts/windows/pull-all.bat | 9 +
src/main/java/io/mifos/dev/ServiceRunner.java | 57 +++-
...anizationListener.java => ChequesListener.java} | 12 +-
....java => DepositAccountManagementListener.java} | 15 +-
...anizationListener.java => PayrollListener.java} | 12 +-
...izationListener.java => ReportingListener.java} | 15 +-
...ganizationListener.java => TellerListener.java} | 15 +-
11 files changed, 203 insertions(+), 573 deletions(-)
mode change 100644 => 100755 scripts/Unix/pull-all.sh
copy src/main/java/io/mifos/dev/listener/{OrganizationListener.java => ChequesListener.java} (87%)
copy src/main/java/io/mifos/dev/listener/{OrganizationListener.java => DepositAccountManagementListener.java} (80%)
copy src/main/java/io/mifos/dev/listener/{OrganizationListener.java => PayrollListener.java} (87%)
copy src/main/java/io/mifos/dev/listener/{OrganizationListener.java => ReportingListener.java} (80%)
copy src/main/java/io/mifos/dev/listener/{OrganizationListener.java => TellerListener.java} (80%)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 24/26: Refactor pull-all.sh Script
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 60f81b3a80e0d0dc8ab34fbcd20b79ca2c8b0bfd
Author: Robin Richtsfeld <ro...@gmail.com>
AuthorDate: Tue Dec 5 19:18:59 2017 +0100
Refactor pull-all.sh Script
---
scripts/Unix/pull-all.sh | 296 +++++------------------------------------------
1 file changed, 28 insertions(+), 268 deletions(-)
diff --git a/scripts/Unix/pull-all.sh b/scripts/Unix/pull-all.sh
old mode 100644
new mode 100755
index e28fc17..4becf82
--- a/scripts/Unix/pull-all.sh
+++ b/scripts/Unix/pull-all.sh
@@ -1,281 +1,41 @@
#!/bin/bash
githubAccount=$1
+get_modules() {
+ for module in "$@"; do
+ (
+ cd "$module"
+ git checkout develop
+ git pull upstream develop
+ chmod +x gradlew
+ ./gradlew publishToMavenLocal
+ git push origin develop
+ )
+ done
+}
+
+(
cd core
+get_modules lang async cassandra mariadb data-jpa 'command' api 'test'
+)
-# REM pull lang
-cd lang
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-
-cd ..
-
-# REM pull async
-cd async
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull cassandra
-cd cassandra
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull mariadb
-cd mariadb
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull data-jpa
-cd data-jpa
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull command
-cd command
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull api
-cd api
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull test
-cd test
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-cd ..
-
+(
cd tools
+get_modules crypto
+)
-# REM pull crypto
-cd crypto
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-cd ..
-
-# REM pull anubis
-cd anubis
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull permitted-feign-client
-cd permitted-feign-client
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull provisioner
-cd provisioner
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull identity
-cd identity
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull rhythm
-cd rhythm
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull template
-cd template
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull office
-cd office
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull customer
-cd customer
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull group
-cd group
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull accounting
-cd accounting
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull portfolio
-cd portfolio
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull deposit-account-management
-cd deposit-account-management
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull teller
-cd teller
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull reporting
-cd reporting
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull payroll
-cd payroll
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
+get_modules anubis permitted-feign-client provisioner identity rhythm template \
+ office customer group accounting portfolio deposit-account-management teller \
+ reporting payroll
+(
cd integration-tests
-
-# REM pull service-starter
-cd service-starter
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull default-setup
-cd default-setup
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull demo-server
-cd demo-server
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull test-provisioner-identity-organization
-cd test-provisioner-identity-organization
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-# REM pull test-accounting-portfolio
-cd test-accounting-portfolio
-git checkout develop
-git pull upstream develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-git push origin develop
-cd ..
-
-cd ..
+get_modules service-starter default-setup demo-server \
+ test-provisioner-identity-organization test-accounting-portfolio
+)
# REM pull Web App
+(
cd fims-web-app
git checkout develop
git checkout -- src/main.ts
@@ -284,4 +44,4 @@ git pull upstream develop
sudo rm -rf node_modules
npm i
git push origin develop
-cd ..
+)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 10/26: Add cheque service
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit d608a491b337aee9623a54ab4d4213750a7d8a52
Author: Mark <ma...@gmail.com>
AuthorDate: Mon Aug 28 21:25:59 2017 +0200
Add cheque service
---
build.gradle | 2 +
src/main/java/io/mifos/dev/ServiceRunner.java | 15 ++++++-
.../io/mifos/dev/listener/ChequesListener.java | 47 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 75e1ac8..1d5ef2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,7 @@ ext.versions = [
mifosdeposit : '0.1.0-BUILD-SNAPSHOT',
mifosteller : '0.1.0-BUILD-SNAPSHOT',
mifosreporting : '0.1.0-BUILD-SNAPSHOT',
+ kuelapcheques : '0.1.0-BUILD-SNAPSHOT',
frameworkapi : '0.1.0-BUILD-SNAPSHOT',
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworktest : '0.1.0-BUILD-SNAPSHOT',
@@ -86,6 +87,7 @@ dependencies {
[group: 'io.mifos.deposit-account-management', name: 'api', version: versions.mifosdeposit],
[group: 'io.mifos.teller', name: 'api', version: versions.mifosteller],
[group: 'io.mifos.reporting', name: 'api', version: versions.mifosreporting],
+ [group: 'io.mifos.cheques', name: 'api', version: versions.kuelapcheques],
[group: 'io.mifos.anubis', name: 'api', version: versions.frameworkanubis],
[group: 'io.mifos.anubis', name: 'test', version: versions.frameworkanubis],
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index a093c49..32a7b67 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -21,6 +21,7 @@ import io.mifos.accounting.api.v1.client.LedgerManager;
import io.mifos.accounting.importer.AccountImporter;
import io.mifos.accounting.importer.LedgerImporter;
import io.mifos.anubis.api.v1.domain.AllowedOperation;
+import io.mifos.cheque.api.v1.client.ChequeManager;
import io.mifos.core.api.config.EnableApiFactory;
import io.mifos.core.api.context.AutoGuest;
import io.mifos.core.api.context.AutoSeshat;
@@ -102,6 +103,7 @@ public class ServiceRunner {
private static Microservice<DepositAccountManager> depositAccountManager;
private static Microservice<TellerManager> tellerManager;
private static Microservice<ReportManager> reportManager;
+ private static Microservice<ChequeManager> chequeManager;
private static DB embeddedMariaDb;
@@ -209,7 +211,8 @@ public class ServiceRunner {
ServiceRunner.portfolioManager = new Microservice<>(PortfolioManager.class, "portfolio", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT)
.addProperties(new ExtraProperties() {{
- setProperty("portfolio.bookInterestAsUser", SCHEDULER_USER_NAME);}});
+ setProperty("portfolio.bookLateFeesAndInterestAsUser", SCHEDULER_USER_NAME);
+ }});
startService(generalProperties, portfolioManager);
ServiceRunner.depositAccountManager = new Microservice<>(DepositAccountManager.class, "deposit-account-management", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
@@ -220,10 +223,14 @@ public class ServiceRunner {
ServiceRunner.reportManager = new Microservice<>(ReportManager.class, "reporting", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
startService(generalProperties, ServiceRunner.reportManager);
+
+ ServiceRunner.chequeManager = new Microservice<>(ChequeManager.class, "cheques", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
+ startService(generalProperties, ServiceRunner.chequeManager);
}
@After
public void tearDown() throws Exception {
+ ServiceRunner.chequeManager.kill();
ServiceRunner.reportManager.kill();
ServiceRunner.tellerManager.kill();
ServiceRunner.depositAccountManager.kill();
@@ -261,6 +268,7 @@ public class ServiceRunner {
System.out.println("Deposit Service: " + ServiceRunner.depositAccountManager.getProcessEnvironment().serverURI());
System.out.println("Teller Service: " + ServiceRunner.tellerManager.getProcessEnvironment().serverURI());
System.out.println("Reporting Service: " + ServiceRunner.reportManager.getProcessEnvironment().serverURI());
+ System.out.println("Cheque Service: " + ServiceRunner.chequeManager.getProcessEnvironment().serverURI());
boolean run = true;
@@ -321,7 +329,8 @@ public class ServiceRunner {
ApplicationBuilder.create(ServiceRunner.portfolioManager.name(), ServiceRunner.portfolioManager.uri()),
ApplicationBuilder.create(ServiceRunner.depositAccountManager.name(), ServiceRunner.depositAccountManager.uri()),
ApplicationBuilder.create(ServiceRunner.tellerManager.name(), ServiceRunner.tellerManager.uri()),
- ApplicationBuilder.create(ServiceRunner.reportManager.name(), ServiceRunner.reportManager.uri())
+ ApplicationBuilder.create(ServiceRunner.reportManager.name(), ServiceRunner.reportManager.uri()),
+ ApplicationBuilder.create(ServiceRunner.chequeManager.name(), ServiceRunner.chequeManager.uri())
);
final List<Tenant> tenantsToCreate = Arrays.asList(
@@ -420,6 +429,8 @@ public class ServiceRunner {
provisionApp(tenant, ServiceRunner.reportManager, io.mifos.reporting.api.v1.EventConstants.INITIALIZE);
+ provisionApp(tenant, ServiceRunner.chequeManager, io.mifos.cheque.api.v1.EventConstants.INITIALIZE);
+
final UserWithPassword orgAdminUserPassword = createOrgAdminRoleAndUser(tenantAdminPassword.getAdminPassword());
createChartOfAccounts(orgAdminUserPassword);
diff --git a/src/main/java/io/mifos/dev/listener/ChequesListener.java b/src/main/java/io/mifos/dev/listener/ChequesListener.java
new file mode 100644
index 0000000..908454b
--- /dev/null
+++ b/src/main/java/io/mifos/dev/listener/ChequesListener.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.dev.listener;
+
+import io.mifos.cheque.api.v1.EventConstants;
+import io.mifos.core.lang.config.TenantHeaderFilter;
+import io.mifos.core.test.listener.EventRecorder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("unused")
+@Component
+public class ChequesListener {
+
+ private final EventRecorder eventRecorder;
+
+ @Autowired
+ public ChequesListener(final EventRecorder eventRecorder) {
+ this.eventRecorder = eventRecorder;
+ }
+
+ @JmsListener(
+ subscription = EventConstants.DESTINATION,
+ destination = EventConstants.DESTINATION,
+ selector = EventConstants.SELECTOR_INITIALIZE
+ )
+ public void onInitialized(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant,
+ final String payload) {
+ this.eventRecorder.event(tenant, EventConstants.INITIALIZE, payload, String.class);
+ }
+}
+
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 02/26: Adding logging.
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 950e603084b1a4faaf2a871dfd4bd98b2265adca
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Tue Aug 15 09:05:37 2017 +0200
Adding logging.
---
src/main/java/io/mifos/dev/ServiceRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index a370d65..e74ee28 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -65,7 +65,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.Base64Utils;
@@ -428,6 +427,7 @@ public class ServiceRunner {
final Tenant tenant,
final Microservice<T> service,
final String initialize_event) throws InterruptedException {
+ logger.info("Provisioning service '{}', for tenant '{}'.", service.name(), tenant.getName());
final AssignedApplication assignedApp = new AssignedApplication();
assignedApp.setName(service.name());
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 12/26: Merge pull request #5 from
markvanveen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 3920c30222ce5e4e891760a48714d2c301d90210
Merge: 5e1ba75 2384b0a
Author: Mark van Veen <30...@users.noreply.github.com>
AuthorDate: Mon Aug 28 21:37:36 2017 +0200
Merge pull request #5 from markvanveen/develop
Add cheque service
build.gradle | 2 +
src/main/java/io/mifos/dev/ServiceRunner.java | 15 ++++++-
.../io/mifos/dev/listener/ChequesListener.java | 47 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 13/26: Refactored code to remove
boilerplate
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit fcb6cfdb617fb9e3adc743625a65be2c4a20a019
Author: Ivange Larry <iv...@gmail.com>
AuthorDate: Thu Sep 7 13:17:50 2017 +0100
Refactored code to remove boilerplate
---
scripts/Unix/initial-setup.sh | 291 ++++--------------------------------------
1 file changed, 23 insertions(+), 268 deletions(-)
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index 2a66e0c..75ce49e 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -5,86 +5,20 @@ githubAccount=$1
mkdir -p core
cd core
-# REM initialize lang
-git clone 'https://github.com/'$githubAccount'/lang.git'
-cd lang
-git remote add upstream https://github.com/mifosio/lang.git
-git checkout develop
-# For some reason permission is denied
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize async
-git clone 'https://github.com/'$githubAccount'/async.git'
-cd async
-git remote add upstream https://github.com/mifosio/async.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize cassandra
-git clone 'https://github.com/'$githubAccount'/cassandra.git'
-cd cassandra
-git remote add upstream https://github.com/mifosio/cassandra.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize mariadb
-git clone 'https://github.com/'$githubAccount'/mariadb.git'
-cd mariadb
-git remote add upstream https://github.com/mifosio/mariadb.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize data-jpa
-git clone 'https://github.com/'$githubAccount'/data-jpa.git'
-cd data-jpa
-git remote add upstream https://github.com/mifosio/data-jpa.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize command
-git clone 'https://github.com/'$githubAccount'/command.git'
-cd command
-git remote add upstream https://github.com/mifosio/command.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize api
-git clone 'https://github.com/'$githubAccount'/api.git'
-cd api
-git remote add upstream https://github.com/mifosio/api.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize test
-git clone 'https://github.com/'$githubAccount'/test.git'
-cd test
-git remote add upstream https://github.com/mifosio/test.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
+get_modules() {
+ for module in $@
+ do
+ git clone https://github.com/$githubAccount/$module.git
+ cd $module
+ git remote add upstream https://github.com/mifosio/$module.git
+ # For some reason permission is denied
+ chmod +x gradlew
+ ./gradlew publishToMavenLocal
+ cd ..
+ done
+}
+
+get_modules lang async cassandra mariadb data-jpa 'command' api 'test'
# Return to start folder
cd ..
@@ -94,223 +28,44 @@ mkdir tools
cd tools
# REM initialize javamoney
-git clone 'https://github.com/'$githubAccount'/javamoney-lib.git'
+git clone https://github.com/JavaMoney/javamoney-lib.git
cd javamoney-lib
-git remote add upstream https://github.com/JavaMoney/javamoney-lib.git
-git checkout master
mvn install -Dmaven.test.skip=true
cd ..
# REM initialize crypto
-git clone 'https://github.com/'$githubAccount'/crypto.git'
+git clone https://github.com/$githubAccount/crypto.git
cd crypto
git remote add upstream https://github.com/mifosio/crypto.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-cd ..
-
-# REM return to start folder
-cd ..
-
-# REM initialize anubis
-git clone 'https://github.com/'$githubAccount'/anubis.git'
-cd anubis
-git remote add upstream https://github.com/mifosio/anubis.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-cd ..
-
-# REM initialize permitted-feign-client
-git clone 'https://github.com/'$githubAccount'/permitted-feign-client.git'
-cd permitted-feign-client
-git remote add upstream https://github.com/mifosio/permitted-feign-client.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-cd ..
-
-# REM initialize provisioner
-git clone 'https://github.com/'$githubAccount'/provisioner.git'
-cd provisioner
-git remote add upstream https://github.com/mifosio/provisioner.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-cd ..
-
-# REM initialize identity
-git clone 'https://github.com/'$githubAccount'/identity.git'
-cd identity
-git remote add upstream https://github.com/mifosio/identity.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize rhythm
-git clone 'https://github.com/'$githubAccount'/rhythm.git'
-cd rhythm
-git remote add upstream https://github.com/mifosio/rhythm.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize template
-git clone 'https://github.com/'$githubAccount'/template.git'
-cd template
-git remote add upstream https://github.com/mifosio/template.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize office
-git clone 'https://github.com/'$githubAccount'/office.git'
-cd office
-git remote add upstream https://github.com/mifosio/office.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize customer
-git clone 'https://github.com/'$githubAccount'/customer.git'
-cd customer
-git remote add upstream https://github.com/mifosio/customer.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize group
-git clone 'https://github.com/'$githubAccount'/group.git'
-cd group
-git remote add upstream https://github.com/mifosio/group.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize accounting
-git clone 'https://github.com/'$githubAccount'/accounting.git'
-cd accounting
-git remote add upstream https://github.com/mifosio/accounting.git
-git checkout develop
chmod +x gradlew
./gradlew publishToMavenLocal
-
cd ..
-# REM initialize portfolio
-git clone 'https://github.com/'$githubAccount'/portfolio.git'
-cd portfolio
-git remote add upstream https://github.com/mifosio/portfolio.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
+# exit tools directory
cd ..
-# REM initialize deposit
-git clone 'https://github.com/'$githubAccount'/deposit-account-management.git'
-cd deposit-account-management
-git remote add upstream https://github.com/mifosio/deposit-account-management.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-cd ..
-
-# REM initialize teller
-git clone 'https://github.com/'$githubAccount'/teller.git'
-cd teller
-git remote add upstream https://github.com/mifosio/teller.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize reporting
-git clone 'https://github.com/'$githubAccount'/reporting.git'
-cd reporting
-git remote add upstream https://github.com/mifosio/reporting.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
+get_modules anubis permitted-feign-client provisioner identity rhythm template office customer group accounting portfolio deposit-account-management teller reporting
mkdir integration-tests
cd integration-tests
-# REM initialize service-starter
-git clone 'https://github.com/'$githubAccount'/service-starter.git'
-cd service-starter
-git remote add upstream https://github.com/mifosio/service-starter.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize default-setup
-git clone 'https://github.com/'$githubAccount'/default-setup.git'
-cd default-setup
-git remote add upstream https://github.com/mifosio/default-setup.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
+get_modules service-starter default-setup demo-server test-provisioner-identity-organization
-cd ..
-
-# REM initialize demo-server
-git clone 'https://github.com/'$githubAccount'/demo-server.git'
-cd demo-server
-git remote add upstream https://github.com/mifosio/demo-server.git
-git checkout develop
-chmod +x gradlew
-./gradlew publishToMavenLocal
-
-cd ..
-
-# REM initialize test-provisioner-identity-organization
-git clone 'https://github.com/'$githubAccount'/test-provisioner-identity-organization.git'
-cd test-provisioner-identity-organization
-git remote add upstream https://github.com/mifosio/test-provisioner-identity-organization.git
-git checkout develop
-chmod +x gradlew
-./gradlew build
-
-cd ..
-
-# REM initialize test-accounting-portfolio
-git clone 'https://github.com/'$githubAccount'/test-accounting-portfolio.git'
+# test-accounting-portfolio is built a little different so it's done separate from the others
+git clone https://github.com/$githubAccount/test-accounting-portfolio.git
cd test-accounting-portfolio
git remote add upstream https://github.com/mifosio/test-accounting-portfolio.git
-git checkout develop
chmod +x gradlew
./gradlew build
-
-cd ..
-
+# exit integration-tests directory
cd ..
# REM initialize Web App
-git clone 'https://github.com/'$githubAccount'/fims-web-app.git'
+git clone https://github.com/$githubAccount/fims-web-app.git
cd fims-web-app
git remote add upstream https://github.com/mifosio/fims-web-app.git
-git checkout develop
npm i
cd ..
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 09/26: Merge pull request #4 from
myrlen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 5e1ba75532ae5d001abf5db1d4f99e1295ff567d
Merge: eb25cce 7804ebb
Author: myrlen <my...@kuelap.io>
AuthorDate: Mon Aug 28 19:10:14 2017 +0200
Merge pull request #4 from myrlen/develop
Updated property name after change.
src/main/java/io/mifos/dev/ServiceRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 19/26: Final changes
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 58fa4d1a6a655aebaa38018242a79abeab6307ba
Author: Simon Matthews <si...@dreamstartlabs.com>
AuthorDate: Mon Oct 16 23:04:20 2017 -0700
Final changes
---
scripts/Unix/initial-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index 1d4dfc1..91f3d05 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -103,7 +103,7 @@ if [ ! -z "$ERRORS" ] ; then
echo "********************"
echo -e "$ERRORS"
echo "********************"
- echo "Build errors found:"
+ echo "Build errors found"
echo "********************"
echo "The following modules failed to build: $FAILEDMODULES"
fi
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 06/26: Add missing customer service
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 66f14b2712a8059bd452659480373f4c45a1296e
Author: Mark <ma...@gmail.com>
AuthorDate: Wed Aug 16 17:26:03 2017 +0200
Add missing customer service
---
src/main/java/io/mifos/dev/ServiceRunner.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index 3c62613..a093c49 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -37,6 +37,7 @@ import io.mifos.core.test.servicestarter.ActiveMQForTest;
import io.mifos.core.test.servicestarter.EurekaForTest;
import io.mifos.core.test.servicestarter.IntegrationTestEnvironment;
import io.mifos.core.test.servicestarter.Microservice;
+import io.mifos.customer.api.v1.CustomerEventConstants;
import io.mifos.customer.api.v1.client.CustomerManager;
import io.mifos.deposit.api.v1.client.DepositAccountManager;
import io.mifos.identity.api.v1.client.IdentityManager;
@@ -411,6 +412,8 @@ public class ServiceRunner {
io.mifos.rhythm.spi.v1.PermittableGroupIds.forApplication(portfolioManager.name()), schedulerUser.getIdentifier())));
}
+ provisionApp(tenant, ServiceRunner.customerManager, CustomerEventConstants.INITIALIZE);
+
provisionApp(tenant, depositAccountManager, io.mifos.deposit.api.v1.EventConstants.INITIALIZE);
provisionApp(tenant, ServiceRunner.tellerManager, io.mifos.teller.api.v1.EventConstants.INITIALIZE);
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 08/26: Updated property name after change.
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 7804ebbf1c88b6ce65948d942827d5df501c6bf7
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Mon Aug 28 19:09:24 2017 +0200
Updated property name after change.
---
src/main/java/io/mifos/dev/ServiceRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index e74ee28..4fc3398 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -203,7 +203,7 @@ public class ServiceRunner {
ServiceRunner.portfolioManager = new Microservice<>(PortfolioManager.class, "portfolio", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT)
.addProperties(new ExtraProperties() {{
- setProperty("portfolio.bookInterestAsUser", SCHEDULER_USER_NAME);}});
+ setProperty("portfolio.bookLateFeesAndInterestAsUser", SCHEDULER_USER_NAME);}});
startService(generalProperties, portfolioManager);
ServiceRunner.depositAccountManager = new Microservice<>(DepositAccountManager.class, "deposit-account-management", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 18/26: fixed the use of tail,
added more info
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 38683ab6c559f44b829699bcee4b85f28aa79966
Author: Simon Matthews <si...@dreamstartlabs.com>
AuthorDate: Mon Oct 16 21:31:54 2017 -0700
fixed the use of tail, added more info
---
scripts/Unix/initial-setup.sh | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index eddd89f..1d4dfc1 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -6,6 +6,7 @@ exec 5>&1
mkdir -p core
cd core
ERRORS=""
+FAILEDMODULES=""
get_modules() {
for module in $@
do
@@ -15,10 +16,11 @@ get_modules() {
# For some reason permission is denied
chmod +x gradlew
THISBUILD="\nBUILDING $module\n"
- THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(tail >&5)
+ THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(cat - >&5)
if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
if [ $? -ne 0 ]; then
- ERRORS+="$THISBUILD\n"
+ ERRORS+="$(echo -e $THISBUILD | tail)\n"
+ FAILEDMODULES+="$module "
fi
popd
done
@@ -37,10 +39,11 @@ cd tools
git clone https://github.com/JavaMoney/javamoney-lib.git
cd javamoney-lib
THISBUILD="\nBUILDING javamoney-lib\n"
-THISBUILD+=$(mvn install -Dmaven.test.skip=true |& tee >(tail >&5)
+THISBUILD+=$(mvn install -Dmaven.test.skip=true |& tee >(cat - >&5)
if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
if [ $? -ne 0 ]; then
- ERRORS+="$THISBUILD\n"
+ ERRORS+="$( echo -e $THISBUILD | tail)\n"
+ FAILEDMODULES+="javamoney-lib "
fi
cd ..
@@ -50,11 +53,12 @@ git clone https://github.com/$githubAccount/crypto.git
cd crypto
git remote add upstream https://github.com/mifosio/crypto.git
chmod +x gradlew
-THISBUILD="\nBUILDING $module\n"
-THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(tail >&5)
+THISBUILD="\nBUILDING crypto\n"
+THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(cat - >&5)
if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
if [ $? -ne 0 ]; then
- ERRORS+="$THISBUILD\n"
+ ERRORS+="$(echo -e $THISBUILD | tail) \n"
+ FAILEDMODULES+="crypto "
fi
cd ..
@@ -76,10 +80,11 @@ cd test-accounting-portfolio
git remote add upstream https://github.com/mifosio/test-accounting-portfolio.git
chmod +x gradlew
THISBUILD="\nBUILDING test-accounting-portfolio\n"
-THISBUILD+=$( ./gradlew build |& tee >(tail >&5)
+THISBUILD+=$( ./gradlew build |& tee >(cat - >&5)
if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
if [ $? -ne 0 ]; then
- ERRORS+="$THISBUILD\n"
+ ERRORS+="$(echo -e $THISBUILD | tail)\n"
+ FAILEDMODULES+="test-accounting-portfolio "
fi
# exit integration-tests directory
cd ..
@@ -100,4 +105,5 @@ if [ ! -z "$ERRORS" ] ; then
echo "********************"
echo "Build errors found:"
echo "********************"
+ echo "The following modules failed to build: $FAILEDMODULES"
fi
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 15/26: Add payroll service
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit e52734766c85f85bbc7bc4ae2866d66d114e2f2e
Author: Mark <ma...@gmail.com>
AuthorDate: Tue Sep 19 14:57:59 2017 +0200
Add payroll service
---
build.gradle | 2 +
scripts/Unix/initial-setup.sh | 10 +++++
scripts/Unix/pull-all.sh | 9 +++++
scripts/windows/initial-setup.bat | 9 +++++
scripts/windows/pull-all.bat | 9 +++++
src/main/java/io/mifos/dev/ServiceRunner.java | 12 +++++-
.../io/mifos/dev/listener/PayrollListener.java | 45 ++++++++++++++++++++++
7 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 1d5ef2a..da39c3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,7 @@ ext.versions = [
mifosteller : '0.1.0-BUILD-SNAPSHOT',
mifosreporting : '0.1.0-BUILD-SNAPSHOT',
kuelapcheques : '0.1.0-BUILD-SNAPSHOT',
+ mifospayroll : '0.1.0-BUILD-SNAPSHOT',
frameworkapi : '0.1.0-BUILD-SNAPSHOT',
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworktest : '0.1.0-BUILD-SNAPSHOT',
@@ -88,6 +89,7 @@ dependencies {
[group: 'io.mifos.teller', name: 'api', version: versions.mifosteller],
[group: 'io.mifos.reporting', name: 'api', version: versions.mifosreporting],
[group: 'io.mifos.cheques', name: 'api', version: versions.kuelapcheques],
+ [group: 'io.mifos.payroll', name: 'api', version: versions.mifospayroll],
[group: 'io.mifos.anubis', name: 'api', version: versions.frameworkanubis],
[group: 'io.mifos.anubis', name: 'test', version: versions.frameworkanubis],
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index 2a66e0c..680afaa 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -251,6 +251,16 @@ chmod +x gradlew
cd ..
+# REM initialize payroll
+git clone 'https://github.com/'$githubAccount'/payroll.git'
+cd payroll
+git remote add upstream https://github.com/mifosio/payroll.git
+git checkout develop
+chmod +x gradlew
+./gradlew publishToMavenLocal
+
+cd ..
+
mkdir integration-tests
cd integration-tests
diff --git a/scripts/Unix/pull-all.sh b/scripts/Unix/pull-all.sh
index 888884e..e28fc17 100644
--- a/scripts/Unix/pull-all.sh
+++ b/scripts/Unix/pull-all.sh
@@ -217,6 +217,15 @@ chmod +x gradlew
git push origin develop
cd ..
+# REM pull payroll
+cd payroll
+git checkout develop
+git pull upstream develop
+chmod +x gradlew
+./gradlew publishToMavenLocal
+git push origin develop
+cd ..
+
cd integration-tests
# REM pull service-starter
diff --git a/scripts/windows/initial-setup.bat b/scripts/windows/initial-setup.bat
index 3d1c727..70ef91b 100644
--- a/scripts/windows/initial-setup.bat
+++ b/scripts/windows/initial-setup.bat
@@ -230,6 +230,15 @@ CALL gradlew publishToMavenLocal
TIMEOUT /T 5
cd ..
+REM initialze payroll
+git clone https://github.com/%githubAccount%/payroll.git
+cd payroll
+git remote add upstream https://github.com/mifosio/payroll.git
+git checkout develop
+CALL gradlew publishToMavenLocal
+TIMEOUT /T 5
+cd ..
+
mkdir integration-tests
cd integration-tests
diff --git a/scripts/windows/pull-all.bat b/scripts/windows/pull-all.bat
index d6475a5..f2597b6 100644
--- a/scripts/windows/pull-all.bat
+++ b/scripts/windows/pull-all.bat
@@ -215,6 +215,15 @@ git push origin develop
TIMEOUT /T 5
cd ..
+REM pull payroll
+cd payroll
+git checkout develop
+git pull upstream develop
+CALL gradlew publishToMavenLocal
+git push origin develop
+TIMEOUT /T 5
+cd ..
+
cd integration-tests
REM pull service-starter
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index 32a7b67..5e60a42 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -48,6 +48,7 @@ import io.mifos.identity.api.v1.events.ApplicationPermissionUserEvent;
import io.mifos.identity.api.v1.events.ApplicationSignatureEvent;
import io.mifos.identity.api.v1.events.EventConstants;
import io.mifos.office.api.v1.client.OrganizationManager;
+import io.mifos.payroll.api.v1.client.PayrollManager;
import io.mifos.portfolio.api.v1.client.PortfolioManager;
import io.mifos.provisioner.api.v1.client.Provisioner;
import io.mifos.provisioner.api.v1.domain.*;
@@ -104,6 +105,7 @@ public class ServiceRunner {
private static Microservice<TellerManager> tellerManager;
private static Microservice<ReportManager> reportManager;
private static Microservice<ChequeManager> chequeManager;
+ private static Microservice<PayrollManager> payrollManager;
private static DB embeddedMariaDb;
@@ -226,10 +228,14 @@ public class ServiceRunner {
ServiceRunner.chequeManager = new Microservice<>(ChequeManager.class, "cheques", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
startService(generalProperties, ServiceRunner.chequeManager);
+
+ ServiceRunner.payrollManager = new Microservice<>(PayrollManager.class, "payroll", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
+ startService(generalProperties, ServiceRunner.payrollManager);
}
@After
public void tearDown() throws Exception {
+ ServiceRunner.payrollManager.kill();
ServiceRunner.chequeManager.kill();
ServiceRunner.reportManager.kill();
ServiceRunner.tellerManager.kill();
@@ -269,6 +275,7 @@ public class ServiceRunner {
System.out.println("Teller Service: " + ServiceRunner.tellerManager.getProcessEnvironment().serverURI());
System.out.println("Reporting Service: " + ServiceRunner.reportManager.getProcessEnvironment().serverURI());
System.out.println("Cheque Service: " + ServiceRunner.chequeManager.getProcessEnvironment().serverURI());
+ System.out.println("Payroll Service: " + ServiceRunner.payrollManager.getProcessEnvironment().serverURI());
boolean run = true;
@@ -330,7 +337,8 @@ public class ServiceRunner {
ApplicationBuilder.create(ServiceRunner.depositAccountManager.name(), ServiceRunner.depositAccountManager.uri()),
ApplicationBuilder.create(ServiceRunner.tellerManager.name(), ServiceRunner.tellerManager.uri()),
ApplicationBuilder.create(ServiceRunner.reportManager.name(), ServiceRunner.reportManager.uri()),
- ApplicationBuilder.create(ServiceRunner.chequeManager.name(), ServiceRunner.chequeManager.uri())
+ ApplicationBuilder.create(ServiceRunner.chequeManager.name(), ServiceRunner.chequeManager.uri()),
+ ApplicationBuilder.create(ServiceRunner.payrollManager.name(), ServiceRunner.payrollManager.uri())
);
final List<Tenant> tenantsToCreate = Arrays.asList(
@@ -431,6 +439,8 @@ public class ServiceRunner {
provisionApp(tenant, ServiceRunner.chequeManager, io.mifos.cheque.api.v1.EventConstants.INITIALIZE);
+ provisionApp(tenant, ServiceRunner.payrollManager, io.mifos.payroll.api.v1.EventConstants.INITIALIZE);
+
final UserWithPassword orgAdminUserPassword = createOrgAdminRoleAndUser(tenantAdminPassword.getAdminPassword());
createChartOfAccounts(orgAdminUserPassword);
diff --git a/src/main/java/io/mifos/dev/listener/PayrollListener.java b/src/main/java/io/mifos/dev/listener/PayrollListener.java
new file mode 100644
index 0000000..a9174b5
--- /dev/null
+++ b/src/main/java/io/mifos/dev/listener/PayrollListener.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2016 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.dev.listener;
+
+import io.mifos.core.lang.config.TenantHeaderFilter;
+import io.mifos.core.test.listener.EventRecorder;
+import io.mifos.payroll.api.v1.EventConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("unused")
+@Component
+public class PayrollListener {
+ private final EventRecorder eventRecorder;
+
+ @Autowired
+ public PayrollListener(final EventRecorder eventRecorder) {
+ this.eventRecorder = eventRecorder;
+ }
+
+ @JmsListener(
+ subscription = EventConstants.DESTINATION,
+ destination = EventConstants.DESTINATION,
+ selector = EventConstants.SELECTOR_INITIALIZE
+ )
+ public void onInitialized(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant,
+ final String payload) {
+ this.eventRecorder.event(tenant, EventConstants.INITIALIZE, payload, String.class);
+ }
+}
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 21/26: Merge pull request #27 from
Whoever57/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit b65f84db626bba5848639c3599f159dbdfc7c546
Merge: e54354c 58fa4d1
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Fri Oct 20 13:16:43 2017 +0200
Merge pull request #27 from Whoever57/develop
Log build failures and provide summary at end of run
scripts/Unix/initial-setup.sh | 52 +++++++++++++++++++++++++++++++++++++------
1 file changed, 45 insertions(+), 7 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 03/26: Merge pull request #1 from
myrlen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 59a4abf150a03059b765b5c69cfaa7b4057b2a1b
Merge: 2cb96ac 950e603
Author: myrlen <my...@kuelap.io>
AuthorDate: Tue Aug 15 09:08:52 2017 +0200
Merge pull request #1 from myrlen/develop
Adding logging.
src/main/java/io/mifos/dev/ServiceRunner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 20/26: Merge branch 'develop' of
https://github.com/mifosio/demo-server into develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit e54354c405e7ca18a747d5c62a2cc2ee89d9ae59
Merge: b96130e e2c820c
Author: mgeiss <mg...@mifos.org>
AuthorDate: Thu Oct 19 07:18:45 2017 +0200
Merge branch 'develop' of https://github.com/mifosio/demo-server into develop
scripts/Unix/initial-setup.sh | 291 ++++--------------------------------------
1 file changed, 23 insertions(+), 268 deletions(-)
diff --cc scripts/Unix/initial-setup.sh
index 680afaa,75ce49e..0c9cd15
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@@ -111,156 -42,12 +42,22 @@@ chmod +x gradle
./gradlew publishToMavenLocal
cd ..
- # REM return to start folder
+ # exit tools directory
cd ..
- # REM initialize anubis
- git clone 'https://github.com/'$githubAccount'/anubis.git'
- cd anubis
- git remote add upstream https://github.com/mifosio/anubis.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
- cd ..
- # REM initialize permitted-feign-client
- git clone 'https://github.com/'$githubAccount'/permitted-feign-client.git'
- cd permitted-feign-client
- git remote add upstream https://github.com/mifosio/permitted-feign-client.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
- cd ..
-
- # REM initialize provisioner
- git clone 'https://github.com/'$githubAccount'/provisioner.git'
- cd provisioner
- git remote add upstream https://github.com/mifosio/provisioner.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
- cd ..
-
- # REM initialize identity
- git clone 'https://github.com/'$githubAccount'/identity.git'
- cd identity
- git remote add upstream https://github.com/mifosio/identity.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize rhythm
- git clone 'https://github.com/'$githubAccount'/rhythm.git'
- cd rhythm
- git remote add upstream https://github.com/mifosio/rhythm.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize template
- git clone 'https://github.com/'$githubAccount'/template.git'
- cd template
- git remote add upstream https://github.com/mifosio/template.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize office
- git clone 'https://github.com/'$githubAccount'/office.git'
- cd office
- git remote add upstream https://github.com/mifosio/office.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize customer
- git clone 'https://github.com/'$githubAccount'/customer.git'
- cd customer
- git remote add upstream https://github.com/mifosio/customer.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize group
- git clone 'https://github.com/'$githubAccount'/group.git'
- cd group
- git remote add upstream https://github.com/mifosio/group.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize accounting
- git clone 'https://github.com/'$githubAccount'/accounting.git'
- cd accounting
- git remote add upstream https://github.com/mifosio/accounting.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize portfolio
- git clone 'https://github.com/'$githubAccount'/portfolio.git'
- cd portfolio
- git remote add upstream https://github.com/mifosio/portfolio.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize deposit
- git clone 'https://github.com/'$githubAccount'/deposit-account-management.git'
- cd deposit-account-management
- git remote add upstream https://github.com/mifosio/deposit-account-management.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize teller
- git clone 'https://github.com/'$githubAccount'/teller.git'
- cd teller
- git remote add upstream https://github.com/mifosio/teller.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
-
- # REM initialize reporting
- git clone 'https://github.com/'$githubAccount'/reporting.git'
- cd reporting
- git remote add upstream https://github.com/mifosio/reporting.git
- git checkout develop
- chmod +x gradlew
- ./gradlew publishToMavenLocal
-
- cd ..
+ get_modules anubis permitted-feign-client provisioner identity rhythm template office customer group accounting portfolio deposit-account-management teller reporting
+# REM initialize payroll
+git clone 'https://github.com/'$githubAccount'/payroll.git'
+cd payroll
+git remote add upstream https://github.com/mifosio/payroll.git
+git checkout develop
+chmod +x gradlew
+./gradlew publishToMavenLocal
+
+cd ..
+
mkdir integration-tests
cd integration-tests
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 07/26: Merge pull request #3 from
markvanveen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit eb25ccea0b80ecc01cd43fef04f956e0cc43fd01
Merge: 47a693d 66f14b2
Author: Mark van Veen <30...@users.noreply.github.com>
AuthorDate: Wed Aug 16 17:26:55 2017 +0200
Merge pull request #3 from markvanveen/develop
Add missing customer service
src/main/java/io/mifos/dev/ServiceRunner.java | 3 +++
1 file changed, 3 insertions(+)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 16/26: Merge pull request #6 from
markvanveen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit b96130eb1f6955305c97be62eb885eb32d3f96dd
Merge: 3920c30 e527347
Author: Mark van Veen <30...@users.noreply.github.com>
AuthorDate: Tue Sep 19 14:58:41 2017 +0200
Merge pull request #6 from markvanveen/develop
Add payroll service
build.gradle | 2 +
scripts/Unix/initial-setup.sh | 10 +++++
scripts/Unix/pull-all.sh | 9 +++++
scripts/windows/initial-setup.bat | 9 +++++
scripts/windows/pull-all.bat | 9 +++++
src/main/java/io/mifos/dev/ServiceRunner.java | 12 +++++-
.../io/mifos/dev/listener/PayrollListener.java | 45 ++++++++++++++++++++++
7 files changed, 95 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 04/26: added missing services fixed
retrieving of csv resources
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit f536d56f30f438801c83581ec509224e20084d68
Author: mgeiss <mg...@mifos.org>
AuthorDate: Tue Aug 15 15:52:54 2017 +0200
added missing services
fixed retrieving of csv resources
---
build.gradle | 4 ++
src/main/java/io/mifos/dev/ServiceRunner.java | 29 ++++++++++++--
.../listener/DepositAccountManagementListener.java | 46 ++++++++++++++++++++++
.../io/mifos/dev/listener/ReportingListener.java | 46 ++++++++++++++++++++++
.../java/io/mifos/dev/listener/TellerListener.java | 46 ++++++++++++++++++++++
5 files changed, 168 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 1a799a1..75e1ac8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,8 @@ ext.versions = [
mifosaccounting : '0.1.0-BUILD-SNAPSHOT',
mifosportfolio : '0.1.0-BUILD-SNAPSHOT',
mifosdeposit : '0.1.0-BUILD-SNAPSHOT',
+ mifosteller : '0.1.0-BUILD-SNAPSHOT',
+ mifosreporting : '0.1.0-BUILD-SNAPSHOT',
frameworkapi : '0.1.0-BUILD-SNAPSHOT',
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworktest : '0.1.0-BUILD-SNAPSHOT',
@@ -82,6 +84,8 @@ dependencies {
[group: 'io.mifos.accounting', name: 'importer', version: versions.mifosaccounting],
[group: 'io.mifos.portfolio', name: 'api', version: versions.mifosportfolio],
[group: 'io.mifos.deposit-account-management', name: 'api', version: versions.mifosdeposit],
+ [group: 'io.mifos.teller', name: 'api', version: versions.mifosteller],
+ [group: 'io.mifos.reporting', name: 'api', version: versions.mifosreporting],
[group: 'io.mifos.anubis', name: 'api', version: versions.frameworkanubis],
[group: 'io.mifos.anubis', name: 'test', version: versions.frameworkanubis],
diff --git a/src/main/java/io/mifos/dev/ServiceRunner.java b/src/main/java/io/mifos/dev/ServiceRunner.java
index e74ee28..3c62613 100644
--- a/src/main/java/io/mifos/dev/ServiceRunner.java
+++ b/src/main/java/io/mifos/dev/ServiceRunner.java
@@ -49,8 +49,10 @@ import io.mifos.office.api.v1.client.OrganizationManager;
import io.mifos.portfolio.api.v1.client.PortfolioManager;
import io.mifos.provisioner.api.v1.client.Provisioner;
import io.mifos.provisioner.api.v1.domain.*;
+import io.mifos.reporting.api.v1.client.ReportManager;
import io.mifos.rhythm.api.v1.client.RhythmManager;
import io.mifos.rhythm.api.v1.events.BeatEvent;
+import io.mifos.teller.api.v1.client.TellerManager;
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.junit.*;
@@ -97,6 +99,9 @@ public class ServiceRunner {
private static Microservice<LedgerManager> ledgerManager;
private static Microservice<PortfolioManager> portfolioManager;
private static Microservice<DepositAccountManager> depositAccountManager;
+ private static Microservice<TellerManager> tellerManager;
+ private static Microservice<ReportManager> reportManager;
+
private static DB embeddedMariaDb;
@@ -208,10 +213,18 @@ public class ServiceRunner {
ServiceRunner.depositAccountManager = new Microservice<>(DepositAccountManager.class, "deposit-account-management", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
startService(generalProperties, depositAccountManager);
+
+ ServiceRunner.tellerManager = new Microservice<>(TellerManager.class, "teller", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
+ startService(generalProperties, ServiceRunner.tellerManager);
+
+ ServiceRunner.reportManager = new Microservice<>(ReportManager.class, "reporting", "0.1.0-BUILD-SNAPSHOT", ServiceRunner.INTEGRATION_TEST_ENVIRONMENT);
+ startService(generalProperties, ServiceRunner.reportManager);
}
@After
public void tearDown() throws Exception {
+ ServiceRunner.reportManager.kill();
+ ServiceRunner.tellerManager.kill();
ServiceRunner.depositAccountManager.kill();
ServiceRunner.rhythmManager.kill();
ServiceRunner.portfolioManager.kill();
@@ -245,6 +258,8 @@ public class ServiceRunner {
System.out.println("Accounting Service: " + ServiceRunner.ledgerManager.getProcessEnvironment().serverURI());
System.out.println("Portfolio Service: " + ServiceRunner.portfolioManager.getProcessEnvironment().serverURI());
System.out.println("Deposit Service: " + ServiceRunner.depositAccountManager.getProcessEnvironment().serverURI());
+ System.out.println("Teller Service: " + ServiceRunner.tellerManager.getProcessEnvironment().serverURI());
+ System.out.println("Reporting Service: " + ServiceRunner.reportManager.getProcessEnvironment().serverURI());
boolean run = true;
@@ -303,7 +318,9 @@ public class ServiceRunner {
ApplicationBuilder.create(ServiceRunner.customerManager.name(), ServiceRunner.customerManager.uri()),
ApplicationBuilder.create(ServiceRunner.ledgerManager.name(), ServiceRunner.ledgerManager.uri()),
ApplicationBuilder.create(ServiceRunner.portfolioManager.name(), ServiceRunner.portfolioManager.uri()),
- ApplicationBuilder.create(ServiceRunner.depositAccountManager.name(), ServiceRunner.depositAccountManager.uri())
+ ApplicationBuilder.create(ServiceRunner.depositAccountManager.name(), ServiceRunner.depositAccountManager.uri()),
+ ApplicationBuilder.create(ServiceRunner.tellerManager.name(), ServiceRunner.tellerManager.uri()),
+ ApplicationBuilder.create(ServiceRunner.reportManager.name(), ServiceRunner.reportManager.uri())
);
final List<Tenant> tenantsToCreate = Arrays.asList(
@@ -362,6 +379,8 @@ public class ServiceRunner {
Assert.assertTrue(this.eventRecorder.wait(EventConstants.OPERATION_PUT_APPLICATION_PERMISSION_USER_ENABLED, new ApplicationPermissionUserEvent(rhythmManager.name(), io.mifos.identity.api.v1.PermittableGroupIds.APPLICATION_SELF_MANAGEMENT, schedulerUser.getIdentifier())));
}
+ provisionApp(tenant, ServiceRunner.organizationManager, io.mifos.office.api.v1.EventConstants.INITIALIZE);
+
provisionApp(tenant, ledgerManager, io.mifos.accounting.api.v1.EventConstants.INITIALIZE);
provisionApp(tenant, portfolioManager, io.mifos.portfolio.api.v1.events.EventConstants.INITIALIZE);
@@ -394,6 +413,10 @@ public class ServiceRunner {
provisionApp(tenant, depositAccountManager, io.mifos.deposit.api.v1.EventConstants.INITIALIZE);
+ provisionApp(tenant, ServiceRunner.tellerManager, io.mifos.teller.api.v1.EventConstants.INITIALIZE);
+
+ provisionApp(tenant, ServiceRunner.reportManager, io.mifos.reporting.api.v1.EventConstants.INITIALIZE);
+
final UserWithPassword orgAdminUserPassword = createOrgAdminRoleAndUser(tenantAdminPassword.getAdminPassword());
createChartOfAccounts(orgAdminUserPassword);
@@ -410,12 +433,12 @@ public class ServiceRunner {
try (final AutoUserContext ignored = new AutoUserContext(userWithPassword.getIdentifier(), authentication.getAccessToken())) {
final LedgerImporter ledgerImporter = new LedgerImporter(ledgerManager.api(), logger);
- final URL ledgersUrl = ClassLoader.getSystemResource("standardChartOfAccounts/ledgers.csv");
+ final URL ledgersUrl = ServiceRunner.class.getResource("/standardChartOfAccounts/ledgers.csv");
ledgerImporter.importCSV(ledgersUrl);
Assert.assertTrue(this.eventRecorder.wait(POST_LEDGER, LOAN_INCOME_LEDGER));
final AccountImporter accountImporter = new AccountImporter(ledgerManager.api(), logger);
- final URL accountsUrl = ClassLoader.getSystemResource("standardChartOfAccounts/accounts.csv");
+ final URL accountsUrl = ServiceRunner.class.getResource("/standardChartOfAccounts/accounts.csv");
accountImporter.importCSV(accountsUrl);
Assert.assertTrue(this.eventRecorder.wait(POST_ACCOUNT, "9330"));
diff --git a/src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java b/src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java
new file mode 100644
index 0000000..174859b
--- /dev/null
+++ b/src/main/java/io/mifos/dev/listener/DepositAccountManagementListener.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.dev.listener;
+
+import io.mifos.core.lang.config.TenantHeaderFilter;
+import io.mifos.core.test.listener.EventRecorder;
+import io.mifos.deposit.api.v1.EventConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("unused")
+@Component
+public class DepositAccountManagementListener {
+
+ private final EventRecorder eventRecorder;
+
+ @Autowired
+ public DepositAccountManagementListener(final EventRecorder eventRecorder) {
+ this.eventRecorder = eventRecorder;
+ }
+
+ @JmsListener(
+ subscription = EventConstants.DESTINATION,
+ destination = EventConstants.DESTINATION,
+ selector = EventConstants.SELECTOR_INITIALIZE
+ )
+ public void onInitialized(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant,
+ final String payload) {
+ this.eventRecorder.event(tenant, EventConstants.INITIALIZE, payload, String.class);
+ }
+}
diff --git a/src/main/java/io/mifos/dev/listener/ReportingListener.java b/src/main/java/io/mifos/dev/listener/ReportingListener.java
new file mode 100644
index 0000000..c9147f1
--- /dev/null
+++ b/src/main/java/io/mifos/dev/listener/ReportingListener.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.dev.listener;
+
+import io.mifos.core.lang.config.TenantHeaderFilter;
+import io.mifos.core.test.listener.EventRecorder;
+import io.mifos.reporting.api.v1.EventConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("unused")
+@Component
+public class ReportingListener {
+
+ private final EventRecorder eventRecorder;
+
+ @Autowired
+ public ReportingListener(final EventRecorder eventRecorder) {
+ this.eventRecorder = eventRecorder;
+ }
+
+ @JmsListener(
+ subscription = EventConstants.DESTINATION,
+ destination = EventConstants.DESTINATION,
+ selector = EventConstants.SELECTOR_INITIALIZE
+ )
+ public void onInitialized(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant,
+ final String payload) {
+ this.eventRecorder.event(tenant, EventConstants.INITIALIZE, payload, String.class);
+ }
+}
diff --git a/src/main/java/io/mifos/dev/listener/TellerListener.java b/src/main/java/io/mifos/dev/listener/TellerListener.java
new file mode 100644
index 0000000..c5c5315
--- /dev/null
+++ b/src/main/java/io/mifos/dev/listener/TellerListener.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.mifos.dev.listener;
+
+import io.mifos.core.lang.config.TenantHeaderFilter;
+import io.mifos.core.test.listener.EventRecorder;
+import io.mifos.teller.api.v1.EventConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("unused")
+@Component
+public class TellerListener {
+
+ private final EventRecorder eventRecorder;
+
+ @Autowired
+ public TellerListener(final EventRecorder eventRecorder) {
+ this.eventRecorder = eventRecorder;
+ }
+
+ @JmsListener(
+ subscription = EventConstants.DESTINATION,
+ destination = EventConstants.DESTINATION,
+ selector = EventConstants.SELECTOR_INITIALIZE
+ )
+ public void onInitialized(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant,
+ final String payload) {
+ this.eventRecorder.event(tenant, EventConstants.INITIALIZE, payload, String.class);
+ }
+}
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 11/26: Merge branch 'develop' of
https://github.com/KuelapInc/demo-server into develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 2384b0ab7d46797eb5b48ef6b8d1061bd318852c
Merge: d608a49 5e1ba75
Author: Mark <ma...@gmail.com>
AuthorDate: Mon Aug 28 21:32:32 2017 +0200
Merge branch 'develop' of https://github.com/KuelapInc/demo-server into develop
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 17/26: Log build failures and provide
summary at end of run
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 75e4edcd82bd2b95e1c7fb0aa731c662086d1c9f
Author: Simon Matthews <si...@dreamstartlabs.com>
AuthorDate: Mon Oct 16 20:38:41 2017 -0700
Log build failures and provide summary at end of run
---
scripts/Unix/initial-setup.sh | 46 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index 75ce49e..eddd89f 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -1,20 +1,26 @@
#!/bin/bash
githubAccount=$1
+exec 5>&1
# REM create core folder
mkdir -p core
cd core
-
+ERRORS=""
get_modules() {
for module in $@
do
git clone https://github.com/$githubAccount/$module.git
- cd $module
+ pushd $module
git remote add upstream https://github.com/mifosio/$module.git
# For some reason permission is denied
chmod +x gradlew
- ./gradlew publishToMavenLocal
- cd ..
+ THISBUILD="\nBUILDING $module\n"
+ THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(tail >&5)
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
+ if [ $? -ne 0 ]; then
+ ERRORS+="$THISBUILD\n"
+ fi
+ popd
done
}
@@ -30,7 +36,12 @@ cd tools
# REM initialize javamoney
git clone https://github.com/JavaMoney/javamoney-lib.git
cd javamoney-lib
-mvn install -Dmaven.test.skip=true
+THISBUILD="\nBUILDING javamoney-lib\n"
+THISBUILD+=$(mvn install -Dmaven.test.skip=true |& tee >(tail >&5)
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
+if [ $? -ne 0 ]; then
+ ERRORS+="$THISBUILD\n"
+fi
cd ..
@@ -39,7 +50,13 @@ git clone https://github.com/$githubAccount/crypto.git
cd crypto
git remote add upstream https://github.com/mifosio/crypto.git
chmod +x gradlew
-./gradlew publishToMavenLocal
+THISBUILD="\nBUILDING $module\n"
+THISBUILD+=$(./gradlew publishToMavenLocal |& tee >(tail >&5)
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
+if [ $? -ne 0 ]; then
+ ERRORS+="$THISBUILD\n"
+fi
+
cd ..
# exit tools directory
@@ -58,7 +75,12 @@ git clone https://github.com/$githubAccount/test-accounting-portfolio.git
cd test-accounting-portfolio
git remote add upstream https://github.com/mifosio/test-accounting-portfolio.git
chmod +x gradlew
-./gradlew build
+THISBUILD="\nBUILDING test-accounting-portfolio\n"
+THISBUILD+=$( ./gradlew build |& tee >(tail >&5)
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi )
+if [ $? -ne 0 ]; then
+ ERRORS+="$THISBUILD\n"
+fi
# exit integration-tests directory
cd ..
@@ -69,3 +91,13 @@ git remote add upstream https://github.com/mifosio/fims-web-app.git
npm i
cd ..
+
+if [ ! -z "$ERRORS" ] ; then
+ echo "********************"
+ echo "Build errors found:"
+ echo "********************"
+ echo -e "$ERRORS"
+ echo "********************"
+ echo "Build errors found:"
+ echo "********************"
+fi
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 22/26: Merge pull request #7 from
myrlen/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 8859b5b2d2009b3fa881f4a987f25e8246743542
Merge: b96130e b65f84d
Author: myrlen <my...@kuelap.io>
AuthorDate: Fri Oct 20 13:27:25 2017 +0200
Merge pull request #7 from myrlen/develop
Updating from mifosio
scripts/Unix/initial-setup.sh | 335 ++++++++----------------------------------
1 file changed, 64 insertions(+), 271 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 23/26: Refactor some Shell scripts
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit a11336026fc71faa09971849914d998059bf883b
Author: Robin Richtsfeld <ro...@gmail.com>
AuthorDate: Tue Dec 5 19:46:08 2017 +0100
Refactor some Shell scripts
---
scripts/Unix/initial-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh
index 13e8796..a0adb63 100755
--- a/scripts/Unix/initial-setup.sh
+++ b/scripts/Unix/initial-setup.sh
@@ -8,7 +8,7 @@ cd core
ERRORS=""
FAILEDMODULES=""
get_modules() {
- for module in $@
+ for module in "$@"
do
git clone https://github.com/$githubAccount/$module.git
pushd $module
@@ -101,11 +101,11 @@ cd ..
# REM initialize Web App
git clone https://github.com/$githubAccount/fims-web-app.git
+(
cd fims-web-app
git remote add upstream https://github.com/mifosio/fims-web-app.git
npm i
-
-cd ..
+)
if [ ! -z "$ERRORS" ] ; then
echo "********************"
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 26/26: Merge pull request #29 from
Androbin/gci
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit ba85aa29bffcccf4d6c6d39e82a6196f51d2d68c
Merge: cd6c0d9 60f81b3
Author: Markus Geiß <ma...@apache.org>
AuthorDate: Wed Dec 6 19:25:55 2017 +0100
Merge pull request #29 from Androbin/gci
Refactor pull-all.sh Script
scripts/Unix/pull-all.sh | 296 +++++------------------------------------------
1 file changed, 28 insertions(+), 268 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 25/26: Merge pull request #28 from
Androbin/shell
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit cd6c0d932fd75da45e2233cc13851cf6afbc6af7
Merge: 8859b5b a113360
Author: Markus Geiß <ma...@apache.org>
AuthorDate: Wed Dec 6 19:25:19 2017 +0100
Merge pull request #28 from Androbin/shell
Refactor some Shell scripts
scripts/Unix/initial-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 14/26: Merge pull request #26 from
ivange94/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit e2c820cd090fdcfb035221d90681904fbf997c25
Merge: 66f14b2 fcb6cfd
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Mon Sep 18 12:05:45 2017 +0200
Merge pull request #26 from ivange94/develop
Refactored code to remove boilerplate
scripts/Unix/initial-setup.sh | 291 ++++--------------------------------------
1 file changed, 23 insertions(+), 268 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 05/26: Merge pull request #2 from
markusgeiss/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 47a693d361a5ac94a0b9439423e9eff3e43bc47e
Merge: 59a4abf f536d56
Author: Markus Geiss <ma...@kuelap.io>
AuthorDate: Tue Aug 15 15:53:57 2017 +0200
Merge pull request #2 from markusgeiss/develop
added missing services
build.gradle | 4 ++
src/main/java/io/mifos/dev/ServiceRunner.java | 29 ++++++++++++--
.../listener/DepositAccountManagementListener.java | 46 ++++++++++++++++++++++
.../io/mifos/dev/listener/ReportingListener.java | 46 ++++++++++++++++++++++
.../java/io/mifos/dev/listener/TellerListener.java | 46 ++++++++++++++++++++++
5 files changed, 168 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.
[fineract-cn-demo-server] 01/26: Merge pull request #25 from
myrle-krantz/develop
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git
commit 2cb96ac13f2a00b8801560b88756699f48936f5d
Merge: e389354 41f0b47
Author: Myrle Krantz <my...@apache.org>
AuthorDate: Fri Aug 4 18:06:37 2017 +0200
Merge pull request #25 from myrle-krantz/develop
Moving accounts.csv and ledgers.csv to new default-setup project.
build.gradle | 2 +
scripts/Unix/initial-setup.sh | 10 ++++
scripts/Unix/pull-all.sh | 11 +++-
scripts/windows/initial-setup.bat | 9 +++
scripts/windows/pull-all.bat | 9 +++
src/main/java/io/mifos/dev/ServiceRunner.java | 10 ++--
src/main/resources/accounts.csv | 79 ---------------------------
src/main/resources/ledgers.csv | 53 ------------------
8 files changed, 44 insertions(+), 139 deletions(-)
--
To stop receiving notification emails like this one, please contact
myrle@apache.org.