From df62a176c9ea66dba5ee34b9a2b7bed52ea4f9b3 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Mon, 15 Sep 2025 11:07:40 +0200 Subject: [PATCH 01/11] build: switch to Keyple Java BOM for centralized dependency management Replaced individual Keyple component definitions with `keyple-java-bom:2025.09.12` for consistent and simplified dependency versioning. --- CHANGELOG.md | 5 ++-- Example_Card_Calypso/build.gradle.kts | 26 ++++++++++--------- .../build.gradle.kts | 23 ++++++++-------- .../build.gradle.kts | 23 ++++++++-------- .../build.gradle.kts | 23 ++++++++-------- .../app/build.gradle.kts | 15 ++++++----- .../app/build.gradle.kts | 15 ++++++----- Example_Plugin_PCSC/build.gradle.kts | 15 ++++++----- Example_Service/build.gradle.kts | 13 +++++----- Example_Service_Resource/build.gradle.kts | 15 ++++++----- 10 files changed, 91 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39b8670..55875cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed bad preparation of the selection in PC/SC examples. ### Changed - Migrated the CI pipeline from Jenkins to GitHub Actions. -### Upgraded -- `keyple-plugin-pcsc-java-lib:2.5.2` -- `keyple-card-calypso-crypto-pki-java-lib:0.2.2` +- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.09.12` for dependency + management, replacing individual Keyple component definitions. ## [2025-04-18] ### Changed diff --git a/Example_Card_Calypso/build.gradle.kts b/Example_Card_Calypso/build.gradle.kts index 34335b1..d89dce8 100644 --- a/Example_Card_Calypso/build.gradle.kts +++ b/Example_Card_Calypso/build.gradle.kts @@ -19,19 +19,21 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keypop:keypop-calypso-crypto-legacysam-java-api:0.7.0") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-service-resource-java-lib:3.1.0") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.8") - implementation("org.eclipse.keyple:keyple-card-calypso-crypto-legacysam-java-lib:0.9.0") - implementation("org.eclipse.keyple:keyple-card-calypso-crypto-pki-java-lib:0.2.2") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib:2.2.1") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keypop:keypop-calypso-crypto-legacysam-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-service-resource-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-crypto-legacysam-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-crypto-pki-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib") // End Keyple configuration + implementation("org.slf4j:slf4j-simple:1.7.32") implementation("com.google.code.gson:gson:2.10.1") } diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts index 8fc4446..70511d8 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts +++ b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts @@ -18,17 +18,18 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.8") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib:2.2.1") + testImplementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-network-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-local-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib") // End Keyple configuration /* Quarkus */ implementation(enforcedPlatform("io.quarkus:quarkus-universe-bom:1.8.1.Final")) diff --git a/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts b/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts index 8fc4446..2df714e 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts +++ b/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts @@ -18,17 +18,18 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.8") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib:2.2.1") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-network-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-local-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib") // End Keyple configuration /* Quarkus */ implementation(enforcedPlatform("io.quarkus:quarkus-universe-bom:1.8.1.Final")) diff --git a/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts b/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts index 9201539..87038b3 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts +++ b/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts @@ -18,17 +18,18 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.8") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") - implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib:2.2.1") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-network-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-local-java-lib") + implementation("org.eclipse.keyple:keyple-distributed-remote-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib") // End Keyple configuration /* Quarkus */ implementation(enforcedPlatform("io.quarkus:quarkus-universe-bom:1.8.1.Final")) diff --git a/Example_Plugin_Android_NFC/app/build.gradle.kts b/Example_Plugin_Android_NFC/app/build.gradle.kts index 818dd38..0c5d21d 100644 --- a/Example_Plugin_Android_NFC/app/build.gradle.kts +++ b/Example_Plugin_Android_NFC/app/build.gradle.kts @@ -19,13 +19,14 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.8") - implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib:3.0.0") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib") // End Keyple configuration // Android components implementation("androidx.appcompat:appcompat:1.6.1") diff --git a/Example_Plugin_Android_OMAPI/app/build.gradle.kts b/Example_Plugin_Android_OMAPI/app/build.gradle.kts index 585429e..92b4834 100644 --- a/Example_Plugin_Android_OMAPI/app/build.gradle.kts +++ b/Example_Plugin_Android_OMAPI/app/build.gradle.kts @@ -25,13 +25,14 @@ dependencies { "exclude" to listOf("org.simalliance.openmobileapi.jar")))) // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.2") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-card-generic-java-lib:3.1.2") - implementation("org.eclipse.keyple:keyple-plugin-android-omapi-java-lib:2.1.0") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keypop:keypop-calypso-card-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-card-generic-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-android-omapi-java-lib") // End Keyple configuration // Android components implementation("androidx.appcompat:appcompat:1.6.1") diff --git a/Example_Plugin_PCSC/build.gradle.kts b/Example_Plugin_PCSC/build.gradle.kts index 18bd6ba..cc171fc 100644 --- a/Example_Plugin_PCSC/build.gradle.kts +++ b/Example_Plugin_PCSC/build.gradle.kts @@ -16,13 +16,14 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-service-resource-java-lib:3.1.0") - implementation("org.eclipse.keyple:keyple-card-generic-java-lib:3.1.2") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-service-resource-java-lib") + implementation("org.eclipse.keyple:keyple-card-generic-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") // End Keyple configuration implementation("org.slf4j:slf4j-simple:1.7.32") } diff --git a/Example_Service/build.gradle.kts b/Example_Service/build.gradle.kts index 907e11a..2a5ede5 100644 --- a/Example_Service/build.gradle.kts +++ b/Example_Service/build.gradle.kts @@ -16,12 +16,13 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-card-generic-java-lib:3.1.2") - implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib:2.5.2") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-card-generic-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-pcsc-java-lib") // End Keyple configuration implementation("org.slf4j:slf4j-simple:1.7.32") } diff --git a/Example_Service_Resource/build.gradle.kts b/Example_Service_Resource/build.gradle.kts index 1472573..f87b110 100644 --- a/Example_Service_Resource/build.gradle.kts +++ b/Example_Service_Resource/build.gradle.kts @@ -16,13 +16,14 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") - implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") - implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0") - implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.5") - implementation("org.eclipse.keyple:keyple-service-resource-java-lib:3.1.0") - implementation("org.eclipse.keyple:keyple-card-generic-java-lib:3.1.2") - implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib:2.2.1") + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation("org.eclipse.keypop:keypop-reader-java-api") + implementation("org.eclipse.keyple:keyple-common-java-api") + implementation("org.eclipse.keyple:keyple-util-java-lib") + implementation("org.eclipse.keyple:keyple-service-java-lib") + implementation("org.eclipse.keyple:keyple-service-resource-java-lib") + implementation("org.eclipse.keyple:keyple-card-generic-java-lib") + implementation("org.eclipse.keyple:keyple-plugin-stub-java-lib") // End Keyple configuration implementation("org.slf4j:slf4j-simple:1.7.32") } From 76f68b654e51d54a1ec4e1ed571da34adf4a16d0 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Mon, 15 Sep 2025 11:18:28 +0200 Subject: [PATCH 02/11] build: fix dependency configuration for Keyple Java BOM --- .../build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts index 70511d8..2df714e 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts +++ b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - testImplementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") From f724ec153b35956950ad2caf15bbd4cf868ea6a2 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Mon, 15 Sep 2025 12:09:07 +0200 Subject: [PATCH 03/11] refactor: reorganize package structure in examples Closes #28 --- CHANGELOG.md | 1 + .../UseCase10_SessionTrace_TN313/CardReaderObserver.java | 2 +- .../Main_SessionTrace_TN313_Pcsc.java | 2 +- .../UseCase11_DataSigning/Main_DataSigning_Pcsc.java | 2 +- ...in_PerformanceMeasurement_EmbeddedValidation_Pcsc.java | 2 +- .../config.properties | 0 ..._PerformanceMeasurement_DistributedReloading_Pcsc.java | 2 +- .../config.properties | 0 .../Main_ReadLegacySamCountersAndCeilings_Pcsc.java | 2 +- .../Main_ExtendedModeSession_Pcsc.java | 2 +- .../Main_PkiModeSession_Pcsc.java | 2 +- .../Main_CardKeyPairGeneratedByCard_Pcsc.java | 2 +- .../Main_CardKeyPairGeneratedByLegacySam_Pcsc.java | 2 +- .../Main_ExplicitSelectionAid_Pcsc.java | 2 +- .../Main_ExplicitSelectionAid_Stub.java | 4 ++-- .../UseCase2_ScheduledSelection/CardReaderObserver.java | 2 +- .../Main_ScheduledSelection_Pcsc.java | 2 +- .../Main_ScheduledSelection_Stub.java | 4 ++-- .../UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java | 2 +- .../Main_CardAuthentication_Pcsc.java | 2 +- .../Main_CardAuthentication_Pcsc_SamResourceService.java | 2 +- .../Main_CardAuthentication_Stub_SamResourceService.java | 4 ++-- .../Main_MultipleSession_Pcsc.java | 2 +- .../calypso}/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java | 2 +- .../Main_StoredValue_SimpleReloading_Pcsc.java | 2 +- .../Main_StoredValue_DebitInSession_Pcsc.java | 2 +- .../calypso}/UseCase9_ChangePin/Main_ChangePin_Pcsc.java | 2 +- .../card/calypso}/common/StubSmartCardFactory.java | 2 +- .../poolreaderserverside/webservice/Main.java | 6 +++--- .../poolreaderserverside/webservice/client/AppClient.java | 2 +- .../webservice/client/CalypsoTicketingServiceUtil.java | 2 +- .../webservice/client/EndpointClient.java | 4 ++-- .../poolreaderserverside/webservice/server/AppServer.java | 2 +- .../webservice/server/EndpointServer.java | 4 ++-- .../app/src/main/AndroidManifest.xml | 2 +- .../plugin/android/nfc}/CalypsoConstants.kt | 2 +- .../plugin/android/nfc}/ExampleApplication.kt | 2 +- .../plugin/android/nfc}/MainActivity.kt | 2 +- .../nfc/example => example/plugin/android/nfc}/Message.kt | 2 +- .../plugin/android/nfc}/MessageDisplayAdapter.kt | 2 +- .../app/src/main/res/layout/activity_main.xml | 2 +- .../plugin/android/omapi}/ExampleApplication.kt | 2 +- .../android/omapi}/activity/AbstractExampleActivity.kt | 8 ++++---- .../android/omapi}/activity/CoreExamplesActivity.kt | 4 ++-- .../plugin/android/omapi}/adapter/EventAdapter.kt | 8 ++++---- .../plugin/android/omapi}/model/ChoiceEventModel.kt | 2 +- .../plugin/android/omapi}/model/EventModel.kt | 2 +- .../plugin/android/omapi}/util/CalypsoClassicInfo.kt | 2 +- .../plugin/android/omapi}/util/Extensions.kt | 2 +- .../app/src/main/res/layout/activity_abstract_example.xml | 2 +- .../app/src/main/res/layout/activity_core_examples.xml | 2 +- .../Main_ReaderTypeAutoIdentification_Pcsc.java | 2 +- .../Main_ExplicitReaderType_Pcsc.java | 2 +- .../Main_ChangeProtocolRules_Pcsc.java | 2 +- .../Main_TransmitControl_Pcsc.java | 2 +- .../UseCase1_BasicSelection/Main_BasicSelection_Pcsc.java | 2 +- .../Main_ProtocolBasedSelection_Pcsc.java | 2 +- .../Main_AidBasedSelection_Pcsc.java | 2 +- .../UseCase4_ScheduledSelection/CardReaderObserver.java | 2 +- .../Main_ScheduledSelection_Pcsc.java | 2 +- .../Main_SequentialMultiSelection_Pcsc.java | 2 +- .../Main_GroupedMultiSelection_Pcsc.java | 2 +- .../Main_PluginAndReaderObservation_Pcsc.java | 2 +- .../PluginObserver.java | 2 +- .../ReaderObserver.java | 2 +- .../core/service}/common/ConfigurationUtil.java | 2 +- .../Main_CardResourceService_Stub.java | 2 +- 67 files changed, 79 insertions(+), 78 deletions(-) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase10_SessionTrace_TN313/CardReaderObserver.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase11_DataSigning/Main_DataSigning_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase12_PerformanceMeasurement_EmbeddedValidation/config.properties (100%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase13_PerformanceMeasurement_DistributedReloading/config.properties (100%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java (98%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase2_ScheduledSelection/CardReaderObserver.java (98%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java (98%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/UseCase9_ChangePin/Main_ChangePin_Pcsc.java (99%) rename Example_Card_Calypso/src/main/java/org/eclipse/keyple/{card/calypso/example => example/card/calypso}/common/StubSmartCardFactory.java (98%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/Main.java (90%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/client/AppClient.java (98%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java (98%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/client/EndpointClient.java (91%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/server/AppServer.java (98%) rename Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/poolreaderserverside/webservice/server/EndpointServer.java (93%) rename Example_Plugin_Android_NFC/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/nfc/example => example/plugin/android/nfc}/CalypsoConstants.kt (96%) rename Example_Plugin_Android_NFC/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/nfc/example => example/plugin/android/nfc}/ExampleApplication.kt (95%) rename Example_Plugin_Android_NFC/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/nfc/example => example/plugin/android/nfc}/MainActivity.kt (99%) rename Example_Plugin_Android_NFC/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/nfc/example => example/plugin/android/nfc}/Message.kt (94%) rename Example_Plugin_Android_NFC/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/nfc/example => example/plugin/android/nfc}/MessageDisplayAdapter.kt (98%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/ExampleApplication.kt (93%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/activity/AbstractExampleActivity.kt (94%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/activity/CoreExamplesActivity.kt (97%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/adapter/EventAdapter.kt (93%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/model/ChoiceEventModel.kt (92%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/model/EventModel.kt (93%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/util/CalypsoClassicInfo.kt (93%) rename Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/{plugin/android/omapi/example => example/plugin/android/omapi}/util/Extensions.kt (93%) rename Example_Plugin_PCSC/src/main/java/org/eclipse/keyple/{plugin/pcsc/example => example/plugin/pcsc}/UseCase1_ReaderTypeAutoIdentification/Main_ReaderTypeAutoIdentification_Pcsc.java (98%) rename Example_Plugin_PCSC/src/main/java/org/eclipse/keyple/{plugin/pcsc/example => example/plugin/pcsc}/UseCase2_ExplicitReaderType/Main_ExplicitReaderType_Pcsc.java (98%) rename Example_Plugin_PCSC/src/main/java/org/eclipse/keyple/{plugin/pcsc/example => example/plugin/pcsc}/UseCase3_ChangeProtocolRules/Main_ChangeProtocolRules_Pcsc.java (98%) rename Example_Plugin_PCSC/src/main/java/org/eclipse/keyple/{plugin/pcsc/example => example/plugin/pcsc}/UseCase4_TransmitControl/Main_TransmitControl_Pcsc.java (99%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase1_BasicSelection/Main_BasicSelection_Pcsc.java (99%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase2_ProtocolBasedSelection/Main_ProtocolBasedSelection_Pcsc.java (99%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java (98%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase4_ScheduledSelection/CardReaderObserver.java (98%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase4_ScheduledSelection/Main_ScheduledSelection_Pcsc.java (98%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase5_SequentialMultiSelection/Main_SequentialMultiSelection_Pcsc.java (99%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase6_GroupedMultiSelection/Main_GroupedMultiSelection_Pcsc.java (99%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase7_PluginAndReaderObservation/Main_PluginAndReaderObservation_Pcsc.java (98%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase7_PluginAndReaderObservation/PluginObserver.java (98%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/UseCase7_PluginAndReaderObservation/ReaderObserver.java (97%) rename Example_Service/src/main/java/org/eclipse/keyple/{core/service/example => example/core/service}/common/ConfigurationUtil.java (96%) rename Example_Service_Resource/src/main/java/org/eclipse/keyple/{core/service/resource/example => example/core/service/resource}/UseCase1_CardResourceService/Main_CardResourceService_Stub.java (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55875cc..6124b5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Migrated the CI pipeline from Jenkins to GitHub Actions. - Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.09.12` for dependency management, replacing individual Keyple component definitions. +- Restructured package names for better alignment with project conventions and clarity. ## [2025-04-18] ### Changed diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/CardReaderObserver.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/CardReaderObserver.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java index ecd6de6..f74015a 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/CardReaderObserver.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase10_SessionTrace_TN313; +package org.eclipse.keyple.example.card.calypso.UseCase10_SessionTrace_TN313; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.DEBIT; import static org.eclipse.keypop.reader.CardReaderEvent.Type.CARD_INSERTED; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java index 33261a6..eb092ec 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/Main_SessionTrace_TN313_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase10_SessionTrace_TN313; +package org.eclipse.keyple.example.card.calypso.UseCase10_SessionTrace_TN313; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.*; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase11_DataSigning/Main_DataSigning_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase11_DataSigning/Main_DataSigning_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase11_DataSigning/Main_DataSigning_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase11_DataSigning/Main_DataSigning_Pcsc.java index db23323..3774dde 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase11_DataSigning/Main_DataSigning_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase11_DataSigning/Main_DataSigning_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase11_DataSigning; +package org.eclipse.keyple.example.card.calypso.UseCase11_DataSigning; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamExtensionService; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamUtil; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java index 3169157..baaf651 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase12_PerformanceMeasurement_EmbeddedValidation; +package org.eclipse.keyple.example.card.calypso.UseCase12_PerformanceMeasurement_EmbeddedValidation; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.DEBIT; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase12_PerformanceMeasurement_EmbeddedValidation/config.properties b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/config.properties similarity index 100% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase12_PerformanceMeasurement_EmbeddedValidation/config.properties rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/config.properties diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java index 39a96b8..17de2ab 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/Main_PerformanceMeasurement_DistributedReloading_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase13_PerformanceMeasurement_DistributedReloading; +package org.eclipse.keyple.example.card.calypso.UseCase13_PerformanceMeasurement_DistributedReloading; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.LOAD; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase13_PerformanceMeasurement_DistributedReloading/config.properties b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/config.properties similarity index 100% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase13_PerformanceMeasurement_DistributedReloading/config.properties rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase13_PerformanceMeasurement_DistributedReloading/config.properties diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java index 466d902..8611e6e 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase14_ReadLegacySamCountersAndCeilings/Main_ReadLegacySamCountersAndCeilings_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase14_ReadLegacySamCountersAndCeilings; +package org.eclipse.keyple.example.card.calypso.UseCase14_ReadLegacySamCountersAndCeilings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java index a047879..506f449 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase15_ExtendedModeSession/Main_ExtendedModeSession_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase15_ExtendedModeSession; +package org.eclipse.keyple.example.card.calypso.UseCase15_ExtendedModeSession; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java index 157ed85..c0a00f9 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase16_PkiModeSession/Main_PkiModeSession_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase16_PkiModeSession; +package org.eclipse.keyple.example.card.calypso.UseCase16_PkiModeSession; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java index 2ec8979..0e620f3 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByCard_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase17_PkiPrePersonalization; +package org.eclipse.keyple.example.card.calypso.UseCase17_PkiPrePersonalization; import java.io.IOException; import java.time.LocalDate; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java index 504d32f..3a55041 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase17_PkiPrePersonalization/Main_CardKeyPairGeneratedByLegacySam_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase17_PkiPrePersonalization; +package org.eclipse.keyple.example.card.calypso.UseCase17_PkiPrePersonalization; import java.io.IOException; import java.time.LocalDate; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java index 761c1e9..29af2e8 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase1_ExplicitSelectionAid; +package org.eclipse.keyple.example.card.calypso.UseCase1_ExplicitSelectionAid; import java.io.IOException; import java.text.ParseException; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java similarity index 98% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java index e0690bc..e0e46c4 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase1_ExplicitSelectionAid; +package org.eclipse.keyple.example.card.calypso.UseCase1_ExplicitSelectionAid; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; -import org.eclipse.keyple.card.calypso.example.common.StubSmartCardFactory; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.*; import org.eclipse.keyple.core.util.HexUtil; import org.eclipse.keyple.plugin.stub.StubPluginFactoryBuilder; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/CardReaderObserver.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/CardReaderObserver.java similarity index 98% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/CardReaderObserver.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/CardReaderObserver.java index edf7c3c..6fa8a53 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/CardReaderObserver.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/CardReaderObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase2_ScheduledSelection; +package org.eclipse.keyple.example.card.calypso.UseCase2_ScheduledSelection; import static org.eclipse.keypop.reader.CardReaderEvent.Type.CARD_INSERTED; import static org.eclipse.keypop.reader.CardReaderEvent.Type.CARD_MATCHED; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java index d64eaf0..0875573 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase2_ScheduledSelection; +package org.eclipse.keyple.example.card.calypso.UseCase2_ScheduledSelection; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java similarity index 98% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java index e292163..0d69d1c 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java @@ -10,10 +10,10 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase2_ScheduledSelection; +package org.eclipse.keyple.example.card.calypso.UseCase2_ScheduledSelection; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; -import org.eclipse.keyple.card.calypso.example.common.StubSmartCardFactory; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.*; import org.eclipse.keyple.plugin.stub.StubPluginFactoryBuilder; import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java index 485f5ce..d438059 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase3_Rev1Selection/Main_Rev1Selection_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase3_Rev1Selection; +package org.eclipse.keyple.example.card.calypso.UseCase3_Rev1Selection; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java index 46894ae..3b42d3a 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase4_CardAuthentication; +package org.eclipse.keyple.example.card.calypso.UseCase4_CardAuthentication; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java index 86459c8..cec667b 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Pcsc_SamResourceService.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase4_CardAuthentication; +package org.eclipse.keyple.example.card.calypso.UseCase4_CardAuthentication; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java index f0e54ba..85543fe 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java @@ -10,12 +10,12 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase4_CardAuthentication; +package org.eclipse.keyple.example.card.calypso.UseCase4_CardAuthentication; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamExtensionService; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamUtil; -import org.eclipse.keyple.card.calypso.example.common.StubSmartCardFactory; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.Plugin; import org.eclipse.keyple.core.service.SmartCardService; import org.eclipse.keyple.core.service.SmartCardServiceProvider; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java index 39297c3..4d5648e 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase5_MultipleSession/Main_MultipleSession_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase5_MultipleSession; +package org.eclipse.keyple.example.card.calypso.UseCase5_MultipleSession; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.DEBIT; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java index f32e322..a8c08bb 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase6_VerifyPin/Main_VerifyPin_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase6_VerifyPin; +package org.eclipse.keyple.example.card.calypso.UseCase6_VerifyPin; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.DEBIT; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java index 7e41274..e103d27 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase7_StoredValue_SimpleReloading/Main_StoredValue_SimpleReloading_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase7_StoredValue_SimpleReloading; +package org.eclipse.keyple.example.card.calypso.UseCase7_StoredValue_SimpleReloading; import java.io.IOException; import java.util.Properties; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java index 011b28c..25c8758 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase8_StoredValue_DebitInSession/Main_StoredValue_DebitInSession_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase8_StoredValue_DebitInSession; +package org.eclipse.keyple.example.card.calypso.UseCase8_StoredValue_DebitInSession; import static org.eclipse.keypop.calypso.card.WriteAccessLevel.DEBIT; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase9_ChangePin/Main_ChangePin_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase9_ChangePin/Main_ChangePin_Pcsc.java similarity index 99% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase9_ChangePin/Main_ChangePin_Pcsc.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase9_ChangePin/Main_ChangePin_Pcsc.java index f30aa3b..49eb7e5 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/UseCase9_ChangePin/Main_ChangePin_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase9_ChangePin/Main_ChangePin_Pcsc.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.UseCase9_ChangePin; +package org.eclipse.keyple.example.card.calypso.UseCase9_ChangePin; import java.io.BufferedReader; import java.io.IOException; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/common/StubSmartCardFactory.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/common/StubSmartCardFactory.java similarity index 98% rename from Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/common/StubSmartCardFactory.java rename to Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/common/StubSmartCardFactory.java index 09007e8..ad8cf9d 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/card/calypso/example/common/StubSmartCardFactory.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/common/StubSmartCardFactory.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.card.calypso.example.common; +package org.eclipse.keyple.example.card.calypso.common; import org.eclipse.keyple.core.util.HexUtil; import org.eclipse.keyple.plugin.stub.StubSmartCard; diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/Main.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/Main.java similarity index 90% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/Main.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/Main.java index e302f54..f27f4eb 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/Main.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/Main.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; import io.quarkus.runtime.annotations.QuarkusMain; import javax.inject.Inject; -import org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.client.AppClient; -import org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.server.AppServer; +import org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.client.AppClient; +import org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.server.AppServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/AppClient.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/AppClient.java similarity index 98% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/AppClient.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/AppClient.java index 8c17dff..d68da8f 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/AppClient.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/AppClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.client; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.client; import java.util.SortedSet; import javax.enterprise.context.ApplicationScoped; diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java similarity index 98% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java index 7e0da00..41a3a50 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/CalypsoTicketingServiceUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.client; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.client; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; import org.eclipse.keyple.core.service.SmartCardServiceProvider; diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/EndpointClient.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/EndpointClient.java similarity index 91% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/EndpointClient.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/EndpointClient.java index 1fdcb8e..9823799 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/client/EndpointClient.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/client/EndpointClient.java @@ -10,15 +10,15 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.client; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.client; import java.util.List; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.eclipse.keyple.distributed.MessageDto; -import org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.server.EndpointServer; import org.eclipse.keyple.distributed.spi.SyncEndpointClientSpi; +import org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.server.EndpointServer; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; /** diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/AppServer.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/AppServer.java similarity index 98% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/AppServer.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/AppServer.java index 6282a88..6a009fb 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/AppServer.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/AppServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.server; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.server; import javax.enterprise.context.ApplicationScoped; import org.eclipse.keyple.core.service.PoolPlugin; diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/EndpointServer.java b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/EndpointServer.java similarity index 93% rename from Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/EndpointServer.java rename to Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/EndpointServer.java index bafb39d..cf18188 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/poolreaderserverside/webservice/server/EndpointServer.java +++ b/Example_Distributed_PoolReaderServerSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/poolreaderserverside/webservice/server/EndpointServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.server; +package org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.server; import java.util.List; import javax.ws.rs.Consumes; @@ -22,7 +22,7 @@ import org.eclipse.keyple.distributed.LocalServiceServer; import org.eclipse.keyple.distributed.MessageDto; import org.eclipse.keyple.distributed.SyncNodeServer; -import org.eclipse.keyple.distributed.example.poolreaderserverside.webservice.client.EndpointClient; +import org.eclipse.keyple.example.distributed.poolreaderserverside.webservice.client.EndpointClient; /** * Example of a Server Controller. diff --git a/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml b/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml index 88dfd98..b5c75c4 100644 --- a/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml +++ b/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:theme="@style/AppTheme"> ) : RecyclerView.Adapter() { diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/ChoiceEventModel.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/ChoiceEventModel.kt similarity index 92% rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/ChoiceEventModel.kt rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/ChoiceEventModel.kt index ac92974..57cb16f 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/ChoiceEventModel.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/ChoiceEventModel.kt @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.plugin.android.omapi.example.model +package org.eclipse.keyple.example.plugin.android.omapi.model data class ChoiceEventModel( val title: String, diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/EventModel.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/EventModel.kt similarity index 93% rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/EventModel.kt rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/EventModel.kt index 454793f..353b29a 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/model/EventModel.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/model/EventModel.kt @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.plugin.android.omapi.example.model +package org.eclipse.keyple.example.plugin.android.omapi.model open class EventModel(val type: Int, val text: String) { companion object { diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/CalypsoClassicInfo.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/CalypsoClassicInfo.kt similarity index 93% rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/CalypsoClassicInfo.kt rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/CalypsoClassicInfo.kt index 364afa6..3458be8 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/CalypsoClassicInfo.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/CalypsoClassicInfo.kt @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.plugin.android.omapi.example.util +package org.eclipse.keyple.example.plugin.android.omapi.util object CalypsoClassicInfo { /** AID: Keyple test kit profile 1, Application 2 */ diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/Extensions.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/Extensions.kt similarity index 93% rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/Extensions.kt rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/Extensions.kt index 59906ed..c8922a7 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/util/Extensions.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/util/Extensions.kt @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.plugin.android.omapi.example.util +package org.eclipse.keyple.example.plugin.android.omapi.util import android.content.Context import android.os.Build diff --git a/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_abstract_example.xml b/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_abstract_example.xml index 1445228..a7c6aec 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_abstract_example.xml +++ b/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_abstract_example.xml @@ -4,6 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".activity.AbstractExampleActivity"> + tools:context="org.eclipse.keyple.example.plugin.android.omapi.activity.AbstractExampleActivity"> \ No newline at end of file diff --git a/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_core_examples.xml b/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_core_examples.xml index b5279e9..65773ef 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_core_examples.xml +++ b/Example_Plugin_Android_OMAPI/app/src/main/res/layout/activity_core_examples.xml @@ -8,7 +8,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true" tools:openDrawer="start" - tools:context=".activity.CoreExamplesActivity"> + tools:context="org.eclipse.keyple.example.plugin.android.omapi.activity.CoreExamplesActivity"> Date: Mon, 15 Sep 2025 15:00:27 +0200 Subject: [PATCH 04/11] docs: update changelog with dependency, package restructuring changes and library upgrades --- CHANGELOG.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6124b5d..7d26184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Changed +- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.09.12` for dependency + management, replacing individual Keyple component definitions. +- Restructured package names for better alignment with project conventions and clarity. ## [2025-07-21] ### Fixed - Fixed bad preparation of the selection in PC/SC examples. ### Changed - Migrated the CI pipeline from Jenkins to GitHub Actions. -- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.09.12` for dependency - management, replacing individual Keyple component definitions. -- Restructured package names for better alignment with project conventions and clarity. +### Upgraded +- `keyple-plugin-pcsc-java-lib:2.5.2` +- `keyple-card-calypso-crypto-pki-java-lib:0.2.2` ## [2025-04-18] ### Changed From 08233eccfe86d28bd3ecd75557361aabd276c30a Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Mon, 15 Sep 2025 16:30:12 +0200 Subject: [PATCH 05/11] refactor: spotless --- .../Main_ExplicitSelectionAid_Stub.java | 2 +- .../Main_ScheduledSelection_Stub.java | 2 +- .../Main_CardAuthentication_Stub_SamResourceService.java | 2 +- .../android/omapi/activity/AbstractExampleActivity.kt | 4 ++-- .../plugin/android/omapi/activity/CoreExamplesActivity.kt | 2 +- .../example/plugin/android/omapi/adapter/EventAdapter.kt | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java index e0e46c4..fa32df2 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase1_ExplicitSelectionAid/Main_ExplicitSelectionAid_Stub.java @@ -13,9 +13,9 @@ package org.eclipse.keyple.example.card.calypso.UseCase1_ExplicitSelectionAid; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; -import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.*; import org.eclipse.keyple.core.util.HexUtil; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.plugin.stub.StubPluginFactoryBuilder; import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory; import org.eclipse.keypop.calypso.card.card.CalypsoCard; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java index 0d69d1c..708b2b9 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase2_ScheduledSelection/Main_ScheduledSelection_Stub.java @@ -13,8 +13,8 @@ package org.eclipse.keyple.example.card.calypso.UseCase2_ScheduledSelection; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; -import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.*; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.plugin.stub.StubPluginFactoryBuilder; import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory; import org.eclipse.keypop.calypso.card.card.CalypsoCardSelectionExtension; diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java index 85543fe..cb65b85 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase4_CardAuthentication/Main_CardAuthentication_Stub_SamResourceService.java @@ -15,7 +15,6 @@ import org.eclipse.keyple.card.calypso.CalypsoExtensionService; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamExtensionService; import org.eclipse.keyple.card.calypso.crypto.legacysam.LegacySamUtil; -import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.core.service.Plugin; import org.eclipse.keyple.core.service.SmartCardService; import org.eclipse.keyple.core.service.SmartCardServiceProvider; @@ -23,6 +22,7 @@ import org.eclipse.keyple.core.service.resource.spi.CardResourceProfileExtension; import org.eclipse.keyple.core.service.resource.spi.ReaderConfiguratorSpi; import org.eclipse.keyple.core.util.HexUtil; +import org.eclipse.keyple.example.card.calypso.common.StubSmartCardFactory; import org.eclipse.keyple.plugin.stub.StubPluginFactoryBuilder; import org.eclipse.keypop.calypso.card.CalypsoCardApiFactory; import org.eclipse.keypop.calypso.card.WriteAccessLevel; diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt index 9089ad4..5fe069c 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt @@ -23,11 +23,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.navigation.NavigationView import java.io.IOException -import org.eclipse.keyple.plugin.android.omapi.example.R import org.eclipse.keyple.example.plugin.android.omapi.adapter.EventAdapter -import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding import org.eclipse.keyple.example.plugin.android.omapi.model.ChoiceEventModel import org.eclipse.keyple.example.plugin.android.omapi.model.EventModel +import org.eclipse.keyple.plugin.android.omapi.example.R +import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding import org.eclipse.keypop.reader.CardReaderEvent import timber.log.Timber diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt index 9dd5340..44a0bbe 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt @@ -19,12 +19,12 @@ import androidx.core.view.GravityCompat import org.eclipse.keyple.card.generic.GenericExtensionService import org.eclipse.keyple.core.service.SmartCardServiceProvider import org.eclipse.keyple.core.util.HexUtil +import org.eclipse.keyple.example.plugin.android.omapi.util.CalypsoClassicInfo import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiPlugin import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiPluginFactoryProvider import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiReader import org.eclipse.keyple.plugin.android.omapi.example.R import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding -import org.eclipse.keyple.example.plugin.android.omapi.util.CalypsoClassicInfo import org.eclipse.keypop.reader.CardCommunicationException import org.eclipse.keypop.reader.CardReader import org.eclipse.keypop.reader.ReaderCommunicationException diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt index bb1edf0..b12e5d7 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt @@ -17,14 +17,14 @@ import android.view.View import android.view.ViewGroup import android.widget.RadioButton import androidx.recyclerview.widget.RecyclerView +import org.eclipse.keyple.example.plugin.android.omapi.model.ChoiceEventModel +import org.eclipse.keyple.example.plugin.android.omapi.model.EventModel +import org.eclipse.keyple.example.plugin.android.omapi.util.getColorResource import org.eclipse.keyple.plugin.android.omapi.example.R import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardActionEventBinding import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardChoiceEventBinding import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardHeaderEventBinding import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardResultEventBinding -import org.eclipse.keyple.example.plugin.android.omapi.model.ChoiceEventModel -import org.eclipse.keyple.example.plugin.android.omapi.model.EventModel -import org.eclipse.keyple.example.plugin.android.omapi.util.getColorResource class EventAdapter(private val events: ArrayList) : RecyclerView.Adapter() { From da8121ab49ade310343494e26f00f7c30bad989b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Mon, 15 Sep 2025 16:51:45 +0200 Subject: [PATCH 06/11] refactor: update import paths for ConfigurationUtil in example use cases --- .../UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java | 2 +- .../Main_ScheduledSelection_Pcsc.java | 2 +- .../Main_SequentialMultiSelection_Pcsc.java | 2 +- .../Main_GroupedMultiSelection_Pcsc.java | 2 +- .../UseCase7_PluginAndReaderObservation/PluginObserver.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java index c3b3bd4..970aa31 100644 --- a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java +++ b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase3_AidBasedSelection/Main_AidBasedSelection_Pcsc.java @@ -14,7 +14,7 @@ import org.eclipse.keyple.card.generic.GenericExtensionService; import org.eclipse.keyple.core.service.*; -import org.eclipse.keyple.core.service.example.common.ConfigurationUtil; +import org.eclipse.keyple.example.core.service.common.ConfigurationUtil; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase4_ScheduledSelection/Main_ScheduledSelection_Pcsc.java b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase4_ScheduledSelection/Main_ScheduledSelection_Pcsc.java index 3abe1c9..4bfbd9f 100644 --- a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase4_ScheduledSelection/Main_ScheduledSelection_Pcsc.java +++ b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase4_ScheduledSelection/Main_ScheduledSelection_Pcsc.java @@ -14,7 +14,7 @@ import org.eclipse.keyple.card.generic.GenericExtensionService; import org.eclipse.keyple.core.service.*; -import org.eclipse.keyple.core.service.example.common.ConfigurationUtil; +import org.eclipse.keyple.example.core.service.common.ConfigurationUtil; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase5_SequentialMultiSelection/Main_SequentialMultiSelection_Pcsc.java b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase5_SequentialMultiSelection/Main_SequentialMultiSelection_Pcsc.java index 41ad742..a569fe6 100644 --- a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase5_SequentialMultiSelection/Main_SequentialMultiSelection_Pcsc.java +++ b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase5_SequentialMultiSelection/Main_SequentialMultiSelection_Pcsc.java @@ -15,8 +15,8 @@ import org.eclipse.keyple.card.generic.GenericCardSelectionExtension; import org.eclipse.keyple.card.generic.GenericExtensionService; import org.eclipse.keyple.core.service.*; -import org.eclipse.keyple.core.service.example.common.ConfigurationUtil; import org.eclipse.keyple.core.util.HexUtil; +import org.eclipse.keyple.example.core.service.common.ConfigurationUtil; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase6_GroupedMultiSelection/Main_GroupedMultiSelection_Pcsc.java b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase6_GroupedMultiSelection/Main_GroupedMultiSelection_Pcsc.java index 56d55d0..1c1504d 100644 --- a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase6_GroupedMultiSelection/Main_GroupedMultiSelection_Pcsc.java +++ b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase6_GroupedMultiSelection/Main_GroupedMultiSelection_Pcsc.java @@ -16,8 +16,8 @@ import org.eclipse.keyple.card.generic.GenericCardSelectionExtension; import org.eclipse.keyple.card.generic.GenericExtensionService; import org.eclipse.keyple.core.service.*; -import org.eclipse.keyple.core.service.example.common.ConfigurationUtil; import org.eclipse.keyple.core.util.HexUtil; +import org.eclipse.keyple.example.core.service.common.ConfigurationUtil; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase7_PluginAndReaderObservation/PluginObserver.java b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase7_PluginAndReaderObservation/PluginObserver.java index 9aaa73c..50e02e3 100644 --- a/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase7_PluginAndReaderObservation/PluginObserver.java +++ b/Example_Service/src/main/java/org/eclipse/keyple/example/core/service/UseCase7_PluginAndReaderObservation/PluginObserver.java @@ -15,9 +15,9 @@ import java.util.Set; import org.eclipse.keyple.core.common.KeypleReaderExtension; import org.eclipse.keyple.core.service.*; -import org.eclipse.keyple.core.service.example.common.ConfigurationUtil; import org.eclipse.keyple.core.service.spi.PluginObservationExceptionHandlerSpi; import org.eclipse.keyple.core.service.spi.PluginObserverSpi; +import org.eclipse.keyple.example.core.service.common.ConfigurationUtil; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; import org.eclipse.keypop.reader.CardReader; From 047467c0a8a626855fa6934ba085b71db1178cf4 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 29 Oct 2025 14:49:52 +0100 Subject: [PATCH 07/11] wip --- CHANGELOG.md | 3 ++- Example_Card_Calypso/build.gradle.kts | 8 +++--- .../CardReaderObserver.java | 25 ++++++++++++++++--- ...ceMeasurement_EmbeddedValidation_Pcsc.java | 18 +++++++++++-- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../app/build.gradle.kts | 2 +- .../app/build.gradle.kts | 2 +- Example_Plugin_PCSC/build.gradle.kts | 2 +- Example_Service/build.gradle.kts | 2 +- Example_Service_Resource/build.gradle.kts | 2 +- 12 files changed, 52 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d26184..f8314b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Changed -- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.09.12` for dependency +- Switched to [Keyple Java BOM](https://github.com/eclipse-keyple/keyple-java-bom) `2025.10.24` for dependency management, replacing individual Keyple component definitions. +- Add additional comments regarding the ratification mechanism. - Restructured package names for better alignment with project conventions and clarity. ## [2025-07-21] diff --git a/Example_Card_Calypso/build.gradle.kts b/Example_Card_Calypso/build.gradle.kts index d89dce8..f4415bf 100644 --- a/Example_Card_Calypso/build.gradle.kts +++ b/Example_Card_Calypso/build.gradle.kts @@ -19,7 +19,7 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keypop:keypop-calypso-crypto-legacysam-java-api") @@ -49,7 +49,7 @@ tasks { manifest { attributes( "Main-Class" to - "org.eclipse.keyple.card.calypso.example.UseCase10_SessionTrace_TN313.Main_SessionTrace_TN313_Pcsc", + "org.eclipse.keyple.example.card.calypso.UseCase10_SessionTrace_TN313.Main_SessionTrace_TN313_Pcsc", "Created-By" to "${System.getProperty("java.version")} (${System.getProperty("java.vendor")} ${ System.getProperty( @@ -78,7 +78,7 @@ tasks { manifest { attributes( "Main-Class" to - "org.eclipse.keyple.card.calypso.example.UseCase12_PerformanceMeasurement_EmbeddedValidation.Main_PerformanceMeasurement_EmbeddedValidation_Pcsc", + "org.eclipse.keyple.example.card.calypso.UseCase12_PerformanceMeasurement_EmbeddedValidation.Main_PerformanceMeasurement_EmbeddedValidation_Pcsc", "Created-By" to "${System.getProperty("java.version")} (${System.getProperty("java.vendor")} ${ System.getProperty( @@ -107,7 +107,7 @@ tasks { manifest { attributes( "Main-Class" to - "org.eclipse.keyple.card.calypso.example.UseCase13_PerformanceMeasurement_DistributedReloading.Main_PerformanceMeasurement_DistributedReloading_Pcsc", + "org.eclipse.keyple.example.card.calypso.UseCase13_PerformanceMeasurement_DistributedReloading.Main_PerformanceMeasurement_DistributedReloading_Pcsc", "Created-By" to "${System.getProperty("java.version")} (${System.getProperty("java.vendor")} ${ System.getProperty( diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java index f74015a..a455396 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase10_SessionTrace_TN313/CardReaderObserver.java @@ -108,12 +108,31 @@ public void onReaderEvent(CardReaderEvent event) { cardReader, calypsoCard, cardSecuritySetting) .prepareOpenSecureSession(DEBIT) .prepareReadRecords(SFI_ENVIRONMENT_AND_HOLDER, 1, 1, RECORD_SIZE) - .prepareReadRecords(SFI_EVENT_LOG, 1, 1, RECORD_SIZE) - .prepareReadRecords(SFI_CONTRACT_LIST, 1, 1, RECORD_SIZE) .processCommands(ChannelControl.KEEP_OPEN); /* - Place for the analysis of the context and the list of contracts + Place for the analysis of the context + */ + + cardTransactionManager + .prepareReadRecords(SFI_EVENT_LOG, 1, 1, RECORD_SIZE) + .processCommands(ChannelControl.KEEP_OPEN); + + /* + Ratification and anti-passback management: + This section handles the scenario where a previous transaction occurred very recently: + - If the previous transaction has not been ratified, access is granted immediately. + The only required action is to close the session, which ensures the authenticity of the support. + - If the previous transaction has been ratified, access is denied according to the anti-passback rule, + preventing multiple successive illegal uses of the same support in a short time. + */ + + cardTransactionManager + .prepareReadRecords(SFI_CONTRACT_LIST, 1, 1, RECORD_SIZE) + .processCommands(ChannelControl.KEEP_OPEN); + + /* + Place for the analysis of the contract list */ // Read the elected contract diff --git a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java index baaf651..bb388f0 100644 --- a/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java +++ b/Example_Card_Calypso/src/main/java/org/eclipse/keyple/example/card/calypso/UseCase12_PerformanceMeasurement_EmbeddedValidation/Main_PerformanceMeasurement_EmbeddedValidation_Pcsc.java @@ -169,15 +169,29 @@ public static void main(String[] args) throws IOException { cardReader, calypsoCard, symmetricCryptoSecuritySetting) .prepareOpenSecureSession(DEBIT) .prepareReadRecords(SFI_ENVIRONMENT_AND_HOLDER, 1, 1, RECORD_SIZE) - .prepareReadRecords(SFI_EVENT_LOG, 1, 1, RECORD_SIZE) .processCommands(ChannelControl.KEEP_OPEN); byte[] environmentAndHolderData = calypsoCard.getFileBySfi(SFI_ENVIRONMENT_AND_HOLDER).getData().getContent(1); + // TODO Place here the analysis of the context + + // Read the last event record + cardTransactionManager + .prepareReadRecords(SFI_EVENT_LOG, 1, 1, RECORD_SIZE) + .processCommands(ChannelControl.KEEP_OPEN); + byte[] eventLogData = calypsoCard.getFileBySfi(SFI_EVENT_LOG).getData().getContent(1); - // TODO Place here the analysis of the context and the last event log + // TODO Place here the analysis of the last event log + // Ratification and anti-passback management: + // This section handles the scenario where a previous transaction occurred very recently: + // - If the previous transaction has not been ratified, access is granted immediately. + // The only required action is to close the session, which ensures the authenticity of + // the support. + // - If the previous transaction has been ratified, access is denied according to the + // anti-passback rule, + // preventing multiple successive illegal uses of the same support in a short time. // Read the contract list // Specifying expected response lengths in read commands serves as a protective measure diff --git a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts index 2df714e..6f5b7b5 100644 --- a/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts +++ b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") diff --git a/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts b/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts index 2df714e..6f5b7b5 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts +++ b/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") diff --git a/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts b/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts index 87038b3..4bf12c7 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts +++ b/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { /* Keyple dependencies */ // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") diff --git a/Example_Plugin_Android_NFC/app/build.gradle.kts b/Example_Plugin_Android_NFC/app/build.gradle.kts index 0c5d21d..f58ecda 100644 --- a/Example_Plugin_Android_NFC/app/build.gradle.kts +++ b/Example_Plugin_Android_NFC/app/build.gradle.kts @@ -19,7 +19,7 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") diff --git a/Example_Plugin_Android_OMAPI/app/build.gradle.kts b/Example_Plugin_Android_OMAPI/app/build.gradle.kts index 92b4834..a78455f 100644 --- a/Example_Plugin_Android_OMAPI/app/build.gradle.kts +++ b/Example_Plugin_Android_OMAPI/app/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { "exclude" to listOf("org.simalliance.openmobileapi.jar")))) // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keypop:keypop-calypso-card-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") diff --git a/Example_Plugin_PCSC/build.gradle.kts b/Example_Plugin_PCSC/build.gradle.kts index cc171fc..714191d 100644 --- a/Example_Plugin_PCSC/build.gradle.kts +++ b/Example_Plugin_PCSC/build.gradle.kts @@ -16,7 +16,7 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") implementation("org.eclipse.keyple:keyple-util-java-lib") diff --git a/Example_Service/build.gradle.kts b/Example_Service/build.gradle.kts index 2a5ede5..79e279c 100644 --- a/Example_Service/build.gradle.kts +++ b/Example_Service/build.gradle.kts @@ -16,7 +16,7 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") implementation("org.eclipse.keyple:keyple-util-java-lib") diff --git a/Example_Service_Resource/build.gradle.kts b/Example_Service_Resource/build.gradle.kts index f87b110..aa17360 100644 --- a/Example_Service_Resource/build.gradle.kts +++ b/Example_Service_Resource/build.gradle.kts @@ -16,7 +16,7 @@ plugins { dependencies { // Begin Keyple configuration (generated by // 'https://keyple.org/components/overview/configuration-wizard/') - implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.09.12")) + implementation(platform("org.eclipse.keyple:keyple-java-bom:2025.10.24")) implementation("org.eclipse.keypop:keypop-reader-java-api") implementation("org.eclipse.keyple:keyple-common-java-api") implementation("org.eclipse.keyple:keyple-util-java-lib") From 94342cb5bf9716cd975575be546022b5f2e99ca7 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 29 Oct 2025 15:30:36 +0100 Subject: [PATCH 08/11] refactor(example): move package segment 'example' immediately after 'org.eclipse.keyple' for distributed reader client examples - Renamed/moved Java sources from org.eclipse.keyple.distributed.example... to org.eclipse.keyple.example.distributed... - Ensures Git tracks moves (renamed files) in Example_Distributed_ReaderClientSide_Webservice and _Websocket modules only. No other files included in this commit. --- .../distributed}/readerclientside/webservice/Main.java | 6 +++--- .../readerclientside/webservice/client/AppClient.java | 6 +++--- .../readerclientside/webservice/client/EndpointClient.java | 4 ++-- .../readerclientside/webservice/common/InputDataDto.java | 2 +- .../readerclientside/webservice/common/OutputDataDto.java | 2 +- .../readerclientside/webservice/server/AppServer.java | 2 +- .../webservice/server/CalypsoTicketingServiceUtil.java | 2 +- .../readerclientside/webservice/server/EndpointServer.java | 4 ++-- .../webservice/server/RemotePluginServerObserver.java | 6 +++--- .../distributed}/readerclientside/websocket/Main.java | 6 +++--- .../readerclientside/websocket/client/AppClient.java | 6 +++--- .../readerclientside/websocket/client/EndpointClient.java | 4 ++-- .../readerclientside/websocket/common/InputDataDto.java | 2 +- .../readerclientside/websocket/common/OutputDataDto.java | 2 +- .../readerclientside/websocket/server/AppServer.java | 2 +- .../websocket/server/CalypsoTicketingServiceUtil.java | 2 +- .../readerclientside/websocket/server/EndpointServer.java | 4 ++-- .../websocket/server/RemotePluginServerObserver.java | 6 +++--- 18 files changed, 34 insertions(+), 34 deletions(-) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/Main.java (90%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/client/AppClient.java (98%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/client/EndpointClient.java (91%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/common/InputDataDto.java (93%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/common/OutputDataDto.java (94%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/server/AppServer.java (97%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java (98%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/server/EndpointServer.java (93%) rename Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/webservice/server/RemotePluginServerObserver.java (96%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/Main.java (90%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/client/AppClient.java (98%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/client/EndpointClient.java (98%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/common/InputDataDto.java (93%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/common/OutputDataDto.java (94%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/server/AppServer.java (97%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java (98%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/server/EndpointServer.java (97%) rename Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/{distributed/example => example/distributed}/readerclientside/websocket/server/RemotePluginServerObserver.java (96%) diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/Main.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/Main.java similarity index 90% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/Main.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/Main.java index abd4192..eaee7f0 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/Main.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/Main.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice; +package org.eclipse.keyple.example.distributed.readerclientside.webservice; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; import io.quarkus.runtime.annotations.QuarkusMain; import javax.inject.Inject; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.client.AppClient; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.server.AppServer; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.client.AppClient; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.server.AppServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/AppClient.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/AppClient.java similarity index 98% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/AppClient.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/AppClient.java index 4dd2e6b..5e701f5 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/AppClient.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/AppClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.client; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.client; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -24,8 +24,8 @@ import org.eclipse.keyple.distributed.LocalServiceClient; import org.eclipse.keyple.distributed.LocalServiceClientFactory; import org.eclipse.keyple.distributed.LocalServiceClientFactoryBuilder; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.common.InputDataDto; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.common.OutputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.common.InputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.common.OutputDataDto; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/EndpointClient.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java similarity index 91% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/EndpointClient.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java index 061de34..dab67ad 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/client/EndpointClient.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.client; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.client; import java.util.List; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.eclipse.keyple.distributed.MessageDto; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.server.EndpointServer; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.server.EndpointServer; import org.eclipse.keyple.distributed.spi.SyncEndpointClientSpi; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/InputDataDto.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/InputDataDto.java similarity index 93% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/InputDataDto.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/InputDataDto.java index a0007e8..127522a 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/InputDataDto.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/InputDataDto.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.common; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.common; /** * Example of POJO which contains the input data associated to the ReaderClientSide diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/OutputDataDto.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/OutputDataDto.java similarity index 94% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/OutputDataDto.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/OutputDataDto.java index 0128311..cecdad3 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/common/OutputDataDto.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/common/OutputDataDto.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.common; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.common; /** * Example of POJO which contains the output data associated to the ReaderClientSide diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/AppServer.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/AppServer.java similarity index 97% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/AppServer.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/AppServer.java index 3b7727e..74a4ec4 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/AppServer.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/AppServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.server; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.server; import javax.enterprise.context.ApplicationScoped; import org.eclipse.keyple.core.service.ObservablePlugin; diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java similarity index 98% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java index f2df2b2..22977a8 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/CalypsoTicketingServiceUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.server; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.server; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; import org.eclipse.keyple.core.service.SmartCardServiceProvider; diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/EndpointServer.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/EndpointServer.java similarity index 93% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/EndpointServer.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/EndpointServer.java index ab6086c..59d6adf 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/EndpointServer.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/EndpointServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.server; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.server; import java.util.List; import javax.ws.rs.Consumes; @@ -22,7 +22,7 @@ import org.eclipse.keyple.distributed.MessageDto; import org.eclipse.keyple.distributed.RemotePluginServer; import org.eclipse.keyple.distributed.SyncNodeServer; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.client.EndpointClient; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.client.EndpointClient; /** * Example of a Server Controller. diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/RemotePluginServerObserver.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/RemotePluginServerObserver.java similarity index 96% rename from Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/RemotePluginServerObserver.java rename to Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/RemotePluginServerObserver.java index 7af5f1f..6fe9aa1 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/webservice/server/RemotePluginServerObserver.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/server/RemotePluginServerObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.webservice.server; +package org.eclipse.keyple.example.distributed.readerclientside.webservice.server; import org.eclipse.keyple.core.service.ObservablePlugin; import org.eclipse.keyple.core.service.PluginEvent; @@ -18,8 +18,8 @@ import org.eclipse.keyple.core.service.spi.PluginObserverSpi; import org.eclipse.keyple.distributed.RemotePluginServer; import org.eclipse.keyple.distributed.RemoteReaderServer; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.common.InputDataDto; -import org.eclipse.keyple.distributed.example.readerclientside.webservice.common.OutputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.common.InputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.common.OutputDataDto; import org.eclipse.keypop.calypso.card.card.CalypsoCard; import org.eclipse.keypop.reader.CardReader; import org.eclipse.keypop.reader.selection.CardSelectionManager; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/Main.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/Main.java similarity index 90% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/Main.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/Main.java index 89546cf..5e42a85 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/Main.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/Main.java @@ -10,14 +10,14 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket; +package org.eclipse.keyple.example.distributed.readerclientside.websocket; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; import io.quarkus.runtime.annotations.QuarkusMain; import javax.inject.Inject; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.client.AppClient; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.server.AppServer; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.client.AppClient; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.server.AppServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/AppClient.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/AppClient.java similarity index 98% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/AppClient.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/AppClient.java index 6176430..a7bcf29 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/AppClient.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/AppClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.client; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.client; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -24,8 +24,8 @@ import org.eclipse.keyple.distributed.LocalServiceClient; import org.eclipse.keyple.distributed.LocalServiceClientFactory; import org.eclipse.keyple.distributed.LocalServiceClientFactoryBuilder; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.common.InputDataDto; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.common.OutputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.common.InputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.common.OutputDataDto; import org.eclipse.keyple.plugin.pcsc.PcscPluginFactoryBuilder; import org.eclipse.keyple.plugin.pcsc.PcscReader; import org.eclipse.keyple.plugin.pcsc.PcscSupportedContactlessProtocol; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/EndpointClient.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java similarity index 98% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/EndpointClient.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java index fe9baa7..ff33f2d 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/client/EndpointClient.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.client; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.client; import java.io.IOException; import java.net.URI; @@ -22,7 +22,7 @@ import org.eclipse.keyple.distributed.AsyncNodeClient; import org.eclipse.keyple.distributed.LocalServiceClient; import org.eclipse.keyple.distributed.MessageDto; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.server.EndpointServer; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.server.EndpointServer; import org.eclipse.keyple.distributed.spi.AsyncEndpointClientSpi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/InputDataDto.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/InputDataDto.java similarity index 93% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/InputDataDto.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/InputDataDto.java index b92ee48..81e6c78 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/InputDataDto.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/InputDataDto.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.common; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.common; /** * Example of POJO which contains the input data associated to the ReaderClientSide diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/OutputDataDto.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/OutputDataDto.java similarity index 94% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/OutputDataDto.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/OutputDataDto.java index 1d88063..af9246d 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/common/OutputDataDto.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/common/OutputDataDto.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.common; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.common; /** * Example of POJO which contains the output data associated to the ReaderClientSide diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/AppServer.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/AppServer.java similarity index 97% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/AppServer.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/AppServer.java index 6eb31bc..cc5e9f0 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/AppServer.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/AppServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.server; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.server; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java similarity index 98% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java index 1a23ca4..284665f 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/CalypsoTicketingServiceUtil.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.server; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.server; import org.eclipse.keyple.card.calypso.CalypsoExtensionService; import org.eclipse.keyple.core.service.SmartCardServiceProvider; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/EndpointServer.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java similarity index 97% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/EndpointServer.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java index 2a7fe6d..94d8d6b 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/EndpointServer.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.server; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.server; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -22,7 +22,7 @@ import org.eclipse.keyple.distributed.AsyncNodeServer; import org.eclipse.keyple.distributed.MessageDto; import org.eclipse.keyple.distributed.RemotePluginServer; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.client.EndpointClient; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.client.EndpointClient; import org.eclipse.keyple.distributed.spi.AsyncEndpointServerSpi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/RemotePluginServerObserver.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/RemotePluginServerObserver.java similarity index 96% rename from Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/RemotePluginServerObserver.java rename to Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/RemotePluginServerObserver.java index 9cd2ec8..daf7d51 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/distributed/example/readerclientside/websocket/server/RemotePluginServerObserver.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/RemotePluginServerObserver.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: BSD-3-Clause ************************************************************************************** */ -package org.eclipse.keyple.distributed.example.readerclientside.websocket.server; +package org.eclipse.keyple.example.distributed.readerclientside.websocket.server; import org.eclipse.keyple.core.service.ObservablePlugin; import org.eclipse.keyple.core.service.PluginEvent; @@ -18,8 +18,8 @@ import org.eclipse.keyple.core.service.spi.PluginObserverSpi; import org.eclipse.keyple.distributed.RemotePluginServer; import org.eclipse.keyple.distributed.RemoteReaderServer; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.common.InputDataDto; -import org.eclipse.keyple.distributed.example.readerclientside.websocket.common.OutputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.common.InputDataDto; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.common.OutputDataDto; import org.eclipse.keypop.calypso.card.card.CalypsoCard; import org.eclipse.keypop.reader.CardReader; import org.eclipse.keypop.reader.selection.CardSelectionManager; From 87795f78465363c3a36ee00355bec6878e600932 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 29 Oct 2025 15:47:33 +0100 Subject: [PATCH 09/11] style(spotless): apply Spotless formatting across keyple-java-example modules --- .../readerclientside/webservice/client/EndpointClient.java | 2 +- .../readerclientside/websocket/client/EndpointClient.java | 2 +- .../readerclientside/websocket/server/EndpointServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java index dab67ad..8872e76 100644 --- a/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java +++ b/Example_Distributed_ReaderClientSide_Webservice/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/webservice/client/EndpointClient.java @@ -17,8 +17,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import org.eclipse.keyple.distributed.MessageDto; -import org.eclipse.keyple.example.distributed.readerclientside.webservice.server.EndpointServer; import org.eclipse.keyple.distributed.spi.SyncEndpointClientSpi; +import org.eclipse.keyple.example.distributed.readerclientside.webservice.server.EndpointServer; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; /** diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java index ff33f2d..aac86a5 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/client/EndpointClient.java @@ -22,8 +22,8 @@ import org.eclipse.keyple.distributed.AsyncNodeClient; import org.eclipse.keyple.distributed.LocalServiceClient; import org.eclipse.keyple.distributed.MessageDto; -import org.eclipse.keyple.example.distributed.readerclientside.websocket.server.EndpointServer; import org.eclipse.keyple.distributed.spi.AsyncEndpointClientSpi; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.server.EndpointServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java index 94d8d6b..2acd9a1 100644 --- a/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java +++ b/Example_Distributed_ReaderClientSide_Websocket/src/main/java/org/eclipse/keyple/example/distributed/readerclientside/websocket/server/EndpointServer.java @@ -22,8 +22,8 @@ import org.eclipse.keyple.distributed.AsyncNodeServer; import org.eclipse.keyple.distributed.MessageDto; import org.eclipse.keyple.distributed.RemotePluginServer; -import org.eclipse.keyple.example.distributed.readerclientside.websocket.client.EndpointClient; import org.eclipse.keyple.distributed.spi.AsyncEndpointServerSpi; +import org.eclipse.keyple.example.distributed.readerclientside.websocket.client.EndpointClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 29401214a5023561d7a2e55dfa4e0942392955b8 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 29 Oct 2025 16:00:26 +0100 Subject: [PATCH 10/11] wip --- .../app/src/main/AndroidManifest.xml | 2 +- .../keyple/example/plugin/android/nfc/MainActivity.kt | 2 +- .../plugin/android/nfc/MessageDisplayAdapter.kt | 6 +++--- Example_Plugin_Android_NFC/gradle.properties | 4 ++-- .../app/src/main/AndroidManifest.xml | 4 ++-- .../android/omapi/activity/AbstractExampleActivity.kt | 4 ++-- .../android/omapi/activity/CoreExamplesActivity.kt | 4 ++-- .../plugin/android/omapi/adapter/EventAdapter.kt | 10 +++++----- Example_Plugin_Android_OMAPI/gradle.properties | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml b/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml index b5c75c4..b9b78d8 100644 --- a/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml +++ b/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt index 5fe069c..2601e21 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt @@ -23,11 +23,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.navigation.NavigationView import java.io.IOException +import org.eclipse.keyple.example.plugin.android.omapi.R import org.eclipse.keyple.example.plugin.android.omapi.adapter.EventAdapter +import org.eclipse.keyple.example.plugin.android.omapi.databinding.ActivityCoreExamplesBinding import org.eclipse.keyple.example.plugin.android.omapi.model.ChoiceEventModel import org.eclipse.keyple.example.plugin.android.omapi.model.EventModel -import org.eclipse.keyple.plugin.android.omapi.example.R -import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding import org.eclipse.keypop.reader.CardReaderEvent import timber.log.Timber diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt index 44a0bbe..19672d1 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt @@ -19,12 +19,12 @@ import androidx.core.view.GravityCompat import org.eclipse.keyple.card.generic.GenericExtensionService import org.eclipse.keyple.core.service.SmartCardServiceProvider import org.eclipse.keyple.core.util.HexUtil +import org.eclipse.keyple.example.plugin.android.omapi.R +import org.eclipse.keyple.example.plugin.android.omapi.databinding.ActivityCoreExamplesBinding import org.eclipse.keyple.example.plugin.android.omapi.util.CalypsoClassicInfo import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiPlugin import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiPluginFactoryProvider import org.eclipse.keyple.plugin.android.omapi.AndroidOmapiReader -import org.eclipse.keyple.plugin.android.omapi.example.R -import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding import org.eclipse.keypop.reader.CardCommunicationException import org.eclipse.keypop.reader.CardReader import org.eclipse.keypop.reader.ReaderCommunicationException diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt index b12e5d7..1bd4448 100644 --- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt +++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt @@ -17,14 +17,14 @@ import android.view.View import android.view.ViewGroup import android.widget.RadioButton import androidx.recyclerview.widget.RecyclerView +import org.eclipse.keyple.example.plugin.android.omapi.R +import org.eclipse.keyple.example.plugin.android.omapi.databinding.CardActionEventBinding +import org.eclipse.keyple.example.plugin.android.omapi.databinding.CardChoiceEventBinding +import org.eclipse.keyple.example.plugin.android.omapi.databinding.CardHeaderEventBinding +import org.eclipse.keyple.example.plugin.android.omapi.databinding.CardResultEventBinding import org.eclipse.keyple.example.plugin.android.omapi.model.ChoiceEventModel import org.eclipse.keyple.example.plugin.android.omapi.model.EventModel import org.eclipse.keyple.example.plugin.android.omapi.util.getColorResource -import org.eclipse.keyple.plugin.android.omapi.example.R -import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardActionEventBinding -import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardChoiceEventBinding -import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardHeaderEventBinding -import org.eclipse.keyple.plugin.android.omapi.example.databinding.CardResultEventBinding class EventAdapter(private val events: ArrayList) : RecyclerView.Adapter() { diff --git a/Example_Plugin_Android_OMAPI/gradle.properties b/Example_Plugin_Android_OMAPI/gradle.properties index b6f3fea..33ef00c 100644 --- a/Example_Plugin_Android_OMAPI/gradle.properties +++ b/Example_Plugin_Android_OMAPI/gradle.properties @@ -12,8 +12,8 @@ javaTargetLevel = 1.8 org.gradle.jvmargs = "-Dfile.encoding=UTF-8" # Android Configuration (custom properties) -androidAppNamespace = org.eclipse.keyple.plugin.android.omapi.example -androidAppId = org.eclipse.keyple.plugin.android.omapi.example +androidAppNamespace = org.eclipse.keyple.example.plugin.android.omapi +androidAppId = org.eclipse.keyple.example.plugin.android.omapi androidAppVersionCode = 1 androidAppVersionName = 1.0 androidCompileSdk = 34 From 86129356aa1d77cb243f66158106a53fb1ea88fd Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 29 Oct 2025 16:43:12 +0100 Subject: [PATCH 11/11] build: exclude signature files from jar in Example_Card_Calypso module Excluded `META-INF/*.SF`, `META-INF/*.DSA`, and `META-INF/*.RSA` files from JAR to prevent inclusion of unnecessary signature files during the build process. --- Example_Card_Calypso/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Example_Card_Calypso/build.gradle.kts b/Example_Card_Calypso/build.gradle.kts index f4415bf..81eb483 100644 --- a/Example_Card_Calypso/build.gradle.kts +++ b/Example_Card_Calypso/build.gradle.kts @@ -63,6 +63,7 @@ tasks { "Bundle-Name" to project.name, "Bundle-Description" to project.description) } + exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA") from( configurations.runtimeClasspath .get() @@ -92,6 +93,7 @@ tasks { "Bundle-Name" to project.name, "Bundle-Description" to project.description) } + exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA") from( configurations.runtimeClasspath .get() @@ -121,6 +123,7 @@ tasks { "Bundle-Name" to project.name, "Bundle-Description" to project.description) } + exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA") from( configurations.runtimeClasspath .get()