From e20db832cb9a362524ea5204b0b03e4e1bc7e4c6 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 24 Apr 2013 20:59:09 +1200
Subject: Use same name for config files

---
 setup/windows/traccar.cfg | 187 ++++++++++++++++++++++++++++++++++++++++++++++
 setup/windows/traccar.iss |   4 +-
 setup/windows/windows.cfg | 187 ----------------------------------------------
 3 files changed, 189 insertions(+), 189 deletions(-)
 create mode 100644 setup/windows/traccar.cfg
 delete mode 100644 setup/windows/windows.cfg

(limited to 'setup/windows')

diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
new file mode 100644
index 000000000..d8cacc1df
--- /dev/null
+++ b/setup/windows/traccar.cfg
@@ -0,0 +1,187 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
+
+<properties>
+
+    <!-- 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>
+
+    <!-- Database refresh delay in seconds -->
+    <entry key='database.refreshDelay'>300</entry>
+
+    <!-->
+        id - Long
+        imei - String
+    <-->
+    <entry key='database.selectDevice'>
+        SELECT id, uniqueId as imei
+        FROM devices;
+    </entry>
+
+    <!-->
+        device_id - Long
+        time - Date
+        valid - Boolean
+        latitude - Double
+        longitude - Double
+        speed - Double
+        course - Double
+        power - Double (NULL for some protocols)
+        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);
+    </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>
+    <entry key='logger.file'>[LOG]</entry>
+
+    <!-- Xexun server configuration -->
+    <entry key='xexun.enable'>true</entry>
+    <entry key='xexun.port'>5000</entry>
+
+    <!-- Gps103 server configuration -->
+    <entry key='gps103.enable'>true</entry>
+    <entry key='gps103.port'>5001</entry>
+
+    <!-- Tk103 server configuration -->
+    <entry key='tk103.enable'>true</entry>
+    <entry key='tk103.port'>5002</entry>
+
+    <!-- Gl100 server configuration -->
+    <entry key='gl100.enable'>true</entry>
+    <entry key='gl100.port'>5003</entry>
+
+    <!-- Gl200 server configuration -->
+    <entry key='gl200.enable'>true</entry>
+    <entry key='gl200.port'>5004</entry>
+
+    <!-- T55 server configuration -->
+    <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>
+
+    <!-- AVL-08 server configuration -->
+    <entry key='avl08.enable'>true</entry>
+    <entry key='avl08.port'>5007</entry>
+
+    <!-- Enfora server configuration -->
+    <entry key='enfora.enable'>true</entry>
+    <entry key='enfora.port'>5008</entry>
+
+    <!-- Meiligao server configuration -->
+    <entry key='meiligao.enable'>true</entry>
+    <entry key='meiligao.port'>5009</entry>
+
+    <!-- Maxon server configuration -->
+    <entry key='maxon.enable'>true</entry>
+    <entry key='maxon.port'>5010</entry>
+
+    <!-- ST-210 server configuration -->
+    <entry key='st210.enable'>true</entry>
+    <entry key='st210.port'>5011</entry>
+
+    <!-- Progress server configuration -->
+    <entry key='progress.enable'>true</entry>
+    <entry key='progress.port'>5012</entry>
+
+    <!-- H02 server configuration -->
+    <entry key='h02.enable'>true</entry>
+    <entry key='h02.port'>5013</entry>
+
+    <!-- JT600 server configuration -->
+    <entry key='jt600.enable'>true</entry>
+    <entry key='jt600.port'>5014</entry>
+
+    <!-- EV603 server configuration -->
+    <entry key='ev603.enable'>true</entry>
+    <entry key='ev603.port'>5015</entry>
+
+    <!-- V680 server configuration -->
+    <entry key='v680.enable'>true</entry>
+    <entry key='v680.port'>5016</entry>
+
+    <!-- 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>
+
+    <!-- Megastek server configuration -->
+    <entry key='megastek.enable'>true</entry>
+    <entry key='megastek.port'>5024</entry>
+
+    <!-- Navigil server configuration -->
+    <entry key='navigil.enable'>true</entry>
+    <entry key='navigil.port'>5025</entry>
+    
+    <!-- GpsGate server configuration -->
+    <entry key='gpsgate.enable'>true</entry>
+    <entry key='gpsgate.port'>5026</entry>
+
+    <!-- Teltonika server configuration -->
+    <entry key='teltonika.enable'>true</entry>
+    <entry key='teltonika.port'>5027</entry>
+
+    <!-- MTA6 server configuration -->
+    <entry key='mta6.enable'>true</entry>
+    <entry key='mta6.port'>5028</entry>
+
+    <!-- MTA6CAN server configuration -->
+    <entry key='mta6can.enable'>true</entry>
+    <entry key='mta6can.port'>5029</entry>
+
+    <!-- TLT-2H server configuration -->
+    <entry key='tlt2h.enable'>true</entry>
+    <entry key='tlt2h.port'>5030</entry>
+
+    <!-- Syrus server configuration -->
+    <entry key='syrus.enable'>true</entry>
+    <entry key='syrus.port'>5031</entry>
+
+</properties>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss
index 50e30ba26..a8ceef253 100644
--- a/setup/windows/traccar.iss
+++ b/setup/windows/traccar.iss
@@ -23,7 +23,7 @@ Source: "..\wrapper\src\conf\wrapper.conf.in"; DestDir: "{app}\conf"; DestName:
 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
+Source: "traccar.cfg"; DestDir: "{app}\conf"; AfterInstall: ConfigureApplication
 
 [Run]
 Filename: "{app}\bin\InstallTraccar-NT.bat"
@@ -51,7 +51,7 @@ var
 begin
   LoadStringFromFile(ExpandConstant(CurrentFileName), S);
   Insert('wrapper.java.classpath.2=../tracker-server.jar' + #13#10, S, Pos('wrapper.java.classpath.1', S));
-  Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\windows.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S));
+  Insert(ExpandConstant('wrapper.app.parameter.2="{app}\conf\traccar.cfg"') + #13#10, S, Pos('wrapper.app.parameter.1', S));
   StringChangeEx(S, '<YourMainClass>', 'org.traccar.Main', true);
   StringChangeEx(S, '@app.name@', 'Traccar', true);
   StringChangeEx(S, '@app.long.name@', 'Traccar', true);
diff --git a/setup/windows/windows.cfg b/setup/windows/windows.cfg
deleted file mode 100644
index d8cacc1df..000000000
--- a/setup/windows/windows.cfg
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
-
-<properties>
-
-    <!-- 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>
-
-    <!-- Database refresh delay in seconds -->
-    <entry key='database.refreshDelay'>300</entry>
-
-    <!-->
-        id - Long
-        imei - String
-    <-->
-    <entry key='database.selectDevice'>
-        SELECT id, uniqueId as imei
-        FROM devices;
-    </entry>
-
-    <!-->
-        device_id - Long
-        time - Date
-        valid - Boolean
-        latitude - Double
-        longitude - Double
-        speed - Double
-        course - Double
-        power - Double (NULL for some protocols)
-        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);
-    </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>
-    <entry key='logger.file'>[LOG]</entry>
-
-    <!-- Xexun server configuration -->
-    <entry key='xexun.enable'>true</entry>
-    <entry key='xexun.port'>5000</entry>
-
-    <!-- Gps103 server configuration -->
-    <entry key='gps103.enable'>true</entry>
-    <entry key='gps103.port'>5001</entry>
-
-    <!-- Tk103 server configuration -->
-    <entry key='tk103.enable'>true</entry>
-    <entry key='tk103.port'>5002</entry>
-
-    <!-- Gl100 server configuration -->
-    <entry key='gl100.enable'>true</entry>
-    <entry key='gl100.port'>5003</entry>
-
-    <!-- Gl200 server configuration -->
-    <entry key='gl200.enable'>true</entry>
-    <entry key='gl200.port'>5004</entry>
-
-    <!-- T55 server configuration -->
-    <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>
-
-    <!-- AVL-08 server configuration -->
-    <entry key='avl08.enable'>true</entry>
-    <entry key='avl08.port'>5007</entry>
-
-    <!-- Enfora server configuration -->
-    <entry key='enfora.enable'>true</entry>
-    <entry key='enfora.port'>5008</entry>
-
-    <!-- Meiligao server configuration -->
-    <entry key='meiligao.enable'>true</entry>
-    <entry key='meiligao.port'>5009</entry>
-
-    <!-- Maxon server configuration -->
-    <entry key='maxon.enable'>true</entry>
-    <entry key='maxon.port'>5010</entry>
-
-    <!-- ST-210 server configuration -->
-    <entry key='st210.enable'>true</entry>
-    <entry key='st210.port'>5011</entry>
-
-    <!-- Progress server configuration -->
-    <entry key='progress.enable'>true</entry>
-    <entry key='progress.port'>5012</entry>
-
-    <!-- H02 server configuration -->
-    <entry key='h02.enable'>true</entry>
-    <entry key='h02.port'>5013</entry>
-
-    <!-- JT600 server configuration -->
-    <entry key='jt600.enable'>true</entry>
-    <entry key='jt600.port'>5014</entry>
-
-    <!-- EV603 server configuration -->
-    <entry key='ev603.enable'>true</entry>
-    <entry key='ev603.port'>5015</entry>
-
-    <!-- V680 server configuration -->
-    <entry key='v680.enable'>true</entry>
-    <entry key='v680.port'>5016</entry>
-
-    <!-- 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>
-
-    <!-- Megastek server configuration -->
-    <entry key='megastek.enable'>true</entry>
-    <entry key='megastek.port'>5024</entry>
-
-    <!-- Navigil server configuration -->
-    <entry key='navigil.enable'>true</entry>
-    <entry key='navigil.port'>5025</entry>
-    
-    <!-- GpsGate server configuration -->
-    <entry key='gpsgate.enable'>true</entry>
-    <entry key='gpsgate.port'>5026</entry>
-
-    <!-- Teltonika server configuration -->
-    <entry key='teltonika.enable'>true</entry>
-    <entry key='teltonika.port'>5027</entry>
-
-    <!-- MTA6 server configuration -->
-    <entry key='mta6.enable'>true</entry>
-    <entry key='mta6.port'>5028</entry>
-
-    <!-- MTA6CAN server configuration -->
-    <entry key='mta6can.enable'>true</entry>
-    <entry key='mta6can.port'>5029</entry>
-
-    <!-- TLT-2H server configuration -->
-    <entry key='tlt2h.enable'>true</entry>
-    <entry key='tlt2h.port'>5030</entry>
-
-    <!-- Syrus server configuration -->
-    <entry key='syrus.enable'>true</entry>
-    <entry key='syrus.port'>5031</entry>
-
-</properties>
-- 
cgit v1.2.3