Version 2.11 releasev2.11

7 files changed, 102 insertions, 37 deletions

diff --git a/opengts.cfg b/opengts.cfg
index 6d632edd4..a7bcad2ad 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -45,9 +45,9 @@
     <!-- Logging options -->
     <entry key='logger.enable'>false</entry>
 
-    <!-- Xexun server configuration -->
-    <entry key='xexun.enable'>true</entry>
-    <entry key='xexun.port'>5000</entry>
+    <!-- Protocol detector -->
+    <entry key='detector.enable'>true</entry>
+    <entry key='detector.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
     <entry key='gps103.enable'>true</entry>
@@ -69,9 +69,10 @@
     <entry key='t55.enable'>true</entry>
     <entry key='t55.port'>5005</entry>
 
-    <!-- Xexun 2 server configuration -->
-    <entry key='xexun2.enable'>true</entry>
-    <entry key='xexun2.port'>5006</entry>
+    <!-- Xexun server configuration -->
+    <entry key='xexun.enable'>true</entry>
+    <entry key='xexun.port'>5006</entry>
+    <entry key='xexun.extended'>false</entry>
 
     <!-- Totem server configuration -->
     <entry key='totem.enable'>true</entry>
@@ -333,4 +334,20 @@
     <entry key='riti.enable'>true</entry>
     <entry key='riti.port'>5071</entry>
 
+    <!-- Ulbotech server configuration -->
+    <entry key='ulbotech.enable'>true</entry>
+    <entry key='ulbotech.port'>5072</entry>
+
+    <!-- Tramigo server configuration -->
+    <entry key='tramigo.enable'>true</entry>
+    <entry key='tramigo.port'>5073</entry>
+
+    <!-- TR900 server configuration -->
+    <entry key='tr900.enable'>true</entry>
+    <entry key='tr900.port'>5074</entry>
+
+    <!-- Ardi_01 server configuration -->
+    <entry key='ardi01.enable'>true</entry>
+    <entry key='ardi01.port'>5075</entry>
+
 </properties>
diff --git a/pom.xml b/pom.xml
index 50d483e58..6fcc8099d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>2.10-SNAPSHOT</version>
+    <version>2.11-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>http://www.traccar.org</url>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -23,12 +23,12 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.181</version>
+            <version>1.4.184</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.33</version>
+            <version>5.1.34</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>0.9.2.1</version>
+            <version>0.9.5</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
-            <version>3.9.5.Final</version>
+            <version>3.10.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.5.3</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 158811f23..32d26ce00 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -67,9 +67,9 @@
     <entry key='logger.level'>all</entry>
     <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
 
-    <!-- Xexun server configuration -->
-    <entry key='xexun.enable'>true</entry>
-    <entry key='xexun.port'>5000</entry>
+    <!-- Protocol detector -->
+    <entry key='detector.enable'>true</entry>
+    <entry key='detector.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
     <entry key='gps103.enable'>true</entry>
@@ -91,9 +91,10 @@
     <entry key='t55.enable'>true</entry>
     <entry key='t55.port'>5005</entry>
 
-    <!-- Xexun 2 server configuration -->
-    <entry key='xexun2.enable'>true</entry>
-    <entry key='xexun2.port'>5006</entry>
+    <!-- Xexun server configuration -->
+    <entry key='xexun.enable'>true</entry>
+    <entry key='xexun.port'>5006</entry>
+    <entry key='xexun.extended'>false</entry>
 
     <!-- Totem server configuration -->
     <entry key='totem.enable'>true</entry>
@@ -355,4 +356,20 @@
     <entry key='riti.enable'>true</entry>
     <entry key='riti.port'>5071</entry>
 
+    <!-- Ulbotech server configuration -->
+    <entry key='ulbotech.enable'>true</entry>
+    <entry key='ulbotech.port'>5072</entry>
+
+    <!-- Tramigo server configuration -->
+    <entry key='tramigo.enable'>true</entry>
+    <entry key='tramigo.port'>5073</entry>
+
+    <!-- TR900 server configuration -->
+    <entry key='tr900.enable'>true</entry>
+    <entry key='tr900.port'>5074</entry>
+
+    <!-- Ardi_01 server configuration -->
+    <entry key='ardi01.enable'>true</entry>
+    <entry key='ardi01.port'>5075</entry>
+
 </properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 158811f23..32d26ce00 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -67,9 +67,9 @@
     <entry key='logger.level'>all</entry>
     <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
 
-    <!-- Xexun server configuration -->
-    <entry key='xexun.enable'>true</entry>
-    <entry key='xexun.port'>5000</entry>
+    <!-- Protocol detector -->
+    <entry key='detector.enable'>true</entry>
+    <entry key='detector.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
     <entry key='gps103.enable'>true</entry>
@@ -91,9 +91,10 @@
     <entry key='t55.enable'>true</entry>
     <entry key='t55.port'>5005</entry>
 
-    <!-- Xexun 2 server configuration -->
-    <entry key='xexun2.enable'>true</entry>
-    <entry key='xexun2.port'>5006</entry>
+    <!-- Xexun server configuration -->
+    <entry key='xexun.enable'>true</entry>
+    <entry key='xexun.port'>5006</entry>
+    <entry key='xexun.extended'>false</entry>
 
     <!-- Totem server configuration -->
     <entry key='totem.enable'>true</entry>
@@ -355,4 +356,20 @@
     <entry key='riti.enable'>true</entry>
     <entry key='riti.port'>5071</entry>
 
+    <!-- Ulbotech server configuration -->
+    <entry key='ulbotech.enable'>true</entry>
+    <entry key='ulbotech.port'>5072</entry>
+
+    <!-- Tramigo server configuration -->
+    <entry key='tramigo.enable'>true</entry>
+    <entry key='tramigo.port'>5073</entry>
+
+    <!-- TR900 server configuration -->
+    <entry key='tr900.enable'>true</entry>
+    <entry key='tr900.port'>5074</entry>
+
+    <!-- Ardi_01 server configuration -->
+    <entry key='ardi01.enable'>true</entry>
+    <entry key='ardi01.port'>5075</entry>
+
 </properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index c3a8676c7..0f91922e3 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -67,9 +67,9 @@
     <entry key='logger.level'>all</entry>

     <entry key='logger.file'>[LOG]</entry>

 

-    <!-- Xexun server configuration -->

-    <entry key='xexun.enable'>true</entry>

-    <entry key='xexun.port'>5000</entry>

+    <!-- Protocol detector -->

+    <entry key='detector.enable'>true</entry>

+    <entry key='detector.port'>5000</entry>

 

     <!-- Gps103 server configuration -->

     <entry key='gps103.enable'>true</entry>

@@ -91,9 +91,10 @@
     <entry key='t55.enable'>true</entry>

     <entry key='t55.port'>5005</entry>

 

-    <!-- Xexun 2 server configuration -->

-    <entry key='xexun2.enable'>true</entry>

-    <entry key='xexun2.port'>5006</entry>

+    <!-- Xexun server configuration -->

+    <entry key='xexun.enable'>true</entry>

+    <entry key='xexun.port'>5006</entry>

+    <entry key='xexun.extended'>false</entry>

 

     <!-- Totem server configuration -->

     <entry key='totem.enable'>true</entry>

@@ -355,4 +356,20 @@
     <entry key='riti.enable'>true</entry>

     <entry key='riti.port'>5071</entry>

 

+    <!-- Ulbotech server configuration -->

+    <entry key='ulbotech.enable'>true</entry>

+    <entry key='ulbotech.port'>5072</entry>

+

+    <!-- Tramigo server configuration -->

+    <entry key='tramigo.enable'>true</entry>

+    <entry key='tramigo.port'>5073</entry>

+

+    <!-- TR900 server configuration -->

+    <entry key='tr900.enable'>true</entry>

+    <entry key='tr900.port'>5074</entry>

+

+    <!-- Ardi_01 server configuration -->

+    <entry key='ardi01.enable'>true</entry>

+    <entry key='ardi01.port'>5075</entry>

+

 </properties>

diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index a1f1cca51..0b37399d3 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]

 AppName=Traccar

-AppVersion=2.10

+AppVersion=2.11

 DefaultDirName={pf}\Traccar

 AlwaysRestart=yes

 

diff --git a/tools/test.sh b/tools/test.sh
index 267d69161..5cebc744b 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -11,14 +11,11 @@
 #       This will cause an unknown device error for "-e".  bash works.
 
 # testing data:
-# ids - 123456789012345 (32), 123456789012 (1), 123456 (2)
+# ids - 123456789012345 (31), 123456789012 (1), 123456 (2)
 # time - 12:00 + X min (where X is protocol number)
 
 # to verify test check database entries
 
-echo "0. xexun"
-(echo -n -e "111111120009,+436763737552,GPRMC,120000.000,A,6000.0000,N,13000.0000,E,0.0,0.0,010112,,,A*76,F,imei:123456789012345,04,481.2,F:4.15V,0,139,2689,232,03,2725,0576";) | nc -v localhost 5000
-
 echo "1. gps103"
 (echo -n -e "imei:123456789012345,help me,1201011201,,F,120100.000,A,6000.0000,N,13000.0000,E,0.00,;";) | nc -v localhost 5001
 
@@ -34,7 +31,7 @@ echo "4. gl200"
 echo "5. t55"
 (echo -n -e "\$PGID,123456789012345*0F\r\n\$GPRMC,120500.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,*33\r\n";) | nc -v localhost 5005
 
-echo "6. xexun2"
+echo "6. xexun"
 (echo -n -e "111111120009,+436763737552,GPRMC,120600.000,A,6000.0000,N,13000.0000,E,0.00,0.00,010112,,,A*68,F,, imei:123456789012345,04,481.2,F:4.15V,0,139,2689,232,03,2725,0576\n";) | nc -v localhost 5006
 
 echo "7. totem"