Move example to the top-level dir (CoAP)

examples/coap-example/Makefile

@@ -1,7 +1,7 @@
 all: coap-example-server coap-example-client
 # use target "plugtest-server" explicitly when required
 
-CONTIKI=../../..
+CONTIKI=../..
 
 # automatically build RESTful resources
 REST_RESOURCES_DIR = ./resources

examples/coap-example/server-client-native.csc

@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-server.c</source>
       <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-client.c</source>
       <commands EXPORT="discard">make coap-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>

examples/coap-example/server-client-observe.csc

@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-server.c</source>
       <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-observe-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-observe-client.c</source>
       <commands EXPORT="discard">make coap-example-observe-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-observe-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-observe-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>

examples/coap-example/server-client.csc

@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-server.c</source>
       <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-client.c</source>
       <commands EXPORT="discard">make coap-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>

examples/coap-example/server-only.csc

@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/coap-example/coap-example-server.c</source>
       <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>

tests/02-compile-arm-ports/Makefile

@@ -14,7 +14,7 @@ platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
 hello-world/cc2538dk \
 ipv6/rpl-border-router/cc2538dk \
 ipv6/rpl-udp/cc2538dk \
-ipv6/coap-example/cc2538dk \
+coap-example/cc2538dk \
 ipso-objects/cc2538dk \
 udp-echo-server/cc2538dk \
 ipv6/multicast/cc2538dk \
@@ -27,7 +27,7 @@ platform-specific/cc2538-common/mqtt-demo/zoul \
 platform-specific/cc2538-common/crypto/zoul \
 platform-specific/cc2538-common/pka/zoul \
 platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \
-ipv6/coap-example/zoul \
+coap-example/zoul \
 ipso-objects/zoul \
 hello-world/zoul \
 sensniff/cc2538dk \