diff options
| -rw-r--r-- | opengts.cfg | 13 | ||||
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | setup/linux/traccar.cfg | 37 | ||||
| -rw-r--r-- | setup/macosx/traccar.cfg | 37 | ||||
| -rw-r--r-- | setup/windows/traccar.cfg | 13 | ||||
| -rw-r--r-- | setup/windows/traccar.iss | 2 |
6 files changed, 33 insertions, 77 deletions
diff --git a/opengts.cfg b/opengts.cfg index d8b7d66c3..03976c297 100644 --- a/opengts.cfg +++ b/opengts.cfg @@ -41,6 +41,7 @@ <!-- Xexun server configuration --> <entry key='xexun.enable'>true</entry> + <!--<entry key='xexun.address'>localhost</entry>--> <entry key='xexun.port'>5000</entry> <!-- Gps103 server configuration --> @@ -67,9 +68,9 @@ <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> + <!-- Totem server configuration --> + <entry key='totem.enable'>true</entry> + <entry key='totem.port'>5007</entry> <!-- Enfora server configuration --> <entry key='enfora.enable'>true</entry> @@ -243,9 +244,9 @@ <entry key='gotop.enable'>true</entry> <entry key='gotop.port'>5050</entry> - <!-- Totem server configuration --> - <entry key='totem.enable'>true</entry> - <entry key='totem.port'>5051</entry> + <!-- Sanav server configuration --> + <entry key='sanav.enable'>true</entry> + <entry key='sanav.port'>5051</entry> <!-- Gator server configuration --> <entry key='gator.enable'>true</entry> @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.traccar</groupId> <artifactId>traccar</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> <name>traccar</name> <url>http://www.traccar.org</url> @@ -22,7 +22,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.173</version> + <version>1.3.174</version> </dependency> <dependency> <groupId>mysql</groupId> @@ -32,7 +32,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>3.6.6.Final</version> + <version>3.7.0.Final</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -43,7 +43,7 @@ <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all-server</artifactId> - <version>8.1.12.v20130726</version> + <version>8.1.13.v20130916</version> </dependency> </dependencies> diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg index 7e91cf72c..ced94805d 100644 --- a/setup/linux/traccar.cfg +++ b/setup/linux/traccar.cfg @@ -58,6 +58,7 @@ <!-- Xexun server configuration --> <entry key='xexun.enable'>true</entry> + <!--<entry key='xexun.address'>localhost</entry>--> <entry key='xexun.port'>5000</entry> <!-- Gps103 server configuration --> @@ -84,9 +85,9 @@ <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> + <!-- Totem server configuration --> + <entry key='totem.enable'>true</entry> + <entry key='totem.port'>5007</entry> <!-- Enfora server configuration --> <entry key='enfora.enable'>true</entry> @@ -152,30 +153,6 @@ <entry key='gt06.enable'>true</entry> <entry key='gt06.port'>5023</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> @@ -284,9 +261,9 @@ <entry key='gotop.enable'>true</entry> <entry key='gotop.port'>5050</entry> - <!-- Totem server configuration --> - <entry key='totem.enable'>true</entry> - <entry key='totem.port'>5051</entry> + <!-- Sanav server configuration --> + <entry key='sanav.enable'>true</entry> + <entry key='sanav.port'>5051</entry> <!-- Gator server configuration --> <entry key='gator.enable'>true</entry> diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg index 7e91cf72c..ced94805d 100644 --- a/setup/macosx/traccar.cfg +++ b/setup/macosx/traccar.cfg @@ -58,6 +58,7 @@ <!-- Xexun server configuration --> <entry key='xexun.enable'>true</entry> + <!--<entry key='xexun.address'>localhost</entry>--> <entry key='xexun.port'>5000</entry> <!-- Gps103 server configuration --> @@ -84,9 +85,9 @@ <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> + <!-- Totem server configuration --> + <entry key='totem.enable'>true</entry> + <entry key='totem.port'>5007</entry> <!-- Enfora server configuration --> <entry key='enfora.enable'>true</entry> @@ -152,30 +153,6 @@ <entry key='gt06.enable'>true</entry> <entry key='gt06.port'>5023</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> @@ -284,9 +261,9 @@ <entry key='gotop.enable'>true</entry> <entry key='gotop.port'>5050</entry> - <!-- Totem server configuration --> - <entry key='totem.enable'>true</entry> - <entry key='totem.port'>5051</entry> + <!-- Sanav server configuration --> + <entry key='sanav.enable'>true</entry> + <entry key='sanav.port'>5051</entry> <!-- Gator server configuration --> <entry key='gator.enable'>true</entry> diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg index 005e31780..7e96d9955 100644 --- a/setup/windows/traccar.cfg +++ b/setup/windows/traccar.cfg @@ -58,6 +58,7 @@ <!-- Xexun server configuration -->
<entry key='xexun.enable'>true</entry>
+ <!--<entry key='xexun.address'>localhost</entry>-->
<entry key='xexun.port'>5000</entry>
<!-- Gps103 server configuration -->
@@ -84,9 +85,9 @@ <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>
+ <!-- Totem server configuration -->
+ <entry key='totem.enable'>true</entry>
+ <entry key='totem.port'>5007</entry>
<!-- Enfora server configuration -->
<entry key='enfora.enable'>true</entry>
@@ -260,9 +261,9 @@ <entry key='gotop.enable'>true</entry>
<entry key='gotop.port'>5050</entry>
- <!-- Totem server configuration -->
- <entry key='totem.enable'>true</entry>
- <entry key='totem.port'>5051</entry>
+ <!-- Sanav server configuration -->
+ <entry key='sanav.enable'>true</entry>
+ <entry key='sanav.port'>5051</entry>
<!-- Gator server configuration -->
<entry key='gator.enable'>true</entry>
diff --git a/setup/windows/traccar.iss b/setup/windows/traccar.iss index 418b472d4..2c406e216 100644 --- a/setup/windows/traccar.iss +++ b/setup/windows/traccar.iss @@ -1,6 +1,6 @@ [Setup]
AppName=Traccar
-AppVersion=2.4
+AppVersion=2.5
DefaultDirName={pf}\Traccar
AlwaysRestart=yes
|