diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39b8670..f8314b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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.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]
### Fixed
diff --git a/Example_Card_Calypso/build.gradle.kts b/Example_Card_Calypso/build.gradle.kts
index 34335b1..81eb483 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.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")
+ 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")
}
@@ -47,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(
@@ -61,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()
@@ -76,7 +79,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(
@@ -90,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()
@@ -105,7 +109,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(
@@ -119,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()
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 86%
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..a455396 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;
@@ -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/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 95%
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..bb388f0 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;
@@ -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_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..fa32df2 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,12 +10,12 @@
*
* 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.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/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..708b2b9 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,11 +10,11 @@
*
* 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.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/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..cb65b85 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,11 @@
*
* 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.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_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/build.gradle.kts b/Example_Distributed_PoolReaderServerSide_Webservice/build.gradle.kts
index 8fc4446..6f5b7b5 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")
+ 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")
+ 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_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_Distributed_ReaderClientSide_Webservice/build.gradle.kts b/Example_Distributed_ReaderClientSide_Webservice/build.gradle.kts
index 8fc4446..6f5b7b5 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.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")
+ 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/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..8872e76 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,15 +10,15 @@
*
* 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.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_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/build.gradle.kts b/Example_Distributed_ReaderClientSide_Websocket/build.gradle.kts
index 9201539..4bf12c7 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.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")
+ 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/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..aac86a5 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,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.distributed.example.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/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..2acd9a1 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,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.distributed.example.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;
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;
diff --git a/Example_Plugin_Android_NFC/app/build.gradle.kts b/Example_Plugin_Android_NFC/app/build.gradle.kts
index 818dd38..f58ecda 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.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")
+ 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_NFC/app/src/main/AndroidManifest.xml b/Example_Plugin_Android_NFC/app/src/main/AndroidManifest.xml
index 88dfd98..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/plugin/android/omapi/example/ExampleApplication.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/ExampleApplication.kt
similarity index 93%
rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/ExampleApplication.kt
rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/ExampleApplication.kt
index 3af101f..17fa0a8 100644
--- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/ExampleApplication.kt
+++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/ExampleApplication.kt
@@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
************************************************************************************** */
-package org.eclipse.keyple.plugin.android.omapi.example
+package org.eclipse.keyple.example.plugin.android.omapi
import android.app.Application
import timber.log.Timber
diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/AbstractExampleActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt
similarity index 92%
rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/AbstractExampleActivity.kt
rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt
index ce1c391..2601e21 100644
--- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/AbstractExampleActivity.kt
+++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/AbstractExampleActivity.kt
@@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
************************************************************************************** */
-package org.eclipse.keyple.plugin.android.omapi.example.activity
+package org.eclipse.keyple.example.plugin.android.omapi.activity
import android.nfc.NfcAdapter
import android.os.Bundle
@@ -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.plugin.android.omapi.example.adapter.EventAdapter
-import org.eclipse.keyple.plugin.android.omapi.example.databinding.ActivityCoreExamplesBinding
-import org.eclipse.keyple.plugin.android.omapi.example.model.ChoiceEventModel
-import org.eclipse.keyple.plugin.android.omapi.example.model.EventModel
+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.keypop.reader.CardReaderEvent
import timber.log.Timber
diff --git a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/CoreExamplesActivity.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt
similarity index 95%
rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/CoreExamplesActivity.kt
rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt
index 3f7825c..19672d1 100644
--- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/activity/CoreExamplesActivity.kt
+++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/activity/CoreExamplesActivity.kt
@@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: BSD-3-Clause
************************************************************************************** */
-package org.eclipse.keyple.plugin.android.omapi.example.activity
+package org.eclipse.keyple.example.plugin.android.omapi.activity
import android.os.Bundle
import android.view.MenuItem
@@ -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.keyple.plugin.android.omapi.example.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/plugin/android/omapi/example/adapter/EventAdapter.kt b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt
similarity index 85%
rename from Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/adapter/EventAdapter.kt
rename to Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt
index 8d2d06e..1bd4448 100644
--- a/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/example/adapter/EventAdapter.kt
+++ b/Example_Plugin_Android_OMAPI/app/src/main/kotlin/org/eclipse/keyple/example/plugin/android/omapi/adapter/EventAdapter.kt
@@ -10,21 +10,21 @@
*
* SPDX-License-Identifier: BSD-3-Clause
************************************************************************************** */
-package org.eclipse.keyple.plugin.android.omapi.example.adapter
+package org.eclipse.keyple.example.plugin.android.omapi.adapter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.RadioButton
import androidx.recyclerview.widget.RecyclerView
-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.plugin.android.omapi.example.model.ChoiceEventModel
-import org.eclipse.keyple.plugin.android.omapi.example.model.EventModel
-import org.eclipse.keyple.plugin.android.omapi.example.util.getColorResource
+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
class EventAdapter(private val events: ArrayList) :
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">