From 36c030fa027402b18e2f77027d407b04a867b4fc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 12 Jan 2013 12:57:19 +1300 Subject: Release version 2.0 --- default.cfg | 4 -- opengts.cfg | 49 ++++++++++------- pom.xml | 12 ++-- setup/linux/linux.cfg | 88 ++++++++++++++--------------- setup/linux/traccar.sh | 56 ------------------- setup/package.sh | 134 +++++++++++++++++++++++++++++++++++++++++++++ setup/universal/traccar.sh | 5 -- setup/windows/traccar.iss | 18 +++--- setup/windows/traccar.sh | 18 ------ setup/windows/windows.cfg | 88 ++++++++++++++--------------- 10 files changed, 260 insertions(+), 212 deletions(-) delete mode 100755 setup/linux/traccar.sh create mode 100755 setup/package.sh delete mode 100755 setup/universal/traccar.sh delete mode 100755 setup/windows/traccar.sh diff --git a/default.cfg b/default.cfg index 8d4df93c7..4b4685ce1 100644 --- a/default.cfg +++ b/default.cfg @@ -34,10 +34,6 @@ power - Double (NULL for some protocols) extended_info - String (XML) <--> - - H2 - SCOPE_IDENTITY() - MySQL - LAST_INSERT_ID() - <--> INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power) VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power); diff --git a/opengts.cfg b/opengts.cfg index dcfae9c19..a34301aec 100644 --- a/opengts.cfg +++ b/opengts.cfg @@ -17,22 +17,6 @@ SELECT imeiNumber AS id, imeiNumber AS imei FROM Device WHERE imeiNumber <> ''; - - DO 0; - - - - DO 0; - - - - DO 0; - - - - DO 0; - - START TRANSACTION; UPDATE Device SET lastValidLatitude = :latitude, lastValidLongitude = :longitude, lastGPSTimestamp = UNIX_TIMESTAMP(:time), lastUpdateTime = UNIX_TIMESTAMP(NOW()) WHERE imeiNumber = :device_id; @@ -42,9 +26,12 @@ COMMIT; + + DO 0; + + - true - 8082 + false true @@ -124,5 +111,29 @@ true 5017 - + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + diff --git a/pom.xml b/pom.xml index a0996b916..9cac127ec 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.traccar traccar - 1.4-SNAPSHOT + 2.0-SNAPSHOT traccar http://www.traccar.org @@ -12,22 +12,22 @@ junit junit - 4.10 + 4.11 com.h2database h2 - 1.3.168 + 1.3.170 mysql mysql-connector-java - 5.1.21 + 5.1.22 io.netty netty - 3.5.9.Final + 3.6.1.Final javax.servlet @@ -37,7 +37,7 @@ org.eclipse.jetty.aggregate jetty-all-server - 8.1.7.v20120910 + 8.1.8.v20121106 diff --git a/setup/linux/linux.cfg b/setup/linux/linux.cfg index 6b60d5edc..16dc51e6f 100644 --- a/setup/linux/linux.cfg +++ b/setup/linux/linux.cfg @@ -6,6 +6,7 @@ org.h2.Driver + org.h2.jdbcx.JdbcDataSource jdbc:h2:/opt/traccar/data/database sa @@ -13,59 +14,17 @@ 300 - - - 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); - - - id - Integer + id - Long imei - String <--> - SELECT id, imei + SELECT id, uniqueId as imei FROM devices; - imei - String - <--> - - INSERT INTO devices (imei) - VALUES (:imei); - - - - id - Integer - imei - String - <--> - - UPDATE devices - SET imei = :imei - WHERE id = :id; - - - - id - Integer - <--> - - DELETE FROM devices - WHERE id = :id; - - - - device_id - Integer - <--> - - SELECT * - FROM positions - WHERE device_id = :device_id - ORDER by time DESC; - - - - device_id - Integer + device_id - Long time - Date valid - Boolean latitude - Double @@ -76,13 +35,22 @@ extended_info - String (XML) <--> - 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); + + + + device_id - Long + id - Long + <--> + + UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; true 8082 + /opt/traccar/traccar-web.war true @@ -183,5 +151,29 @@ true 5023 - + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + diff --git a/setup/linux/traccar.sh b/setup/linux/traccar.sh deleted file mode 100755 index bcba7bb5a..000000000 --- a/setup/linux/traccar.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -app='/opt/traccar' - -tar -xzf wrapper-delta-pack-*.tar.gz -mv wrapper-delta-pack-*/ wrapper/ - -rm -rf out - -mkdir out -mkdir out/bin -mkdir out/conf -mkdir out/data -mkdir out/lib -mkdir out/logs - -cp wrapper/src/bin/sh.script.in out/bin/traccar -cp wrapper/lib/wrapper.jar out/lib -cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf - -cp ../../target/tracker-server.jar out -cp ../../target/lib/* out/lib -cp linux.cfg out/conf - -sed -i 's/@app.name@/traccar/g' out/bin/traccar -sed -i 's/@app.long.name@/traccar/g' out/bin/traccar - -sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf -sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/linux.cfg" out/conf/wrapper.conf -sed -i 's//org.traccar.Main/g' out/conf/wrapper.conf -sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf -sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf -sed -i 's/@app.description@/traccar/g' out/conf/wrapper.conf - -# linux 32 - -cp wrapper/bin/wrapper-linux-x86-32 out/bin/wrapper -cp wrapper/lib/libwrapper-linux-x86-32.so out/lib/libwrapper.so -chmod +x out/bin/traccar - -makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" -zip traccar-linux-32.zip traccar.run README.txt - -# linux 64 - -cp wrapper/bin/wrapper-linux-x86-64 out/bin/wrapper -cp wrapper/lib/libwrapper-linux-x86-64.so out/lib/libwrapper.so -chmod +x out/bin/traccar - -makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" -zip traccar-linux-64.zip traccar.run README.txt - -rm traccar.run -rm -rf out -rm -rf wrapper - diff --git a/setup/package.sh b/setup/package.sh new file mode 100755 index 000000000..ac0f021a8 --- /dev/null +++ b/setup/package.sh @@ -0,0 +1,134 @@ +#!/bin/sh + +# GENERAL REQUIREMENTS + +# Check web application +if [ -e "traccar-web.war" ]; then + echo "Web application archive found" +else + echo "Put traccar-web.war into this directory" + exit 0 +fi + +# Check wrapper +if ls wrapper-delta-pack-*.tar.gz &> /dev/null; then + echo "Java wrapper package found" +else + echo "Put wrapper-delta-pack-*.tar.gz into this directory" + exit 0 +fi + +# WINDOWS REQUIREMENTS + +# Check inno setup +if ls isetup-*.exe &> /dev/null; then + echo "Inno setup installer found" +else + echo "Put isetup-*.exe into this directory" + exit 0 +fi + +# Check wine +if which wine > /dev/null; then + echo "Found wine" +else + echo "Install wine package" + exit 0 +fi + +# Check innoextract +if which innoextract > /dev/null; then + echo "Found Innoextract" +else + echo "Install innoextract package" + exit 0 +fi + +# LINUX REQUIREMENTS + +# Check makeself +if which makeself > /dev/null; then + echo "Found makeself" +else + echo "Install makeself package" + exit 0 +fi + +# GENERAL PREPARATION + +tar -xzf wrapper-delta-pack-*.tar.gz +mv wrapper-delta-pack-*/ wrapper/ + +# UNIVERSAL PACKAGE + +zip -j tracker-server.zip ../target/tracker-server.jar universal/README.txt + +# WINDOWS PACKAGE + +innoextract isetup-*.exe +echo "NOTE: if you got any errors here try isetup version 5.4.3 (or check what versions are supported by 'innoextract -v')" + +wine app/ISCC.exe windows/traccar.iss + +zip -j traccar-windows-32.zip windows/Output/setup.exe windows/README.txt + +rm -rf windows/Output/ +rm -rf tmp/ +rm -rf app/ + +# LINIX PACKAGE + +app='/opt/traccar' + +rm -rf out + +mkdir out +mkdir out/bin +mkdir out/conf +mkdir out/data +mkdir out/lib +mkdir out/logs + +cp wrapper/src/bin/sh.script.in out/bin/traccar +cp wrapper/lib/wrapper.jar out/lib +cp wrapper/src/conf/wrapper.conf.in out/conf/wrapper.conf + +cp ../target/tracker-server.jar out +cp ../target/lib/* out/lib +cp traccar-web.war out +cp linux/linux.cfg out/conf + +sed -i 's/@app.name@/traccar/g' out/bin/traccar +sed -i 's/@app.long.name@/traccar/g' out/bin/traccar + +sed -i '/wrapper.java.classpath.1/i\wrapper.java.classpath.2=../tracker-server.jar' out/conf/wrapper.conf +sed -i "/wrapper.app.parameter.1/i\wrapper.app.parameter.2=$app/conf/linux.cfg" out/conf/wrapper.conf +sed -i 's//org.traccar.Main/g' out/conf/wrapper.conf +sed -i 's/@app.name@/traccar/g' out/conf/wrapper.conf +sed -i 's/@app.long.name@/traccar/g' out/conf/wrapper.conf +sed -i 's/@app.description@/traccar/g' out/conf/wrapper.conf + +# linux 32 + +cp wrapper/bin/wrapper-linux-x86-32 out/bin/wrapper +cp wrapper/lib/libwrapper-linux-x86-32.so out/lib/libwrapper.so +chmod +x out/bin/traccar + +makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" +zip -j traccar-linux-32.zip traccar.run linux/README.txt + +# linux 64 + +cp wrapper/bin/wrapper-linux-x86-64 out/bin/wrapper +cp wrapper/lib/libwrapper-linux-x86-64.so out/lib/libwrapper.so +chmod +x out/bin/traccar + +makeself out traccar.run "traccar" "mkdir $app; cp -rf * $app; $app/bin/traccar install" +zip -j traccar-linux-64.zip traccar.run linux/README.txt + +rm traccar.run +rm -rf out + +# GENERAL CLEANUP + +rm -rf wrapper/ diff --git a/setup/universal/traccar.sh b/setup/universal/traccar.sh deleted file mode 100755 index 26a3078fa..000000000 --- a/setup/universal/traccar.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cp ../../target/tracker-server.jar ./ -zip tracker-server.zip tracker-server.jar README.txt -rm tracker-server.jar 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 @@ org.h2.Driver + org.h2.jdbcx.JdbcDataSource jdbc:h2:[DATABASE] sa @@ -13,59 +14,17 @@ 300 - - - 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); - - - id - Integer + id - Long imei - String <--> - SELECT id, imei + SELECT id, uniqueId as imei FROM devices; - imei - String - <--> - - INSERT INTO devices (imei) - VALUES (:imei); - - - - id - Integer - imei - String - <--> - - UPDATE devices - SET imei = :imei - WHERE id = :id; - - - - id - Integer - <--> - - DELETE FROM devices - WHERE id = :id; - - - - device_id - Integer - <--> - - SELECT * - FROM positions - WHERE device_id = :device_id - ORDER by time DESC; - - - - device_id - Integer + device_id - Long time - Date valid - Boolean latitude - Double @@ -76,13 +35,22 @@ extended_info - String (XML) <--> - 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); + + + + device_id - Long + id - Long + <--> + + UPDATE devices SET latestPosition_id = :id WHERE id = :device_id; true 8082 + [WAR] true @@ -159,5 +127,29 @@ true 5017 - + + + true + 5018 + + + true + 5019 + + + true + 5020 + + + true + 5021 + + + true + 5022 + + + true + 5023 + -- cgit v1.2.3