From f367b71b9c081416f6d64f6efd9844cd05f047ea Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 2 May 2013 19:20:45 +1200
Subject: Version 2.2 release

---
 setup/linux/traccar.cfg   | 40 ++++++++++++++++++++++++++++++++++++++--
 setup/macosx/traccar.cfg  | 40 ++++++++++++++++++++++++++++++++++++++--
 setup/windows/traccar.cfg | 40 ++++++++++++++++++++++++++++++++++++++--
 setup/windows/traccar.iss |  2 +-
 4 files changed, 115 insertions(+), 7 deletions(-)

diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 00831c08e..df11d78e2 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -35,8 +35,8 @@
         extended_info - String (XML)
     <-->
     <entry key='database.insertPosition'>
-        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power)
-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power);
+        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power, other)
+        VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power, :extended_info);
     </entry>
 
     <!-->
@@ -208,4 +208,40 @@
     <entry key='syrus.enable'>true</entry>
     <entry key='syrus.port'>5031</entry>
 
+    <!-- Wondex server configuration -->
+    <entry key='wondex.enable'>true</entry>
+    <entry key='wondex.port'>5032</entry>
+
+    <!-- Cellocator server configuration -->
+    <entry key='cellocator.enable'>true</entry>
+    <entry key='cellocator.port'>5033</entry>
+
+    <!-- Galileo server configuration -->
+    <entry key='galileo.enable'>true</entry>
+    <entry key='galileo.port'>5034</entry>
+
+    <!-- YWT server configuration -->
+    <entry key='ywt.enable'>true</entry>
+    <entry key='ywt.port'>5035</entry>
+
+    <!-- TK102 server configuration -->
+    <entry key='tk102.enable'>true</entry>
+    <entry key='tk102.port'>5036</entry>
+
+    <!-- IntelliTrac server configuration -->
+    <entry key='intellitrac.enable'>true</entry>
+    <entry key='intellitrac.port'>5037</entry>
+
+    <!-- XT7 server configuration -->
+    <entry key='xt7.enable'>true</entry>
+    <entry key='xt7.port'>5038</entry>
+
+    <!-- Wialon server configuration -->
+    <entry key='wialon.enable'>true</entry>
+    <entry key='wialon.port'>5039</entry>
+
+    <!-- Carscop server configuration -->
+    <entry key='carscop.enable'>true</entry>
+    <entry key='carscop.port'>5040</entry>
+
 </properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 00831c08e..df11d78e2 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -35,8 +35,8 @@
         extended_info - String (XML)
     <-->
     <entry key='database.insertPosition'>
-        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power)
-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power);
+        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power, other)
+        VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power, :extended_info);
     </entry>
 
     <!-->
@@ -208,4 +208,40 @@
     <entry key='syrus.enable'>true</entry>
     <entry key='syrus.port'>5031</entry>
 
+    <!-- Wondex server configuration -->
+    <entry key='wondex.enable'>true</entry>
+    <entry key='wondex.port'>5032</entry>
+
+    <!-- Cellocator server configuration -->
+    <entry key='cellocator.enable'>true</entry>
+    <entry key='cellocator.port'>5033</entry>
+
+    <!-- Galileo server configuration -->
+    <entry key='galileo.enable'>true</entry>
+    <entry key='galileo.port'>5034</entry>
+
+    <!-- YWT server configuration -->
+    <entry key='ywt.enable'>true</entry>
+    <entry key='ywt.port'>5035</entry>
+
+    <!-- TK102 server configuration -->
+    <entry key='tk102.enable'>true</entry>
+    <entry key='tk102.port'>5036</entry>
+
+    <!-- IntelliTrac server configuration -->
+    <entry key='intellitrac.enable'>true</entry>
+    <entry key='intellitrac.port'>5037</entry>
+
+    <!-- XT7 server configuration -->
+    <entry key='xt7.enable'>true</entry>
+    <entry key='xt7.port'>5038</entry>
+
+    <!-- Wialon server configuration -->
+    <entry key='wialon.enable'>true</entry>
+    <entry key='wialon.port'>5039</entry>
+
+    <!-- Carscop server configuration -->
+    <entry key='carscop.enable'>true</entry>
+    <entry key='carscop.port'>5040</entry>
+
 </properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index d8cacc1df..67e6f83c9 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -35,8 +35,8 @@
         extended_info - String (XML)
     <-->
     <entry key='database.insertPosition'>
-        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power)
-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power);
+        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power, other)
+        VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power, :extended_info);
     </entry>
 
     <!-->
@@ -184,4 +184,40 @@
     <entry key='syrus.enable'>true</entry>
     <entry key='syrus.port'>5031</entry>
 
+    <!-- Wondex server configuration -->
+    <entry key='wondex.enable'>true</entry>
+    <entry key='wondex.port'>5032</entry>
+
+    <!-- Cellocator server configuration -->
+    <entry key='cellocator.enable'>true</entry>
+    <entry key='cellocator.port'>5033</entry>
+
+    <!-- Galileo server configuration -->
+    <entry key='galileo.enable'>true</entry>
+    <entry key='galileo.port'>5034</entry>
+
+    <!-- YWT server configuration -->
+    <entry key='ywt.enable'>true</entry>
+    <entry key='ywt.port'>5035</entry>
+
+    <!-- TK102 server configuration -->
+    <entry key='tk102.enable'>true</entry>
+    <entry key='tk102.port'>5036</entry>
+
+    <!-- IntelliTrac server configuration -->
+    <entry key='intellitrac.enable'>true</entry>
+    <entry key='intellitrac.port'>5037</entry>
+
+    <!-- XT7 server configuration -->
+    <entry key='xt7.enable'>true</entry>
+    <entry key='xt7.port'>5038</entry>
+
+    <!-- Wialon server configuration -->
+    <entry key='wialon.enable'>true</entry>
+    <entry key='wialon.port'>5039</entry>
+
+    <!-- Carscop server configuration -->
+    <entry key='carscop.enable'>true</entry>
+    <entry key='carscop.port'>5040</entry>
+
 </properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index a8ceef253..215cbc998 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=2.1
+AppVersion=2.2
 DefaultDirName={pf}\Traccar
 AlwaysRestart=yes
 
-- 
cgit v1.2.3