diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java b/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java
index 5ec03a8702..fd8acd7fc8 100644
--- a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java
+++ b/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java
@@ -60,7 +60,33 @@ public class LeshanClientDemo {
private static final Logger LOG = LoggerFactory.getLogger(LeshanClientDemo.class);
- private final static String[] modelPaths = new String[] { "3303.xml" };
+ // /!\ This class is a COPY of org.eclipse.leshan.server.demo.LeshanServerDemo.modelPaths /!\
+ // TODO create a leshan-demo project ?
+ private final static String[] modelPaths = new String[] { "31024.xml",
+
+ "10241.xml", "10242.xml", "10243.xml", "10244.xml", "10245.xml", "10246.xml", "10247.xml",
+ "10248.xml", "10249.xml", "10250.xml",
+
+ "2048.xml", "2049.xml", "2050.xml", "2051.xml", "2052.xml", "2053.xml", "2054.xml",
+ "2055.xml", "2056.xml", "2057.xml",
+
+ "3200.xml", "3201.xml", "3202.xml", "3203.xml", "3300.xml", "3301.xml", "3302.xml",
+ "3303.xml", "3304.xml", "3305.xml", "3306.xml", "3308.xml", "3310.xml", "3311.xml",
+ "3312.xml", "3313.xml", "3314.xml", "3315.xml", "3316.xml", "3317.xml", "3318.xml",
+ "3319.xml", "3320.xml", "3321.xml", "3322.xml", "3323.xml", "3324.xml", "3325.xml",
+ "3326.xml", "3327.xml", "3328.xml", "3329.xml", "3330.xml", "3331.xml", "3332.xml",
+ "3333.xml", "3334.xml", "3335.xml", "3336.xml", "3337.xml", "3338.xml", "3339.xml",
+ "3340.xml", "3341.xml", "3342.xml", "3343.xml", "3344.xml", "3345.xml", "3346.xml",
+ "3347.xml", "3348.xml", "3349.xml", "3350.xml",
+
+ "Communication_Characteristics-V1_0.xml",
+
+ "LWM2M_Lock_and_Wipe-V1_0.xml", "LWM2M_Cellular_connectivity-v1_0.xml",
+ "LWM2M_APN_connection_profile-v1_0.xml", "LWM2M_WLAN_connectivity4-v1_0.xml",
+ "LWM2M_Bearer_selection-v1_0.xml", "LWM2M_Portfolio-v1_0.xml", "LWM2M_DevCapMgmt-v1_0.xml",
+ "LWM2M_Software_Component-v1_0.xml", "LWM2M_Software_Management-v1_0.xml",
+
+ "Non-Access_Stratum_NAS_configuration-V1_0.xml" };
private static final int OBJECT_ID_TEMPERATURE_SENSOR = 3303;
private final static String DEFAULT_ENDPOINT = "LeshanClientDemo";
diff --git a/leshan-client-demo/src/main/resources/models/10241.xml b/leshan-client-demo/src/main/resources/models/10241.xml
new file mode 100644
index 0000000000..04ed43264d
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10241.xml
@@ -0,0 +1,50 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10242.xml b/leshan-client-demo/src/main/resources/models/10242.xml
new file mode 100644
index 0000000000..e3a471b624
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10242.xml
@@ -0,0 +1,629 @@
+
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/10243.xml b/leshan-client-demo/src/main/resources/models/10243.xml
new file mode 100644
index 0000000000..56714f0f2a
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10243.xml
@@ -0,0 +1,233 @@
+
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/10244.xml b/leshan-client-demo/src/main/resources/models/10244.xml
new file mode 100644
index 0000000000..c64ea988e9
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10244.xml
@@ -0,0 +1,301 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10245.xml b/leshan-client-demo/src/main/resources/models/10245.xml
new file mode 100644
index 0000000000..631cbb169e
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10245.xml
@@ -0,0 +1,183 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10246.xml b/leshan-client-demo/src/main/resources/models/10246.xml
new file mode 100644
index 0000000000..a494f06a02
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10246.xml
@@ -0,0 +1,73 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10247.xml b/leshan-client-demo/src/main/resources/models/10247.xml
new file mode 100644
index 0000000000..e8be1ee032
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10247.xml
@@ -0,0 +1,63 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10248.xml b/leshan-client-demo/src/main/resources/models/10248.xml
new file mode 100644
index 0000000000..74bffea1f8
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10248.xml
@@ -0,0 +1,43 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10249.xml b/leshan-client-demo/src/main/resources/models/10249.xml
new file mode 100644
index 0000000000..7fe7275318
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10249.xml
@@ -0,0 +1,103 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/10250.xml b/leshan-client-demo/src/main/resources/models/10250.xml
new file mode 100644
index 0000000000..b789964298
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/10250.xml
@@ -0,0 +1,40 @@
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2048.xml b/leshan-client-demo/src/main/resources/models/2048.xml
new file mode 100644
index 0000000000..7d8f4ea65b
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2048.xml
@@ -0,0 +1,57 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2049.xml b/leshan-client-demo/src/main/resources/models/2049.xml
new file mode 100644
index 0000000000..10cf638ff7
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2049.xml
@@ -0,0 +1,26 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2050.xml b/leshan-client-demo/src/main/resources/models/2050.xml
new file mode 100644
index 0000000000..fc65f844b9
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2050.xml
@@ -0,0 +1,35 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2051.xml b/leshan-client-demo/src/main/resources/models/2051.xml
new file mode 100644
index 0000000000..abfa655a68
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2051.xml
@@ -0,0 +1,66 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2052.xml b/leshan-client-demo/src/main/resources/models/2052.xml
new file mode 100644
index 0000000000..7df5acd2de
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2052.xml
@@ -0,0 +1,78 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2053.xml b/leshan-client-demo/src/main/resources/models/2053.xml
new file mode 100644
index 0000000000..af2739aaad
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2053.xml
@@ -0,0 +1,132 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2054.xml b/leshan-client-demo/src/main/resources/models/2054.xml
new file mode 100644
index 0000000000..eeeebb3001
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2054.xml
@@ -0,0 +1,36 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2055.xml b/leshan-client-demo/src/main/resources/models/2055.xml
new file mode 100644
index 0000000000..18598be8d3
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2055.xml
@@ -0,0 +1,67 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2056.xml b/leshan-client-demo/src/main/resources/models/2056.xml
new file mode 100644
index 0000000000..f0585118e9
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2056.xml
@@ -0,0 +1,44 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/2057.xml b/leshan-client-demo/src/main/resources/models/2057.xml
new file mode 100644
index 0000000000..2ec0927f8c
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/2057.xml
@@ -0,0 +1,59 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/31024.xml b/leshan-client-demo/src/main/resources/models/31024.xml
new file mode 100644
index 0000000000..85ba52a79d
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/31024.xml
@@ -0,0 +1,51 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3200.xml b/leshan-client-demo/src/main/resources/models/3200.xml
new file mode 100644
index 0000000000..4e47a64ea3
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3200.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3201.xml b/leshan-client-demo/src/main/resources/models/3201.xml
new file mode 100644
index 0000000000..e5ac9e05b4
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3201.xml
@@ -0,0 +1,44 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3202.xml b/leshan-client-demo/src/main/resources/models/3202.xml
new file mode 100644
index 0000000000..b75569db74
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3202.xml
@@ -0,0 +1,94 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3203.xml b/leshan-client-demo/src/main/resources/models/3203.xml
new file mode 100644
index 0000000000..f3082eff46
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3203.xml
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3300.xml b/leshan-client-demo/src/main/resources/models/3300.xml
new file mode 100644
index 0000000000..ca03f71d91
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3300.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3301.xml b/leshan-client-demo/src/main/resources/models/3301.xml
new file mode 100644
index 0000000000..debb1170ed
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3301.xml
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3302.xml b/leshan-client-demo/src/main/resources/models/3302.xml
new file mode 100644
index 0000000000..e7afb5a6e1
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3302.xml
@@ -0,0 +1,74 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3304.xml b/leshan-client-demo/src/main/resources/models/3304.xml
new file mode 100644
index 0000000000..8216847a43
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3304.xml
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3305.xml b/leshan-client-demo/src/main/resources/models/3305.xml
new file mode 100644
index 0000000000..050ae493e2
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3305.xml
@@ -0,0 +1,194 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3306.xml b/leshan-client-demo/src/main/resources/models/3306.xml
new file mode 100644
index 0000000000..8c1cd45812
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3306.xml
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3308.xml b/leshan-client-demo/src/main/resources/models/3308.xml
new file mode 100644
index 0000000000..850ea9f099
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3308.xml
@@ -0,0 +1,54 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3310.xml b/leshan-client-demo/src/main/resources/models/3310.xml
new file mode 100644
index 0000000000..13b6dbce4e
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3310.xml
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3311.xml b/leshan-client-demo/src/main/resources/models/3311.xml
new file mode 100644
index 0000000000..7cd78bea59
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3311.xml
@@ -0,0 +1,94 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3312.xml b/leshan-client-demo/src/main/resources/models/3312.xml
new file mode 100644
index 0000000000..761a24b1bb
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3312.xml
@@ -0,0 +1,74 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3313.xml b/leshan-client-demo/src/main/resources/models/3313.xml
new file mode 100644
index 0000000000..71786067ff
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3313.xml
@@ -0,0 +1,74 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3314.xml b/leshan-client-demo/src/main/resources/models/3314.xml
new file mode 100644
index 0000000000..d92f0df020
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3314.xml
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3315.xml b/leshan-client-demo/src/main/resources/models/3315.xml
new file mode 100644
index 0000000000..acc61f5bd4
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3315.xml
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3316.xml b/leshan-client-demo/src/main/resources/models/3316.xml
new file mode 100644
index 0000000000..f7454bf188
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3316.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3317.xml b/leshan-client-demo/src/main/resources/models/3317.xml
new file mode 100644
index 0000000000..05b49a73fa
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3317.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3318.xml b/leshan-client-demo/src/main/resources/models/3318.xml
new file mode 100644
index 0000000000..d9c748883b
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3318.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3319.xml b/leshan-client-demo/src/main/resources/models/3319.xml
new file mode 100644
index 0000000000..6a64dac832
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3319.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3320.xml b/leshan-client-demo/src/main/resources/models/3320.xml
new file mode 100644
index 0000000000..888aa8f544
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3320.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3321.xml b/leshan-client-demo/src/main/resources/models/3321.xml
new file mode 100644
index 0000000000..d869ae1da9
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3321.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3322.xml b/leshan-client-demo/src/main/resources/models/3322.xml
new file mode 100644
index 0000000000..557b9e2361
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3322.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3323.xml b/leshan-client-demo/src/main/resources/models/3323.xml
new file mode 100644
index 0000000000..6b2f07b381
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3323.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3324.xml b/leshan-client-demo/src/main/resources/models/3324.xml
new file mode 100644
index 0000000000..3afd8ad276
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3324.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3325.xml b/leshan-client-demo/src/main/resources/models/3325.xml
new file mode 100644
index 0000000000..8d407ce80f
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3325.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3326.xml b/leshan-client-demo/src/main/resources/models/3326.xml
new file mode 100644
index 0000000000..202cdf2340
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3326.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3327.xml b/leshan-client-demo/src/main/resources/models/3327.xml
new file mode 100644
index 0000000000..1c68c2155e
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3327.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3328.xml b/leshan-client-demo/src/main/resources/models/3328.xml
new file mode 100644
index 0000000000..3613009fee
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3328.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3329.xml b/leshan-client-demo/src/main/resources/models/3329.xml
new file mode 100644
index 0000000000..421dfc2075
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3329.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3330.xml b/leshan-client-demo/src/main/resources/models/3330.xml
new file mode 100644
index 0000000000..5ccf25644a
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3330.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3331.xml b/leshan-client-demo/src/main/resources/models/3331.xml
new file mode 100644
index 0000000000..1a2b7cb579
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3331.xml
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3332.xml b/leshan-client-demo/src/main/resources/models/3332.xml
new file mode 100644
index 0000000000..1ae8e6770a
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3332.xml
@@ -0,0 +1,65 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3333.xml b/leshan-client-demo/src/main/resources/models/3333.xml
new file mode 100644
index 0000000000..3c8a3839ce
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3333.xml
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3334.xml b/leshan-client-demo/src/main/resources/models/3334.xml
new file mode 100644
index 0000000000..ce35bacd0a
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3334.xml
@@ -0,0 +1,155 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3335.xml b/leshan-client-demo/src/main/resources/models/3335.xml
new file mode 100644
index 0000000000..1e5bb30a72
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3335.xml
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3336.xml b/leshan-client-demo/src/main/resources/models/3336.xml
new file mode 100644
index 0000000000..bc6631162c
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3336.xml
@@ -0,0 +1,95 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3337.xml b/leshan-client-demo/src/main/resources/models/3337.xml
new file mode 100644
index 0000000000..19dcdeada9
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3337.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3338.xml b/leshan-client-demo/src/main/resources/models/3338.xml
new file mode 100644
index 0000000000..73e79c3868
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3338.xml
@@ -0,0 +1,65 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3339.xml b/leshan-client-demo/src/main/resources/models/3339.xml
new file mode 100644
index 0000000000..b34e5f9689
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3339.xml
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3340.xml b/leshan-client-demo/src/main/resources/models/3340.xml
new file mode 100644
index 0000000000..24590c310c
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3340.xml
@@ -0,0 +1,125 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3341.xml b/leshan-client-demo/src/main/resources/models/3341.xml
new file mode 100644
index 0000000000..e71a2bdf68
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3341.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3342.xml b/leshan-client-demo/src/main/resources/models/3342.xml
new file mode 100644
index 0000000000..e2d42b56ca
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3342.xml
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3343.xml b/leshan-client-demo/src/main/resources/models/3343.xml
new file mode 100644
index 0000000000..b7aa257cfe
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3343.xml
@@ -0,0 +1,55 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3344.xml b/leshan-client-demo/src/main/resources/models/3344.xml
new file mode 100644
index 0000000000..f9d3d542de
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3344.xml
@@ -0,0 +1,65 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3345.xml b/leshan-client-demo/src/main/resources/models/3345.xml
new file mode 100644
index 0000000000..ca57510e50
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3345.xml
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3346.xml b/leshan-client-demo/src/main/resources/models/3346.xml
new file mode 100644
index 0000000000..21e60f2460
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3346.xml
@@ -0,0 +1,105 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3347.xml b/leshan-client-demo/src/main/resources/models/3347.xml
new file mode 100644
index 0000000000..b0bf6b0128
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3347.xml
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3348.xml b/leshan-client-demo/src/main/resources/models/3348.xml
new file mode 100644
index 0000000000..b55db3ca95
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3348.xml
@@ -0,0 +1,35 @@
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3349.xml b/leshan-client-demo/src/main/resources/models/3349.xml
new file mode 100644
index 0000000000..eba88afbc0
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3349.xml
@@ -0,0 +1,50 @@
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/3350.xml b/leshan-client-demo/src/main/resources/models/3350.xml
new file mode 100644
index 0000000000..d10e5c83f8
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/3350.xml
@@ -0,0 +1,50 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml b/leshan-client-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml
new file mode 100644
index 0000000000..b46edcadef
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/Communication_Characteristics-V1_0.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_APN_connection_profile-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_APN_connection_profile-v1_0.xml
new file mode 100644
index 0000000000..a96aa321f3
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_APN_connection_profile-v1_0.xml
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Bearer_selection-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Bearer_selection-v1_0.xml
new file mode 100644
index 0000000000..3053f20f1d
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Bearer_selection-v1_0.xml
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Cellular_connectivity-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Cellular_connectivity-v1_0.xml
new file mode 100644
index 0000000000..1000ed5e0e
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Cellular_connectivity-v1_0.xml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml
new file mode 100644
index 0000000000..c499d3d691
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_DevCapMgmt-v1_0.xml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Lock_and_Wipe-V1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Lock_and_Wipe-V1_0.xml
new file mode 100644
index 0000000000..155815b7d1
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Lock_and_Wipe-V1_0.xml
@@ -0,0 +1,80 @@
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Portfolio-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Portfolio-v1_0.xml
new file mode 100644
index 0000000000..206e40819d
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Portfolio-v1_0.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml
new file mode 100644
index 0000000000..f88f9c0009
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Software_Component-v1_0.xml
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml
new file mode 100644
index 0000000000..a95426ebea
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_Software_Management-v1_0.xml
@@ -0,0 +1,280 @@
+
+
+
+
+
+
+
diff --git a/leshan-client-demo/src/main/resources/models/LWM2M_WLAN_connectivity4-v1_0.xml b/leshan-client-demo/src/main/resources/models/LWM2M_WLAN_connectivity4-v1_0.xml
new file mode 100644
index 0000000000..bf7692d0b5
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/LWM2M_WLAN_connectivity4-v1_0.xml
@@ -0,0 +1,572 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-client-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml b/leshan-client-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml
new file mode 100644
index 0000000000..6a7f7ae273
--- /dev/null
+++ b/leshan-client-demo/src/main/resources/models/Non-Access_Stratum_NAS_configuration-V1_0.xml
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
index 1b89c1e8d4..b16257875b 100644
--- a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
+++ b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
@@ -91,6 +91,8 @@ public class LeshanServerDemo {
private static final Logger LOG = LoggerFactory.getLogger(LeshanServerDemo.class);
+ // /!\ This class is a COPY of org.eclipse.leshan.client.demo.LeshanClientDemo.modelPaths /!\
+ // TODO create a leshan-demo project ?
private final static String[] modelPaths = new String[] { "31024.xml",
"10241.xml", "10242.xml", "10243.xml", "10244.xml", "10245.xml", "10246.xml", "10247.xml",