Refactoring add bsserver module - edit file content

Move Bootstrap Server code in dedicated maven modules. This is part of : eclipse-leshan#1295 Refactoring was done in 2 commits to try to keep git history : https://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history
sbernard31 · Jul 2, 2024 · ab4f9a4 · ab4f9a4
1 parent 2869625
commit ab4f9a4
Show file tree

Hide file tree

Showing 149 changed files with 537 additions and 1,216 deletions.
diff --git a/leshan-demo-bsserver/pom.xml b/leshan-demo-bsserver/pom.xml
@@ -31,7 +31,7 @@ Contributors:
   <dependencies>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
-      <artifactId>leshan-tl-cf-server-coap</artifactId>
+      <artifactId>leshan-tl-cf-bsserver-coap</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>

diff --git a/...-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java b/...-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java
@@ -28,14 +28,14 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.eclipse.leshan.bsserver.BootstrapConfig;
+import org.eclipse.leshan.bsserver.EditableBootstrapConfigStore;
+import org.eclipse.leshan.bsserver.InMemoryBootstrapConfigStore;
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.core.util.Validate;
 import org.eclipse.leshan.demo.bsserver.json.ByteArraySerializer;
 import org.eclipse.leshan.demo.bsserver.json.EnumSetDeserializer;
 import org.eclipse.leshan.demo.bsserver.json.EnumSetSerializer;
-import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
-import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore;
-import org.eclipse.leshan.server.bootstrap.InMemoryBootstrapConfigStore;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...mo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java b/...mo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java
@@ -31,6 +31,11 @@
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.leshan.bsserver.EditableBootstrapConfigStore;
+import org.eclipse.leshan.bsserver.LeshanBootstrapServer;
+import org.eclipse.leshan.bsserver.LeshanBootstrapServerBuilder;
+import org.eclipse.leshan.bsserver.model.VersionedBootstrapModelProvider;
+import org.eclipse.leshan.bsserver.security.BootstrapSecurityStoreAdapter;
 import org.eclipse.leshan.core.endpoint.EndpointUriUtil;
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.core.model.ObjectLoader;
@@ -41,18 +46,13 @@
 import org.eclipse.leshan.demo.bsserver.servlet.ServerServlet;
 import org.eclipse.leshan.demo.cli.ShortErrorMessageHandler;
 import org.eclipse.leshan.demo.servers.json.servlet.SecurityServlet;
-import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore;
-import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer;
-import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServerBuilder;
-import org.eclipse.leshan.server.model.VersionedBootstrapModelProvider;
-import org.eclipse.leshan.server.security.BootstrapSecurityStoreAdapter;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
-import org.eclipse.leshan.server.security.FileSecurityStore;
+import org.eclipse.leshan.servers.security.EditableSecurityStore;
+import org.eclipse.leshan.servers.security.FileSecurityStore;
 import org.eclipse.leshan.transport.californium.PrincipalMdcConnectionListener;
-import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.CaliforniumBootstrapServerEndpointsProvider;
-import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coap.CoapBootstrapServerProtocolProvider;
-import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coap.CoapOscoreBootstrapServerEndpointFactory;
-import org.eclipse.leshan.transport.californium.server.bootstrap.endpoint.coaps.CoapsBootstrapServerProtocolProvider;
+import org.eclipse.leshan.transport.californium.bsserver.endpoint.CaliforniumBootstrapServerEndpointsProvider;
+import org.eclipse.leshan.transport.californium.bsserver.endpoint.coap.CoapBootstrapServerProtocolProvider;
+import org.eclipse.leshan.transport.californium.bsserver.endpoint.coap.CoapOscoreBootstrapServerEndpointFactory;
+import org.eclipse.leshan.transport.californium.bsserver.endpoint.coaps.CoapsBootstrapServerProtocolProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...emo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java b/...emo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java
@@ -28,12 +28,12 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.leshan.bsserver.BootstrapConfig;
+import org.eclipse.leshan.bsserver.EditableBootstrapConfigStore;
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.demo.bsserver.json.ByteArraySerializer;
 import org.eclipse.leshan.demo.bsserver.json.EnumSetDeserializer;
 import org.eclipse.leshan.demo.bsserver.json.EnumSetSerializer;
-import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
-import org.eclipse.leshan.server.bootstrap.EditableBootstrapConfigStore;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonParseException;

diff --git a/...an-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java b/...an-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java
@@ -25,6 +25,10 @@
 
 import org.eclipse.jetty.servlets.EventSource;
 import org.eclipse.jetty.servlets.EventSourceServlet;
+import org.eclipse.leshan.bsserver.BootstrapFailureCause;
+import org.eclipse.leshan.bsserver.BootstrapSession;
+import org.eclipse.leshan.bsserver.BootstrapSessionListener;
+import org.eclipse.leshan.bsserver.LeshanBootstrapServer;
 import org.eclipse.leshan.core.peer.IpPeer;
 import org.eclipse.leshan.core.peer.LwM2mPeer;
 import org.eclipse.leshan.core.request.BootstrapDeleteRequest;
@@ -34,10 +38,6 @@
 import org.eclipse.leshan.core.request.BootstrapWriteRequest;
 import org.eclipse.leshan.core.response.BootstrapDiscoverResponse;
 import org.eclipse.leshan.core.response.LwM2mResponse;
-import org.eclipse.leshan.server.bootstrap.BootstrapFailureCause;
-import org.eclipse.leshan.server.bootstrap.BootstrapSession;
-import org.eclipse.leshan.server.bootstrap.BootstrapSessionListener;
-import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...n-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java b/...n-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java
@@ -27,10 +27,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.leshan.bsserver.LeshanBootstrapServer;
+import org.eclipse.leshan.bsserver.endpoint.LwM2mBootstrapServerEndpoint;
 import org.eclipse.leshan.demo.servers.json.PublicKeySerDes;
 import org.eclipse.leshan.demo.servers.json.X509CertificateSerDes;
-import org.eclipse.leshan.server.bootstrap.LeshanBootstrapServer;
-import org.eclipse.leshan.server.bootstrap.endpoint.LwM2mBootstrapServerEndpoint;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;

diff --git a/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java
@@ -55,8 +55,8 @@
 import org.eclipse.leshan.server.model.VersionedModelProvider;
 import org.eclipse.leshan.server.redis.RedisRegistrationStore;
 import org.eclipse.leshan.server.redis.RedisSecurityStore;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
-import org.eclipse.leshan.server.security.FileSecurityStore;
+import org.eclipse.leshan.servers.security.EditableSecurityStore;
+import org.eclipse.leshan.servers.security.FileSecurityStore;
 import org.eclipse.leshan.transport.californium.PrincipalMdcConnectionListener;
 import org.eclipse.leshan.transport.californium.server.endpoint.CaliforniumServerEndpointsProvider;
 import org.eclipse.leshan.transport.californium.server.endpoint.coap.CoapOscoreServerEndpointFactory;

diff --git a/...rc/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonSecurityDeserializer.java b/...rc/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonSecurityDeserializer.java
@@ -30,7 +30,7 @@
 
 import org.eclipse.leshan.core.security.util.SecurityUtil;
 import org.eclipse.leshan.core.util.Hex;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/...hared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecurityDeserializer.java b/...hared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecurityDeserializer.java
@@ -23,7 +23,7 @@
 import org.eclipse.leshan.core.oscore.OscoreSetting;
 import org.eclipse.leshan.core.security.util.SecurityUtil;
 import org.eclipse.leshan.core.util.Hex;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;

diff --git a/...-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecuritySerializer.java b/...-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecuritySerializer.java
@@ -20,7 +20,7 @@
 import java.security.PublicKey;
 
 import org.eclipse.leshan.core.util.Hex;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

diff --git a/...rs-shared/src/main/java/org/eclipse/leshan/demo/servers/json/servlet/SecurityServlet.java b/...rs-shared/src/main/java/org/eclipse/leshan/demo/servers/json/servlet/SecurityServlet.java
@@ -33,9 +33,9 @@
 import org.eclipse.leshan.demo.servers.json.JacksonSecuritySerializer;
 import org.eclipse.leshan.demo.servers.json.PublicKeySerDes;
 import org.eclipse.leshan.demo.servers.json.X509CertificateSerDes;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.EditableSecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/leshan-integration-tests/pom.xml b/leshan-integration-tests/pom.xml
@@ -38,6 +38,10 @@ Contributors:
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-cf-server-coap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-bsserver-coap</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.leshan</groupId>
       <artifactId>leshan-tl-jc-server-coap</artifactId>

diff --git a/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/RegistrationTest.java b/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/RegistrationTest.java
@@ -52,7 +52,7 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...est/java/org/eclipse/leshan/integration/tests/attributes/WriteAttributeBootstrapTest.java b/...est/java/org/eclipse/leshan/integration/tests/attributes/WriteAttributeBootstrapTest.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeSet;
 import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributes;
@@ -46,7 +47,6 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
 import org.eclipse.leshan.server.registration.Registration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ion-tests/src/test/java/org/eclipse/leshan/integration/tests/bootstrap/BootstrapTest.java b/...ion-tests/src/test/java/org/eclipse/leshan/integration/tests/bootstrap/BootstrapTest.java
@@ -35,6 +35,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
+import org.eclipse.leshan.bsserver.BootstrapConfig.ACLConfig;
+import org.eclipse.leshan.bsserver.BootstrapFailureCause;
+import org.eclipse.leshan.bsserver.BootstrapSession;
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.client.bootstrap.InvalidStateException;
 import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
 import org.eclipse.leshan.client.servers.LwM2mServer;
@@ -62,10 +66,6 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
-import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ACLConfig;
-import org.eclipse.leshan.server.bootstrap.BootstrapFailureCause;
-import org.eclipse.leshan.server.bootstrap.BootstrapSession;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
 import org.eclipse.leshan.server.registration.Registration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...sts/src/test/java/org/eclipse/leshan/integration/tests/bootstrap/SecureBootstrapTest.java b/...sts/src/test/java/org/eclipse/leshan/integration/tests/bootstrap/SecureBootstrapTest.java
@@ -34,6 +34,7 @@
 import java.security.cert.CertificateEncodingException;
 import java.util.concurrent.TimeUnit;
 
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.core.CertificateUsage;
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.Credentials;
@@ -43,10 +44,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestClientBuilder;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.eclipse.leshan.transport.californium.client.endpoint.CaliforniumClientEndpointsProvider;
 import org.eclipse.leshan.transport.californium.client.endpoint.coap.CoapClientProtocolProvider;
 import org.eclipse.leshan.transport.californium.client.endpoint.coaps.CoapsClientProtocolProvider;

diff --git a/...ests/src/test/java/org/eclipse/leshan/integration/tests/observe/DynamicIPObserveTest.java b/...ests/src/test/java/org/eclipse/leshan/integration/tests/observe/DynamicIPObserveTest.java
@@ -55,9 +55,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.ReverseProxy;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;

diff --git a/...-tests/src/test/java/org/eclipse/leshan/integration/tests/oscore/OscoreBootstrapTest.java b/...-tests/src/test/java/org/eclipse/leshan/integration/tests/oscore/OscoreBootstrapTest.java
@@ -32,6 +32,8 @@
 import static org.eclipse.leshan.integration.tests.util.assertion.Assertions.assertThat;
 
 import org.eclipse.californium.oscore.OSException;
+import org.eclipse.leshan.bsserver.BootstrapConfig;
+import org.eclipse.leshan.bsserver.InvalidConfigurationException;
 import org.eclipse.leshan.client.object.Oscore;
 import org.eclipse.leshan.core.LwM2mId;
 import org.eclipse.leshan.core.endpoint.Protocol;
@@ -42,11 +44,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestClientBuilder;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
-import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...tegration-tests/src/test/java/org/eclipse/leshan/integration/tests/oscore/OscoreTest.java b/...tegration-tests/src/test/java/org/eclipse/leshan/integration/tests/oscore/OscoreTest.java
@@ -36,9 +36,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/PskTest.java b/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/PskTest.java
@@ -51,9 +51,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RpkTest.java b/...ntegration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RpkTest.java
@@ -40,9 +40,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...ration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RpkX509Test.java b/...ration-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RpkX509Test.java
@@ -42,9 +42,9 @@
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...-tests/src/test/java/org/eclipse/leshan/integration/tests/security/SecurityStoreTest.java b/...-tests/src/test/java/org/eclipse/leshan/integration/tests/security/SecurityStoreTest.java
@@ -26,10 +26,10 @@
 import org.eclipse.leshan.integration.tests.util.Credentials;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.EditableSecurityStore;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...s/src/test/java/org/eclipse/leshan/integration/tests/security/ServerOnlySecurityTest.java b/...s/src/test/java/org/eclipse/leshan/integration/tests/security/ServerOnlySecurityTest.java
@@ -63,9 +63,9 @@
 import org.eclipse.leshan.integration.tests.util.cf.SimpleMessageCallback;
 import org.eclipse.leshan.integration.tests.util.junit5.extensions.BeforeEachParameterizedResolver;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
-import org.eclipse.leshan.server.security.SecurityInfo;
+import org.eclipse.leshan.servers.security.InMemorySecurityStore;
+import org.eclipse.leshan.servers.security.NonUniqueSecurityInfoException;
+import org.eclipse.leshan.servers.security.SecurityInfo;
 import org.eclipse.leshan.transport.californium.client.endpoint.CaliforniumClientEndpointFactory;
 import org.eclipse.leshan.transport.californium.client.endpoint.CaliforniumClientEndpointsProvider;
 import org.eclipse.leshan.transport.californium.client.endpoint.coaps.CoapsClientEndpointFactory;