19 files changed, 35 insertions, 36 deletions

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 4e1f3eb23..8f2da5eb7 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -25,15 +25,14 @@ dist.jar=${dist.dir}/tracker-server.jar
 dist.javadoc.dir=${dist.dir}/javadoc

 endorsed.classpath=

 excludes=

-file.reference.netty-3.2.4.Final.jar=C:\\Test\\traccar\\lib\\netty-3.2.4.Final.jar

+file.reference.netty-3.2.6.Final.jar=C:\\Test\\traccar\\lib\\netty-3.2.6.Final.jar

 includes=**

 jar.archive.disabled=${jnlp.enabled}

 jar.compress=false

 jar.index=${jnlp.enabled}

 javac.classpath=\

-    ${libs.PostgreSQLDriver.classpath}:\

     ${libs.MySQLDriver.classpath}:\

-    ${file.reference.netty-3.2.4.Final.jar}

+    ${file.reference.netty-3.2.6.Final.jar}

 # Space-separated list of extra javac options

 javac.compilerargs=

 javac.deprecation=false

diff --git a/src/net/sourceforge/opentracking/DataManager.java b/src/org/traccar/DataManager.java
index cd67c97da..c2ba588cd 100644
--- a/src/net/sourceforge/opentracking/DataManager.java
+++ b/src/org/traccar/DataManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 import java.util.List;
 
diff --git a/src/net/sourceforge/opentracking/Device.java b/src/org/traccar/Device.java
index 9c949b6ca..ad952bac8 100644
--- a/src/net/sourceforge/opentracking/Device.java
+++ b/src/org/traccar/Device.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 /**
  * Device
diff --git a/src/net/sourceforge/opentracking/Position.java b/src/org/traccar/Position.java
index 0c4117448..29451482d 100644
--- a/src/net/sourceforge/opentracking/Position.java
+++ b/src/org/traccar/Position.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 import java.util.Date;
 
diff --git a/src/net/sourceforge/opentracking/Server.java b/src/org/traccar/Server.java
index 66d0ba3d9..7dd2a5990 100644
--- a/src/net/sourceforge/opentracking/Server.java
+++ b/src/org/traccar/Server.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -34,18 +34,18 @@ import java.util.logging.FileHandler;
 import java.util.logging.Formatter;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
-import net.sourceforge.opentracking.helper.NamedParameterStatement;
+import org.traccar.helper.NamedParameterStatement;
 import org.jboss.netty.handler.codec.string.StringDecoder;
 import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.handler.logging.LoggingHandler;
-import net.sourceforge.opentracking.protocol.xexun.XexunFrameDecoder;
-import net.sourceforge.opentracking.protocol.xexun.XexunProtocolDecoder;
-import net.sourceforge.opentracking.protocol.gps103.Gps103ProtocolDecoder;
-import net.sourceforge.opentracking.protocol.tk103.Tk103ProtocolDecoder;
-import net.sourceforge.opentracking.protocol.gl200.Gl200ProtocolDecoder;
-import net.sourceforge.opentracking.protocol.t55.T55ProtocolDecoder;
+import org.traccar.protocol.xexun.XexunFrameDecoder;
+import org.traccar.protocol.xexun.XexunProtocolDecoder;
+import org.traccar.protocol.gps103.Gps103ProtocolDecoder;
+import org.traccar.protocol.tk103.Tk103ProtocolDecoder;
+import org.traccar.protocol.gl200.Gl200ProtocolDecoder;
+import org.traccar.protocol.t55.T55ProtocolDecoder;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
diff --git a/src/net/sourceforge/opentracking/TrackerEventHandler.java b/src/org/traccar/TrackerEventHandler.java
index cfb9e8070..78be1b340 100644
--- a/src/net/sourceforge/opentracking/TrackerEventHandler.java
+++ b/src/org/traccar/TrackerEventHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/net/sourceforge/opentracking/TrackerServer.java b/src/org/traccar/TrackerServer.java
index dc9981e61..20beaec5e 100644
--- a/src/net/sourceforge/opentracking/TrackerServer.java
+++ b/src/org/traccar/TrackerServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.sourceforge.opentracking;
+package org.traccar;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
diff --git a/src/net/sourceforge/opentracking/helper/NamedParameterStatement.java b/src/org/traccar/helper/NamedParameterStatement.java
index 4e5ffc4fc..4e5ffc4fc 100644
--- a/src/net/sourceforge/opentracking/helper/NamedParameterStatement.java
+++ b/src/org/traccar/helper/NamedParameterStatement.java
diff --git a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
index 6d0e0a8d9..6d0e0a8d9 100644
--- a/src/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/gl200/Gl200ProtocolDecoder.java
diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java
index 85e29cc0e..85e29cc0e 100644
--- a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/gps103/Gps103ProtocolDecoder.java
diff --git a/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java
index 01954b474..01954b474 100644
--- a/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java
+++ b/src/org/traccar/protocol/t55/T55ProtocolDecoder.java
diff --git a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
index 12108b121..12108b121 100644
--- a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/tk103/Tk103ProtocolDecoder.java
diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
index 839e5b3ec..839e5b3ec 100644
--- a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java
+++ b/src/org/traccar/protocol/xexun/XexunFrameDecoder.java
diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
index 872569e1a..872569e1a 100644
--- a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/xexun/XexunProtocolDecoder.java
diff --git a/test/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java
index 53f1eebf8..e2f4188bc 100644
--- a/test/net/sourceforge/opentracking/protocol/gl200/Gl200ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/gl200/Gl200ProtocolDecoderTest.java
@@ -1,13 +1,13 @@
-package net.sourceforge.opentracking.protocol.gl200;
+package org.traccar.protocol.gl200;
 
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
-import net.sourceforge.opentracking.Device;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import static org.junit.Assert.*;
 
 public class Gl200ProtocolDecoderTest {
diff --git a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java
index 18fde11a7..8cdebcb88 100644
--- a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/gps103/Gps103ProtocolDecoderTest.java
@@ -1,13 +1,13 @@
-package net.sourceforge.opentracking.protocol.gps103;
+package org.traccar.protocol.gps103;
 
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
-import net.sourceforge.opentracking.Device;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import static org.junit.Assert.*;
 
 public class Gps103ProtocolDecoderTest {
diff --git a/test/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java
index 009c94c5c..e806d49de 100644
--- a/test/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/t55/T55ProtocolDecoderTest.java
@@ -1,12 +1,12 @@
-package net.sourceforge.opentracking.protocol.t55;
+package org.traccar.protocol.t55;
 
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
-import net.sourceforge.opentracking.Device;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import static org.junit.Assert.*;
 
 public class T55ProtocolDecoderTest {
diff --git a/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java
index ba4a97e14..68ea941fd 100644
--- a/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/tk103/Tk103ProtocolDecoderTest.java
@@ -1,13 +1,13 @@
-package net.sourceforge.opentracking.protocol.tk103;
+package org.traccar.protocol.tk103;
 
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
-import net.sourceforge.opentracking.Device;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import static org.junit.Assert.*;
 
 public class Tk103ProtocolDecoderTest {
diff --git a/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java b/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java
index ba374a3ed..76c299cd2 100644
--- a/test/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/xexun/XexunProtocolDecoderTest.java
@@ -1,12 +1,12 @@
-package net.sourceforge.opentracking.protocol.xexun;
+package org.traccar.protocol.xexun;
 
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import org.junit.Test;
-import net.sourceforge.opentracking.Device;
-import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.DataManager;
+import org.traccar.Device;
+import org.traccar.Position;
+import org.traccar.DataManager;
 import static org.junit.Assert.*;
 
 public class XexunProtocolDecoderTest {