Commit f0e811b0 authored by Björn Butzin's avatar Björn Butzin
Browse files

Cleaned Master branch to be standard jCoAP implementation

- changed .project file
-- use JDK1.7 as Runtime Target instead of JamaicaVM
-- removed dependency to javolution

- removed javolution import
-- @ BasicCoapClientChannel.java
-- @ BasicCoapServerChannel.java
-- @ BasicCoapSocketHandler.java

- moved ws4d-jcoap/bin/.gitignore into toplevel projectfolder

- added /bin to all toplevel project .gitignore
parent 7a7c1324
/.settings
/bin
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/com.aicas.jamaica.eclipse.launcher.vm.JamaicaVMType/jamaica-6.3-1"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/javolution"/>
<classpathentry kind="output" path="bin"/>
</classpath>
/.settings
/bin
\ No newline at end of file
......@@ -15,8 +15,6 @@
package org.ws4d.coap.connection;
import javolution.util.FastTable;
import java.util.ArrayList;
import java.net.InetAddress;
......
......@@ -18,8 +18,6 @@ package org.ws4d.coap.connection;
import java.net.InetAddress;
import java.util.ArrayList;
import javolution.util.FastTable;
import org.ws4d.coap.interfaces.CoapChannel;
import org.ws4d.coap.interfaces.CoapMessage;
import org.ws4d.coap.interfaces.CoapRequest;
......
......@@ -30,7 +30,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.PriorityQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.realtime.*;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
......@@ -110,7 +109,7 @@ public class BasicCoapSocketHandler implements CoapSocketHandler {
this(channelManager, 0);
}
protected class WorkerThread extends RealtimeThread {
protected class WorkerThread extends Thread {
Selector selector = null;
/* contains all received message keys of a remote (message id generated by the remote) to detect duplications */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment