Refactoring add oscore module - no file content changes [dont build]

This aims to implement : 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 This commit doesn't build.
sbernard31 · Jul 4, 2024 · d5c81f1 · d5c81f1
1 parent bc90314
commit d5c81f1
Show file tree

Hide file tree

Showing 22 changed files with 403 additions and 5 deletions.
diff --git a/leshan-tl-cf-bsserver-coap-oscore/logback-leshan-test.xml b/leshan-tl-cf-bsserver-coap-oscore/logback-leshan-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+-->
+<configuration>
+	<!--
+		This file will only be used by maven by default.
+		If you want to use it in your IDE, just :
+		 - use -Dlogback.configurationFile=logback-test-.xml argument  
+		or
+		 - put a logback-test.xml file in your classpath (it will be ignore by git)
+	-->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %p %C{1} [%t] %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="ERROR">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
+
diff --git a/leshan-tl-cf-bsserver-coap-oscore/pom.xml b/leshan-tl-cf-bsserver-coap-oscore/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+    Bosch Software Innovations GmbH - OSGi support
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.leshan</groupId>
+    <artifactId>lib-build-config</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build-config/lib-build-config/pom.xml</relativePath>
+  </parent>
+  <artifactId>leshan-tl-cf-bsserver-coap-oscore</artifactId>
+  <packaging>bundle</packaging>
+  <name>leshan - transport - californium - bsserver - coap oscore</name>
+  <description>A transport implementation for leshan bootstrap server based on Californium for CoAP protocol supporting OSCORE</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-shared</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-lwm2m-bsserver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>californium-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>scandium</artifactId>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- We need to launch each tests in its own JVM to be able to check number 
+                         of active threads in LeshanBootstrapServerTest and LeshanServerTest -->
+          <reuseForks>false</reuseForks>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/...server/BootstrapOscoreContextCleaner.java → ...server/BootstrapOscoreContextCleaner.java b/...server/BootstrapOscoreContextCleaner.java → ...server/BootstrapOscoreContextCleaner.java
diff --git a/...m/bsserver/LwM2mBootstrapOscoreStore.java → ...m/bsserver/LwM2mBootstrapOscoreStore.java b/...m/bsserver/LwM2mBootstrapOscoreStore.java → ...m/bsserver/LwM2mBootstrapOscoreStore.java
diff --git a/...ium/bsserver/OscoreBootstrapListener.java → ...ium/bsserver/OscoreBootstrapListener.java b/...ium/bsserver/OscoreBootstrapListener.java → ...ium/bsserver/OscoreBootstrapListener.java
diff --git a/...OscoreBootstrapServerEndpointFactory.java → ...OscoreBootstrapServerEndpointFactory.java b/...OscoreBootstrapServerEndpointFactory.java → ...OscoreBootstrapServerEndpointFactory.java
diff --git a/leshan-tl-cf-client-coap-oscore/logback-leshan-test.xml b/leshan-tl-cf-client-coap-oscore/logback-leshan-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+-->
+<configuration>
+	<!--
+		This file will only be used by maven by default.
+		If you want to use it in your IDE, just :
+		 - use -Dlogback.configurationFile=logback-test-.xml argument  
+		or
+		 - put a logback-test.xml file in your classpath (it will be ignore by git)
+	-->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %p %C{1} [%t] %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="ERROR">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
+
diff --git a/leshan-tl-cf-client-coap-oscore/pom.xml b/leshan-tl-cf-client-coap-oscore/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+
+Copyright (c) 2013-2014 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+    Zebra Technologies - initial API and implementation
+    Eurotech - initial API and implementation
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.leshan</groupId>
+    <artifactId>lib-build-config</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build-config/lib-build-config/pom.xml</relativePath>
+  </parent>
+  <artifactId>leshan-tl-cf-client-coap-oscore</artifactId>
+  <packaging>bundle</packaging>
+  <name>leshan - transport - californium - client - coap oscore</name>
+  <description>A transport implementation for leshan client based on Californium for CoAP protocol supporting OSCORE</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-shared</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-lwm2m-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>californium-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>scandium</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>cf-oscore</artifactId>
+      <version>${californium.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...coap/CoapOscoreClientEndpointFactory.java → ...coap/CoapOscoreClientEndpointFactory.java b/...coap/CoapOscoreClientEndpointFactory.java → ...coap/CoapOscoreClientEndpointFactory.java
diff --git a/...oint/coap/CoapOscoreProtocolProvider.java → ...oint/coap/CoapOscoreProtocolProvider.java b/...oint/coap/CoapOscoreProtocolProvider.java → ...oint/coap/CoapOscoreProtocolProvider.java
diff --git a/leshan-tl-cf-server-coap-oscore/logback-leshan-test.xml b/leshan-tl-cf-server-coap-oscore/logback-leshan-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+-->
+<configuration>
+	<!--
+		This file will only be used by maven by default.
+		If you want to use it in your IDE, just :
+		 - use -Dlogback.configurationFile=logback-test-.xml argument  
+		or
+		 - put a logback-test.xml file in your classpath (it will be ignore by git)
+	-->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %p %C{1} [%t] %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="ERROR">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
+
diff --git a/leshan-tl-cf-server-coap-oscore/pom.xml b/leshan-tl-cf-server-coap-oscore/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+    Bosch Software Innovations GmbH - OSGi support
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.leshan</groupId>
+    <artifactId>lib-build-config</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../build-config/lib-build-config/pom.xml</relativePath>
+  </parent>
+  <artifactId>leshan-tl-cf-server-coap-oscore</artifactId>
+  <packaging>bundle</packaging>
+  <name>leshan - transport - californium - server - coap oscore</name>
+  <description>A transport implementation for leshan server based on Californium for CoAP protocol supporting OSCORE</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-tl-cf-shared</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.leshan</groupId>
+      <artifactId>leshan-lwm2m-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>californium-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>scandium</artifactId>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- We need to launch each tests in its own JVM to be able to check number 
+                         of active threads in LeshanBootstrapServerTest and LeshanServerTest -->
+          <reuseForks>false</reuseForks>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/.../californium/server/LwM2mOscoreStore.java → .../californium/server/LwM2mOscoreStore.java b/.../californium/server/LwM2mOscoreStore.java → .../californium/server/LwM2mOscoreStore.java
diff --git a/...ifornium/server/OscoreContextCleaner.java → ...ifornium/server/OscoreContextCleaner.java b/...ifornium/server/OscoreContextCleaner.java → ...ifornium/server/OscoreContextCleaner.java
diff --git a/...coap/CoapOscoreServerEndpointFactory.java → ...coap/CoapOscoreServerEndpointFactory.java b/...coap/CoapOscoreServerEndpointFactory.java → ...coap/CoapOscoreServerEndpointFactory.java
diff --git a/leshan-tl-cf-shared-oscore/logback-leshan-test.xml b/leshan-tl-cf-shared-oscore/logback-leshan-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2013-2015 Sierra Wireless and others.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v20.html
+and the Eclipse Distribution License is available at
+   http://www.eclipse.org/org/documents/edl-v10.html.
+
+Contributors:
+    Sierra Wireless - initial API and implementation
+-->
+<configuration>
+	<!--
+		This file will only be used by maven by default.
+		If you want to use it in your IDE, just :
+		 - use -Dlogback.configurationFile=logback-test-.xml argument  
+		or
+		 - put a logback-test.xml file in your classpath (it will be ignore by git)
+	-->
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %p %C{1} [%t] %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="ERROR">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
+