From aaf8c8c02f75b560296adf75bc51be57da21f232 Mon Sep 17 00:00:00 2001 From: b00lean Date: Wed, 10 Jan 2024 16:17:13 +0100 Subject: [PATCH] BATM-5682 - Extensions examples should be in separate module (#873) Co-authored-by: kkyovsky --- README.md | 8 +++-- server_extensions_examples/build.gradle | 34 +++++++++++++++++++ .../examples/ProfitOverrideExtension.java | 2 +- .../examples/TransactionExtension.java | 3 +- .../ActiveTerminalsExtension.java | 2 +- .../RestServiceActiveTerminals.java | 2 +- .../chat/ChatBotExtensionExample.java | 2 +- .../extensions}/examples/chat/ChatUtils.java | 2 +- .../examples/chat/InfoCommand.java | 2 +- .../examples/chat/LightningCommand.java | 2 +- .../examples/chat/VersionCommand.java | 2 +- ...ExternalCommunicationExampleExtension.java | 2 +- .../communication/NexmoSmsProvider.java | 2 +- .../communication/SmsErrorResponseImpl.java | 2 +- .../communication/SmsResponseImpl.java | 2 +- .../identity/ExampleIdentityListener.java | 2 +- .../ExternalIdentityExampleExtension.java | 2 +- .../identity/IdentityExampleExtension.java | 2 +- .../identity/IdentityExampleIRestService.java | 2 +- .../identity/IdentityExampleRestService.java | 2 +- .../identity/IdentityPieceExample.java | 2 +- .../examples/identity/LimitExample.java | 2 +- .../location/CashCollectionDayExample.java | 2 +- .../location/LocationDetailExample.java | 2 +- .../location/LocationExampleExtension.java | 2 +- .../location/LocationExampleIRestService.java | 2 +- .../location/LocationExampleRestService.java | 2 +- .../examples/location/NoteExample.java | 2 +- .../location/OpeningHoursExample.java | 2 +- .../location/OrganizationExample.java | 2 +- .../examples/location/PersonExample.java | 2 +- .../ExampleNotificationListener.java | 2 +- .../NotificationExampleExtension.java | 4 +-- .../rest/MyExtensionExampleResponse.java | 2 +- .../examples/rest/RESTExampleExtension.java | 2 +- .../examples/rest/RESTServiceExample.java | 2 +- .../rest/SecuredRESTServiceClient.java | 2 +- .../rest/SecuredRESTServiceExample.java | 2 +- .../examples/rest/ServletFilterExample.java | 2 +- .../watchlists/WatchlistExtension.java | 2 +- .../src/main/resources/batm-extensions.xml | 18 ++++++++++ server_extensions_extra/build.gradle | 2 -- .../src/main/resources/batm-extensions.xml | 13 ------- server_extensions_template/build.gradle | 9 ----- settings.gradle | 1 + 45 files changed, 97 insertions(+), 67 deletions(-) create mode 100644 server_extensions_examples/build.gradle rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/ProfitOverrideExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/TransactionExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals}/ActiveTerminalsExtension.java (94%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals}/RestServiceActiveTerminals.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/ChatBotExtensionExample.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/ChatUtils.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/InfoCommand.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/LightningCommand.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/chat/VersionCommand.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/ExternalCommunicationExampleExtension.java (91%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/NexmoSmsProvider.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/SmsErrorResponseImpl.java (90%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/communication/SmsResponseImpl.java (92%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/ExampleIdentityListener.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/ExternalIdentityExampleExtension.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleExtension.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleIRestService.java (93%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityExampleRestService.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/IdentityPieceExample.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/identity/LimitExample.java (94%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/CashCollectionDayExample.java (80%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationDetailExample.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleExtension.java (92%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleIRestService.java (82%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/LocationExampleRestService.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/NoteExample.java (93%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/OpeningHoursExample.java (89%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/OrganizationExample.java (81%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/location/PersonExample.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/notification/ExampleNotificationListener.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/notification/NotificationExampleExtension.java (87%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/MyExtensionExampleResponse.java (95%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/RESTExampleExtension.java (97%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/RESTServiceExample.java (99%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/SecuredRESTServiceClient.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/SecuredRESTServiceExample.java (98%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions}/examples/rest/ServletFilterExample.java (96%) rename {server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra => server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples}/watchlists/WatchlistExtension.java (97%) create mode 100644 server_extensions_examples/src/main/resources/batm-extensions.xml diff --git a/README.md b/README.md index 85795b7af..00707147d 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ CAS then parses any "batm-extensions.xml" found in the JAR file to enumerate the Extension is a high level component - something like a plugin - that encapsulates and instantiates the rest of the features. -Extension can be asked to provide wallet X for currency Y etc. The best way to learn more about extensions is to read the sample code and examine how other people have implemented support for their wallet or cryptocurrency in the server_extensions_extra module. Additional examples can be found here. +Extension can be asked to provide wallet X for currency Y etc. The best way to learn more about extensions is to read the sample code and examine how other people have implemented support for their wallet or cryptocurrency in the server_extensions_extra module. Additional examples can be found here. Here is the list of some functionality that can be extended using Extensions API: * **Implement support for different cryptocurrency wallets** - for more information, see the IWallet interface. @@ -43,14 +43,16 @@ Here is the list of some functionality that can be extended using Extensions API * **Send emails or SMSes from extension** - To notify your customer via SMS or email with custom messages, call the methods exposed by the IExtensionContext interface. * **ExtensionContext** is your main entrypoint for interacting with CAS. ExtensionContext may be called from any extension. A reference to ExtensionContext is passed to an Extension when the **init** method is called by CAS on any Extension. Please make sure you read all of the methods that are available on the IExtensionContext interface. There are, for example: cash related operations, sell functionality, and more! -* **Implement RESTful services** - facilitates integration of the Server with a 3rd party system. Extensions enable you to quickly and easily create a RESTful service that sends/receives data via JSON and HTTPS. Do you want your website to contact CAS to find the current exchange rate on your BATM (or even more complicated functions)? Use IRestService for that. A simple example that returns your current CAS version can be found here. -* **Implement ChatBot commands** - Do you need to execute some tasks on server by sending message to server via Telegram Messenger? Simply implement Telegram your command and you are ready to go. A simple example that returns your current CAS version can be found here. +* **Implement RESTful services** - facilitates integration of the Server with a 3rd party system. Extensions enable you to quickly and easily create a RESTful service that sends/receives data via JSON and HTTPS. Do you want your website to contact CAS to find the current exchange rate on your BATM (or even more complicated functions)? Use IRestService for that. A simple example that returns your current CAS version can be found here. +* **Implement ChatBot commands** - Do you need to execute some tasks on server by sending message to server via Telegram Messenger? Simply implement Telegram your command and you are ready to go. A simple example that returns your current CAS version can be found here. Content ======= * **server_extensions_api** - contains the extension API that all extensions use to extend CAS' functionality. * **server_extensions_extra** - reference extension implementation that demonstrates BTC, LTC, CLOAK, DGB, DASH, HATCH, POT, VIA, BTX, SYS, FLASH, DOGE, NLG, ICG, NBT, GRS, MAX, BSD, MEC, BTDX, NANO, SUM, BURST, ECA, LINDA, $PAC, DAI, MKR, BTBS, GQ, VERUM, MUE, BAT and REP coin support functionality. +* **server_extensions_examples** - contains example implementations of various extensions. +* **server_extensions_template** - contains template for developer's own extension. * **server_extensions_test** - contains tester for testing the extensions (CAS not required). * **operators_sample_website** - The OSW is a sample web application that demonstrates how operators can enable their customers initiate sell transactions online via operator's website and later visit two-way BATMThree or BATMFour ATM when cash is ready for withdrawal. For more detailed information see description.

` diff --git a/server_extensions_examples/build.gradle b/server_extensions_examples/build.gradle new file mode 100644 index 000000000..275a5bf6b --- /dev/null +++ b/server_extensions_examples/build.gradle @@ -0,0 +1,34 @@ +plugins { + id("shared-build-conventions") + id("shared-repositories-ext-conventions") +} + +group = projectGroup +version = projectVersion + +jar { + archiveFileName = "batm_server_extensions_examples.${archiveExtension.get()}" +} + +configurations { + artifactOnly +} + +artifacts { + artifactOnly jar +} + +dependencies { + implementation("org.slf4j:slf4j-api:1.7.28") //for logging + implementation("javax.ws.rs:javax.ws.rs-api:2.1") //for REST services + implementation("javax.servlet:javax.servlet-api:3.1.0") //for REST services + implementation("com.github.mmazi:rescu:2.1.0") //for REST client + implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis + implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.0") //JSON serialization + implementation("com.fasterxml.jackson.core:jackson-databind:2.12.0") //JSON serialization + implementation("com.fasterxml.jackson.core:jackson-core:2.12.0") //JSON serialization + implementation("com.nexmo:client:5.5.0") // sms provider + + implementation project(":server_extensions_api") + implementation project(":currencies") +} \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java index 6bb423feb..47a3b22c0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/ProfitOverrideExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/ProfitOverrideExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples; +package com.generalbytes.batm.server.extensions.examples; import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.AbstractExtension; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java index c0c91e4c0..f3a073c30 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/TransactionExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/TransactionExtension.java @@ -15,14 +15,13 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples; +package com.generalbytes.batm.server.extensions.examples; import com.generalbytes.batm.server.extensions.*; import com.generalbytes.batm.server.extensions.exceptions.UpdateException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigDecimal; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java similarity index 94% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java index 4a4dd5a47..fb8e3a7f2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/ActiveTerminalsExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/ActiveTerminalsExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.activeTerminals; +package com.generalbytes.batm.server.extensions.examples.activeterminals; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java index 0ff8dd65d..66158ed2b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/activeTerminals/RestServiceActiveTerminals.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/activeterminals/RestServiceActiveTerminals.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.activeTerminals; +package com.generalbytes.batm.server.extensions.examples.activeterminals; import com.generalbytes.batm.server.extensions.ApiAccessType; import com.generalbytes.batm.server.extensions.IApiAccess; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java index 5277fb023..5741400de 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatBotExtensionExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatBotExtensionExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.AbstractExtension; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java index 76850544f..81680d253 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/ChatUtils.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/ChatUtils.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java index aaa4d186e..fc22f8e84 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/InfoCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/InfoCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IBanknoteCounts; import com.generalbytes.batm.server.extensions.ICryptoConfiguration; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java index dd3a1f76d..4d86adaf2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/LightningCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/LightningCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.common.currencies.CryptoCurrency; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java index 9de4c839d..17e990ba7 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/chat/VersionCommand.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/chat/VersionCommand.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.chat; +package com.generalbytes.batm.server.extensions.examples.chat; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.chat.AbstractChatCommnad; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java similarity index 91% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java index c449eda5c..99398ff38 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/ExternalCommunicationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/ExternalCommunicationExampleExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java index 09e7e95b7..6d18863c6 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/NexmoSmsProvider.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/NexmoSmsProvider.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ICommunicationProvider; import com.generalbytes.batm.server.extensions.communication.ISmsResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java similarity index 90% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java index 340a30dc9..bd518b54f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsErrorResponseImpl.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsErrorResponseImpl.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ISmsErrorResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java similarity index 92% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java index 4035642ef..7e64053b3 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/communication/SmsResponseImpl.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/communication/SmsResponseImpl.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.communication; +package com.generalbytes.batm.server.extensions.examples.communication; import com.generalbytes.batm.server.extensions.communication.ISmsErrorResponse; import com.generalbytes.batm.server.extensions.communication.ISmsResponse; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java index e65f62b72..30c93f213 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExampleIdentityListener.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExampleIdentityListener.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java index b8f33fc1c..b9b72ca29 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/ExternalIdentityExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/ExternalIdentityExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.aml.IExternalIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java index 7343bc70c..61dfa9e5e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java similarity index 93% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java index f5b8f8f5b..9d64795a4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleIRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleIRestService.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IRestService; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java index 51e36538b..41339bac4 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityExampleRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityExampleRestService.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java index 1e0c398c8..75befc75f 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/IdentityPieceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/IdentityPieceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.IIdentityPiece; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java similarity index 94% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java index 2809406cb..251a22c41 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/identity/LimitExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/identity/LimitExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.identity; +package com.generalbytes.batm.server.extensions.examples.identity; import com.generalbytes.batm.server.extensions.ILimit; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java similarity index 80% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java index 50039c2a4..834ae7ecc 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/CashCollectionDayExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/CashCollectionDayExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.ICashCollectionDay; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java index 82423c0fd..49f3d3eef 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationDetailExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationDetailExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.ICashCollectionDay; import com.generalbytes.batm.server.extensions.ILocationDetail; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java similarity index 92% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java index 9f21211ee..c5ffeaf40 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleExtension.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java similarity index 82% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java index 7a627cde5..df1b3ddca 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleIRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleIRestService.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IRestService; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java index f16081abf..8d5ab6daf 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/LocationExampleRestService.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/LocationExampleRestService.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java similarity index 93% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java index 89c41ce8d..9d3384f21 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/NoteExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/NoteExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.INote; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java similarity index 89% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java index 712c4ed91..77330508b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OpeningHoursExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OpeningHoursExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IOpeningHours; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java similarity index 81% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java index 94c8ab8d2..5a9d99316 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/OrganizationExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/OrganizationExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IOrganization; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java index e60688011..62ce902af 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/location/PersonExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/location/PersonExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.location; +package com.generalbytes.batm.server.extensions.examples.location; import com.generalbytes.batm.server.extensions.IPerson; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java index fb0d14d9e..9528d0846 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/ExampleNotificationListener.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/ExampleNotificationListener.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.notification; +package com.generalbytes.batm.server.extensions.examples.notification; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.IIdentity; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java similarity index 87% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java index ba4ee9add..a9991a975 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/notification/NotificationExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/notification/NotificationExampleExtension.java @@ -15,14 +15,14 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.notification; +package com.generalbytes.batm.server.extensions.examples.notification; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; /* Enable this extension by adding the following line to /batm/config/extensions -com.generalbytes.batm.server.extensions.extra.examples.notification.NotificationExampleExtension.autoload=true +com.generalbytes.batm.server.extensions.examples.notification.NotificationExampleExtension.autoload=true */ public class NotificationExampleExtension extends AbstractExtension { diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java similarity index 95% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java index 7514ee0fb..c8a0195a0 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/MyExtensionExampleResponse.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/MyExtensionExampleResponse.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; /** * Simple data transfer class diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java index 477db7a91..ca05e6f5e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTExampleExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTExampleExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import com.generalbytes.batm.server.extensions.AbstractExtension; import com.generalbytes.batm.server.extensions.IExtensionContext; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java index 967db2c24..8e129b7f1 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/RESTServiceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/RESTServiceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import com.generalbytes.batm.server.extensions.IExtensionContext; import com.generalbytes.batm.server.extensions.ITransactionCashbackInfo; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java index ba4b85455..e5f98ab66 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceClient.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceClient.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java index ac6a0c3d9..f9005f19b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/SecuredRESTServiceExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/SecuredRESTServiceExample.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java index a6dc666d8..1694ab8cd 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/examples/rest/ServletFilterExample.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/rest/ServletFilterExample.java @@ -1,4 +1,4 @@ -package com.generalbytes.batm.server.extensions.extra.examples.rest; +package com.generalbytes.batm.server.extensions.examples.rest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java rename to server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java index 93bf6c981..c6b1f537e 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/watchlists/WatchlistExtension.java +++ b/server_extensions_examples/src/main/java/com/generalbytes/batm/server/extensions/examples/watchlists/WatchlistExtension.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.watchlists; +package com.generalbytes.batm.server.extensions.examples.watchlists; import com.generalbytes.batm.server.extensions.*; import com.generalbytes.batm.server.extensions.watchlist.WatchListMatch; diff --git a/server_extensions_examples/src/main/resources/batm-extensions.xml b/server_extensions_examples/src/main/resources/batm-extensions.xml new file mode 100644 index 000000000..7a7cf5dc0 --- /dev/null +++ b/server_extensions_examples/src/main/resources/batm-extensions.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/server_extensions_extra/build.gradle b/server_extensions_extra/build.gradle index 582ee8fcd..f29377a07 100644 --- a/server_extensions_extra/build.gradle +++ b/server_extensions_extra/build.gradle @@ -65,8 +65,6 @@ dependencies { implementation("org.reactivestreams:reactive-streams:1.0.2") // for ERC20Interface generated by web3j implementation("com.squareup.okhttp3:okhttp:4.9.0") implementation("com.squareup.okio:okio:2.8.0") - implementation("com.vdurmont:emoji-java:3.1.3") //for chat emojis - implementation("com.nexmo:client:5.5.0") // sms provider implementation("org.bitcoinj:bitcoinj-core:0.16.1") // Note when updating bitcoinj: block.io depends on libdohj for doge and ltc // which depends on bitcoinj and extends some classes, it must be compatible version diff --git a/server_extensions_extra/src/main/resources/batm-extensions.xml b/server_extensions_extra/src/main/resources/batm-extensions.xml index bf704461a..1ab29a93a 100644 --- a/server_extensions_extra/src/main/resources/batm-extensions.xml +++ b/server_extensions_extra/src/main/resources/batm-extensions.xml @@ -2179,7 +2179,6 @@ - @@ -2366,16 +2365,4 @@ - - - - - - - - - - - - diff --git a/server_extensions_template/build.gradle b/server_extensions_template/build.gradle index b13228751..32493ee0b 100644 --- a/server_extensions_template/build.gradle +++ b/server_extensions_template/build.gradle @@ -12,15 +12,6 @@ jar { configurations { artifactOnly - - // handle Github (e.g. community) vs GENERAL BYTES dichotomy - generalBytesCompile - githubCompile - if (hasGbArtifactory) { - implementation { extendsFrom generalBytesCompile } - } else { - implementation { extendsFrom githubCompile } - } } artifacts { diff --git a/settings.gradle b/settings.gradle index f4227ae8b..1f15e385b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ include ':server_extensions_api' include ':server_extensions_extra' include ':server_extensions_test' +include ':server_extensions_examples' include ':server_extensions_template' include ':currencies' include ':batm_ssh_tunnel'