Release version 2.0v2.0

3 files changed, 50 insertions, 74 deletions

diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 54c93367c..dda8e175f 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]

 AppName=Traccar

-AppVersion=1.4

+AppVersion=2.0

 DefaultDirName={pf}\Traccar

 AlwaysRestart=yes

 

@@ -12,16 +12,17 @@ Name: "{app}\lib"
 Name: "{app}\logs"

 

 [Files]

-Source: "wrapper\bin\wrapper-windows-x86-32.exe"; DestDir: "{app}\bin"; DestName: "wrapper.exe"

-Source: "wrapper\src\bin\App.bat.in"; DestDir: "{app}\bin"; DestName: "Traccar.bat"

-Source: "wrapper\src\bin\InstallApp-NT.bat.in"; DestDir: "{app}\bin"; DestName: "InstallTraccar-NT.bat"

-Source: "wrapper\src\bin\UninstallApp-NT.bat.in"; DestDir: "{app}\bin"; DestName: "UninstallTraccar-NT.bat"

-Source: "wrapper\lib\wrapper-windows-x86-32.dll"; DestDir: "{app}\lib"; DestName: "wrapper.dll"

-Source: "wrapper\lib\wrapper.jar"; DestDir: "{app}\lib";

-Source: "wrapper\src\conf\wrapper.conf.in"; DestDir: "{app}\conf"; DestName: "wrapper.conf"; AfterInstall: ConfigureWrapper

+Source: "..\wrapper\bin\wrapper-windows-x86-32.exe"; DestDir: "{app}\bin"; DestName: "wrapper.exe"

+Source: "..\wrapper\src\bin\App.bat.in"; DestDir: "{app}\bin"; DestName: "Traccar.bat"

+Source: "..\wrapper\src\bin\InstallApp-NT.bat.in"; DestDir: "{app}\bin"; DestName: "InstallTraccar-NT.bat"

+Source: "..\wrapper\src\bin\UninstallApp-NT.bat.in"; DestDir: "{app}\bin"; DestName: "UninstallTraccar-NT.bat"

+Source: "..\wrapper\lib\wrapper-windows-x86-32.dll"; DestDir: "{app}\lib"; DestName: "wrapper.dll"

+Source: "..\wrapper\lib\wrapper.jar"; DestDir: "{app}\lib";

+Source: "..\wrapper\src\conf\wrapper.conf.in"; DestDir: "{app}\conf"; DestName: "wrapper.conf"; AfterInstall: ConfigureWrapper

 

 Source: "..\..\target\tracker-server.jar"; DestDir: "{app}"

 Source: "..\..\target\lib\*"; DestDir: "{app}\lib"

+Source: "..\traccar-web.war"; DestDir: "{app}"

 Source: "windows.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication

 

 [Run]

@@ -64,6 +65,7 @@ var
 begin

   LoadStringFromFile(ExpandConstant(CurrentFileName), S);

   StringChangeEx(S, '[DATABASE]', ExpandConstant('{app}\data\database'), true);

+  StringChangeEx(S, '[WAR]', ExpandConstant('{app}\traccar-web.war'), true);

   StringChangeEx(S, '[LOG]', ExpandConstant('{app}\logs\tracker-server.log'), true);

   SaveStringToFile(ExpandConstant(CurrentFileName), S, false);

 end;

diff --git a/setup/windows/traccar.sh b/setup/windows/traccar.sh
deleted file mode 100755
index e72a130f1..000000000
--- a/setup/windows/traccar.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-tar -xzf wrapper-delta-pack-*.tar.gz
-mv wrapper-delta-pack-*/ wrapper/
-
-innoextract isetup-*.exe
-
-wine app/ISCC.exe traccar.iss
-mv Output/setup.exe .
-
-zip traccar-windows-32.zip setup.exe README.txt
-
-rm setup.exe
-rm -rf Output
-rm -rf wrapper
-rm -rf app
-rm -rf tmp
-
diff --git a/setup/windows/windows.cfg b/setup/windows/windows.cfg
index 6e3a1a12f..e6b620b0c 100644
--- a/setup/windows/windows.cfg
+++ b/setup/windows/windows.cfg
@@ -6,6 +6,7 @@
 

     <!-- Global confiduration -->

     <entry key="database.driver">org.h2.Driver</entry>

+    <entry key="database.dataSource">org.h2.jdbcx.JdbcDataSource</entry>

     <entry key="database.url">jdbc:h2:[DATABASE]</entry>

     <entry key="database.user">sa</entry>

     <entry key="database.password"></entry>

@@ -13,59 +14,17 @@
     <!-- Database refresh delay in seconds -->

     <entry key="database.refreshDelay">300</entry>

 

-    <!-- Create database schema -->

-    <entry key="database.initialize">

-        CREATE TABLE IF NOT EXISTS devices (id INT IDENTITY, imei VARCHAR(16));

-        CREATE TABLE IF NOT EXISTS positions (device_id INT, time TIMESTAMP, valid BOOLEAN, latitude DOUBLE, longitude DOUBLE, speed DOUBLE, course DOUBLE, power DOUBLE);

-    </entry>

-

     <!-->

-        id - Integer

+        id - Long

         imei - String

     <-->

     <entry key="database.selectDevice">

-        SELECT id, imei

+        SELECT id, uniqueId as imei

         FROM devices;

     </entry>

 

     <!-->

-        imei - String

-    <-->

-    <entry key="database.insertDevice">

-        INSERT INTO devices (imei)

-        VALUES (:imei);

-    </entry>

-

-    <!-->

-        id - Integer

-        imei - String

-    <-->

-    <entry key="database.updateDevice">

-        UPDATE devices

-        SET imei = :imei

-        WHERE id = :id;

-    </entry>

-

-    <!-->

-        id - Integer

-    <-->

-    <entry key="database.deleteDevice">

-        DELETE FROM devices

-        WHERE id = :id;

-    </entry>

-

-    <!-->

-        device_id - Integer

-    <-->

-    <entry key="database.selectPosition">

-        SELECT *

-        FROM positions

-        WHERE device_id = :device_id

-        ORDER by time DESC;

-    </entry>

-

-    <!-->

-        device_id - Integer

+        device_id - Long

         time - Date

         valid - Boolean

         latitude - Double

@@ -76,13 +35,22 @@
         extended_info - String (XML)

     <-->

     <entry key="database.insertPosition">

-        INSERT INTO positions (device_id, time, valid, latitude, longitude, speed, course, power)

-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power);

+        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power)

+	VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power);

+    </entry>

+

+    <!-->

+        device_id - Long

+        id - Long

+    <-->

+    <entry key="database.updateLatestPosition">

+        UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;

     </entry>

 

     <!-- Web interface port -->

     <entry key="http.enable">true</entry>

     <entry key="http.port">8082</entry>

+    <entry key="http.application">[WAR]</entry>

 

     <!-- Logging options -->

     <entry key="logger.enable">true</entry>

@@ -159,5 +127,29 @@
     <!-- PT502 server configuration -->

     <entry key="pt502.enable">true</entry>

     <entry key="pt502.port">5017</entry>

-    

+

+    <!-- TR20 server configuration -->

+    <entry key="tr20.enable">true</entry>

+    <entry key="tr20.port">5018</entry>

+

+    <!-- Navis server configuration -->

+    <entry key="navis.enable">true</entry>

+    <entry key="navis.port">5019</entry>

+

+    <!-- Meitrack server configuration -->

+    <entry key="meitrack.enable">true</entry>

+    <entry key="meitrack.port">5020</entry>

+

+    <!-- Skypatrol server configuration -->

+    <entry key="skypatrol.enable">true</entry>

+    <entry key="skypatrol.port">5021</entry>

+

+    <!-- GT02 server configuration -->

+    <entry key="gt02.enable">true</entry>

+    <entry key="gt02.port">5022</entry>

+

+    <!-- GT06 server configuration -->

+    <entry key="gt06.enable">true</entry>

+    <entry key="gt06.port">5023</entry>

+

 </properties>