diff --git a/.gitignore b/.gitignore index 00818a38a..c005ef9e4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ nbactions.xml *.iml .DS_Store .checkstyle +.gradle +out +build diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..155a893a5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,83 @@ +plugins { + id "java" + id "checkstyle" +} + +repositories { + mavenCentral() +} + +sourceCompatibility = "1.8" +compileJava.options.encoding = "UTF-8" + +checkstyle { + configFile = "gradle/checkstyle.xml" as File + checkstyleTest.enabled = false +} + +ext { + jettyVersion = "9.4.14.v20181114" + jerseyVersion = "2.28" + jacksonVersion = "2.9.8" +} + +dependencies { + implementation "commons-codec:commons-codec:1.11" + implementation "com.h2database:h2:1.4.197" + implementation "mysql:mysql-connector-java:5.1.47" // bug should be fixed in 8.0.13 + implementation "org.postgresql:postgresql:42.2.5" + implementation "com.microsoft.sqlserver:mssql-jdbc:7.2.0.jre8" + implementation "com.zaxxer:HikariCP:3.3.0" + implementation "io.netty:netty-all:4.1.33.Final" + implementation "org.slf4j:slf4j-jdk14:1.7.25" + implementation "com.google.inject:guice:4.2.2" + implementation "com.google.inject.extensions:guice-assistedinject:4.2.2" + implementation "org.owasp.encoder:encoder:1.2.2" + implementation "org.glassfish:javax.json:1.1.4" + implementation "org.eclipse.jetty:jetty-server:$jettyVersion" + implementation "org.eclipse.jetty:jetty-servlet:$jettyVersion" + implementation "org.eclipse.jetty:jetty-webapp:$jettyVersion" + implementation "org.eclipse.jetty:jetty-jndi:$jettyVersion" + implementation "org.eclipse.jetty:jetty-proxy:$jettyVersion" + implementation "org.eclipse.jetty.websocket:websocket-server:$jettyVersion" + implementation "org.glassfish.jersey.containers:jersey-container-servlet:$jerseyVersion" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jerseyVersion" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr353:$jacksonVersion" + implementation "org.liquibase:liquibase-core:3.6.3" + implementation "com.sun.mail:javax.mail:1.6.2" + implementation "org.jxls:jxls:2.4.7" + implementation "org.jxls:jxls-poi:1.0.16" + implementation "org.apache.velocity:velocity:1.7" + implementation "org.apache.velocity:velocity-tools:2.0" + implementation "org.apache.commons:commons-collections4:4.2" + implementation "org.mnode.ical4j:ical4j:2.0.5" // needs upgrade + implementation "com.fizzed:ch-smpp:6.0.0-netty4-beta-3" + implementation "net.java.dev.jna:jna-platform:5.2.0" + implementation "com.github.jnr:jnr-posix:3.0.49" + implementation "javax.xml.bind:jaxb-api:2.3.1" + implementation "com.sun.xml.bind:jaxb-core:2.3.0.1" + implementation "com.sun.xml.bind:jaxb-impl:2.3.2" + implementation "javax.activation:activation:1.1.1" + testImplementation "junit:junit:4.12" +} + +task copyDependencies(type: Copy) { + into "$projectDir/target/lib" + from configurations.runtimeClasspath +} +task copyBinary(type: Copy) { + into "$projectDir/target" + from jar +} +assemble.dependsOn(copyBinary, copyDependencies) + +jar { + manifest { + attributes( + "Main-Class": "org.traccar.Main", + "Implementation-Version": "4.3", + "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" ")) + } +} diff --git a/checkstyle.xml b/gradle/checkstyle.xml similarity index 100% rename from checkstyle.xml rename to gradle/checkstyle.xml diff --git a/findbugs.xml b/gradle/findbugs.xml similarity index 100% rename from findbugs.xml rename to gradle/findbugs.xml diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..5c2d1cf01 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..b8a51fe20 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..b0d6d0ab5 --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..9991c5032 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml index 9a5abbd84..b9f5965f7 100644 --- a/pom.xml +++ b/pom.xml @@ -224,23 +224,13 @@ tracker-server target/classes - src - test - - - src - - **/*.java - - - maven-checkstyle-plugin 3.0.0 - checkstyle.xml + gradle/checkstyle.xml @@ -374,7 +364,7 @@ findbugs-maven-plugin 3.0.5 - findbugs.xml + gradle/findbugs.xml diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..eccaa4cdb --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "traccar" diff --git a/src/org/traccar/BaseDataHandler.java b/src/main/java/org/traccar/BaseDataHandler.java similarity index 100% rename from src/org/traccar/BaseDataHandler.java rename to src/main/java/org/traccar/BaseDataHandler.java diff --git a/src/org/traccar/BaseFrameDecoder.java b/src/main/java/org/traccar/BaseFrameDecoder.java similarity index 100% rename from src/org/traccar/BaseFrameDecoder.java rename to src/main/java/org/traccar/BaseFrameDecoder.java diff --git a/src/org/traccar/BaseHttpProtocolDecoder.java b/src/main/java/org/traccar/BaseHttpProtocolDecoder.java similarity index 100% rename from src/org/traccar/BaseHttpProtocolDecoder.java rename to src/main/java/org/traccar/BaseHttpProtocolDecoder.java diff --git a/src/org/traccar/BasePipelineFactory.java b/src/main/java/org/traccar/BasePipelineFactory.java similarity index 100% rename from src/org/traccar/BasePipelineFactory.java rename to src/main/java/org/traccar/BasePipelineFactory.java diff --git a/src/org/traccar/BaseProtocol.java b/src/main/java/org/traccar/BaseProtocol.java similarity index 100% rename from src/org/traccar/BaseProtocol.java rename to src/main/java/org/traccar/BaseProtocol.java diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java similarity index 100% rename from src/org/traccar/BaseProtocolDecoder.java rename to src/main/java/org/traccar/BaseProtocolDecoder.java diff --git a/src/org/traccar/BaseProtocolEncoder.java b/src/main/java/org/traccar/BaseProtocolEncoder.java similarity index 100% rename from src/org/traccar/BaseProtocolEncoder.java rename to src/main/java/org/traccar/BaseProtocolEncoder.java diff --git a/src/org/traccar/CharacterDelimiterFrameDecoder.java b/src/main/java/org/traccar/CharacterDelimiterFrameDecoder.java similarity index 100% rename from src/org/traccar/CharacterDelimiterFrameDecoder.java rename to src/main/java/org/traccar/CharacterDelimiterFrameDecoder.java diff --git a/src/org/traccar/Context.java b/src/main/java/org/traccar/Context.java similarity index 100% rename from src/org/traccar/Context.java rename to src/main/java/org/traccar/Context.java diff --git a/src/org/traccar/DeviceSession.java b/src/main/java/org/traccar/DeviceSession.java similarity index 100% rename from src/org/traccar/DeviceSession.java rename to src/main/java/org/traccar/DeviceSession.java diff --git a/src/org/traccar/EventLoopGroupFactory.java b/src/main/java/org/traccar/EventLoopGroupFactory.java similarity index 100% rename from src/org/traccar/EventLoopGroupFactory.java rename to src/main/java/org/traccar/EventLoopGroupFactory.java diff --git a/src/org/traccar/ExtendedObjectDecoder.java b/src/main/java/org/traccar/ExtendedObjectDecoder.java similarity index 100% rename from src/org/traccar/ExtendedObjectDecoder.java rename to src/main/java/org/traccar/ExtendedObjectDecoder.java diff --git a/src/org/traccar/GlobalTimer.java b/src/main/java/org/traccar/GlobalTimer.java similarity index 100% rename from src/org/traccar/GlobalTimer.java rename to src/main/java/org/traccar/GlobalTimer.java diff --git a/src/org/traccar/Main.java b/src/main/java/org/traccar/Main.java similarity index 100% rename from src/org/traccar/Main.java rename to src/main/java/org/traccar/Main.java diff --git a/src/org/traccar/MainEventHandler.java b/src/main/java/org/traccar/MainEventHandler.java similarity index 100% rename from src/org/traccar/MainEventHandler.java rename to src/main/java/org/traccar/MainEventHandler.java diff --git a/src/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java similarity index 100% rename from src/org/traccar/MainModule.java rename to src/main/java/org/traccar/MainModule.java diff --git a/src/org/traccar/NetworkMessage.java b/src/main/java/org/traccar/NetworkMessage.java similarity index 100% rename from src/org/traccar/NetworkMessage.java rename to src/main/java/org/traccar/NetworkMessage.java diff --git a/src/org/traccar/PipelineBuilder.java b/src/main/java/org/traccar/PipelineBuilder.java similarity index 100% rename from src/org/traccar/PipelineBuilder.java rename to src/main/java/org/traccar/PipelineBuilder.java diff --git a/src/org/traccar/Protocol.java b/src/main/java/org/traccar/Protocol.java similarity index 100% rename from src/org/traccar/Protocol.java rename to src/main/java/org/traccar/Protocol.java diff --git a/src/org/traccar/ServerManager.java b/src/main/java/org/traccar/ServerManager.java similarity index 100% rename from src/org/traccar/ServerManager.java rename to src/main/java/org/traccar/ServerManager.java diff --git a/src/org/traccar/StringProtocolEncoder.java b/src/main/java/org/traccar/StringProtocolEncoder.java similarity index 100% rename from src/org/traccar/StringProtocolEncoder.java rename to src/main/java/org/traccar/StringProtocolEncoder.java diff --git a/src/org/traccar/TrackerServer.java b/src/main/java/org/traccar/TrackerServer.java similarity index 100% rename from src/org/traccar/TrackerServer.java rename to src/main/java/org/traccar/TrackerServer.java diff --git a/src/org/traccar/WebDataHandler.java b/src/main/java/org/traccar/WebDataHandler.java similarity index 100% rename from src/org/traccar/WebDataHandler.java rename to src/main/java/org/traccar/WebDataHandler.java diff --git a/src/org/traccar/WindowsService.java b/src/main/java/org/traccar/WindowsService.java similarity index 100% rename from src/org/traccar/WindowsService.java rename to src/main/java/org/traccar/WindowsService.java diff --git a/src/org/traccar/WrapperContext.java b/src/main/java/org/traccar/WrapperContext.java similarity index 100% rename from src/org/traccar/WrapperContext.java rename to src/main/java/org/traccar/WrapperContext.java diff --git a/src/org/traccar/WrapperInboundHandler.java b/src/main/java/org/traccar/WrapperInboundHandler.java similarity index 100% rename from src/org/traccar/WrapperInboundHandler.java rename to src/main/java/org/traccar/WrapperInboundHandler.java diff --git a/src/org/traccar/WrapperOutboundHandler.java b/src/main/java/org/traccar/WrapperOutboundHandler.java similarity index 100% rename from src/org/traccar/WrapperOutboundHandler.java rename to src/main/java/org/traccar/WrapperOutboundHandler.java diff --git a/src/org/traccar/api/AsyncSocket.java b/src/main/java/org/traccar/api/AsyncSocket.java similarity index 100% rename from src/org/traccar/api/AsyncSocket.java rename to src/main/java/org/traccar/api/AsyncSocket.java diff --git a/src/org/traccar/api/AsyncSocketServlet.java b/src/main/java/org/traccar/api/AsyncSocketServlet.java similarity index 100% rename from src/org/traccar/api/AsyncSocketServlet.java rename to src/main/java/org/traccar/api/AsyncSocketServlet.java diff --git a/src/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java similarity index 100% rename from src/org/traccar/api/BaseObjectResource.java rename to src/main/java/org/traccar/api/BaseObjectResource.java diff --git a/src/org/traccar/api/BaseResource.java b/src/main/java/org/traccar/api/BaseResource.java similarity index 100% rename from src/org/traccar/api/BaseResource.java rename to src/main/java/org/traccar/api/BaseResource.java diff --git a/src/org/traccar/api/CorsResponseFilter.java b/src/main/java/org/traccar/api/CorsResponseFilter.java similarity index 100% rename from src/org/traccar/api/CorsResponseFilter.java rename to src/main/java/org/traccar/api/CorsResponseFilter.java diff --git a/src/org/traccar/api/ExtendedObjectResource.java b/src/main/java/org/traccar/api/ExtendedObjectResource.java similarity index 100% rename from src/org/traccar/api/ExtendedObjectResource.java rename to src/main/java/org/traccar/api/ExtendedObjectResource.java diff --git a/src/org/traccar/api/MediaFilter.java b/src/main/java/org/traccar/api/MediaFilter.java similarity index 100% rename from src/org/traccar/api/MediaFilter.java rename to src/main/java/org/traccar/api/MediaFilter.java diff --git a/src/org/traccar/api/ObjectMapperProvider.java b/src/main/java/org/traccar/api/ObjectMapperProvider.java similarity index 100% rename from src/org/traccar/api/ObjectMapperProvider.java rename to src/main/java/org/traccar/api/ObjectMapperProvider.java diff --git a/src/org/traccar/api/ResourceErrorHandler.java b/src/main/java/org/traccar/api/ResourceErrorHandler.java similarity index 100% rename from src/org/traccar/api/ResourceErrorHandler.java rename to src/main/java/org/traccar/api/ResourceErrorHandler.java diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/main/java/org/traccar/api/SecurityRequestFilter.java similarity index 100% rename from src/org/traccar/api/SecurityRequestFilter.java rename to src/main/java/org/traccar/api/SecurityRequestFilter.java diff --git a/src/org/traccar/api/SimpleObjectResource.java b/src/main/java/org/traccar/api/SimpleObjectResource.java similarity index 100% rename from src/org/traccar/api/SimpleObjectResource.java rename to src/main/java/org/traccar/api/SimpleObjectResource.java diff --git a/src/org/traccar/api/UserPrincipal.java b/src/main/java/org/traccar/api/UserPrincipal.java similarity index 100% rename from src/org/traccar/api/UserPrincipal.java rename to src/main/java/org/traccar/api/UserPrincipal.java diff --git a/src/org/traccar/api/UserSecurityContext.java b/src/main/java/org/traccar/api/UserSecurityContext.java similarity index 100% rename from src/org/traccar/api/UserSecurityContext.java rename to src/main/java/org/traccar/api/UserSecurityContext.java diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/main/java/org/traccar/api/resource/AttributeResource.java similarity index 100% rename from src/org/traccar/api/resource/AttributeResource.java rename to src/main/java/org/traccar/api/resource/AttributeResource.java diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/main/java/org/traccar/api/resource/CalendarResource.java similarity index 100% rename from src/org/traccar/api/resource/CalendarResource.java rename to src/main/java/org/traccar/api/resource/CalendarResource.java diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/main/java/org/traccar/api/resource/CommandResource.java similarity index 100% rename from src/org/traccar/api/resource/CommandResource.java rename to src/main/java/org/traccar/api/resource/CommandResource.java diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/main/java/org/traccar/api/resource/DeviceResource.java similarity index 100% rename from src/org/traccar/api/resource/DeviceResource.java rename to src/main/java/org/traccar/api/resource/DeviceResource.java diff --git a/src/org/traccar/api/resource/DriverResource.java b/src/main/java/org/traccar/api/resource/DriverResource.java similarity index 100% rename from src/org/traccar/api/resource/DriverResource.java rename to src/main/java/org/traccar/api/resource/DriverResource.java diff --git a/src/org/traccar/api/resource/EventResource.java b/src/main/java/org/traccar/api/resource/EventResource.java similarity index 100% rename from src/org/traccar/api/resource/EventResource.java rename to src/main/java/org/traccar/api/resource/EventResource.java diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/main/java/org/traccar/api/resource/GeofenceResource.java similarity index 100% rename from src/org/traccar/api/resource/GeofenceResource.java rename to src/main/java/org/traccar/api/resource/GeofenceResource.java diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/main/java/org/traccar/api/resource/GroupResource.java similarity index 100% rename from src/org/traccar/api/resource/GroupResource.java rename to src/main/java/org/traccar/api/resource/GroupResource.java diff --git a/src/org/traccar/api/resource/MaintenanceResource.java b/src/main/java/org/traccar/api/resource/MaintenanceResource.java similarity index 100% rename from src/org/traccar/api/resource/MaintenanceResource.java rename to src/main/java/org/traccar/api/resource/MaintenanceResource.java diff --git a/src/org/traccar/api/resource/NotificationResource.java b/src/main/java/org/traccar/api/resource/NotificationResource.java similarity index 100% rename from src/org/traccar/api/resource/NotificationResource.java rename to src/main/java/org/traccar/api/resource/NotificationResource.java diff --git a/src/org/traccar/api/resource/PermissionsResource.java b/src/main/java/org/traccar/api/resource/PermissionsResource.java similarity index 100% rename from src/org/traccar/api/resource/PermissionsResource.java rename to src/main/java/org/traccar/api/resource/PermissionsResource.java diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/main/java/org/traccar/api/resource/PositionResource.java similarity index 100% rename from src/org/traccar/api/resource/PositionResource.java rename to src/main/java/org/traccar/api/resource/PositionResource.java diff --git a/src/org/traccar/api/resource/ReportResource.java b/src/main/java/org/traccar/api/resource/ReportResource.java similarity index 100% rename from src/org/traccar/api/resource/ReportResource.java rename to src/main/java/org/traccar/api/resource/ReportResource.java diff --git a/src/org/traccar/api/resource/ServerResource.java b/src/main/java/org/traccar/api/resource/ServerResource.java similarity index 100% rename from src/org/traccar/api/resource/ServerResource.java rename to src/main/java/org/traccar/api/resource/ServerResource.java diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/main/java/org/traccar/api/resource/SessionResource.java similarity index 100% rename from src/org/traccar/api/resource/SessionResource.java rename to src/main/java/org/traccar/api/resource/SessionResource.java diff --git a/src/org/traccar/api/resource/StatisticsResource.java b/src/main/java/org/traccar/api/resource/StatisticsResource.java similarity index 100% rename from src/org/traccar/api/resource/StatisticsResource.java rename to src/main/java/org/traccar/api/resource/StatisticsResource.java diff --git a/src/org/traccar/api/resource/UserResource.java b/src/main/java/org/traccar/api/resource/UserResource.java similarity index 100% rename from src/org/traccar/api/resource/UserResource.java rename to src/main/java/org/traccar/api/resource/UserResource.java diff --git a/src/org/traccar/config/Config.java b/src/main/java/org/traccar/config/Config.java similarity index 100% rename from src/org/traccar/config/Config.java rename to src/main/java/org/traccar/config/Config.java diff --git a/src/org/traccar/config/ConfigKey.java b/src/main/java/org/traccar/config/ConfigKey.java similarity index 100% rename from src/org/traccar/config/ConfigKey.java rename to src/main/java/org/traccar/config/ConfigKey.java diff --git a/src/org/traccar/config/ConfigSuffix.java b/src/main/java/org/traccar/config/ConfigSuffix.java similarity index 100% rename from src/org/traccar/config/ConfigSuffix.java rename to src/main/java/org/traccar/config/ConfigSuffix.java diff --git a/src/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java similarity index 100% rename from src/org/traccar/config/Keys.java rename to src/main/java/org/traccar/config/Keys.java diff --git a/src/org/traccar/database/ActiveDevice.java b/src/main/java/org/traccar/database/ActiveDevice.java similarity index 100% rename from src/org/traccar/database/ActiveDevice.java rename to src/main/java/org/traccar/database/ActiveDevice.java diff --git a/src/org/traccar/database/AttributesManager.java b/src/main/java/org/traccar/database/AttributesManager.java similarity index 100% rename from src/org/traccar/database/AttributesManager.java rename to src/main/java/org/traccar/database/AttributesManager.java diff --git a/src/org/traccar/database/BaseObjectManager.java b/src/main/java/org/traccar/database/BaseObjectManager.java similarity index 100% rename from src/org/traccar/database/BaseObjectManager.java rename to src/main/java/org/traccar/database/BaseObjectManager.java diff --git a/src/org/traccar/database/CalendarManager.java b/src/main/java/org/traccar/database/CalendarManager.java similarity index 100% rename from src/org/traccar/database/CalendarManager.java rename to src/main/java/org/traccar/database/CalendarManager.java diff --git a/src/org/traccar/database/CommandsManager.java b/src/main/java/org/traccar/database/CommandsManager.java similarity index 100% rename from src/org/traccar/database/CommandsManager.java rename to src/main/java/org/traccar/database/CommandsManager.java diff --git a/src/org/traccar/database/ConnectionManager.java b/src/main/java/org/traccar/database/ConnectionManager.java similarity index 100% rename from src/org/traccar/database/ConnectionManager.java rename to src/main/java/org/traccar/database/ConnectionManager.java diff --git a/src/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java similarity index 100% rename from src/org/traccar/database/DataManager.java rename to src/main/java/org/traccar/database/DataManager.java diff --git a/src/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java similarity index 100% rename from src/org/traccar/database/DeviceManager.java rename to src/main/java/org/traccar/database/DeviceManager.java diff --git a/src/org/traccar/database/DriversManager.java b/src/main/java/org/traccar/database/DriversManager.java similarity index 100% rename from src/org/traccar/database/DriversManager.java rename to src/main/java/org/traccar/database/DriversManager.java diff --git a/src/org/traccar/database/ExtendedObjectManager.java b/src/main/java/org/traccar/database/ExtendedObjectManager.java similarity index 100% rename from src/org/traccar/database/ExtendedObjectManager.java rename to src/main/java/org/traccar/database/ExtendedObjectManager.java diff --git a/src/org/traccar/database/GeofenceManager.java b/src/main/java/org/traccar/database/GeofenceManager.java similarity index 100% rename from src/org/traccar/database/GeofenceManager.java rename to src/main/java/org/traccar/database/GeofenceManager.java diff --git a/src/org/traccar/database/GroupTree.java b/src/main/java/org/traccar/database/GroupTree.java similarity index 100% rename from src/org/traccar/database/GroupTree.java rename to src/main/java/org/traccar/database/GroupTree.java diff --git a/src/org/traccar/database/GroupsManager.java b/src/main/java/org/traccar/database/GroupsManager.java similarity index 100% rename from src/org/traccar/database/GroupsManager.java rename to src/main/java/org/traccar/database/GroupsManager.java diff --git a/src/org/traccar/database/IdentityManager.java b/src/main/java/org/traccar/database/IdentityManager.java similarity index 100% rename from src/org/traccar/database/IdentityManager.java rename to src/main/java/org/traccar/database/IdentityManager.java diff --git a/src/org/traccar/database/LdapProvider.java b/src/main/java/org/traccar/database/LdapProvider.java similarity index 100% rename from src/org/traccar/database/LdapProvider.java rename to src/main/java/org/traccar/database/LdapProvider.java diff --git a/src/org/traccar/database/MailManager.java b/src/main/java/org/traccar/database/MailManager.java similarity index 100% rename from src/org/traccar/database/MailManager.java rename to src/main/java/org/traccar/database/MailManager.java diff --git a/src/org/traccar/database/MaintenancesManager.java b/src/main/java/org/traccar/database/MaintenancesManager.java similarity index 100% rename from src/org/traccar/database/MaintenancesManager.java rename to src/main/java/org/traccar/database/MaintenancesManager.java diff --git a/src/org/traccar/database/ManagableObjects.java b/src/main/java/org/traccar/database/ManagableObjects.java similarity index 100% rename from src/org/traccar/database/ManagableObjects.java rename to src/main/java/org/traccar/database/ManagableObjects.java diff --git a/src/org/traccar/database/MediaManager.java b/src/main/java/org/traccar/database/MediaManager.java similarity index 100% rename from src/org/traccar/database/MediaManager.java rename to src/main/java/org/traccar/database/MediaManager.java diff --git a/src/org/traccar/database/NotificationManager.java b/src/main/java/org/traccar/database/NotificationManager.java similarity index 100% rename from src/org/traccar/database/NotificationManager.java rename to src/main/java/org/traccar/database/NotificationManager.java diff --git a/src/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java similarity index 100% rename from src/org/traccar/database/PermissionsManager.java rename to src/main/java/org/traccar/database/PermissionsManager.java diff --git a/src/org/traccar/database/QueryBuilder.java b/src/main/java/org/traccar/database/QueryBuilder.java similarity index 100% rename from src/org/traccar/database/QueryBuilder.java rename to src/main/java/org/traccar/database/QueryBuilder.java diff --git a/src/org/traccar/database/QueryExtended.java b/src/main/java/org/traccar/database/QueryExtended.java similarity index 100% rename from src/org/traccar/database/QueryExtended.java rename to src/main/java/org/traccar/database/QueryExtended.java diff --git a/src/org/traccar/database/QueryIgnore.java b/src/main/java/org/traccar/database/QueryIgnore.java similarity index 100% rename from src/org/traccar/database/QueryIgnore.java rename to src/main/java/org/traccar/database/QueryIgnore.java diff --git a/src/org/traccar/database/SimpleObjectManager.java b/src/main/java/org/traccar/database/SimpleObjectManager.java similarity index 100% rename from src/org/traccar/database/SimpleObjectManager.java rename to src/main/java/org/traccar/database/SimpleObjectManager.java diff --git a/src/org/traccar/database/StatisticsManager.java b/src/main/java/org/traccar/database/StatisticsManager.java similarity index 100% rename from src/org/traccar/database/StatisticsManager.java rename to src/main/java/org/traccar/database/StatisticsManager.java diff --git a/src/org/traccar/database/UsersManager.java b/src/main/java/org/traccar/database/UsersManager.java similarity index 100% rename from src/org/traccar/database/UsersManager.java rename to src/main/java/org/traccar/database/UsersManager.java diff --git a/src/org/traccar/geocoder/Address.java b/src/main/java/org/traccar/geocoder/Address.java similarity index 100% rename from src/org/traccar/geocoder/Address.java rename to src/main/java/org/traccar/geocoder/Address.java diff --git a/src/org/traccar/geocoder/AddressFormat.java b/src/main/java/org/traccar/geocoder/AddressFormat.java similarity index 100% rename from src/org/traccar/geocoder/AddressFormat.java rename to src/main/java/org/traccar/geocoder/AddressFormat.java diff --git a/src/org/traccar/geocoder/BanGeocoder.java b/src/main/java/org/traccar/geocoder/BanGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/BanGeocoder.java rename to src/main/java/org/traccar/geocoder/BanGeocoder.java diff --git a/src/org/traccar/geocoder/BingMapsGeocoder.java b/src/main/java/org/traccar/geocoder/BingMapsGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/BingMapsGeocoder.java rename to src/main/java/org/traccar/geocoder/BingMapsGeocoder.java diff --git a/src/org/traccar/geocoder/FactualGeocoder.java b/src/main/java/org/traccar/geocoder/FactualGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/FactualGeocoder.java rename to src/main/java/org/traccar/geocoder/FactualGeocoder.java diff --git a/src/org/traccar/geocoder/GeocodeFarmGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeFarmGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/GeocodeFarmGeocoder.java rename to src/main/java/org/traccar/geocoder/GeocodeFarmGeocoder.java diff --git a/src/org/traccar/geocoder/GeocodeXyzGeocoder.java b/src/main/java/org/traccar/geocoder/GeocodeXyzGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/GeocodeXyzGeocoder.java rename to src/main/java/org/traccar/geocoder/GeocodeXyzGeocoder.java diff --git a/src/org/traccar/geocoder/Geocoder.java b/src/main/java/org/traccar/geocoder/Geocoder.java similarity index 100% rename from src/org/traccar/geocoder/Geocoder.java rename to src/main/java/org/traccar/geocoder/Geocoder.java diff --git a/src/org/traccar/geocoder/GeocoderException.java b/src/main/java/org/traccar/geocoder/GeocoderException.java similarity index 100% rename from src/org/traccar/geocoder/GeocoderException.java rename to src/main/java/org/traccar/geocoder/GeocoderException.java diff --git a/src/org/traccar/geocoder/GisgraphyGeocoder.java b/src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/GisgraphyGeocoder.java rename to src/main/java/org/traccar/geocoder/GisgraphyGeocoder.java diff --git a/src/org/traccar/geocoder/GoogleGeocoder.java b/src/main/java/org/traccar/geocoder/GoogleGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/GoogleGeocoder.java rename to src/main/java/org/traccar/geocoder/GoogleGeocoder.java diff --git a/src/org/traccar/geocoder/HereGeocoder.java b/src/main/java/org/traccar/geocoder/HereGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/HereGeocoder.java rename to src/main/java/org/traccar/geocoder/HereGeocoder.java diff --git a/src/org/traccar/geocoder/JsonGeocoder.java b/src/main/java/org/traccar/geocoder/JsonGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/JsonGeocoder.java rename to src/main/java/org/traccar/geocoder/JsonGeocoder.java diff --git a/src/org/traccar/geocoder/MapQuestGeocoder.java b/src/main/java/org/traccar/geocoder/MapQuestGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/MapQuestGeocoder.java rename to src/main/java/org/traccar/geocoder/MapQuestGeocoder.java diff --git a/src/org/traccar/geocoder/MapmyIndiaGeocoder.java b/src/main/java/org/traccar/geocoder/MapmyIndiaGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/MapmyIndiaGeocoder.java rename to src/main/java/org/traccar/geocoder/MapmyIndiaGeocoder.java diff --git a/src/org/traccar/geocoder/NominatimGeocoder.java b/src/main/java/org/traccar/geocoder/NominatimGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/NominatimGeocoder.java rename to src/main/java/org/traccar/geocoder/NominatimGeocoder.java diff --git a/src/org/traccar/geocoder/OpenCageGeocoder.java b/src/main/java/org/traccar/geocoder/OpenCageGeocoder.java similarity index 100% rename from src/org/traccar/geocoder/OpenCageGeocoder.java rename to src/main/java/org/traccar/geocoder/OpenCageGeocoder.java diff --git a/src/org/traccar/geofence/GeofenceCircle.java b/src/main/java/org/traccar/geofence/GeofenceCircle.java similarity index 100% rename from src/org/traccar/geofence/GeofenceCircle.java rename to src/main/java/org/traccar/geofence/GeofenceCircle.java diff --git a/src/org/traccar/geofence/GeofenceGeometry.java b/src/main/java/org/traccar/geofence/GeofenceGeometry.java similarity index 100% rename from src/org/traccar/geofence/GeofenceGeometry.java rename to src/main/java/org/traccar/geofence/GeofenceGeometry.java diff --git a/src/org/traccar/geofence/GeofencePolygon.java b/src/main/java/org/traccar/geofence/GeofencePolygon.java similarity index 100% rename from src/org/traccar/geofence/GeofencePolygon.java rename to src/main/java/org/traccar/geofence/GeofencePolygon.java diff --git a/src/org/traccar/geofence/GeofencePolyline.java b/src/main/java/org/traccar/geofence/GeofencePolyline.java similarity index 100% rename from src/org/traccar/geofence/GeofencePolyline.java rename to src/main/java/org/traccar/geofence/GeofencePolyline.java diff --git a/src/org/traccar/geolocation/GeolocationException.java b/src/main/java/org/traccar/geolocation/GeolocationException.java similarity index 100% rename from src/org/traccar/geolocation/GeolocationException.java rename to src/main/java/org/traccar/geolocation/GeolocationException.java diff --git a/src/org/traccar/geolocation/GeolocationProvider.java b/src/main/java/org/traccar/geolocation/GeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/GeolocationProvider.java rename to src/main/java/org/traccar/geolocation/GeolocationProvider.java diff --git a/src/org/traccar/geolocation/GoogleGeolocationProvider.java b/src/main/java/org/traccar/geolocation/GoogleGeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/GoogleGeolocationProvider.java rename to src/main/java/org/traccar/geolocation/GoogleGeolocationProvider.java diff --git a/src/org/traccar/geolocation/MozillaGeolocationProvider.java b/src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/MozillaGeolocationProvider.java rename to src/main/java/org/traccar/geolocation/MozillaGeolocationProvider.java diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java rename to src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java diff --git a/src/org/traccar/geolocation/UniversalGeolocationProvider.java b/src/main/java/org/traccar/geolocation/UniversalGeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/UniversalGeolocationProvider.java rename to src/main/java/org/traccar/geolocation/UniversalGeolocationProvider.java diff --git a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java b/src/main/java/org/traccar/geolocation/UnwiredGeolocationProvider.java similarity index 100% rename from src/org/traccar/geolocation/UnwiredGeolocationProvider.java rename to src/main/java/org/traccar/geolocation/UnwiredGeolocationProvider.java diff --git a/src/org/traccar/handler/ComputedAttributesHandler.java b/src/main/java/org/traccar/handler/ComputedAttributesHandler.java similarity index 100% rename from src/org/traccar/handler/ComputedAttributesHandler.java rename to src/main/java/org/traccar/handler/ComputedAttributesHandler.java diff --git a/src/org/traccar/handler/CopyAttributesHandler.java b/src/main/java/org/traccar/handler/CopyAttributesHandler.java similarity index 100% rename from src/org/traccar/handler/CopyAttributesHandler.java rename to src/main/java/org/traccar/handler/CopyAttributesHandler.java diff --git a/src/org/traccar/handler/DefaultDataHandler.java b/src/main/java/org/traccar/handler/DefaultDataHandler.java similarity index 100% rename from src/org/traccar/handler/DefaultDataHandler.java rename to src/main/java/org/traccar/handler/DefaultDataHandler.java diff --git a/src/org/traccar/handler/DistanceHandler.java b/src/main/java/org/traccar/handler/DistanceHandler.java similarity index 100% rename from src/org/traccar/handler/DistanceHandler.java rename to src/main/java/org/traccar/handler/DistanceHandler.java diff --git a/src/org/traccar/handler/EngineHoursHandler.java b/src/main/java/org/traccar/handler/EngineHoursHandler.java similarity index 100% rename from src/org/traccar/handler/EngineHoursHandler.java rename to src/main/java/org/traccar/handler/EngineHoursHandler.java diff --git a/src/org/traccar/handler/FilterHandler.java b/src/main/java/org/traccar/handler/FilterHandler.java similarity index 100% rename from src/org/traccar/handler/FilterHandler.java rename to src/main/java/org/traccar/handler/FilterHandler.java diff --git a/src/org/traccar/handler/GeocoderHandler.java b/src/main/java/org/traccar/handler/GeocoderHandler.java similarity index 100% rename from src/org/traccar/handler/GeocoderHandler.java rename to src/main/java/org/traccar/handler/GeocoderHandler.java diff --git a/src/org/traccar/handler/GeolocationHandler.java b/src/main/java/org/traccar/handler/GeolocationHandler.java similarity index 100% rename from src/org/traccar/handler/GeolocationHandler.java rename to src/main/java/org/traccar/handler/GeolocationHandler.java diff --git a/src/org/traccar/handler/HemisphereHandler.java b/src/main/java/org/traccar/handler/HemisphereHandler.java similarity index 100% rename from src/org/traccar/handler/HemisphereHandler.java rename to src/main/java/org/traccar/handler/HemisphereHandler.java diff --git a/src/org/traccar/handler/MotionHandler.java b/src/main/java/org/traccar/handler/MotionHandler.java similarity index 100% rename from src/org/traccar/handler/MotionHandler.java rename to src/main/java/org/traccar/handler/MotionHandler.java diff --git a/src/org/traccar/handler/NetworkMessageHandler.java b/src/main/java/org/traccar/handler/NetworkMessageHandler.java similarity index 100% rename from src/org/traccar/handler/NetworkMessageHandler.java rename to src/main/java/org/traccar/handler/NetworkMessageHandler.java diff --git a/src/org/traccar/handler/OpenChannelHandler.java b/src/main/java/org/traccar/handler/OpenChannelHandler.java similarity index 100% rename from src/org/traccar/handler/OpenChannelHandler.java rename to src/main/java/org/traccar/handler/OpenChannelHandler.java diff --git a/src/org/traccar/handler/RemoteAddressHandler.java b/src/main/java/org/traccar/handler/RemoteAddressHandler.java similarity index 100% rename from src/org/traccar/handler/RemoteAddressHandler.java rename to src/main/java/org/traccar/handler/RemoteAddressHandler.java diff --git a/src/org/traccar/handler/StandardLoggingHandler.java b/src/main/java/org/traccar/handler/StandardLoggingHandler.java similarity index 100% rename from src/org/traccar/handler/StandardLoggingHandler.java rename to src/main/java/org/traccar/handler/StandardLoggingHandler.java diff --git a/src/org/traccar/handler/events/AlertEventHandler.java b/src/main/java/org/traccar/handler/events/AlertEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/AlertEventHandler.java rename to src/main/java/org/traccar/handler/events/AlertEventHandler.java diff --git a/src/org/traccar/handler/events/BaseEventHandler.java b/src/main/java/org/traccar/handler/events/BaseEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/BaseEventHandler.java rename to src/main/java/org/traccar/handler/events/BaseEventHandler.java diff --git a/src/org/traccar/handler/events/CommandResultEventHandler.java b/src/main/java/org/traccar/handler/events/CommandResultEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/CommandResultEventHandler.java rename to src/main/java/org/traccar/handler/events/CommandResultEventHandler.java diff --git a/src/org/traccar/handler/events/DriverEventHandler.java b/src/main/java/org/traccar/handler/events/DriverEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/DriverEventHandler.java rename to src/main/java/org/traccar/handler/events/DriverEventHandler.java diff --git a/src/org/traccar/handler/events/FuelDropEventHandler.java b/src/main/java/org/traccar/handler/events/FuelDropEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/FuelDropEventHandler.java rename to src/main/java/org/traccar/handler/events/FuelDropEventHandler.java diff --git a/src/org/traccar/handler/events/GeofenceEventHandler.java b/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/GeofenceEventHandler.java rename to src/main/java/org/traccar/handler/events/GeofenceEventHandler.java diff --git a/src/org/traccar/handler/events/IgnitionEventHandler.java b/src/main/java/org/traccar/handler/events/IgnitionEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/IgnitionEventHandler.java rename to src/main/java/org/traccar/handler/events/IgnitionEventHandler.java diff --git a/src/org/traccar/handler/events/MaintenanceEventHandler.java b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/MaintenanceEventHandler.java rename to src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java diff --git a/src/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/MotionEventHandler.java rename to src/main/java/org/traccar/handler/events/MotionEventHandler.java diff --git a/src/org/traccar/handler/events/OverspeedEventHandler.java b/src/main/java/org/traccar/handler/events/OverspeedEventHandler.java similarity index 100% rename from src/org/traccar/handler/events/OverspeedEventHandler.java rename to src/main/java/org/traccar/handler/events/OverspeedEventHandler.java diff --git a/src/org/traccar/helper/BcdUtil.java b/src/main/java/org/traccar/helper/BcdUtil.java similarity index 100% rename from src/org/traccar/helper/BcdUtil.java rename to src/main/java/org/traccar/helper/BcdUtil.java diff --git a/src/org/traccar/helper/BitBuffer.java b/src/main/java/org/traccar/helper/BitBuffer.java similarity index 100% rename from src/org/traccar/helper/BitBuffer.java rename to src/main/java/org/traccar/helper/BitBuffer.java diff --git a/src/org/traccar/helper/BitUtil.java b/src/main/java/org/traccar/helper/BitUtil.java similarity index 100% rename from src/org/traccar/helper/BitUtil.java rename to src/main/java/org/traccar/helper/BitUtil.java diff --git a/src/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java similarity index 100% rename from src/org/traccar/helper/BufferUtil.java rename to src/main/java/org/traccar/helper/BufferUtil.java diff --git a/src/org/traccar/helper/Checksum.java b/src/main/java/org/traccar/helper/Checksum.java similarity index 100% rename from src/org/traccar/helper/Checksum.java rename to src/main/java/org/traccar/helper/Checksum.java diff --git a/src/org/traccar/helper/DataConverter.java b/src/main/java/org/traccar/helper/DataConverter.java similarity index 100% rename from src/org/traccar/helper/DataConverter.java rename to src/main/java/org/traccar/helper/DataConverter.java diff --git a/src/org/traccar/helper/DateBuilder.java b/src/main/java/org/traccar/helper/DateBuilder.java similarity index 100% rename from src/org/traccar/helper/DateBuilder.java rename to src/main/java/org/traccar/helper/DateBuilder.java diff --git a/src/org/traccar/helper/DateUtil.java b/src/main/java/org/traccar/helper/DateUtil.java similarity index 100% rename from src/org/traccar/helper/DateUtil.java rename to src/main/java/org/traccar/helper/DateUtil.java diff --git a/src/org/traccar/helper/DistanceCalculator.java b/src/main/java/org/traccar/helper/DistanceCalculator.java similarity index 100% rename from src/org/traccar/helper/DistanceCalculator.java rename to src/main/java/org/traccar/helper/DistanceCalculator.java diff --git a/src/org/traccar/helper/Hashing.java b/src/main/java/org/traccar/helper/Hashing.java similarity index 100% rename from src/org/traccar/helper/Hashing.java rename to src/main/java/org/traccar/helper/Hashing.java diff --git a/src/org/traccar/helper/LocationTree.java b/src/main/java/org/traccar/helper/LocationTree.java similarity index 100% rename from src/org/traccar/helper/LocationTree.java rename to src/main/java/org/traccar/helper/LocationTree.java diff --git a/src/org/traccar/helper/Log.java b/src/main/java/org/traccar/helper/Log.java similarity index 100% rename from src/org/traccar/helper/Log.java rename to src/main/java/org/traccar/helper/Log.java diff --git a/src/org/traccar/helper/LogAction.java b/src/main/java/org/traccar/helper/LogAction.java similarity index 100% rename from src/org/traccar/helper/LogAction.java rename to src/main/java/org/traccar/helper/LogAction.java diff --git a/src/org/traccar/helper/ObdDecoder.java b/src/main/java/org/traccar/helper/ObdDecoder.java similarity index 100% rename from src/org/traccar/helper/ObdDecoder.java rename to src/main/java/org/traccar/helper/ObdDecoder.java diff --git a/src/org/traccar/helper/Parser.java b/src/main/java/org/traccar/helper/Parser.java similarity index 100% rename from src/org/traccar/helper/Parser.java rename to src/main/java/org/traccar/helper/Parser.java diff --git a/src/org/traccar/helper/PatternBuilder.java b/src/main/java/org/traccar/helper/PatternBuilder.java similarity index 100% rename from src/org/traccar/helper/PatternBuilder.java rename to src/main/java/org/traccar/helper/PatternBuilder.java diff --git a/src/org/traccar/helper/PatternUtil.java b/src/main/java/org/traccar/helper/PatternUtil.java similarity index 100% rename from src/org/traccar/helper/PatternUtil.java rename to src/main/java/org/traccar/helper/PatternUtil.java diff --git a/src/org/traccar/helper/SanitizerModule.java b/src/main/java/org/traccar/helper/SanitizerModule.java similarity index 100% rename from src/org/traccar/helper/SanitizerModule.java rename to src/main/java/org/traccar/helper/SanitizerModule.java diff --git a/src/org/traccar/helper/UnitsConverter.java b/src/main/java/org/traccar/helper/UnitsConverter.java similarity index 100% rename from src/org/traccar/helper/UnitsConverter.java rename to src/main/java/org/traccar/helper/UnitsConverter.java diff --git a/src/org/traccar/model/Attribute.java b/src/main/java/org/traccar/model/Attribute.java similarity index 100% rename from src/org/traccar/model/Attribute.java rename to src/main/java/org/traccar/model/Attribute.java diff --git a/src/org/traccar/model/BaseModel.java b/src/main/java/org/traccar/model/BaseModel.java similarity index 100% rename from src/org/traccar/model/BaseModel.java rename to src/main/java/org/traccar/model/BaseModel.java diff --git a/src/org/traccar/model/Calendar.java b/src/main/java/org/traccar/model/Calendar.java similarity index 100% rename from src/org/traccar/model/Calendar.java rename to src/main/java/org/traccar/model/Calendar.java diff --git a/src/org/traccar/model/CellTower.java b/src/main/java/org/traccar/model/CellTower.java similarity index 100% rename from src/org/traccar/model/CellTower.java rename to src/main/java/org/traccar/model/CellTower.java diff --git a/src/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java similarity index 100% rename from src/org/traccar/model/Command.java rename to src/main/java/org/traccar/model/Command.java diff --git a/src/org/traccar/model/Device.java b/src/main/java/org/traccar/model/Device.java similarity index 100% rename from src/org/traccar/model/Device.java rename to src/main/java/org/traccar/model/Device.java diff --git a/src/org/traccar/model/DeviceAccumulators.java b/src/main/java/org/traccar/model/DeviceAccumulators.java similarity index 100% rename from src/org/traccar/model/DeviceAccumulators.java rename to src/main/java/org/traccar/model/DeviceAccumulators.java diff --git a/src/org/traccar/model/DeviceState.java b/src/main/java/org/traccar/model/DeviceState.java similarity index 100% rename from src/org/traccar/model/DeviceState.java rename to src/main/java/org/traccar/model/DeviceState.java diff --git a/src/org/traccar/model/Driver.java b/src/main/java/org/traccar/model/Driver.java similarity index 100% rename from src/org/traccar/model/Driver.java rename to src/main/java/org/traccar/model/Driver.java diff --git a/src/org/traccar/model/Event.java b/src/main/java/org/traccar/model/Event.java similarity index 100% rename from src/org/traccar/model/Event.java rename to src/main/java/org/traccar/model/Event.java diff --git a/src/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java similarity index 100% rename from src/org/traccar/model/ExtendedModel.java rename to src/main/java/org/traccar/model/ExtendedModel.java diff --git a/src/org/traccar/model/Geofence.java b/src/main/java/org/traccar/model/Geofence.java similarity index 100% rename from src/org/traccar/model/Geofence.java rename to src/main/java/org/traccar/model/Geofence.java diff --git a/src/org/traccar/model/Group.java b/src/main/java/org/traccar/model/Group.java similarity index 100% rename from src/org/traccar/model/Group.java rename to src/main/java/org/traccar/model/Group.java diff --git a/src/org/traccar/model/GroupedModel.java b/src/main/java/org/traccar/model/GroupedModel.java similarity index 100% rename from src/org/traccar/model/GroupedModel.java rename to src/main/java/org/traccar/model/GroupedModel.java diff --git a/src/org/traccar/model/Maintenance.java b/src/main/java/org/traccar/model/Maintenance.java similarity index 100% rename from src/org/traccar/model/Maintenance.java rename to src/main/java/org/traccar/model/Maintenance.java diff --git a/src/org/traccar/model/ManagedUser.java b/src/main/java/org/traccar/model/ManagedUser.java similarity index 100% rename from src/org/traccar/model/ManagedUser.java rename to src/main/java/org/traccar/model/ManagedUser.java diff --git a/src/org/traccar/model/Message.java b/src/main/java/org/traccar/model/Message.java similarity index 100% rename from src/org/traccar/model/Message.java rename to src/main/java/org/traccar/model/Message.java diff --git a/src/org/traccar/model/MiscFormatter.java b/src/main/java/org/traccar/model/MiscFormatter.java similarity index 100% rename from src/org/traccar/model/MiscFormatter.java rename to src/main/java/org/traccar/model/MiscFormatter.java diff --git a/src/org/traccar/model/Network.java b/src/main/java/org/traccar/model/Network.java similarity index 100% rename from src/org/traccar/model/Network.java rename to src/main/java/org/traccar/model/Network.java diff --git a/src/org/traccar/model/Notification.java b/src/main/java/org/traccar/model/Notification.java similarity index 100% rename from src/org/traccar/model/Notification.java rename to src/main/java/org/traccar/model/Notification.java diff --git a/src/org/traccar/model/Permission.java b/src/main/java/org/traccar/model/Permission.java similarity index 100% rename from src/org/traccar/model/Permission.java rename to src/main/java/org/traccar/model/Permission.java diff --git a/src/org/traccar/model/Position.java b/src/main/java/org/traccar/model/Position.java similarity index 100% rename from src/org/traccar/model/Position.java rename to src/main/java/org/traccar/model/Position.java diff --git a/src/org/traccar/model/ScheduledModel.java b/src/main/java/org/traccar/model/ScheduledModel.java similarity index 100% rename from src/org/traccar/model/ScheduledModel.java rename to src/main/java/org/traccar/model/ScheduledModel.java diff --git a/src/org/traccar/model/Server.java b/src/main/java/org/traccar/model/Server.java similarity index 100% rename from src/org/traccar/model/Server.java rename to src/main/java/org/traccar/model/Server.java diff --git a/src/org/traccar/model/Statistics.java b/src/main/java/org/traccar/model/Statistics.java similarity index 100% rename from src/org/traccar/model/Statistics.java rename to src/main/java/org/traccar/model/Statistics.java diff --git a/src/org/traccar/model/Typed.java b/src/main/java/org/traccar/model/Typed.java similarity index 100% rename from src/org/traccar/model/Typed.java rename to src/main/java/org/traccar/model/Typed.java diff --git a/src/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java similarity index 100% rename from src/org/traccar/model/User.java rename to src/main/java/org/traccar/model/User.java diff --git a/src/org/traccar/model/WifiAccessPoint.java b/src/main/java/org/traccar/model/WifiAccessPoint.java similarity index 100% rename from src/org/traccar/model/WifiAccessPoint.java rename to src/main/java/org/traccar/model/WifiAccessPoint.java diff --git a/src/org/traccar/notification/EventForwarder.java b/src/main/java/org/traccar/notification/EventForwarder.java similarity index 100% rename from src/org/traccar/notification/EventForwarder.java rename to src/main/java/org/traccar/notification/EventForwarder.java diff --git a/src/org/traccar/notification/FullMessage.java b/src/main/java/org/traccar/notification/FullMessage.java similarity index 100% rename from src/org/traccar/notification/FullMessage.java rename to src/main/java/org/traccar/notification/FullMessage.java diff --git a/src/org/traccar/notification/JsonTypeEventForwarder.java b/src/main/java/org/traccar/notification/JsonTypeEventForwarder.java similarity index 96% rename from src/org/traccar/notification/JsonTypeEventForwarder.java rename to src/main/java/org/traccar/notification/JsonTypeEventForwarder.java index fcafb964a..55d926fc8 100644 --- a/src/org/traccar/notification/JsonTypeEventForwarder.java +++ b/src/main/java/org/traccar/notification/JsonTypeEventForwarder.java @@ -1,18 +1,18 @@ -package org.traccar.notification; - -import java.util.Set; - -import org.traccar.model.Event; -import org.traccar.model.Position; - -import javax.ws.rs.client.AsyncInvoker; -import javax.ws.rs.client.Entity; - -public class JsonTypeEventForwarder extends EventForwarder { - - @Override - protected void executeRequest(Event event, Position position, Set users, AsyncInvoker invoker) { - invoker.post(Entity.json(preparePayload(event, position, users))); - } - -} +package org.traccar.notification; + +import java.util.Set; + +import org.traccar.model.Event; +import org.traccar.model.Position; + +import javax.ws.rs.client.AsyncInvoker; +import javax.ws.rs.client.Entity; + +public class JsonTypeEventForwarder extends EventForwarder { + + @Override + protected void executeRequest(Event event, Position position, Set users, AsyncInvoker invoker) { + invoker.post(Entity.json(preparePayload(event, position, users))); + } + +} diff --git a/src/org/traccar/notification/MessageException.java b/src/main/java/org/traccar/notification/MessageException.java similarity index 100% rename from src/org/traccar/notification/MessageException.java rename to src/main/java/org/traccar/notification/MessageException.java diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/main/java/org/traccar/notification/NotificationFormatter.java similarity index 100% rename from src/org/traccar/notification/NotificationFormatter.java rename to src/main/java/org/traccar/notification/NotificationFormatter.java diff --git a/src/org/traccar/notification/NotificatorManager.java b/src/main/java/org/traccar/notification/NotificatorManager.java similarity index 100% rename from src/org/traccar/notification/NotificatorManager.java rename to src/main/java/org/traccar/notification/NotificatorManager.java diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/main/java/org/traccar/notification/PropertiesProvider.java similarity index 100% rename from src/org/traccar/notification/PropertiesProvider.java rename to src/main/java/org/traccar/notification/PropertiesProvider.java diff --git a/src/org/traccar/notificators/Notificator.java b/src/main/java/org/traccar/notificators/Notificator.java similarity index 100% rename from src/org/traccar/notificators/Notificator.java rename to src/main/java/org/traccar/notificators/Notificator.java diff --git a/src/org/traccar/notificators/NotificatorFirebase.java b/src/main/java/org/traccar/notificators/NotificatorFirebase.java similarity index 100% rename from src/org/traccar/notificators/NotificatorFirebase.java rename to src/main/java/org/traccar/notificators/NotificatorFirebase.java diff --git a/src/org/traccar/notificators/NotificatorMail.java b/src/main/java/org/traccar/notificators/NotificatorMail.java similarity index 100% rename from src/org/traccar/notificators/NotificatorMail.java rename to src/main/java/org/traccar/notificators/NotificatorMail.java diff --git a/src/org/traccar/notificators/NotificatorNull.java b/src/main/java/org/traccar/notificators/NotificatorNull.java similarity index 100% rename from src/org/traccar/notificators/NotificatorNull.java rename to src/main/java/org/traccar/notificators/NotificatorNull.java diff --git a/src/org/traccar/notificators/NotificatorSms.java b/src/main/java/org/traccar/notificators/NotificatorSms.java similarity index 100% rename from src/org/traccar/notificators/NotificatorSms.java rename to src/main/java/org/traccar/notificators/NotificatorSms.java diff --git a/src/org/traccar/notificators/NotificatorWeb.java b/src/main/java/org/traccar/notificators/NotificatorWeb.java similarity index 100% rename from src/org/traccar/notificators/NotificatorWeb.java rename to src/main/java/org/traccar/notificators/NotificatorWeb.java diff --git a/src/org/traccar/protocol/AdmProtocol.java b/src/main/java/org/traccar/protocol/AdmProtocol.java similarity index 100% rename from src/org/traccar/protocol/AdmProtocol.java rename to src/main/java/org/traccar/protocol/AdmProtocol.java diff --git a/src/org/traccar/protocol/AdmProtocolDecoder.java b/src/main/java/org/traccar/protocol/AdmProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AdmProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AdmProtocolDecoder.java diff --git a/src/org/traccar/protocol/AdmProtocolEncoder.java b/src/main/java/org/traccar/protocol/AdmProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/AdmProtocolEncoder.java rename to src/main/java/org/traccar/protocol/AdmProtocolEncoder.java diff --git a/src/org/traccar/protocol/AisProtocol.java b/src/main/java/org/traccar/protocol/AisProtocol.java similarity index 100% rename from src/org/traccar/protocol/AisProtocol.java rename to src/main/java/org/traccar/protocol/AisProtocol.java diff --git a/src/org/traccar/protocol/AisProtocolDecoder.java b/src/main/java/org/traccar/protocol/AisProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AisProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AisProtocolDecoder.java diff --git a/src/org/traccar/protocol/AlematicsFrameDecoder.java b/src/main/java/org/traccar/protocol/AlematicsFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/AlematicsFrameDecoder.java rename to src/main/java/org/traccar/protocol/AlematicsFrameDecoder.java diff --git a/src/org/traccar/protocol/AlematicsProtocol.java b/src/main/java/org/traccar/protocol/AlematicsProtocol.java similarity index 100% rename from src/org/traccar/protocol/AlematicsProtocol.java rename to src/main/java/org/traccar/protocol/AlematicsProtocol.java diff --git a/src/org/traccar/protocol/AlematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/AlematicsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AlematicsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AlematicsProtocolDecoder.java diff --git a/src/org/traccar/protocol/AnytrekProtocol.java b/src/main/java/org/traccar/protocol/AnytrekProtocol.java similarity index 100% rename from src/org/traccar/protocol/AnytrekProtocol.java rename to src/main/java/org/traccar/protocol/AnytrekProtocol.java diff --git a/src/org/traccar/protocol/AnytrekProtocolDecoder.java b/src/main/java/org/traccar/protocol/AnytrekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AnytrekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AnytrekProtocolDecoder.java diff --git a/src/org/traccar/protocol/ApelProtocol.java b/src/main/java/org/traccar/protocol/ApelProtocol.java similarity index 100% rename from src/org/traccar/protocol/ApelProtocol.java rename to src/main/java/org/traccar/protocol/ApelProtocol.java diff --git a/src/org/traccar/protocol/ApelProtocolDecoder.java b/src/main/java/org/traccar/protocol/ApelProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ApelProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ApelProtocolDecoder.java diff --git a/src/org/traccar/protocol/AplicomFrameDecoder.java b/src/main/java/org/traccar/protocol/AplicomFrameDecoder.java similarity index 96% rename from src/org/traccar/protocol/AplicomFrameDecoder.java rename to src/main/java/org/traccar/protocol/AplicomFrameDecoder.java index 6e81e8202..56fca27c7 100644 --- a/src/org/traccar/protocol/AplicomFrameDecoder.java +++ b/src/main/java/org/traccar/protocol/AplicomFrameDecoder.java @@ -1,62 +1,62 @@ -/* - * Copyright 2013 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandlerContext; -import org.traccar.BaseFrameDecoder; - -public class AplicomFrameDecoder extends BaseFrameDecoder { - - @Override - protected Object decode( - ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception { - - // Skip Alive message - while (buf.isReadable() && Character.isDigit(buf.getByte(buf.readerIndex()))) { - buf.readByte(); - } - - // Check minimum length - if (buf.readableBytes() < 11) { - return null; - } - - // Read flags - int version = buf.getUnsignedByte(buf.readerIndex() + 1); - int offset = 1 + 1 + 3; - if ((version & 0x80) != 0) { - offset += 4; - } - - // Get data length - int length = buf.getUnsignedShort(buf.readerIndex() + offset); - offset += 2; - if ((version & 0x40) != 0) { - offset += 3; - } - length += offset; // add header - - // Return buffer - if (buf.readableBytes() >= length) { - return buf.readRetainedSlice(length); - } - - return null; - } - -} +/* + * Copyright 2013 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; +import org.traccar.BaseFrameDecoder; + +public class AplicomFrameDecoder extends BaseFrameDecoder { + + @Override + protected Object decode( + ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception { + + // Skip Alive message + while (buf.isReadable() && Character.isDigit(buf.getByte(buf.readerIndex()))) { + buf.readByte(); + } + + // Check minimum length + if (buf.readableBytes() < 11) { + return null; + } + + // Read flags + int version = buf.getUnsignedByte(buf.readerIndex() + 1); + int offset = 1 + 1 + 3; + if ((version & 0x80) != 0) { + offset += 4; + } + + // Get data length + int length = buf.getUnsignedShort(buf.readerIndex() + offset); + offset += 2; + if ((version & 0x40) != 0) { + offset += 3; + } + length += offset; // add header + + // Return buffer + if (buf.readableBytes() >= length) { + return buf.readRetainedSlice(length); + } + + return null; + } + +} diff --git a/src/org/traccar/protocol/AplicomProtocol.java b/src/main/java/org/traccar/protocol/AplicomProtocol.java similarity index 100% rename from src/org/traccar/protocol/AplicomProtocol.java rename to src/main/java/org/traccar/protocol/AplicomProtocol.java diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AplicomProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AplicomProtocolDecoder.java diff --git a/src/org/traccar/protocol/AppelloProtocol.java b/src/main/java/org/traccar/protocol/AppelloProtocol.java similarity index 100% rename from src/org/traccar/protocol/AppelloProtocol.java rename to src/main/java/org/traccar/protocol/AppelloProtocol.java diff --git a/src/org/traccar/protocol/AppelloProtocolDecoder.java b/src/main/java/org/traccar/protocol/AppelloProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AppelloProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AppelloProtocolDecoder.java diff --git a/src/org/traccar/protocol/AppletProtocol.java b/src/main/java/org/traccar/protocol/AppletProtocol.java similarity index 100% rename from src/org/traccar/protocol/AppletProtocol.java rename to src/main/java/org/traccar/protocol/AppletProtocol.java diff --git a/src/org/traccar/protocol/AppletProtocolDecoder.java b/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AppletProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AppletProtocolDecoder.java diff --git a/src/org/traccar/protocol/AquilaProtocol.java b/src/main/java/org/traccar/protocol/AquilaProtocol.java similarity index 100% rename from src/org/traccar/protocol/AquilaProtocol.java rename to src/main/java/org/traccar/protocol/AquilaProtocol.java diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/main/java/org/traccar/protocol/AquilaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AquilaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AquilaProtocolDecoder.java diff --git a/src/org/traccar/protocol/Ardi01Protocol.java b/src/main/java/org/traccar/protocol/Ardi01Protocol.java similarity index 100% rename from src/org/traccar/protocol/Ardi01Protocol.java rename to src/main/java/org/traccar/protocol/Ardi01Protocol.java diff --git a/src/org/traccar/protocol/Ardi01ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Ardi01ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Ardi01ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Ardi01ProtocolDecoder.java diff --git a/src/org/traccar/protocol/ArknavProtocol.java b/src/main/java/org/traccar/protocol/ArknavProtocol.java similarity index 100% rename from src/org/traccar/protocol/ArknavProtocol.java rename to src/main/java/org/traccar/protocol/ArknavProtocol.java diff --git a/src/org/traccar/protocol/ArknavProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArknavProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ArknavProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ArknavProtocolDecoder.java diff --git a/src/org/traccar/protocol/ArknavX8Protocol.java b/src/main/java/org/traccar/protocol/ArknavX8Protocol.java similarity index 100% rename from src/org/traccar/protocol/ArknavX8Protocol.java rename to src/main/java/org/traccar/protocol/ArknavX8Protocol.java diff --git a/src/org/traccar/protocol/ArknavX8ProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArknavX8ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ArknavX8ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ArknavX8ProtocolDecoder.java diff --git a/src/org/traccar/protocol/ArnaviProtocol.java b/src/main/java/org/traccar/protocol/ArnaviProtocol.java similarity index 100% rename from src/org/traccar/protocol/ArnaviProtocol.java rename to src/main/java/org/traccar/protocol/ArnaviProtocol.java diff --git a/src/org/traccar/protocol/ArnaviProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ArnaviProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ArnaviProtocolDecoder.java diff --git a/src/org/traccar/protocol/AstraProtocol.java b/src/main/java/org/traccar/protocol/AstraProtocol.java similarity index 100% rename from src/org/traccar/protocol/AstraProtocol.java rename to src/main/java/org/traccar/protocol/AstraProtocol.java diff --git a/src/org/traccar/protocol/AstraProtocolDecoder.java b/src/main/java/org/traccar/protocol/AstraProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AstraProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AstraProtocolDecoder.java diff --git a/src/org/traccar/protocol/At2000FrameDecoder.java b/src/main/java/org/traccar/protocol/At2000FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/At2000FrameDecoder.java rename to src/main/java/org/traccar/protocol/At2000FrameDecoder.java diff --git a/src/org/traccar/protocol/At2000Protocol.java b/src/main/java/org/traccar/protocol/At2000Protocol.java similarity index 100% rename from src/org/traccar/protocol/At2000Protocol.java rename to src/main/java/org/traccar/protocol/At2000Protocol.java diff --git a/src/org/traccar/protocol/At2000ProtocolDecoder.java b/src/main/java/org/traccar/protocol/At2000ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/At2000ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/At2000ProtocolDecoder.java diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/main/java/org/traccar/protocol/AtrackFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/AtrackFrameDecoder.java rename to src/main/java/org/traccar/protocol/AtrackFrameDecoder.java diff --git a/src/org/traccar/protocol/AtrackProtocol.java b/src/main/java/org/traccar/protocol/AtrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/AtrackProtocol.java rename to src/main/java/org/traccar/protocol/AtrackProtocol.java diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AtrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/AtrackProtocolEncoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/AtrackProtocolEncoder.java rename to src/main/java/org/traccar/protocol/AtrackProtocolEncoder.java diff --git a/src/org/traccar/protocol/AuroProtocol.java b/src/main/java/org/traccar/protocol/AuroProtocol.java similarity index 100% rename from src/org/traccar/protocol/AuroProtocol.java rename to src/main/java/org/traccar/protocol/AuroProtocol.java diff --git a/src/org/traccar/protocol/AuroProtocolDecoder.java b/src/main/java/org/traccar/protocol/AuroProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AuroProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AuroProtocolDecoder.java diff --git a/src/org/traccar/protocol/AustinNbProtocol.java b/src/main/java/org/traccar/protocol/AustinNbProtocol.java similarity index 100% rename from src/org/traccar/protocol/AustinNbProtocol.java rename to src/main/java/org/traccar/protocol/AustinNbProtocol.java diff --git a/src/org/traccar/protocol/AustinNbProtocolDecoder.java b/src/main/java/org/traccar/protocol/AustinNbProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AustinNbProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AustinNbProtocolDecoder.java diff --git a/src/org/traccar/protocol/AutoFonFrameDecoder.java b/src/main/java/org/traccar/protocol/AutoFonFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/AutoFonFrameDecoder.java rename to src/main/java/org/traccar/protocol/AutoFonFrameDecoder.java diff --git a/src/org/traccar/protocol/AutoFonProtocol.java b/src/main/java/org/traccar/protocol/AutoFonProtocol.java similarity index 100% rename from src/org/traccar/protocol/AutoFonProtocol.java rename to src/main/java/org/traccar/protocol/AutoFonProtocol.java diff --git a/src/org/traccar/protocol/AutoFonProtocolDecoder.java b/src/main/java/org/traccar/protocol/AutoFonProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AutoFonProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AutoFonProtocolDecoder.java diff --git a/src/org/traccar/protocol/AutoGradeProtocol.java b/src/main/java/org/traccar/protocol/AutoGradeProtocol.java similarity index 100% rename from src/org/traccar/protocol/AutoGradeProtocol.java rename to src/main/java/org/traccar/protocol/AutoGradeProtocol.java diff --git a/src/org/traccar/protocol/AutoGradeProtocolDecoder.java b/src/main/java/org/traccar/protocol/AutoGradeProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AutoGradeProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AutoGradeProtocolDecoder.java diff --git a/src/org/traccar/protocol/AutoTrackProtocol.java b/src/main/java/org/traccar/protocol/AutoTrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/AutoTrackProtocol.java rename to src/main/java/org/traccar/protocol/AutoTrackProtocol.java diff --git a/src/org/traccar/protocol/AutoTrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AutoTrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AutoTrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AutoTrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/AvemaProtocol.java b/src/main/java/org/traccar/protocol/AvemaProtocol.java similarity index 100% rename from src/org/traccar/protocol/AvemaProtocol.java rename to src/main/java/org/traccar/protocol/AvemaProtocol.java diff --git a/src/org/traccar/protocol/AvemaProtocolDecoder.java b/src/main/java/org/traccar/protocol/AvemaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/AvemaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/AvemaProtocolDecoder.java diff --git a/src/org/traccar/protocol/Avl301Protocol.java b/src/main/java/org/traccar/protocol/Avl301Protocol.java similarity index 100% rename from src/org/traccar/protocol/Avl301Protocol.java rename to src/main/java/org/traccar/protocol/Avl301Protocol.java diff --git a/src/org/traccar/protocol/Avl301ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Avl301ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Avl301ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Avl301ProtocolDecoder.java diff --git a/src/org/traccar/protocol/BceFrameDecoder.java b/src/main/java/org/traccar/protocol/BceFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/BceFrameDecoder.java rename to src/main/java/org/traccar/protocol/BceFrameDecoder.java diff --git a/src/org/traccar/protocol/BceProtocol.java b/src/main/java/org/traccar/protocol/BceProtocol.java similarity index 100% rename from src/org/traccar/protocol/BceProtocol.java rename to src/main/java/org/traccar/protocol/BceProtocol.java diff --git a/src/org/traccar/protocol/BceProtocolDecoder.java b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/BceProtocolDecoder.java rename to src/main/java/org/traccar/protocol/BceProtocolDecoder.java diff --git a/src/org/traccar/protocol/BceProtocolEncoder.java b/src/main/java/org/traccar/protocol/BceProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/BceProtocolEncoder.java rename to src/main/java/org/traccar/protocol/BceProtocolEncoder.java diff --git a/src/org/traccar/protocol/BlackKiteProtocol.java b/src/main/java/org/traccar/protocol/BlackKiteProtocol.java similarity index 100% rename from src/org/traccar/protocol/BlackKiteProtocol.java rename to src/main/java/org/traccar/protocol/BlackKiteProtocol.java diff --git a/src/org/traccar/protocol/BlackKiteProtocolDecoder.java b/src/main/java/org/traccar/protocol/BlackKiteProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/BlackKiteProtocolDecoder.java rename to src/main/java/org/traccar/protocol/BlackKiteProtocolDecoder.java diff --git a/src/org/traccar/protocol/BoxProtocol.java b/src/main/java/org/traccar/protocol/BoxProtocol.java similarity index 100% rename from src/org/traccar/protocol/BoxProtocol.java rename to src/main/java/org/traccar/protocol/BoxProtocol.java diff --git a/src/org/traccar/protocol/BoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/BoxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/BoxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/BoxProtocolDecoder.java diff --git a/src/org/traccar/protocol/C2stekProtocol.java b/src/main/java/org/traccar/protocol/C2stekProtocol.java similarity index 100% rename from src/org/traccar/protocol/C2stekProtocol.java rename to src/main/java/org/traccar/protocol/C2stekProtocol.java diff --git a/src/org/traccar/protocol/C2stekProtocolDecoder.java b/src/main/java/org/traccar/protocol/C2stekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/C2stekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/C2stekProtocolDecoder.java diff --git a/src/org/traccar/protocol/CalAmpProtocol.java b/src/main/java/org/traccar/protocol/CalAmpProtocol.java similarity index 100% rename from src/org/traccar/protocol/CalAmpProtocol.java rename to src/main/java/org/traccar/protocol/CalAmpProtocol.java diff --git a/src/org/traccar/protocol/CalAmpProtocolDecoder.java b/src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CalAmpProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CalAmpProtocolDecoder.java diff --git a/src/org/traccar/protocol/CarTrackProtocol.java b/src/main/java/org/traccar/protocol/CarTrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/CarTrackProtocol.java rename to src/main/java/org/traccar/protocol/CarTrackProtocol.java diff --git a/src/org/traccar/protocol/CarTrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/CarTrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CarTrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CarTrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/CarcellProtocol.java b/src/main/java/org/traccar/protocol/CarcellProtocol.java similarity index 100% rename from src/org/traccar/protocol/CarcellProtocol.java rename to src/main/java/org/traccar/protocol/CarcellProtocol.java diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/main/java/org/traccar/protocol/CarcellProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CarcellProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CarcellProtocolDecoder.java diff --git a/src/org/traccar/protocol/CarcellProtocolEncoder.java b/src/main/java/org/traccar/protocol/CarcellProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/CarcellProtocolEncoder.java rename to src/main/java/org/traccar/protocol/CarcellProtocolEncoder.java diff --git a/src/org/traccar/protocol/CarscopProtocol.java b/src/main/java/org/traccar/protocol/CarscopProtocol.java similarity index 100% rename from src/org/traccar/protocol/CarscopProtocol.java rename to src/main/java/org/traccar/protocol/CarscopProtocol.java diff --git a/src/org/traccar/protocol/CarscopProtocolDecoder.java b/src/main/java/org/traccar/protocol/CarscopProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CarscopProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CarscopProtocolDecoder.java diff --git a/src/org/traccar/protocol/CastelProtocol.java b/src/main/java/org/traccar/protocol/CastelProtocol.java similarity index 100% rename from src/org/traccar/protocol/CastelProtocol.java rename to src/main/java/org/traccar/protocol/CastelProtocol.java diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/main/java/org/traccar/protocol/CastelProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CastelProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CastelProtocolDecoder.java diff --git a/src/org/traccar/protocol/CastelProtocolEncoder.java b/src/main/java/org/traccar/protocol/CastelProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/CastelProtocolEncoder.java rename to src/main/java/org/traccar/protocol/CastelProtocolEncoder.java diff --git a/src/org/traccar/protocol/CautelaProtocol.java b/src/main/java/org/traccar/protocol/CautelaProtocol.java similarity index 100% rename from src/org/traccar/protocol/CautelaProtocol.java rename to src/main/java/org/traccar/protocol/CautelaProtocol.java diff --git a/src/org/traccar/protocol/CautelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/CautelaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CautelaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CautelaProtocolDecoder.java diff --git a/src/org/traccar/protocol/CellocatorFrameDecoder.java b/src/main/java/org/traccar/protocol/CellocatorFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/CellocatorFrameDecoder.java rename to src/main/java/org/traccar/protocol/CellocatorFrameDecoder.java diff --git a/src/org/traccar/protocol/CellocatorProtocol.java b/src/main/java/org/traccar/protocol/CellocatorProtocol.java similarity index 100% rename from src/org/traccar/protocol/CellocatorProtocol.java rename to src/main/java/org/traccar/protocol/CellocatorProtocol.java diff --git a/src/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CellocatorProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java diff --git a/src/org/traccar/protocol/CellocatorProtocolEncoder.java b/src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/CellocatorProtocolEncoder.java rename to src/main/java/org/traccar/protocol/CellocatorProtocolEncoder.java diff --git a/src/org/traccar/protocol/CguardProtocol.java b/src/main/java/org/traccar/protocol/CguardProtocol.java similarity index 100% rename from src/org/traccar/protocol/CguardProtocol.java rename to src/main/java/org/traccar/protocol/CguardProtocol.java diff --git a/src/org/traccar/protocol/CguardProtocolDecoder.java b/src/main/java/org/traccar/protocol/CguardProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CguardProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CguardProtocolDecoder.java diff --git a/src/org/traccar/protocol/CityeasyProtocol.java b/src/main/java/org/traccar/protocol/CityeasyProtocol.java similarity index 100% rename from src/org/traccar/protocol/CityeasyProtocol.java rename to src/main/java/org/traccar/protocol/CityeasyProtocol.java diff --git a/src/org/traccar/protocol/CityeasyProtocolDecoder.java b/src/main/java/org/traccar/protocol/CityeasyProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CityeasyProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CityeasyProtocolDecoder.java diff --git a/src/org/traccar/protocol/CityeasyProtocolEncoder.java b/src/main/java/org/traccar/protocol/CityeasyProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/CityeasyProtocolEncoder.java rename to src/main/java/org/traccar/protocol/CityeasyProtocolEncoder.java diff --git a/src/org/traccar/protocol/ContinentalProtocol.java b/src/main/java/org/traccar/protocol/ContinentalProtocol.java similarity index 100% rename from src/org/traccar/protocol/ContinentalProtocol.java rename to src/main/java/org/traccar/protocol/ContinentalProtocol.java diff --git a/src/org/traccar/protocol/ContinentalProtocolDecoder.java b/src/main/java/org/traccar/protocol/ContinentalProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ContinentalProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ContinentalProtocolDecoder.java diff --git a/src/org/traccar/protocol/CradlepointProtocol.java b/src/main/java/org/traccar/protocol/CradlepointProtocol.java similarity index 100% rename from src/org/traccar/protocol/CradlepointProtocol.java rename to src/main/java/org/traccar/protocol/CradlepointProtocol.java diff --git a/src/org/traccar/protocol/CradlepointProtocolDecoder.java b/src/main/java/org/traccar/protocol/CradlepointProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/CradlepointProtocolDecoder.java rename to src/main/java/org/traccar/protocol/CradlepointProtocolDecoder.java diff --git a/src/org/traccar/protocol/DishaProtocol.java b/src/main/java/org/traccar/protocol/DishaProtocol.java similarity index 100% rename from src/org/traccar/protocol/DishaProtocol.java rename to src/main/java/org/traccar/protocol/DishaProtocol.java diff --git a/src/org/traccar/protocol/DishaProtocolDecoder.java b/src/main/java/org/traccar/protocol/DishaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/DishaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/DishaProtocolDecoder.java diff --git a/src/org/traccar/protocol/DmtHttpProtocol.java b/src/main/java/org/traccar/protocol/DmtHttpProtocol.java similarity index 100% rename from src/org/traccar/protocol/DmtHttpProtocol.java rename to src/main/java/org/traccar/protocol/DmtHttpProtocol.java diff --git a/src/org/traccar/protocol/DmtHttpProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/DmtHttpProtocolDecoder.java rename to src/main/java/org/traccar/protocol/DmtHttpProtocolDecoder.java diff --git a/src/org/traccar/protocol/DmtProtocol.java b/src/main/java/org/traccar/protocol/DmtProtocol.java similarity index 100% rename from src/org/traccar/protocol/DmtProtocol.java rename to src/main/java/org/traccar/protocol/DmtProtocol.java diff --git a/src/org/traccar/protocol/DmtProtocolDecoder.java b/src/main/java/org/traccar/protocol/DmtProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/DmtProtocolDecoder.java rename to src/main/java/org/traccar/protocol/DmtProtocolDecoder.java diff --git a/src/org/traccar/protocol/DwayProtocol.java b/src/main/java/org/traccar/protocol/DwayProtocol.java similarity index 100% rename from src/org/traccar/protocol/DwayProtocol.java rename to src/main/java/org/traccar/protocol/DwayProtocol.java diff --git a/src/org/traccar/protocol/DwayProtocolDecoder.java b/src/main/java/org/traccar/protocol/DwayProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/DwayProtocolDecoder.java rename to src/main/java/org/traccar/protocol/DwayProtocolDecoder.java diff --git a/src/org/traccar/protocol/EasyTrackProtocol.java b/src/main/java/org/traccar/protocol/EasyTrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/EasyTrackProtocol.java rename to src/main/java/org/traccar/protocol/EasyTrackProtocol.java diff --git a/src/org/traccar/protocol/EasyTrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/EasyTrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EasyTrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EasyTrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/EelinkProtocol.java b/src/main/java/org/traccar/protocol/EelinkProtocol.java similarity index 100% rename from src/org/traccar/protocol/EelinkProtocol.java rename to src/main/java/org/traccar/protocol/EelinkProtocol.java diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EelinkProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java diff --git a/src/org/traccar/protocol/EelinkProtocolEncoder.java b/src/main/java/org/traccar/protocol/EelinkProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/EelinkProtocolEncoder.java rename to src/main/java/org/traccar/protocol/EelinkProtocolEncoder.java diff --git a/src/org/traccar/protocol/EgtsFrameDecoder.java b/src/main/java/org/traccar/protocol/EgtsFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/EgtsFrameDecoder.java rename to src/main/java/org/traccar/protocol/EgtsFrameDecoder.java diff --git a/src/org/traccar/protocol/EgtsProtocol.java b/src/main/java/org/traccar/protocol/EgtsProtocol.java similarity index 100% rename from src/org/traccar/protocol/EgtsProtocol.java rename to src/main/java/org/traccar/protocol/EgtsProtocol.java diff --git a/src/org/traccar/protocol/EgtsProtocolDecoder.java b/src/main/java/org/traccar/protocol/EgtsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EgtsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EgtsProtocolDecoder.java diff --git a/src/org/traccar/protocol/EnforaProtocol.java b/src/main/java/org/traccar/protocol/EnforaProtocol.java similarity index 100% rename from src/org/traccar/protocol/EnforaProtocol.java rename to src/main/java/org/traccar/protocol/EnforaProtocol.java diff --git a/src/org/traccar/protocol/EnforaProtocolDecoder.java b/src/main/java/org/traccar/protocol/EnforaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EnforaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EnforaProtocolDecoder.java diff --git a/src/org/traccar/protocol/EnforaProtocolEncoder.java b/src/main/java/org/traccar/protocol/EnforaProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/EnforaProtocolEncoder.java rename to src/main/java/org/traccar/protocol/EnforaProtocolEncoder.java diff --git a/src/org/traccar/protocol/EsealProtocol.java b/src/main/java/org/traccar/protocol/EsealProtocol.java similarity index 100% rename from src/org/traccar/protocol/EsealProtocol.java rename to src/main/java/org/traccar/protocol/EsealProtocol.java diff --git a/src/org/traccar/protocol/EsealProtocolDecoder.java b/src/main/java/org/traccar/protocol/EsealProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EsealProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EsealProtocolDecoder.java diff --git a/src/org/traccar/protocol/EsealProtocolEncoder.java b/src/main/java/org/traccar/protocol/EsealProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/EsealProtocolEncoder.java rename to src/main/java/org/traccar/protocol/EsealProtocolEncoder.java diff --git a/src/org/traccar/protocol/EskyFrameDecoder.java b/src/main/java/org/traccar/protocol/EskyFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/EskyFrameDecoder.java rename to src/main/java/org/traccar/protocol/EskyFrameDecoder.java diff --git a/src/org/traccar/protocol/EskyProtocol.java b/src/main/java/org/traccar/protocol/EskyProtocol.java similarity index 100% rename from src/org/traccar/protocol/EskyProtocol.java rename to src/main/java/org/traccar/protocol/EskyProtocol.java diff --git a/src/org/traccar/protocol/EskyProtocolDecoder.java b/src/main/java/org/traccar/protocol/EskyProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/EskyProtocolDecoder.java rename to src/main/java/org/traccar/protocol/EskyProtocolDecoder.java diff --git a/src/org/traccar/protocol/ExtremTracProtocol.java b/src/main/java/org/traccar/protocol/ExtremTracProtocol.java similarity index 100% rename from src/org/traccar/protocol/ExtremTracProtocol.java rename to src/main/java/org/traccar/protocol/ExtremTracProtocol.java diff --git a/src/org/traccar/protocol/ExtremTracProtocolDecoder.java b/src/main/java/org/traccar/protocol/ExtremTracProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ExtremTracProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ExtremTracProtocolDecoder.java diff --git a/src/org/traccar/protocol/FifotrackProtocol.java b/src/main/java/org/traccar/protocol/FifotrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/FifotrackProtocol.java rename to src/main/java/org/traccar/protocol/FifotrackProtocol.java diff --git a/src/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FifotrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/FlespiProtocol.java b/src/main/java/org/traccar/protocol/FlespiProtocol.java similarity index 100% rename from src/org/traccar/protocol/FlespiProtocol.java rename to src/main/java/org/traccar/protocol/FlespiProtocol.java diff --git a/src/org/traccar/protocol/FlespiProtocolDecoder.java b/src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FlespiProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FlespiProtocolDecoder.java diff --git a/src/org/traccar/protocol/FlexCommProtocol.java b/src/main/java/org/traccar/protocol/FlexCommProtocol.java similarity index 100% rename from src/org/traccar/protocol/FlexCommProtocol.java rename to src/main/java/org/traccar/protocol/FlexCommProtocol.java diff --git a/src/org/traccar/protocol/FlexCommProtocolDecoder.java b/src/main/java/org/traccar/protocol/FlexCommProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FlexCommProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FlexCommProtocolDecoder.java diff --git a/src/org/traccar/protocol/FlextrackProtocol.java b/src/main/java/org/traccar/protocol/FlextrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/FlextrackProtocol.java rename to src/main/java/org/traccar/protocol/FlextrackProtocol.java diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/FlextrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FlextrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FlextrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/FoxProtocol.java b/src/main/java/org/traccar/protocol/FoxProtocol.java similarity index 100% rename from src/org/traccar/protocol/FoxProtocol.java rename to src/main/java/org/traccar/protocol/FoxProtocol.java diff --git a/src/org/traccar/protocol/FoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/FoxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FoxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FoxProtocolDecoder.java diff --git a/src/org/traccar/protocol/FreedomProtocol.java b/src/main/java/org/traccar/protocol/FreedomProtocol.java similarity index 100% rename from src/org/traccar/protocol/FreedomProtocol.java rename to src/main/java/org/traccar/protocol/FreedomProtocol.java diff --git a/src/org/traccar/protocol/FreedomProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreedomProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FreedomProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FreedomProtocolDecoder.java diff --git a/src/org/traccar/protocol/FreematicsProtocol.java b/src/main/java/org/traccar/protocol/FreematicsProtocol.java similarity index 100% rename from src/org/traccar/protocol/FreematicsProtocol.java rename to src/main/java/org/traccar/protocol/FreematicsProtocol.java diff --git a/src/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/FreematicsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java diff --git a/src/org/traccar/protocol/GalileoFrameDecoder.java b/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/GalileoFrameDecoder.java rename to src/main/java/org/traccar/protocol/GalileoFrameDecoder.java diff --git a/src/org/traccar/protocol/GalileoProtocol.java b/src/main/java/org/traccar/protocol/GalileoProtocol.java similarity index 100% rename from src/org/traccar/protocol/GalileoProtocol.java rename to src/main/java/org/traccar/protocol/GalileoProtocol.java diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/main/java/org/traccar/protocol/GalileoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GalileoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GalileoProtocolDecoder.java diff --git a/src/org/traccar/protocol/GalileoProtocolEncoder.java b/src/main/java/org/traccar/protocol/GalileoProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/GalileoProtocolEncoder.java rename to src/main/java/org/traccar/protocol/GalileoProtocolEncoder.java diff --git a/src/org/traccar/protocol/GatorProtocol.java b/src/main/java/org/traccar/protocol/GatorProtocol.java similarity index 100% rename from src/org/traccar/protocol/GatorProtocol.java rename to src/main/java/org/traccar/protocol/GatorProtocol.java diff --git a/src/org/traccar/protocol/GatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/GatorProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GatorProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GatorProtocolDecoder.java diff --git a/src/org/traccar/protocol/GenxProtocol.java b/src/main/java/org/traccar/protocol/GenxProtocol.java similarity index 100% rename from src/org/traccar/protocol/GenxProtocol.java rename to src/main/java/org/traccar/protocol/GenxProtocol.java diff --git a/src/org/traccar/protocol/GenxProtocolDecoder.java b/src/main/java/org/traccar/protocol/GenxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GenxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GenxProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gl100Protocol.java b/src/main/java/org/traccar/protocol/Gl100Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gl100Protocol.java rename to src/main/java/org/traccar/protocol/Gl100Protocol.java diff --git a/src/org/traccar/protocol/Gl100ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl100ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gl100ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gl100ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200BinaryProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gl200BinaryProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gl200BinaryProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gl200FrameDecoder.java b/src/main/java/org/traccar/protocol/Gl200FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gl200FrameDecoder.java rename to src/main/java/org/traccar/protocol/Gl200FrameDecoder.java diff --git a/src/org/traccar/protocol/Gl200Protocol.java b/src/main/java/org/traccar/protocol/Gl200Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gl200Protocol.java rename to src/main/java/org/traccar/protocol/Gl200Protocol.java diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gl200ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gl200ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gl200ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Gl200ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Gl200ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Gl200ProtocolEncoder.java diff --git a/src/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gl200TextProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java diff --git a/src/org/traccar/protocol/GlobalSatProtocol.java b/src/main/java/org/traccar/protocol/GlobalSatProtocol.java similarity index 100% rename from src/org/traccar/protocol/GlobalSatProtocol.java rename to src/main/java/org/traccar/protocol/GlobalSatProtocol.java diff --git a/src/org/traccar/protocol/GlobalSatProtocolDecoder.java b/src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GlobalSatProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GlobalSatProtocolDecoder.java diff --git a/src/org/traccar/protocol/GnxProtocol.java b/src/main/java/org/traccar/protocol/GnxProtocol.java similarity index 100% rename from src/org/traccar/protocol/GnxProtocol.java rename to src/main/java/org/traccar/protocol/GnxProtocol.java diff --git a/src/org/traccar/protocol/GnxProtocolDecoder.java b/src/main/java/org/traccar/protocol/GnxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GnxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GnxProtocolDecoder.java diff --git a/src/org/traccar/protocol/GoSafeProtocol.java b/src/main/java/org/traccar/protocol/GoSafeProtocol.java similarity index 100% rename from src/org/traccar/protocol/GoSafeProtocol.java rename to src/main/java/org/traccar/protocol/GoSafeProtocol.java diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GoSafeProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java diff --git a/src/org/traccar/protocol/GotopProtocol.java b/src/main/java/org/traccar/protocol/GotopProtocol.java similarity index 100% rename from src/org/traccar/protocol/GotopProtocol.java rename to src/main/java/org/traccar/protocol/GotopProtocol.java diff --git a/src/org/traccar/protocol/GotopProtocolDecoder.java b/src/main/java/org/traccar/protocol/GotopProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GotopProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GotopProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gps056FrameDecoder.java b/src/main/java/org/traccar/protocol/Gps056FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gps056FrameDecoder.java rename to src/main/java/org/traccar/protocol/Gps056FrameDecoder.java diff --git a/src/org/traccar/protocol/Gps056Protocol.java b/src/main/java/org/traccar/protocol/Gps056Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gps056Protocol.java rename to src/main/java/org/traccar/protocol/Gps056Protocol.java diff --git a/src/org/traccar/protocol/Gps056ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gps056ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gps056ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gps056ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gps103Protocol.java b/src/main/java/org/traccar/protocol/Gps103Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gps103Protocol.java rename to src/main/java/org/traccar/protocol/Gps103Protocol.java diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gps103ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gps103ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Gps103ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Gps103ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Gps103ProtocolEncoder.java diff --git a/src/org/traccar/protocol/GpsGateProtocol.java b/src/main/java/org/traccar/protocol/GpsGateProtocol.java similarity index 100% rename from src/org/traccar/protocol/GpsGateProtocol.java rename to src/main/java/org/traccar/protocol/GpsGateProtocol.java diff --git a/src/org/traccar/protocol/GpsGateProtocolDecoder.java b/src/main/java/org/traccar/protocol/GpsGateProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GpsGateProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GpsGateProtocolDecoder.java diff --git a/src/org/traccar/protocol/GpsMarkerProtocol.java b/src/main/java/org/traccar/protocol/GpsMarkerProtocol.java similarity index 100% rename from src/org/traccar/protocol/GpsMarkerProtocol.java rename to src/main/java/org/traccar/protocol/GpsMarkerProtocol.java diff --git a/src/org/traccar/protocol/GpsMarkerProtocolDecoder.java b/src/main/java/org/traccar/protocol/GpsMarkerProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GpsMarkerProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GpsMarkerProtocolDecoder.java diff --git a/src/org/traccar/protocol/GpsmtaProtocol.java b/src/main/java/org/traccar/protocol/GpsmtaProtocol.java similarity index 100% rename from src/org/traccar/protocol/GpsmtaProtocol.java rename to src/main/java/org/traccar/protocol/GpsmtaProtocol.java diff --git a/src/org/traccar/protocol/GpsmtaProtocolDecoder.java b/src/main/java/org/traccar/protocol/GpsmtaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GpsmtaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GpsmtaProtocolDecoder.java diff --git a/src/org/traccar/protocol/GranitFrameDecoder.java b/src/main/java/org/traccar/protocol/GranitFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/GranitFrameDecoder.java rename to src/main/java/org/traccar/protocol/GranitFrameDecoder.java diff --git a/src/org/traccar/protocol/GranitProtocol.java b/src/main/java/org/traccar/protocol/GranitProtocol.java similarity index 100% rename from src/org/traccar/protocol/GranitProtocol.java rename to src/main/java/org/traccar/protocol/GranitProtocol.java diff --git a/src/org/traccar/protocol/GranitProtocolDecoder.java b/src/main/java/org/traccar/protocol/GranitProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/GranitProtocolDecoder.java rename to src/main/java/org/traccar/protocol/GranitProtocolDecoder.java diff --git a/src/org/traccar/protocol/GranitProtocolEncoder.java b/src/main/java/org/traccar/protocol/GranitProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/GranitProtocolEncoder.java rename to src/main/java/org/traccar/protocol/GranitProtocolEncoder.java diff --git a/src/org/traccar/protocol/GranitProtocolSmsEncoder.java b/src/main/java/org/traccar/protocol/GranitProtocolSmsEncoder.java similarity index 100% rename from src/org/traccar/protocol/GranitProtocolSmsEncoder.java rename to src/main/java/org/traccar/protocol/GranitProtocolSmsEncoder.java diff --git a/src/org/traccar/protocol/Gt02Protocol.java b/src/main/java/org/traccar/protocol/Gt02Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gt02Protocol.java rename to src/main/java/org/traccar/protocol/Gt02Protocol.java diff --git a/src/org/traccar/protocol/Gt02ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt02ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gt02ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gt02ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gt06FrameDecoder.java b/src/main/java/org/traccar/protocol/Gt06FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gt06FrameDecoder.java rename to src/main/java/org/traccar/protocol/Gt06FrameDecoder.java diff --git a/src/org/traccar/protocol/Gt06Protocol.java b/src/main/java/org/traccar/protocol/Gt06Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gt06Protocol.java rename to src/main/java/org/traccar/protocol/Gt06Protocol.java diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gt06ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Gt06ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Gt06ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Gt06ProtocolEncoder.java diff --git a/src/org/traccar/protocol/Gt30Protocol.java b/src/main/java/org/traccar/protocol/Gt30Protocol.java similarity index 100% rename from src/org/traccar/protocol/Gt30Protocol.java rename to src/main/java/org/traccar/protocol/Gt30Protocol.java diff --git a/src/org/traccar/protocol/Gt30ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt30ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Gt30ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Gt30ProtocolDecoder.java diff --git a/src/org/traccar/protocol/H02FrameDecoder.java b/src/main/java/org/traccar/protocol/H02FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/H02FrameDecoder.java rename to src/main/java/org/traccar/protocol/H02FrameDecoder.java diff --git a/src/org/traccar/protocol/H02Protocol.java b/src/main/java/org/traccar/protocol/H02Protocol.java similarity index 100% rename from src/org/traccar/protocol/H02Protocol.java rename to src/main/java/org/traccar/protocol/H02Protocol.java diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/main/java/org/traccar/protocol/H02ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/H02ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/H02ProtocolDecoder.java diff --git a/src/org/traccar/protocol/H02ProtocolEncoder.java b/src/main/java/org/traccar/protocol/H02ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/H02ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/H02ProtocolEncoder.java diff --git a/src/org/traccar/protocol/HaicomProtocol.java b/src/main/java/org/traccar/protocol/HaicomProtocol.java similarity index 100% rename from src/org/traccar/protocol/HaicomProtocol.java rename to src/main/java/org/traccar/protocol/HaicomProtocol.java diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/main/java/org/traccar/protocol/HaicomProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/HaicomProtocolDecoder.java rename to src/main/java/org/traccar/protocol/HaicomProtocolDecoder.java diff --git a/src/org/traccar/protocol/HomtecsProtocol.java b/src/main/java/org/traccar/protocol/HomtecsProtocol.java similarity index 100% rename from src/org/traccar/protocol/HomtecsProtocol.java rename to src/main/java/org/traccar/protocol/HomtecsProtocol.java diff --git a/src/org/traccar/protocol/HomtecsProtocolDecoder.java b/src/main/java/org/traccar/protocol/HomtecsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/HomtecsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/HomtecsProtocolDecoder.java diff --git a/src/org/traccar/protocol/HuaShengFrameDecoder.java b/src/main/java/org/traccar/protocol/HuaShengFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/HuaShengFrameDecoder.java rename to src/main/java/org/traccar/protocol/HuaShengFrameDecoder.java diff --git a/src/org/traccar/protocol/HuaShengProtocol.java b/src/main/java/org/traccar/protocol/HuaShengProtocol.java similarity index 100% rename from src/org/traccar/protocol/HuaShengProtocol.java rename to src/main/java/org/traccar/protocol/HuaShengProtocol.java diff --git a/src/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/HuaShengProtocolDecoder.java rename to src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java diff --git a/src/org/traccar/protocol/HuabaoFrameDecoder.java b/src/main/java/org/traccar/protocol/HuabaoFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/HuabaoFrameDecoder.java rename to src/main/java/org/traccar/protocol/HuabaoFrameDecoder.java diff --git a/src/org/traccar/protocol/HuabaoProtocol.java b/src/main/java/org/traccar/protocol/HuabaoProtocol.java similarity index 100% rename from src/org/traccar/protocol/HuabaoProtocol.java rename to src/main/java/org/traccar/protocol/HuabaoProtocol.java diff --git a/src/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/HuabaoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java diff --git a/src/org/traccar/protocol/HuabaoProtocolEncoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/HuabaoProtocolEncoder.java rename to src/main/java/org/traccar/protocol/HuabaoProtocolEncoder.java diff --git a/src/org/traccar/protocol/HunterProProtocol.java b/src/main/java/org/traccar/protocol/HunterProProtocol.java similarity index 100% rename from src/org/traccar/protocol/HunterProProtocol.java rename to src/main/java/org/traccar/protocol/HunterProProtocol.java diff --git a/src/org/traccar/protocol/HunterProProtocolDecoder.java b/src/main/java/org/traccar/protocol/HunterProProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/HunterProProtocolDecoder.java rename to src/main/java/org/traccar/protocol/HunterProProtocolDecoder.java diff --git a/src/org/traccar/protocol/IdplProtocol.java b/src/main/java/org/traccar/protocol/IdplProtocol.java similarity index 100% rename from src/org/traccar/protocol/IdplProtocol.java rename to src/main/java/org/traccar/protocol/IdplProtocol.java diff --git a/src/org/traccar/protocol/IdplProtocolDecoder.java b/src/main/java/org/traccar/protocol/IdplProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/IdplProtocolDecoder.java rename to src/main/java/org/traccar/protocol/IdplProtocolDecoder.java diff --git a/src/org/traccar/protocol/IntellitracFrameDecoder.java b/src/main/java/org/traccar/protocol/IntellitracFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/IntellitracFrameDecoder.java rename to src/main/java/org/traccar/protocol/IntellitracFrameDecoder.java diff --git a/src/org/traccar/protocol/IntellitracProtocol.java b/src/main/java/org/traccar/protocol/IntellitracProtocol.java similarity index 100% rename from src/org/traccar/protocol/IntellitracProtocol.java rename to src/main/java/org/traccar/protocol/IntellitracProtocol.java diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/main/java/org/traccar/protocol/IntellitracProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/IntellitracProtocolDecoder.java rename to src/main/java/org/traccar/protocol/IntellitracProtocolDecoder.java diff --git a/src/org/traccar/protocol/ItsProtocol.java b/src/main/java/org/traccar/protocol/ItsProtocol.java similarity index 100% rename from src/org/traccar/protocol/ItsProtocol.java rename to src/main/java/org/traccar/protocol/ItsProtocol.java diff --git a/src/org/traccar/protocol/ItsProtocolDecoder.java b/src/main/java/org/traccar/protocol/ItsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ItsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ItsProtocolDecoder.java diff --git a/src/org/traccar/protocol/Ivt401Protocol.java b/src/main/java/org/traccar/protocol/Ivt401Protocol.java similarity index 100% rename from src/org/traccar/protocol/Ivt401Protocol.java rename to src/main/java/org/traccar/protocol/Ivt401Protocol.java diff --git a/src/org/traccar/protocol/Ivt401ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Ivt401ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Ivt401ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Ivt401ProtocolDecoder.java diff --git a/src/org/traccar/protocol/JpKorjarFrameDecoder.java b/src/main/java/org/traccar/protocol/JpKorjarFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/JpKorjarFrameDecoder.java rename to src/main/java/org/traccar/protocol/JpKorjarFrameDecoder.java diff --git a/src/org/traccar/protocol/JpKorjarProtocol.java b/src/main/java/org/traccar/protocol/JpKorjarProtocol.java similarity index 100% rename from src/org/traccar/protocol/JpKorjarProtocol.java rename to src/main/java/org/traccar/protocol/JpKorjarProtocol.java diff --git a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java b/src/main/java/org/traccar/protocol/JpKorjarProtocolDecoder.java similarity index 97% rename from src/org/traccar/protocol/JpKorjarProtocolDecoder.java rename to src/main/java/org/traccar/protocol/JpKorjarProtocolDecoder.java index a8389d1b1..33026918a 100644 --- a/src/org/traccar/protocol/JpKorjarProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/JpKorjarProtocolDecoder.java @@ -1,89 +1,89 @@ -/* - * Copyright 2016 Nyash (nyashh@gmail.com) - * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.channel.Channel; -import org.traccar.BaseProtocolDecoder; -import org.traccar.DeviceSession; -import org.traccar.Protocol; -import org.traccar.helper.Parser; -import org.traccar.helper.PatternBuilder; -import org.traccar.model.CellTower; -import org.traccar.model.Network; -import org.traccar.model.Position; - -import java.net.SocketAddress; -import java.util.regex.Pattern; - -public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { - - public JpKorjarProtocolDecoder(Protocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .text("KORJAR.PL,") - .number("(d+),") // imei - .number("(dd)(dd)(dd)") // date (yymmdd) - .number("(dd)(dd)(dd),") // time (hhmmss) - .number("(d+.d+)([NS]),") // latitude - .number("(d+.d+)([EW]),") // longitude - .number("(d+.d+),") // speed - .number("(d+),") // course - .number("[FL]:(d+.d+)V,") // battery - .number("([01]) ") // valid - .number("(d+) ") // mcc - .number("(d+) ") // mnc - .number("(x+) ") // lac - .number("(x+),") // cid - .compile(); - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - Parser parser = new Parser(PATTERN, (String) msg); - if (!parser.matches()) { - return null; - } - - Position position = new Position(getProtocolName()); - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); - if (deviceSession == null) { - return null; - } - position.setDeviceId(deviceSession.getDeviceId()); - - position.setTime(parser.nextDateTime()); - - position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); - position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); - position.setSpeed(parser.nextDouble(0)); - position.setCourse(parser.nextDouble(0)); - - position.set(Position.KEY_BATTERY, parser.nextDouble(0)); - - position.setValid(parser.nextInt(0) == 1); - - position.setNetwork(new Network(CellTower.from( - parser.nextInt(0), parser.nextInt(0), parser.nextHexInt(0), parser.nextHexInt(0)))); - - return position; - } - -} +/* + * Copyright 2016 Nyash (nyashh@gmail.com) + * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import io.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.Protocol; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.CellTower; +import org.traccar.model.Network; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class JpKorjarProtocolDecoder extends BaseProtocolDecoder { + + public JpKorjarProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("KORJAR.PL,") + .number("(d+),") // imei + .number("(dd)(dd)(dd)") // date (yymmdd) + .number("(dd)(dd)(dd),") // time (hhmmss) + .number("(d+.d+)([NS]),") // latitude + .number("(d+.d+)([EW]),") // longitude + .number("(d+.d+),") // speed + .number("(d+),") // course + .number("[FL]:(d+.d+)V,") // battery + .number("([01]) ") // valid + .number("(d+) ") // mcc + .number("(d+) ") // mnc + .number("(x+) ") // lac + .number("(x+),") // cid + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + Position position = new Position(getProtocolName()); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime()); + + position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); + position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.DEG_HEM)); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); + + position.set(Position.KEY_BATTERY, parser.nextDouble(0)); + + position.setValid(parser.nextInt(0) == 1); + + position.setNetwork(new Network(CellTower.from( + parser.nextInt(0), parser.nextInt(0), parser.nextHexInt(0), parser.nextHexInt(0)))); + + return position; + } + +} diff --git a/src/org/traccar/protocol/Jt600FrameDecoder.java b/src/main/java/org/traccar/protocol/Jt600FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Jt600FrameDecoder.java rename to src/main/java/org/traccar/protocol/Jt600FrameDecoder.java diff --git a/src/org/traccar/protocol/Jt600Protocol.java b/src/main/java/org/traccar/protocol/Jt600Protocol.java similarity index 100% rename from src/org/traccar/protocol/Jt600Protocol.java rename to src/main/java/org/traccar/protocol/Jt600Protocol.java diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Jt600ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Jt600ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Jt600ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Jt600ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Jt600ProtocolEncoder.java diff --git a/src/org/traccar/protocol/KenjiProtocol.java b/src/main/java/org/traccar/protocol/KenjiProtocol.java similarity index 100% rename from src/org/traccar/protocol/KenjiProtocol.java rename to src/main/java/org/traccar/protocol/KenjiProtocol.java diff --git a/src/org/traccar/protocol/KenjiProtocolDecoder.java b/src/main/java/org/traccar/protocol/KenjiProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/KenjiProtocolDecoder.java rename to src/main/java/org/traccar/protocol/KenjiProtocolDecoder.java diff --git a/src/org/traccar/protocol/KhdProtocol.java b/src/main/java/org/traccar/protocol/KhdProtocol.java similarity index 100% rename from src/org/traccar/protocol/KhdProtocol.java rename to src/main/java/org/traccar/protocol/KhdProtocol.java diff --git a/src/org/traccar/protocol/KhdProtocolDecoder.java b/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/KhdProtocolDecoder.java rename to src/main/java/org/traccar/protocol/KhdProtocolDecoder.java diff --git a/src/org/traccar/protocol/KhdProtocolEncoder.java b/src/main/java/org/traccar/protocol/KhdProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/KhdProtocolEncoder.java rename to src/main/java/org/traccar/protocol/KhdProtocolEncoder.java diff --git a/src/org/traccar/protocol/L100FrameDecoder.java b/src/main/java/org/traccar/protocol/L100FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/L100FrameDecoder.java rename to src/main/java/org/traccar/protocol/L100FrameDecoder.java diff --git a/src/org/traccar/protocol/L100Protocol.java b/src/main/java/org/traccar/protocol/L100Protocol.java similarity index 100% rename from src/org/traccar/protocol/L100Protocol.java rename to src/main/java/org/traccar/protocol/L100Protocol.java diff --git a/src/org/traccar/protocol/L100ProtocolDecoder.java b/src/main/java/org/traccar/protocol/L100ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/L100ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/L100ProtocolDecoder.java diff --git a/src/org/traccar/protocol/LaipacProtocol.java b/src/main/java/org/traccar/protocol/LaipacProtocol.java similarity index 100% rename from src/org/traccar/protocol/LaipacProtocol.java rename to src/main/java/org/traccar/protocol/LaipacProtocol.java diff --git a/src/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/LaipacProtocolDecoder.java rename to src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java diff --git a/src/org/traccar/protocol/M2cProtocol.java b/src/main/java/org/traccar/protocol/M2cProtocol.java similarity index 100% rename from src/org/traccar/protocol/M2cProtocol.java rename to src/main/java/org/traccar/protocol/M2cProtocol.java diff --git a/src/org/traccar/protocol/M2cProtocolDecoder.java b/src/main/java/org/traccar/protocol/M2cProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/M2cProtocolDecoder.java rename to src/main/java/org/traccar/protocol/M2cProtocolDecoder.java diff --git a/src/org/traccar/protocol/M2mProtocol.java b/src/main/java/org/traccar/protocol/M2mProtocol.java similarity index 100% rename from src/org/traccar/protocol/M2mProtocol.java rename to src/main/java/org/traccar/protocol/M2mProtocol.java diff --git a/src/org/traccar/protocol/M2mProtocolDecoder.java b/src/main/java/org/traccar/protocol/M2mProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/M2mProtocolDecoder.java rename to src/main/java/org/traccar/protocol/M2mProtocolDecoder.java diff --git a/src/org/traccar/protocol/MaestroProtocol.java b/src/main/java/org/traccar/protocol/MaestroProtocol.java similarity index 100% rename from src/org/traccar/protocol/MaestroProtocol.java rename to src/main/java/org/traccar/protocol/MaestroProtocol.java diff --git a/src/org/traccar/protocol/MaestroProtocolDecoder.java b/src/main/java/org/traccar/protocol/MaestroProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MaestroProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MaestroProtocolDecoder.java diff --git a/src/org/traccar/protocol/ManPowerProtocol.java b/src/main/java/org/traccar/protocol/ManPowerProtocol.java similarity index 100% rename from src/org/traccar/protocol/ManPowerProtocol.java rename to src/main/java/org/traccar/protocol/ManPowerProtocol.java diff --git a/src/org/traccar/protocol/ManPowerProtocolDecoder.java b/src/main/java/org/traccar/protocol/ManPowerProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ManPowerProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ManPowerProtocolDecoder.java diff --git a/src/org/traccar/protocol/MegastekFrameDecoder.java b/src/main/java/org/traccar/protocol/MegastekFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/MegastekFrameDecoder.java rename to src/main/java/org/traccar/protocol/MegastekFrameDecoder.java diff --git a/src/org/traccar/protocol/MegastekProtocol.java b/src/main/java/org/traccar/protocol/MegastekProtocol.java similarity index 100% rename from src/org/traccar/protocol/MegastekProtocol.java rename to src/main/java/org/traccar/protocol/MegastekProtocol.java diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MegastekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MegastekProtocolDecoder.java diff --git a/src/org/traccar/protocol/MeiligaoFrameDecoder.java b/src/main/java/org/traccar/protocol/MeiligaoFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/MeiligaoFrameDecoder.java rename to src/main/java/org/traccar/protocol/MeiligaoFrameDecoder.java diff --git a/src/org/traccar/protocol/MeiligaoProtocol.java b/src/main/java/org/traccar/protocol/MeiligaoProtocol.java similarity index 100% rename from src/org/traccar/protocol/MeiligaoProtocol.java rename to src/main/java/org/traccar/protocol/MeiligaoProtocol.java diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeiligaoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MeiligaoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MeiligaoProtocolDecoder.java diff --git a/src/org/traccar/protocol/MeiligaoProtocolEncoder.java b/src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/MeiligaoProtocolEncoder.java rename to src/main/java/org/traccar/protocol/MeiligaoProtocolEncoder.java diff --git a/src/org/traccar/protocol/MeitrackFrameDecoder.java b/src/main/java/org/traccar/protocol/MeitrackFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/MeitrackFrameDecoder.java rename to src/main/java/org/traccar/protocol/MeitrackFrameDecoder.java diff --git a/src/org/traccar/protocol/MeitrackProtocol.java b/src/main/java/org/traccar/protocol/MeitrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/MeitrackProtocol.java rename to src/main/java/org/traccar/protocol/MeitrackProtocol.java diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MeitrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/MeitrackProtocolEncoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/MeitrackProtocolEncoder.java rename to src/main/java/org/traccar/protocol/MeitrackProtocolEncoder.java diff --git a/src/org/traccar/protocol/MilesmateProtocol.java b/src/main/java/org/traccar/protocol/MilesmateProtocol.java similarity index 100% rename from src/org/traccar/protocol/MilesmateProtocol.java rename to src/main/java/org/traccar/protocol/MilesmateProtocol.java diff --git a/src/org/traccar/protocol/MilesmateProtocolDecoder.java b/src/main/java/org/traccar/protocol/MilesmateProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MilesmateProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MilesmateProtocolDecoder.java diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/main/java/org/traccar/protocol/MiniFinderProtocol.java similarity index 100% rename from src/org/traccar/protocol/MiniFinderProtocol.java rename to src/main/java/org/traccar/protocol/MiniFinderProtocol.java diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MiniFinderProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/main/java/org/traccar/protocol/MiniFinderProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/MiniFinderProtocolEncoder.java rename to src/main/java/org/traccar/protocol/MiniFinderProtocolEncoder.java diff --git a/src/org/traccar/protocol/Mta6Protocol.java b/src/main/java/org/traccar/protocol/Mta6Protocol.java similarity index 100% rename from src/org/traccar/protocol/Mta6Protocol.java rename to src/main/java/org/traccar/protocol/Mta6Protocol.java diff --git a/src/org/traccar/protocol/Mta6ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Mta6ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Mta6ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Mta6ProtocolDecoder.java diff --git a/src/org/traccar/protocol/MtxProtocol.java b/src/main/java/org/traccar/protocol/MtxProtocol.java similarity index 100% rename from src/org/traccar/protocol/MtxProtocol.java rename to src/main/java/org/traccar/protocol/MtxProtocol.java diff --git a/src/org/traccar/protocol/MtxProtocolDecoder.java b/src/main/java/org/traccar/protocol/MtxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MtxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MtxProtocolDecoder.java diff --git a/src/org/traccar/protocol/MxtFrameDecoder.java b/src/main/java/org/traccar/protocol/MxtFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/MxtFrameDecoder.java rename to src/main/java/org/traccar/protocol/MxtFrameDecoder.java diff --git a/src/org/traccar/protocol/MxtProtocol.java b/src/main/java/org/traccar/protocol/MxtProtocol.java similarity index 100% rename from src/org/traccar/protocol/MxtProtocol.java rename to src/main/java/org/traccar/protocol/MxtProtocol.java diff --git a/src/org/traccar/protocol/MxtProtocolDecoder.java b/src/main/java/org/traccar/protocol/MxtProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/MxtProtocolDecoder.java rename to src/main/java/org/traccar/protocol/MxtProtocolDecoder.java diff --git a/src/org/traccar/protocol/NavigilFrameDecoder.java b/src/main/java/org/traccar/protocol/NavigilFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/NavigilFrameDecoder.java rename to src/main/java/org/traccar/protocol/NavigilFrameDecoder.java diff --git a/src/org/traccar/protocol/NavigilProtocol.java b/src/main/java/org/traccar/protocol/NavigilProtocol.java similarity index 100% rename from src/org/traccar/protocol/NavigilProtocol.java rename to src/main/java/org/traccar/protocol/NavigilProtocol.java diff --git a/src/org/traccar/protocol/NavigilProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavigilProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NavigilProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NavigilProtocolDecoder.java diff --git a/src/org/traccar/protocol/NavisFrameDecoder.java b/src/main/java/org/traccar/protocol/NavisFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/NavisFrameDecoder.java rename to src/main/java/org/traccar/protocol/NavisFrameDecoder.java diff --git a/src/org/traccar/protocol/NavisProtocol.java b/src/main/java/org/traccar/protocol/NavisProtocol.java similarity index 100% rename from src/org/traccar/protocol/NavisProtocol.java rename to src/main/java/org/traccar/protocol/NavisProtocol.java diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavisProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NavisProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NavisProtocolDecoder.java diff --git a/src/org/traccar/protocol/NeosProtocol.java b/src/main/java/org/traccar/protocol/NeosProtocol.java similarity index 100% rename from src/org/traccar/protocol/NeosProtocol.java rename to src/main/java/org/traccar/protocol/NeosProtocol.java diff --git a/src/org/traccar/protocol/NeosProtocolDecoder.java b/src/main/java/org/traccar/protocol/NeosProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NeosProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NeosProtocolDecoder.java diff --git a/src/org/traccar/protocol/NoranProtocol.java b/src/main/java/org/traccar/protocol/NoranProtocol.java similarity index 100% rename from src/org/traccar/protocol/NoranProtocol.java rename to src/main/java/org/traccar/protocol/NoranProtocol.java diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/main/java/org/traccar/protocol/NoranProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NoranProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NoranProtocolDecoder.java diff --git a/src/org/traccar/protocol/NoranProtocolEncoder.java b/src/main/java/org/traccar/protocol/NoranProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/NoranProtocolEncoder.java rename to src/main/java/org/traccar/protocol/NoranProtocolEncoder.java diff --git a/src/org/traccar/protocol/NvsFrameDecoder.java b/src/main/java/org/traccar/protocol/NvsFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/NvsFrameDecoder.java rename to src/main/java/org/traccar/protocol/NvsFrameDecoder.java diff --git a/src/org/traccar/protocol/NvsProtocol.java b/src/main/java/org/traccar/protocol/NvsProtocol.java similarity index 100% rename from src/org/traccar/protocol/NvsProtocol.java rename to src/main/java/org/traccar/protocol/NvsProtocol.java diff --git a/src/org/traccar/protocol/NvsProtocolDecoder.java b/src/main/java/org/traccar/protocol/NvsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NvsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NvsProtocolDecoder.java diff --git a/src/org/traccar/protocol/NyitechProtocol.java b/src/main/java/org/traccar/protocol/NyitechProtocol.java similarity index 100% rename from src/org/traccar/protocol/NyitechProtocol.java rename to src/main/java/org/traccar/protocol/NyitechProtocol.java diff --git a/src/org/traccar/protocol/NyitechProtocolDecoder.java b/src/main/java/org/traccar/protocol/NyitechProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/NyitechProtocolDecoder.java rename to src/main/java/org/traccar/protocol/NyitechProtocolDecoder.java diff --git a/src/org/traccar/protocol/ObdDongleProtocol.java b/src/main/java/org/traccar/protocol/ObdDongleProtocol.java similarity index 100% rename from src/org/traccar/protocol/ObdDongleProtocol.java rename to src/main/java/org/traccar/protocol/ObdDongleProtocol.java diff --git a/src/org/traccar/protocol/ObdDongleProtocolDecoder.java b/src/main/java/org/traccar/protocol/ObdDongleProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ObdDongleProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ObdDongleProtocolDecoder.java diff --git a/src/org/traccar/protocol/OigoProtocol.java b/src/main/java/org/traccar/protocol/OigoProtocol.java similarity index 100% rename from src/org/traccar/protocol/OigoProtocol.java rename to src/main/java/org/traccar/protocol/OigoProtocol.java diff --git a/src/org/traccar/protocol/OigoProtocolDecoder.java b/src/main/java/org/traccar/protocol/OigoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OigoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OigoProtocolDecoder.java diff --git a/src/org/traccar/protocol/OkoProtocol.java b/src/main/java/org/traccar/protocol/OkoProtocol.java similarity index 100% rename from src/org/traccar/protocol/OkoProtocol.java rename to src/main/java/org/traccar/protocol/OkoProtocol.java diff --git a/src/org/traccar/protocol/OkoProtocolDecoder.java b/src/main/java/org/traccar/protocol/OkoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OkoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OkoProtocolDecoder.java diff --git a/src/org/traccar/protocol/OpenGtsProtocol.java b/src/main/java/org/traccar/protocol/OpenGtsProtocol.java similarity index 100% rename from src/org/traccar/protocol/OpenGtsProtocol.java rename to src/main/java/org/traccar/protocol/OpenGtsProtocol.java diff --git a/src/org/traccar/protocol/OpenGtsProtocolDecoder.java b/src/main/java/org/traccar/protocol/OpenGtsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OpenGtsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OpenGtsProtocolDecoder.java diff --git a/src/org/traccar/protocol/OrionFrameDecoder.java b/src/main/java/org/traccar/protocol/OrionFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/OrionFrameDecoder.java rename to src/main/java/org/traccar/protocol/OrionFrameDecoder.java diff --git a/src/org/traccar/protocol/OrionProtocol.java b/src/main/java/org/traccar/protocol/OrionProtocol.java similarity index 100% rename from src/org/traccar/protocol/OrionProtocol.java rename to src/main/java/org/traccar/protocol/OrionProtocol.java diff --git a/src/org/traccar/protocol/OrionProtocolDecoder.java b/src/main/java/org/traccar/protocol/OrionProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OrionProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OrionProtocolDecoder.java diff --git a/src/org/traccar/protocol/OsmAndProtocol.java b/src/main/java/org/traccar/protocol/OsmAndProtocol.java similarity index 100% rename from src/org/traccar/protocol/OsmAndProtocol.java rename to src/main/java/org/traccar/protocol/OsmAndProtocol.java diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/main/java/org/traccar/protocol/OsmAndProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OsmAndProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OsmAndProtocolDecoder.java diff --git a/src/org/traccar/protocol/OwnTracksProtocol.java b/src/main/java/org/traccar/protocol/OwnTracksProtocol.java similarity index 100% rename from src/org/traccar/protocol/OwnTracksProtocol.java rename to src/main/java/org/traccar/protocol/OwnTracksProtocol.java diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/main/java/org/traccar/protocol/OwnTracksProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/OwnTracksProtocolDecoder.java rename to src/main/java/org/traccar/protocol/OwnTracksProtocolDecoder.java diff --git a/src/org/traccar/protocol/PathAwayProtocol.java b/src/main/java/org/traccar/protocol/PathAwayProtocol.java similarity index 100% rename from src/org/traccar/protocol/PathAwayProtocol.java rename to src/main/java/org/traccar/protocol/PathAwayProtocol.java diff --git a/src/org/traccar/protocol/PathAwayProtocolDecoder.java b/src/main/java/org/traccar/protocol/PathAwayProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/PathAwayProtocolDecoder.java rename to src/main/java/org/traccar/protocol/PathAwayProtocolDecoder.java diff --git a/src/org/traccar/protocol/PiligrimProtocol.java b/src/main/java/org/traccar/protocol/PiligrimProtocol.java similarity index 100% rename from src/org/traccar/protocol/PiligrimProtocol.java rename to src/main/java/org/traccar/protocol/PiligrimProtocol.java diff --git a/src/org/traccar/protocol/PiligrimProtocolDecoder.java b/src/main/java/org/traccar/protocol/PiligrimProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/PiligrimProtocolDecoder.java rename to src/main/java/org/traccar/protocol/PiligrimProtocolDecoder.java diff --git a/src/org/traccar/protocol/PretraceProtocol.java b/src/main/java/org/traccar/protocol/PretraceProtocol.java similarity index 100% rename from src/org/traccar/protocol/PretraceProtocol.java rename to src/main/java/org/traccar/protocol/PretraceProtocol.java diff --git a/src/org/traccar/protocol/PretraceProtocolDecoder.java b/src/main/java/org/traccar/protocol/PretraceProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/PretraceProtocolDecoder.java rename to src/main/java/org/traccar/protocol/PretraceProtocolDecoder.java diff --git a/src/org/traccar/protocol/PretraceProtocolEncoder.java b/src/main/java/org/traccar/protocol/PretraceProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/PretraceProtocolEncoder.java rename to src/main/java/org/traccar/protocol/PretraceProtocolEncoder.java diff --git a/src/org/traccar/protocol/PricolProtocol.java b/src/main/java/org/traccar/protocol/PricolProtocol.java similarity index 100% rename from src/org/traccar/protocol/PricolProtocol.java rename to src/main/java/org/traccar/protocol/PricolProtocol.java diff --git a/src/org/traccar/protocol/PricolProtocolDecoder.java b/src/main/java/org/traccar/protocol/PricolProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/PricolProtocolDecoder.java rename to src/main/java/org/traccar/protocol/PricolProtocolDecoder.java diff --git a/src/org/traccar/protocol/ProgressProtocol.java b/src/main/java/org/traccar/protocol/ProgressProtocol.java similarity index 100% rename from src/org/traccar/protocol/ProgressProtocol.java rename to src/main/java/org/traccar/protocol/ProgressProtocol.java diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/main/java/org/traccar/protocol/ProgressProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ProgressProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ProgressProtocolDecoder.java diff --git a/src/org/traccar/protocol/Pt3000Protocol.java b/src/main/java/org/traccar/protocol/Pt3000Protocol.java similarity index 100% rename from src/org/traccar/protocol/Pt3000Protocol.java rename to src/main/java/org/traccar/protocol/Pt3000Protocol.java diff --git a/src/org/traccar/protocol/Pt3000ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Pt3000ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Pt3000ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Pt3000ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Pt502FrameDecoder.java b/src/main/java/org/traccar/protocol/Pt502FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Pt502FrameDecoder.java rename to src/main/java/org/traccar/protocol/Pt502FrameDecoder.java diff --git a/src/org/traccar/protocol/Pt502Protocol.java b/src/main/java/org/traccar/protocol/Pt502Protocol.java similarity index 100% rename from src/org/traccar/protocol/Pt502Protocol.java rename to src/main/java/org/traccar/protocol/Pt502Protocol.java diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Pt502ProtocolDecoder.java similarity index 97% rename from src/org/traccar/protocol/Pt502ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Pt502ProtocolDecoder.java index 12210652b..0afec67ad 100644 --- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Pt502ProtocolDecoder.java @@ -1,212 +1,212 @@ -/* - * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org) - * Copyright 2012 Luis Parada (luis.parada@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; -import org.traccar.BaseProtocolDecoder; -import org.traccar.Context; -import org.traccar.DeviceSession; -import org.traccar.NetworkMessage; -import org.traccar.Protocol; -import org.traccar.helper.DateBuilder; -import org.traccar.helper.Parser; -import org.traccar.helper.PatternBuilder; -import org.traccar.model.Position; - -import java.net.SocketAddress; -import java.nio.charset.StandardCharsets; -import java.util.regex.Pattern; - -public class Pt502ProtocolDecoder extends BaseProtocolDecoder { - - private static final int MAX_CHUNK_SIZE = 960; - - private ByteBuf photo; - - public Pt502ProtocolDecoder(Protocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .any().text("$") - .expression("([^,]+),") // type - .number("(d+),") // id - .number("(dd)(dd)(dd).(ddd),") // time (hhmmss.sss) - .expression("([AV]),") // validity - .number("(d+)(dd.dddd),") // latitude - .expression("([NS]),") - .number("(d+)(dd.dddd),") // longitude - .expression("([EW]),") - .number("(d+.d+)?,") // speed - .number("(d+.d+)?,") // course - .number("(dd)(dd)(dd),,,") // date (ddmmyy) - .expression("./") - .expression("([01])+,") // input - .expression("([01])+/") // output - .expression("([^/]+)?/") // adc - .number("(d+)") // odometer - .expression("/([^/]+)?/") // rfid - .number("(xxx)").optional(2) // state - .any() - .compile(); - - private String decodeAlarm(String value) { - switch (value) { - case "IN1": - return Position.ALARM_SOS; - case "GOF": - return Position.ALARM_GEOFENCE; - case "TOW": - return Position.ALARM_TOW; - case "HDA": - return Position.ALARM_ACCELERATION; - case "HDB": - return Position.ALARM_BRAKING; - case "FDA": - return Position.ALARM_FATIGUE_DRIVING; - case "SKA": - return Position.ALARM_VIBRATION; - case "PMA": - return Position.ALARM_MOVEMENT; - case "CPA": - return Position.ALARM_POWER_CUT; - default: - return null; - } - } - - private Position decodePosition(Channel channel, SocketAddress remoteAddress, String sentence) { - - Parser parser = new Parser(PATTERN, sentence); - if (!parser.matches()) { - return null; - } - - Position position = new Position(getProtocolName()); - position.set(Position.KEY_ALARM, decodeAlarm(parser.next())); - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); - if (deviceSession == null) { - return null; - } - position.setDeviceId(deviceSession.getDeviceId()); - - DateBuilder dateBuilder = new DateBuilder() - .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); - - position.setValid(parser.next().equals("A")); - position.setLatitude(parser.nextCoordinate()); - position.setLongitude(parser.nextCoordinate()); - position.setSpeed(parser.nextDouble(0)); - position.setCourse(parser.nextDouble(0)); - - dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); - position.setTime(dateBuilder.getDate()); - - position.set(Position.KEY_INPUT, parser.next()); - position.set(Position.KEY_OUTPUT, parser.next()); - - if (parser.hasNext()) { - String[] values = parser.next().split(","); - for (int i = 0; i < values.length; i++) { - position.set(Position.PREFIX_ADC + (i + 1), Integer.parseInt(values[i], 16)); - } - } - - position.set(Position.KEY_ODOMETER, parser.nextInt(0)); - position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next()); - - if (parser.hasNext()) { - int value = parser.nextHexInt(0); - position.set(Position.KEY_BATTERY, value >> 8); - position.set(Position.KEY_RSSI, (value >> 4) & 0xf); - position.set(Position.KEY_SATELLITES, value & 0xf); - } - - return position; - } - - private void requestPhotoFragment(Channel channel) { - if (channel != null) { - int offset = photo.writerIndex(); - int size = Math.min(photo.writableBytes(), MAX_CHUNK_SIZE); - channel.writeAndFlush(new NetworkMessage("#PHD" + offset + "," + size + "\r\n", channel.remoteAddress())); - } - } - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - ByteBuf buf = (ByteBuf) msg; - - int typeEndIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ','); - String type = buf.toString(buf.readerIndex(), typeEndIndex - buf.readerIndex(), StandardCharsets.US_ASCII); - - if (type.startsWith("$PHD")) { - - int dataIndex = buf.indexOf(typeEndIndex + 1, buf.writerIndex(), (byte) ',') + 1; - buf.readerIndex(dataIndex); - - if (photo != null) { - - photo.writeBytes(buf.readSlice(buf.readableBytes())); - - if (photo.writableBytes() > 0) { - - requestPhotoFragment(channel); - - } else { - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); - String uniqueId = Context.getIdentityManager().getById(deviceSession.getDeviceId()).getUniqueId(); - - Position position = new Position(getProtocolName()); - position.setDeviceId(deviceSession.getDeviceId()); - - getLastLocation(position, null); - - position.set(Position.KEY_IMAGE, Context.getMediaManager().writeFile(uniqueId, photo, "jpg")); - photo.release(); - photo = null; - - return position; - - } - - } - - } else { - - if (type.startsWith("$PHO")) { - int size = Integer.parseInt(type.split("-")[0].substring(4)); - if (size > 0) { - photo = Unpooled.buffer(size); - requestPhotoFragment(channel); - } - } - - return decodePosition(channel, remoteAddress, buf.toString(StandardCharsets.US_ASCII)); - - } - - return null; - } - -} +/* + * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2012 Luis Parada (luis.parada@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.Context; +import org.traccar.DeviceSession; +import org.traccar.NetworkMessage; +import org.traccar.Protocol; +import org.traccar.helper.DateBuilder; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.regex.Pattern; + +public class Pt502ProtocolDecoder extends BaseProtocolDecoder { + + private static final int MAX_CHUNK_SIZE = 960; + + private ByteBuf photo; + + public Pt502ProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .any().text("$") + .expression("([^,]+),") // type + .number("(d+),") // id + .number("(dd)(dd)(dd).(ddd),") // time (hhmmss.sss) + .expression("([AV]),") // validity + .number("(d+)(dd.dddd),") // latitude + .expression("([NS]),") + .number("(d+)(dd.dddd),") // longitude + .expression("([EW]),") + .number("(d+.d+)?,") // speed + .number("(d+.d+)?,") // course + .number("(dd)(dd)(dd),,,") // date (ddmmyy) + .expression("./") + .expression("([01])+,") // input + .expression("([01])+/") // output + .expression("([^/]+)?/") // adc + .number("(d+)") // odometer + .expression("/([^/]+)?/") // rfid + .number("(xxx)").optional(2) // state + .any() + .compile(); + + private String decodeAlarm(String value) { + switch (value) { + case "IN1": + return Position.ALARM_SOS; + case "GOF": + return Position.ALARM_GEOFENCE; + case "TOW": + return Position.ALARM_TOW; + case "HDA": + return Position.ALARM_ACCELERATION; + case "HDB": + return Position.ALARM_BRAKING; + case "FDA": + return Position.ALARM_FATIGUE_DRIVING; + case "SKA": + return Position.ALARM_VIBRATION; + case "PMA": + return Position.ALARM_MOVEMENT; + case "CPA": + return Position.ALARM_POWER_CUT; + default: + return null; + } + } + + private Position decodePosition(Channel channel, SocketAddress remoteAddress, String sentence) { + + Parser parser = new Parser(PATTERN, sentence); + if (!parser.matches()) { + return null; + } + + Position position = new Position(getProtocolName()); + position.set(Position.KEY_ALARM, decodeAlarm(parser.next())); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + position.setDeviceId(deviceSession.getDeviceId()); + + DateBuilder dateBuilder = new DateBuilder() + .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); + + position.setValid(parser.next().equals("A")); + position.setLatitude(parser.nextCoordinate()); + position.setLongitude(parser.nextCoordinate()); + position.setSpeed(parser.nextDouble(0)); + position.setCourse(parser.nextDouble(0)); + + dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); + position.setTime(dateBuilder.getDate()); + + position.set(Position.KEY_INPUT, parser.next()); + position.set(Position.KEY_OUTPUT, parser.next()); + + if (parser.hasNext()) { + String[] values = parser.next().split(","); + for (int i = 0; i < values.length; i++) { + position.set(Position.PREFIX_ADC + (i + 1), Integer.parseInt(values[i], 16)); + } + } + + position.set(Position.KEY_ODOMETER, parser.nextInt(0)); + position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next()); + + if (parser.hasNext()) { + int value = parser.nextHexInt(0); + position.set(Position.KEY_BATTERY, value >> 8); + position.set(Position.KEY_RSSI, (value >> 4) & 0xf); + position.set(Position.KEY_SATELLITES, value & 0xf); + } + + return position; + } + + private void requestPhotoFragment(Channel channel) { + if (channel != null) { + int offset = photo.writerIndex(); + int size = Math.min(photo.writableBytes(), MAX_CHUNK_SIZE); + channel.writeAndFlush(new NetworkMessage("#PHD" + offset + "," + size + "\r\n", channel.remoteAddress())); + } + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + ByteBuf buf = (ByteBuf) msg; + + int typeEndIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ','); + String type = buf.toString(buf.readerIndex(), typeEndIndex - buf.readerIndex(), StandardCharsets.US_ASCII); + + if (type.startsWith("$PHD")) { + + int dataIndex = buf.indexOf(typeEndIndex + 1, buf.writerIndex(), (byte) ',') + 1; + buf.readerIndex(dataIndex); + + if (photo != null) { + + photo.writeBytes(buf.readSlice(buf.readableBytes())); + + if (photo.writableBytes() > 0) { + + requestPhotoFragment(channel); + + } else { + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); + String uniqueId = Context.getIdentityManager().getById(deviceSession.getDeviceId()).getUniqueId(); + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + getLastLocation(position, null); + + position.set(Position.KEY_IMAGE, Context.getMediaManager().writeFile(uniqueId, photo, "jpg")); + photo.release(); + photo = null; + + return position; + + } + + } + + } else { + + if (type.startsWith("$PHO")) { + int size = Integer.parseInt(type.split("-")[0].substring(4)); + if (size > 0) { + photo = Unpooled.buffer(size); + requestPhotoFragment(channel); + } + } + + return decodePosition(channel, remoteAddress, buf.toString(StandardCharsets.US_ASCII)); + + } + + return null; + } + +} diff --git a/src/org/traccar/protocol/Pt502ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Pt502ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Pt502ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Pt502ProtocolEncoder.java diff --git a/src/org/traccar/protocol/Pt60Protocol.java b/src/main/java/org/traccar/protocol/Pt60Protocol.java similarity index 100% rename from src/org/traccar/protocol/Pt60Protocol.java rename to src/main/java/org/traccar/protocol/Pt60Protocol.java diff --git a/src/org/traccar/protocol/Pt60ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Pt60ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Pt60ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Pt60ProtocolDecoder.java diff --git a/src/org/traccar/protocol/RaveonProtocol.java b/src/main/java/org/traccar/protocol/RaveonProtocol.java similarity index 100% rename from src/org/traccar/protocol/RaveonProtocol.java rename to src/main/java/org/traccar/protocol/RaveonProtocol.java diff --git a/src/org/traccar/protocol/RaveonProtocolDecoder.java b/src/main/java/org/traccar/protocol/RaveonProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RaveonProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RaveonProtocolDecoder.java diff --git a/src/org/traccar/protocol/RecodaProtocol.java b/src/main/java/org/traccar/protocol/RecodaProtocol.java similarity index 100% rename from src/org/traccar/protocol/RecodaProtocol.java rename to src/main/java/org/traccar/protocol/RecodaProtocol.java diff --git a/src/org/traccar/protocol/RecodaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RecodaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RecodaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RecodaProtocolDecoder.java diff --git a/src/org/traccar/protocol/RetranslatorFrameDecoder.java b/src/main/java/org/traccar/protocol/RetranslatorFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/RetranslatorFrameDecoder.java rename to src/main/java/org/traccar/protocol/RetranslatorFrameDecoder.java diff --git a/src/org/traccar/protocol/RetranslatorProtocol.java b/src/main/java/org/traccar/protocol/RetranslatorProtocol.java similarity index 100% rename from src/org/traccar/protocol/RetranslatorProtocol.java rename to src/main/java/org/traccar/protocol/RetranslatorProtocol.java diff --git a/src/org/traccar/protocol/RetranslatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RetranslatorProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java diff --git a/src/org/traccar/protocol/RitiProtocol.java b/src/main/java/org/traccar/protocol/RitiProtocol.java similarity index 100% rename from src/org/traccar/protocol/RitiProtocol.java rename to src/main/java/org/traccar/protocol/RitiProtocol.java diff --git a/src/org/traccar/protocol/RitiProtocolDecoder.java b/src/main/java/org/traccar/protocol/RitiProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RitiProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RitiProtocolDecoder.java diff --git a/src/org/traccar/protocol/RoboTrackFrameDecoder.java b/src/main/java/org/traccar/protocol/RoboTrackFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/RoboTrackFrameDecoder.java rename to src/main/java/org/traccar/protocol/RoboTrackFrameDecoder.java diff --git a/src/org/traccar/protocol/RoboTrackProtocol.java b/src/main/java/org/traccar/protocol/RoboTrackProtocol.java similarity index 100% rename from src/org/traccar/protocol/RoboTrackProtocol.java rename to src/main/java/org/traccar/protocol/RoboTrackProtocol.java diff --git a/src/org/traccar/protocol/RoboTrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/RoboTrackProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RoboTrackProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RoboTrackProtocolDecoder.java diff --git a/src/org/traccar/protocol/RuptelaProtocol.java b/src/main/java/org/traccar/protocol/RuptelaProtocol.java similarity index 100% rename from src/org/traccar/protocol/RuptelaProtocol.java rename to src/main/java/org/traccar/protocol/RuptelaProtocol.java diff --git a/src/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/RuptelaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java diff --git a/src/org/traccar/protocol/RuptelaProtocolEncoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/RuptelaProtocolEncoder.java rename to src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java diff --git a/src/org/traccar/protocol/SabertekFrameDecoder.java b/src/main/java/org/traccar/protocol/SabertekFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/SabertekFrameDecoder.java rename to src/main/java/org/traccar/protocol/SabertekFrameDecoder.java diff --git a/src/org/traccar/protocol/SabertekProtocol.java b/src/main/java/org/traccar/protocol/SabertekProtocol.java similarity index 100% rename from src/org/traccar/protocol/SabertekProtocol.java rename to src/main/java/org/traccar/protocol/SabertekProtocol.java diff --git a/src/org/traccar/protocol/SabertekProtocolDecoder.java b/src/main/java/org/traccar/protocol/SabertekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SabertekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SabertekProtocolDecoder.java diff --git a/src/org/traccar/protocol/SanavProtocol.java b/src/main/java/org/traccar/protocol/SanavProtocol.java similarity index 100% rename from src/org/traccar/protocol/SanavProtocol.java rename to src/main/java/org/traccar/protocol/SanavProtocol.java diff --git a/src/org/traccar/protocol/SanavProtocolDecoder.java b/src/main/java/org/traccar/protocol/SanavProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SanavProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SanavProtocolDecoder.java diff --git a/src/org/traccar/protocol/SatsolProtocol.java b/src/main/java/org/traccar/protocol/SatsolProtocol.java similarity index 100% rename from src/org/traccar/protocol/SatsolProtocol.java rename to src/main/java/org/traccar/protocol/SatsolProtocol.java diff --git a/src/org/traccar/protocol/SatsolProtocolDecoder.java b/src/main/java/org/traccar/protocol/SatsolProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SatsolProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SatsolProtocolDecoder.java diff --git a/src/org/traccar/protocol/SigfoxProtocol.java b/src/main/java/org/traccar/protocol/SigfoxProtocol.java similarity index 100% rename from src/org/traccar/protocol/SigfoxProtocol.java rename to src/main/java/org/traccar/protocol/SigfoxProtocol.java diff --git a/src/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SigfoxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java diff --git a/src/org/traccar/protocol/SiwiProtocol.java b/src/main/java/org/traccar/protocol/SiwiProtocol.java similarity index 100% rename from src/org/traccar/protocol/SiwiProtocol.java rename to src/main/java/org/traccar/protocol/SiwiProtocol.java diff --git a/src/org/traccar/protocol/SiwiProtocolDecoder.java b/src/main/java/org/traccar/protocol/SiwiProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SiwiProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SiwiProtocolDecoder.java diff --git a/src/org/traccar/protocol/SkypatrolProtocol.java b/src/main/java/org/traccar/protocol/SkypatrolProtocol.java similarity index 100% rename from src/org/traccar/protocol/SkypatrolProtocol.java rename to src/main/java/org/traccar/protocol/SkypatrolProtocol.java diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/main/java/org/traccar/protocol/SkypatrolProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SkypatrolProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SkypatrolProtocolDecoder.java diff --git a/src/org/traccar/protocol/SmartSoleProtocol.java b/src/main/java/org/traccar/protocol/SmartSoleProtocol.java similarity index 100% rename from src/org/traccar/protocol/SmartSoleProtocol.java rename to src/main/java/org/traccar/protocol/SmartSoleProtocol.java diff --git a/src/org/traccar/protocol/SmartSoleProtocolDecoder.java b/src/main/java/org/traccar/protocol/SmartSoleProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SmartSoleProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SmartSoleProtocolDecoder.java diff --git a/src/org/traccar/protocol/SmokeyProtocol.java b/src/main/java/org/traccar/protocol/SmokeyProtocol.java similarity index 100% rename from src/org/traccar/protocol/SmokeyProtocol.java rename to src/main/java/org/traccar/protocol/SmokeyProtocol.java diff --git a/src/org/traccar/protocol/SmokeyProtocolDecoder.java b/src/main/java/org/traccar/protocol/SmokeyProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SmokeyProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SmokeyProtocolDecoder.java diff --git a/src/org/traccar/protocol/SpotProtocol.java b/src/main/java/org/traccar/protocol/SpotProtocol.java similarity index 100% rename from src/org/traccar/protocol/SpotProtocol.java rename to src/main/java/org/traccar/protocol/SpotProtocol.java diff --git a/src/org/traccar/protocol/SpotProtocolDecoder.java b/src/main/java/org/traccar/protocol/SpotProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SpotProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SpotProtocolDecoder.java diff --git a/src/org/traccar/protocol/StarLinkProtocol.java b/src/main/java/org/traccar/protocol/StarLinkProtocol.java similarity index 100% rename from src/org/traccar/protocol/StarLinkProtocol.java rename to src/main/java/org/traccar/protocol/StarLinkProtocol.java diff --git a/src/org/traccar/protocol/StarLinkProtocolDecoder.java b/src/main/java/org/traccar/protocol/StarLinkProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/StarLinkProtocolDecoder.java rename to src/main/java/org/traccar/protocol/StarLinkProtocolDecoder.java diff --git a/src/org/traccar/protocol/Stl060FrameDecoder.java b/src/main/java/org/traccar/protocol/Stl060FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Stl060FrameDecoder.java rename to src/main/java/org/traccar/protocol/Stl060FrameDecoder.java diff --git a/src/org/traccar/protocol/Stl060Protocol.java b/src/main/java/org/traccar/protocol/Stl060Protocol.java similarity index 100% rename from src/org/traccar/protocol/Stl060Protocol.java rename to src/main/java/org/traccar/protocol/Stl060Protocol.java diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Stl060ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Stl060ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Stl060ProtocolDecoder.java diff --git a/src/org/traccar/protocol/SuntechProtocol.java b/src/main/java/org/traccar/protocol/SuntechProtocol.java similarity index 100% rename from src/org/traccar/protocol/SuntechProtocol.java rename to src/main/java/org/traccar/protocol/SuntechProtocol.java diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SuntechProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java diff --git a/src/org/traccar/protocol/SuntechProtocolEncoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/SuntechProtocolEncoder.java rename to src/main/java/org/traccar/protocol/SuntechProtocolEncoder.java diff --git a/src/org/traccar/protocol/SupermateProtocol.java b/src/main/java/org/traccar/protocol/SupermateProtocol.java similarity index 100% rename from src/org/traccar/protocol/SupermateProtocol.java rename to src/main/java/org/traccar/protocol/SupermateProtocol.java diff --git a/src/org/traccar/protocol/SupermateProtocolDecoder.java b/src/main/java/org/traccar/protocol/SupermateProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/SupermateProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SupermateProtocolDecoder.java diff --git a/src/org/traccar/protocol/SviasProtocol.java b/src/main/java/org/traccar/protocol/SviasProtocol.java similarity index 97% rename from src/org/traccar/protocol/SviasProtocol.java rename to src/main/java/org/traccar/protocol/SviasProtocol.java index c6624b7d4..f01f28389 100644 --- a/src/org/traccar/protocol/SviasProtocol.java +++ b/src/main/java/org/traccar/protocol/SviasProtocol.java @@ -1,51 +1,51 @@ -/* - * Copyright 2018 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.handler.codec.string.StringDecoder; -import io.netty.handler.codec.string.StringEncoder; -import org.traccar.BaseProtocol; -import org.traccar.CharacterDelimiterFrameDecoder; -import org.traccar.PipelineBuilder; -import org.traccar.TrackerServer; - -import org.traccar.model.Command; - -public class SviasProtocol extends BaseProtocol { - - public SviasProtocol() { - setSupportedDataCommands( - Command.TYPE_CUSTOM, - Command.TYPE_POSITION_SINGLE, - Command.TYPE_SET_ODOMETER, - Command.TYPE_ENGINE_STOP, - Command.TYPE_ENGINE_RESUME, - Command.TYPE_ALARM_ARM, - Command.TYPE_ALARM_DISARM, - Command.TYPE_ALARM_REMOVE); - addServer(new TrackerServer(false, getName()) { - @Override - protected void addProtocolHandlers(PipelineBuilder pipeline) { - pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "]")); - pipeline.addLast(new StringEncoder()); - pipeline.addLast(new StringDecoder()); - pipeline.addLast(new SviasProtocolEncoder()); - pipeline.addLast(new SviasProtocolDecoder(SviasProtocol.this)); - } - }); - } - -} +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import io.netty.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.CharacterDelimiterFrameDecoder; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +import org.traccar.model.Command; + +public class SviasProtocol extends BaseProtocol { + + public SviasProtocol() { + setSupportedDataCommands( + Command.TYPE_CUSTOM, + Command.TYPE_POSITION_SINGLE, + Command.TYPE_SET_ODOMETER, + Command.TYPE_ENGINE_STOP, + Command.TYPE_ENGINE_RESUME, + Command.TYPE_ALARM_ARM, + Command.TYPE_ALARM_DISARM, + Command.TYPE_ALARM_REMOVE); + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "]")); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new SviasProtocolEncoder()); + pipeline.addLast(new SviasProtocolDecoder(SviasProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/SviasProtocolDecoder.java b/src/main/java/org/traccar/protocol/SviasProtocolDecoder.java similarity index 97% rename from src/org/traccar/protocol/SviasProtocolDecoder.java rename to src/main/java/org/traccar/protocol/SviasProtocolDecoder.java index 978483175..7e783f6cd 100644 --- a/src/org/traccar/protocol/SviasProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/SviasProtocolDecoder.java @@ -1,105 +1,105 @@ -/* - * Copyright 2018 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import io.netty.channel.Channel; -import org.traccar.BaseProtocolDecoder; -import org.traccar.NetworkMessage; -import org.traccar.Protocol; -import org.traccar.helper.BitUtil; -import org.traccar.helper.PatternBuilder; - -import java.net.SocketAddress; -import java.util.regex.Pattern; -import org.traccar.DeviceSession; -import org.traccar.helper.Parser; -import org.traccar.helper.UnitsConverter; -import org.traccar.model.Position; - -public class SviasProtocolDecoder extends BaseProtocolDecoder { - - public SviasProtocolDecoder(Protocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .text("[") // delimiter - .number("d{4},") // hardware version - .number("d{4},") // software version - .number("d+,") // index - .number("(d+),") // imei - .number("d+,") // hour meter - .number("(d+)(dd)(dd),") // date (dmmyy) - .number("(d+)(dd)(dd),") // time (hmmss) - .number("(-?)(d+)(dd)(d{5}),") // latitude - .number("(-?)(d+)(dd)(d{5}),") // longitude - .number("(d+),") // speed - .number("(d+),") // course - .number("(d+),") // odometer - .number("(d+),") // input - .number("(d+),") // output / status - .number("(d),") - .number("(d),") - .number("(d+),") // power - .number("(d+),") // battery level - .number("(d+),") // rssi - .any() - .compile(); - - @Override - protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) - throws Exception { - - if (channel != null) { - channel.writeAndFlush(new NetworkMessage("@", remoteAddress)); - } - - Parser parser = new Parser(PATTERN, (String) msg); - if (!parser.matches()) { - return null; - } - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); - if (deviceSession == null) { - return null; - } - - Position position = new Position(getProtocolName()); - position.setDeviceId(deviceSession.getDeviceId()); - - position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS)); - position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); - position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); - position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble() * 0.01)); - position.setCourse(parser.nextDouble() * 0.01); - - position.set(Position.KEY_ODOMETER, parser.nextInt() * 100); - - int input = parser.nextInt(); - int output = parser.nextInt(); - - position.set(Position.KEY_ALARM, BitUtil.check(input, 0) ? Position.ALARM_SOS : null); - position.set(Position.KEY_IGNITION, BitUtil.check(input, 4)); - position.setValid(BitUtil.check(output, 0)); - - position.set(Position.KEY_POWER, parser.nextInt() * 0.001); - position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt()); - position.set(Position.KEY_RSSI, parser.nextInt()); - - return position; - } - -} +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import io.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.NetworkMessage; +import org.traccar.Protocol; +import org.traccar.helper.BitUtil; +import org.traccar.helper.PatternBuilder; + +import java.net.SocketAddress; +import java.util.regex.Pattern; +import org.traccar.DeviceSession; +import org.traccar.helper.Parser; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +public class SviasProtocolDecoder extends BaseProtocolDecoder { + + public SviasProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("[") // delimiter + .number("d{4},") // hardware version + .number("d{4},") // software version + .number("d+,") // index + .number("(d+),") // imei + .number("d+,") // hour meter + .number("(d+)(dd)(dd),") // date (dmmyy) + .number("(d+)(dd)(dd),") // time (hmmss) + .number("(-?)(d+)(dd)(d{5}),") // latitude + .number("(-?)(d+)(dd)(d{5}),") // longitude + .number("(d+),") // speed + .number("(d+),") // course + .number("(d+),") // odometer + .number("(d+),") // input + .number("(d+),") // output / status + .number("(d),") + .number("(d),") + .number("(d+),") // power + .number("(d+),") // battery level + .number("(d+),") // rssi + .any() + .compile(); + + @Override + protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) + throws Exception { + + if (channel != null) { + channel.writeAndFlush(new NetworkMessage("@", remoteAddress)); + } + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS)); + position.setLatitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); + position.setLongitude(parser.nextCoordinate(Parser.CoordinateFormat.HEM_DEG_MIN_MIN)); + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble() * 0.01)); + position.setCourse(parser.nextDouble() * 0.01); + + position.set(Position.KEY_ODOMETER, parser.nextInt() * 100); + + int input = parser.nextInt(); + int output = parser.nextInt(); + + position.set(Position.KEY_ALARM, BitUtil.check(input, 0) ? Position.ALARM_SOS : null); + position.set(Position.KEY_IGNITION, BitUtil.check(input, 4)); + position.setValid(BitUtil.check(output, 0)); + + position.set(Position.KEY_POWER, parser.nextInt() * 0.001); + position.set(Position.KEY_BATTERY_LEVEL, parser.nextInt()); + position.set(Position.KEY_RSSI, parser.nextInt()); + + return position; + } + +} diff --git a/src/org/traccar/protocol/SviasProtocolEncoder.java b/src/main/java/org/traccar/protocol/SviasProtocolEncoder.java similarity index 97% rename from src/org/traccar/protocol/SviasProtocolEncoder.java rename to src/main/java/org/traccar/protocol/SviasProtocolEncoder.java index 9fce57223..8bfbef119 100644 --- a/src/org/traccar/protocol/SviasProtocolEncoder.java +++ b/src/main/java/org/traccar/protocol/SviasProtocolEncoder.java @@ -1,48 +1,48 @@ -/* - * Copyright 2018 Anton Tananaev (anton@traccar.org) - * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.traccar.StringProtocolEncoder; -import org.traccar.model.Command; - -public class SviasProtocolEncoder extends StringProtocolEncoder { - - @Override - protected Object encodeCommand(Command command) { - switch (command.getType()) { - case Command.TYPE_CUSTOM: - return formatCommand(command, "{%s}", Command.KEY_DATA); - case Command.TYPE_POSITION_SINGLE: - return formatCommand(command, "AT+STR=1*"); - case Command.TYPE_SET_ODOMETER: - return formatCommand(command, "AT+ODT={%s}*", Command.KEY_DATA); - case Command.TYPE_ENGINE_STOP: - return formatCommand(command, "AT+OUT=1,1*"); - case Command.TYPE_ENGINE_RESUME: - return formatCommand(command, "AT+OUT=1,0*"); - case Command.TYPE_ALARM_ARM: - return formatCommand(command, "AT+OUT=2,1*"); - case Command.TYPE_ALARM_DISARM: - return formatCommand(command, "AT+OUT=2,0*"); - case Command.TYPE_ALARM_REMOVE: - return formatCommand(command, "AT+PNC=600*"); - default: - return null; - } - } - -} +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.traccar.StringProtocolEncoder; +import org.traccar.model.Command; + +public class SviasProtocolEncoder extends StringProtocolEncoder { + + @Override + protected Object encodeCommand(Command command) { + switch (command.getType()) { + case Command.TYPE_CUSTOM: + return formatCommand(command, "{%s}", Command.KEY_DATA); + case Command.TYPE_POSITION_SINGLE: + return formatCommand(command, "AT+STR=1*"); + case Command.TYPE_SET_ODOMETER: + return formatCommand(command, "AT+ODT={%s}*", Command.KEY_DATA); + case Command.TYPE_ENGINE_STOP: + return formatCommand(command, "AT+OUT=1,1*"); + case Command.TYPE_ENGINE_RESUME: + return formatCommand(command, "AT+OUT=1,0*"); + case Command.TYPE_ALARM_ARM: + return formatCommand(command, "AT+OUT=2,1*"); + case Command.TYPE_ALARM_DISARM: + return formatCommand(command, "AT+OUT=2,0*"); + case Command.TYPE_ALARM_REMOVE: + return formatCommand(command, "AT+PNC=600*"); + default: + return null; + } + } + +} diff --git a/src/org/traccar/protocol/T55Protocol.java b/src/main/java/org/traccar/protocol/T55Protocol.java similarity index 100% rename from src/org/traccar/protocol/T55Protocol.java rename to src/main/java/org/traccar/protocol/T55Protocol.java diff --git a/src/org/traccar/protocol/T55ProtocolDecoder.java b/src/main/java/org/traccar/protocol/T55ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/T55ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/T55ProtocolDecoder.java diff --git a/src/org/traccar/protocol/T57FrameDecoder.java b/src/main/java/org/traccar/protocol/T57FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/T57FrameDecoder.java rename to src/main/java/org/traccar/protocol/T57FrameDecoder.java diff --git a/src/org/traccar/protocol/T57Protocol.java b/src/main/java/org/traccar/protocol/T57Protocol.java similarity index 100% rename from src/org/traccar/protocol/T57Protocol.java rename to src/main/java/org/traccar/protocol/T57Protocol.java diff --git a/src/org/traccar/protocol/T57ProtocolDecoder.java b/src/main/java/org/traccar/protocol/T57ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/T57ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/T57ProtocolDecoder.java diff --git a/src/org/traccar/protocol/T800xProtocol.java b/src/main/java/org/traccar/protocol/T800xProtocol.java similarity index 100% rename from src/org/traccar/protocol/T800xProtocol.java rename to src/main/java/org/traccar/protocol/T800xProtocol.java diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/T800xProtocolDecoder.java rename to src/main/java/org/traccar/protocol/T800xProtocolDecoder.java diff --git a/src/org/traccar/protocol/T800xProtocolEncoder.java b/src/main/java/org/traccar/protocol/T800xProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/T800xProtocolEncoder.java rename to src/main/java/org/traccar/protocol/T800xProtocolEncoder.java diff --git a/src/org/traccar/protocol/TaipProtocol.java b/src/main/java/org/traccar/protocol/TaipProtocol.java similarity index 100% rename from src/org/traccar/protocol/TaipProtocol.java rename to src/main/java/org/traccar/protocol/TaipProtocol.java diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/main/java/org/traccar/protocol/TaipProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TaipProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TaipProtocolDecoder.java diff --git a/src/org/traccar/protocol/TekFrameDecoder.java b/src/main/java/org/traccar/protocol/TekFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TekFrameDecoder.java rename to src/main/java/org/traccar/protocol/TekFrameDecoder.java diff --git a/src/org/traccar/protocol/TekProtocol.java b/src/main/java/org/traccar/protocol/TekProtocol.java similarity index 100% rename from src/org/traccar/protocol/TekProtocol.java rename to src/main/java/org/traccar/protocol/TekProtocol.java diff --git a/src/org/traccar/protocol/TekProtocolDecoder.java b/src/main/java/org/traccar/protocol/TekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TekProtocolDecoder.java diff --git a/src/org/traccar/protocol/TelemaxProtocol.java b/src/main/java/org/traccar/protocol/TelemaxProtocol.java similarity index 100% rename from src/org/traccar/protocol/TelemaxProtocol.java rename to src/main/java/org/traccar/protocol/TelemaxProtocol.java diff --git a/src/org/traccar/protocol/TelemaxProtocolDecoder.java b/src/main/java/org/traccar/protocol/TelemaxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TelemaxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TelemaxProtocolDecoder.java diff --git a/src/org/traccar/protocol/TelicFrameDecoder.java b/src/main/java/org/traccar/protocol/TelicFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TelicFrameDecoder.java rename to src/main/java/org/traccar/protocol/TelicFrameDecoder.java diff --git a/src/org/traccar/protocol/TelicProtocol.java b/src/main/java/org/traccar/protocol/TelicProtocol.java similarity index 100% rename from src/org/traccar/protocol/TelicProtocol.java rename to src/main/java/org/traccar/protocol/TelicProtocol.java diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/main/java/org/traccar/protocol/TelicProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TelicProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TelicProtocolDecoder.java diff --git a/src/org/traccar/protocol/TeltonikaFrameDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TeltonikaFrameDecoder.java rename to src/main/java/org/traccar/protocol/TeltonikaFrameDecoder.java diff --git a/src/org/traccar/protocol/TeltonikaProtocol.java b/src/main/java/org/traccar/protocol/TeltonikaProtocol.java similarity index 100% rename from src/org/traccar/protocol/TeltonikaProtocol.java rename to src/main/java/org/traccar/protocol/TeltonikaProtocol.java diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TeltonikaProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java diff --git a/src/org/traccar/protocol/TeltonikaProtocolEncoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/TeltonikaProtocolEncoder.java rename to src/main/java/org/traccar/protocol/TeltonikaProtocolEncoder.java diff --git a/src/org/traccar/protocol/ThinkRaceProtocol.java b/src/main/java/org/traccar/protocol/ThinkRaceProtocol.java similarity index 100% rename from src/org/traccar/protocol/ThinkRaceProtocol.java rename to src/main/java/org/traccar/protocol/ThinkRaceProtocol.java diff --git a/src/org/traccar/protocol/ThinkRaceProtocolDecoder.java b/src/main/java/org/traccar/protocol/ThinkRaceProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/ThinkRaceProtocolDecoder.java rename to src/main/java/org/traccar/protocol/ThinkRaceProtocolDecoder.java diff --git a/src/org/traccar/protocol/Tk102Protocol.java b/src/main/java/org/traccar/protocol/Tk102Protocol.java similarity index 100% rename from src/org/traccar/protocol/Tk102Protocol.java rename to src/main/java/org/traccar/protocol/Tk102Protocol.java diff --git a/src/org/traccar/protocol/Tk102ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk102ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tk102ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tk102ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Tk103FrameDecoder.java b/src/main/java/org/traccar/protocol/Tk103FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tk103FrameDecoder.java rename to src/main/java/org/traccar/protocol/Tk103FrameDecoder.java diff --git a/src/org/traccar/protocol/Tk103Protocol.java b/src/main/java/org/traccar/protocol/Tk103Protocol.java similarity index 100% rename from src/org/traccar/protocol/Tk103Protocol.java rename to src/main/java/org/traccar/protocol/Tk103Protocol.java diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tk103ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Tk103ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java diff --git a/src/org/traccar/protocol/Tlt2hProtocol.java b/src/main/java/org/traccar/protocol/Tlt2hProtocol.java similarity index 100% rename from src/org/traccar/protocol/Tlt2hProtocol.java rename to src/main/java/org/traccar/protocol/Tlt2hProtocol.java diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tlt2hProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tlt2hProtocolDecoder.java diff --git a/src/org/traccar/protocol/TlvProtocol.java b/src/main/java/org/traccar/protocol/TlvProtocol.java similarity index 100% rename from src/org/traccar/protocol/TlvProtocol.java rename to src/main/java/org/traccar/protocol/TlvProtocol.java diff --git a/src/org/traccar/protocol/TlvProtocolDecoder.java b/src/main/java/org/traccar/protocol/TlvProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TlvProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TlvProtocolDecoder.java diff --git a/src/org/traccar/protocol/TmgFrameDecoder.java b/src/main/java/org/traccar/protocol/TmgFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TmgFrameDecoder.java rename to src/main/java/org/traccar/protocol/TmgFrameDecoder.java diff --git a/src/org/traccar/protocol/TmgProtocol.java b/src/main/java/org/traccar/protocol/TmgProtocol.java similarity index 100% rename from src/org/traccar/protocol/TmgProtocol.java rename to src/main/java/org/traccar/protocol/TmgProtocol.java diff --git a/src/org/traccar/protocol/TmgProtocolDecoder.java b/src/main/java/org/traccar/protocol/TmgProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TmgProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TmgProtocolDecoder.java diff --git a/src/org/traccar/protocol/TopflytechProtocol.java b/src/main/java/org/traccar/protocol/TopflytechProtocol.java similarity index 100% rename from src/org/traccar/protocol/TopflytechProtocol.java rename to src/main/java/org/traccar/protocol/TopflytechProtocol.java diff --git a/src/org/traccar/protocol/TopflytechProtocolDecoder.java b/src/main/java/org/traccar/protocol/TopflytechProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TopflytechProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TopflytechProtocolDecoder.java diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/main/java/org/traccar/protocol/TotemFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TotemFrameDecoder.java rename to src/main/java/org/traccar/protocol/TotemFrameDecoder.java diff --git a/src/org/traccar/protocol/TotemProtocol.java b/src/main/java/org/traccar/protocol/TotemProtocol.java similarity index 100% rename from src/org/traccar/protocol/TotemProtocol.java rename to src/main/java/org/traccar/protocol/TotemProtocol.java diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/main/java/org/traccar/protocol/TotemProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TotemProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TotemProtocolDecoder.java diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/main/java/org/traccar/protocol/TotemProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/TotemProtocolEncoder.java rename to src/main/java/org/traccar/protocol/TotemProtocolEncoder.java diff --git a/src/org/traccar/protocol/Tr20Protocol.java b/src/main/java/org/traccar/protocol/Tr20Protocol.java similarity index 100% rename from src/org/traccar/protocol/Tr20Protocol.java rename to src/main/java/org/traccar/protocol/Tr20Protocol.java diff --git a/src/org/traccar/protocol/Tr20ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tr20ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tr20ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Tr900Protocol.java b/src/main/java/org/traccar/protocol/Tr900Protocol.java similarity index 100% rename from src/org/traccar/protocol/Tr900Protocol.java rename to src/main/java/org/traccar/protocol/Tr900Protocol.java diff --git a/src/org/traccar/protocol/Tr900ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tr900ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tr900ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tr900ProtocolDecoder.java diff --git a/src/org/traccar/protocol/TrackboxProtocol.java b/src/main/java/org/traccar/protocol/TrackboxProtocol.java similarity index 100% rename from src/org/traccar/protocol/TrackboxProtocol.java rename to src/main/java/org/traccar/protocol/TrackboxProtocol.java diff --git a/src/org/traccar/protocol/TrackboxProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrackboxProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TrackboxProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TrackboxProtocolDecoder.java diff --git a/src/org/traccar/protocol/TrakMateProtocol.java b/src/main/java/org/traccar/protocol/TrakMateProtocol.java similarity index 100% rename from src/org/traccar/protocol/TrakMateProtocol.java rename to src/main/java/org/traccar/protocol/TrakMateProtocol.java diff --git a/src/org/traccar/protocol/TrakMateProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TrakMateProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TrakMateProtocolDecoder.java diff --git a/src/org/traccar/protocol/TramigoFrameDecoder.java b/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/TramigoFrameDecoder.java rename to src/main/java/org/traccar/protocol/TramigoFrameDecoder.java diff --git a/src/org/traccar/protocol/TramigoProtocol.java b/src/main/java/org/traccar/protocol/TramigoProtocol.java similarity index 100% rename from src/org/traccar/protocol/TramigoProtocol.java rename to src/main/java/org/traccar/protocol/TramigoProtocol.java diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TramigoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java diff --git a/src/org/traccar/protocol/TrvProtocol.java b/src/main/java/org/traccar/protocol/TrvProtocol.java similarity index 100% rename from src/org/traccar/protocol/TrvProtocol.java rename to src/main/java/org/traccar/protocol/TrvProtocol.java diff --git a/src/org/traccar/protocol/TrvProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TrvProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TrvProtocolDecoder.java diff --git a/src/org/traccar/protocol/Tt8850Protocol.java b/src/main/java/org/traccar/protocol/Tt8850Protocol.java similarity index 100% rename from src/org/traccar/protocol/Tt8850Protocol.java rename to src/main/java/org/traccar/protocol/Tt8850Protocol.java diff --git a/src/org/traccar/protocol/Tt8850ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tt8850ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Tt8850ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Tt8850ProtocolDecoder.java diff --git a/src/org/traccar/protocol/TytanProtocol.java b/src/main/java/org/traccar/protocol/TytanProtocol.java similarity index 100% rename from src/org/traccar/protocol/TytanProtocol.java rename to src/main/java/org/traccar/protocol/TytanProtocol.java diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/main/java/org/traccar/protocol/TytanProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TytanProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TytanProtocolDecoder.java diff --git a/src/org/traccar/protocol/TzoneProtocol.java b/src/main/java/org/traccar/protocol/TzoneProtocol.java similarity index 100% rename from src/org/traccar/protocol/TzoneProtocol.java rename to src/main/java/org/traccar/protocol/TzoneProtocol.java diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/TzoneProtocolDecoder.java rename to src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java diff --git a/src/org/traccar/protocol/UlbotechFrameDecoder.java b/src/main/java/org/traccar/protocol/UlbotechFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/UlbotechFrameDecoder.java rename to src/main/java/org/traccar/protocol/UlbotechFrameDecoder.java diff --git a/src/org/traccar/protocol/UlbotechProtocol.java b/src/main/java/org/traccar/protocol/UlbotechProtocol.java similarity index 100% rename from src/org/traccar/protocol/UlbotechProtocol.java rename to src/main/java/org/traccar/protocol/UlbotechProtocol.java diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/main/java/org/traccar/protocol/UlbotechProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/UlbotechProtocolDecoder.java rename to src/main/java/org/traccar/protocol/UlbotechProtocolDecoder.java diff --git a/src/org/traccar/protocol/UproProtocol.java b/src/main/java/org/traccar/protocol/UproProtocol.java similarity index 100% rename from src/org/traccar/protocol/UproProtocol.java rename to src/main/java/org/traccar/protocol/UproProtocol.java diff --git a/src/org/traccar/protocol/UproProtocolDecoder.java b/src/main/java/org/traccar/protocol/UproProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/UproProtocolDecoder.java rename to src/main/java/org/traccar/protocol/UproProtocolDecoder.java diff --git a/src/org/traccar/protocol/V680Protocol.java b/src/main/java/org/traccar/protocol/V680Protocol.java similarity index 100% rename from src/org/traccar/protocol/V680Protocol.java rename to src/main/java/org/traccar/protocol/V680Protocol.java diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/main/java/org/traccar/protocol/V680ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/V680ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/V680ProtocolDecoder.java diff --git a/src/org/traccar/protocol/VisiontekProtocol.java b/src/main/java/org/traccar/protocol/VisiontekProtocol.java similarity index 100% rename from src/org/traccar/protocol/VisiontekProtocol.java rename to src/main/java/org/traccar/protocol/VisiontekProtocol.java diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/main/java/org/traccar/protocol/VisiontekProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/VisiontekProtocolDecoder.java rename to src/main/java/org/traccar/protocol/VisiontekProtocolDecoder.java diff --git a/src/org/traccar/protocol/Vt200FrameDecoder.java b/src/main/java/org/traccar/protocol/Vt200FrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/Vt200FrameDecoder.java rename to src/main/java/org/traccar/protocol/Vt200FrameDecoder.java diff --git a/src/org/traccar/protocol/Vt200Protocol.java b/src/main/java/org/traccar/protocol/Vt200Protocol.java similarity index 100% rename from src/org/traccar/protocol/Vt200Protocol.java rename to src/main/java/org/traccar/protocol/Vt200Protocol.java diff --git a/src/org/traccar/protocol/Vt200ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Vt200ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Vt200ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Vt200ProtocolDecoder.java diff --git a/src/org/traccar/protocol/VtfmsFrameDecoder.java b/src/main/java/org/traccar/protocol/VtfmsFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/VtfmsFrameDecoder.java rename to src/main/java/org/traccar/protocol/VtfmsFrameDecoder.java diff --git a/src/org/traccar/protocol/VtfmsProtocol.java b/src/main/java/org/traccar/protocol/VtfmsProtocol.java similarity index 100% rename from src/org/traccar/protocol/VtfmsProtocol.java rename to src/main/java/org/traccar/protocol/VtfmsProtocol.java diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/main/java/org/traccar/protocol/VtfmsProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/VtfmsProtocolDecoder.java rename to src/main/java/org/traccar/protocol/VtfmsProtocolDecoder.java diff --git a/src/org/traccar/protocol/WatchFrameDecoder.java b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/WatchFrameDecoder.java rename to src/main/java/org/traccar/protocol/WatchFrameDecoder.java diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/main/java/org/traccar/protocol/WatchProtocol.java similarity index 100% rename from src/org/traccar/protocol/WatchProtocol.java rename to src/main/java/org/traccar/protocol/WatchProtocol.java diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/WatchProtocolDecoder.java rename to src/main/java/org/traccar/protocol/WatchProtocolDecoder.java diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/WatchProtocolEncoder.java rename to src/main/java/org/traccar/protocol/WatchProtocolEncoder.java diff --git a/src/org/traccar/protocol/WialonProtocol.java b/src/main/java/org/traccar/protocol/WialonProtocol.java similarity index 100% rename from src/org/traccar/protocol/WialonProtocol.java rename to src/main/java/org/traccar/protocol/WialonProtocol.java diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/WialonProtocolDecoder.java rename to src/main/java/org/traccar/protocol/WialonProtocolDecoder.java diff --git a/src/org/traccar/protocol/WialonProtocolEncoder.java b/src/main/java/org/traccar/protocol/WialonProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/WialonProtocolEncoder.java rename to src/main/java/org/traccar/protocol/WialonProtocolEncoder.java diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/main/java/org/traccar/protocol/WondexFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/WondexFrameDecoder.java rename to src/main/java/org/traccar/protocol/WondexFrameDecoder.java diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/main/java/org/traccar/protocol/WondexProtocol.java similarity index 100% rename from src/org/traccar/protocol/WondexProtocol.java rename to src/main/java/org/traccar/protocol/WondexProtocol.java diff --git a/src/org/traccar/protocol/WondexProtocolDecoder.java b/src/main/java/org/traccar/protocol/WondexProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/WondexProtocolDecoder.java rename to src/main/java/org/traccar/protocol/WondexProtocolDecoder.java diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/main/java/org/traccar/protocol/WondexProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/WondexProtocolEncoder.java rename to src/main/java/org/traccar/protocol/WondexProtocolEncoder.java diff --git a/src/org/traccar/protocol/WristbandProtocol.java b/src/main/java/org/traccar/protocol/WristbandProtocol.java similarity index 100% rename from src/org/traccar/protocol/WristbandProtocol.java rename to src/main/java/org/traccar/protocol/WristbandProtocol.java diff --git a/src/org/traccar/protocol/WristbandProtocolDecoder.java b/src/main/java/org/traccar/protocol/WristbandProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/WristbandProtocolDecoder.java rename to src/main/java/org/traccar/protocol/WristbandProtocolDecoder.java diff --git a/src/org/traccar/protocol/XexunFrameDecoder.java b/src/main/java/org/traccar/protocol/XexunFrameDecoder.java similarity index 100% rename from src/org/traccar/protocol/XexunFrameDecoder.java rename to src/main/java/org/traccar/protocol/XexunFrameDecoder.java diff --git a/src/org/traccar/protocol/XexunProtocol.java b/src/main/java/org/traccar/protocol/XexunProtocol.java similarity index 100% rename from src/org/traccar/protocol/XexunProtocol.java rename to src/main/java/org/traccar/protocol/XexunProtocol.java diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/main/java/org/traccar/protocol/XexunProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/XexunProtocolDecoder.java rename to src/main/java/org/traccar/protocol/XexunProtocolDecoder.java diff --git a/src/org/traccar/protocol/XexunProtocolEncoder.java b/src/main/java/org/traccar/protocol/XexunProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/XexunProtocolEncoder.java rename to src/main/java/org/traccar/protocol/XexunProtocolEncoder.java diff --git a/src/org/traccar/protocol/XirgoProtocol.java b/src/main/java/org/traccar/protocol/XirgoProtocol.java similarity index 100% rename from src/org/traccar/protocol/XirgoProtocol.java rename to src/main/java/org/traccar/protocol/XirgoProtocol.java diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/main/java/org/traccar/protocol/XirgoProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/XirgoProtocolDecoder.java rename to src/main/java/org/traccar/protocol/XirgoProtocolDecoder.java diff --git a/src/org/traccar/protocol/XirgoProtocolEncoder.java b/src/main/java/org/traccar/protocol/XirgoProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/XirgoProtocolEncoder.java rename to src/main/java/org/traccar/protocol/XirgoProtocolEncoder.java diff --git a/src/org/traccar/protocol/Xrb28Protocol.java b/src/main/java/org/traccar/protocol/Xrb28Protocol.java similarity index 100% rename from src/org/traccar/protocol/Xrb28Protocol.java rename to src/main/java/org/traccar/protocol/Xrb28Protocol.java diff --git a/src/org/traccar/protocol/Xrb28ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Xrb28ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Xrb28ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Xrb28ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Xrb28ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Xrb28ProtocolEncoder.java similarity index 100% rename from src/org/traccar/protocol/Xrb28ProtocolEncoder.java rename to src/main/java/org/traccar/protocol/Xrb28ProtocolEncoder.java diff --git a/src/org/traccar/protocol/Xt013Protocol.java b/src/main/java/org/traccar/protocol/Xt013Protocol.java similarity index 100% rename from src/org/traccar/protocol/Xt013Protocol.java rename to src/main/java/org/traccar/protocol/Xt013Protocol.java diff --git a/src/org/traccar/protocol/Xt013ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Xt013ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Xt013ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Xt013ProtocolDecoder.java diff --git a/src/org/traccar/protocol/Xt2400Protocol.java b/src/main/java/org/traccar/protocol/Xt2400Protocol.java similarity index 100% rename from src/org/traccar/protocol/Xt2400Protocol.java rename to src/main/java/org/traccar/protocol/Xt2400Protocol.java diff --git a/src/org/traccar/protocol/Xt2400ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/Xt2400ProtocolDecoder.java rename to src/main/java/org/traccar/protocol/Xt2400ProtocolDecoder.java diff --git a/src/org/traccar/protocol/YwtProtocol.java b/src/main/java/org/traccar/protocol/YwtProtocol.java similarity index 100% rename from src/org/traccar/protocol/YwtProtocol.java rename to src/main/java/org/traccar/protocol/YwtProtocol.java diff --git a/src/org/traccar/protocol/YwtProtocolDecoder.java b/src/main/java/org/traccar/protocol/YwtProtocolDecoder.java similarity index 100% rename from src/org/traccar/protocol/YwtProtocolDecoder.java rename to src/main/java/org/traccar/protocol/YwtProtocolDecoder.java diff --git a/src/org/traccar/reports/Events.java b/src/main/java/org/traccar/reports/Events.java similarity index 100% rename from src/org/traccar/reports/Events.java rename to src/main/java/org/traccar/reports/Events.java diff --git a/src/org/traccar/reports/ReportUtils.java b/src/main/java/org/traccar/reports/ReportUtils.java similarity index 100% rename from src/org/traccar/reports/ReportUtils.java rename to src/main/java/org/traccar/reports/ReportUtils.java diff --git a/src/org/traccar/reports/Route.java b/src/main/java/org/traccar/reports/Route.java similarity index 100% rename from src/org/traccar/reports/Route.java rename to src/main/java/org/traccar/reports/Route.java diff --git a/src/org/traccar/reports/Stops.java b/src/main/java/org/traccar/reports/Stops.java similarity index 100% rename from src/org/traccar/reports/Stops.java rename to src/main/java/org/traccar/reports/Stops.java diff --git a/src/org/traccar/reports/Summary.java b/src/main/java/org/traccar/reports/Summary.java similarity index 100% rename from src/org/traccar/reports/Summary.java rename to src/main/java/org/traccar/reports/Summary.java diff --git a/src/org/traccar/reports/Trips.java b/src/main/java/org/traccar/reports/Trips.java similarity index 100% rename from src/org/traccar/reports/Trips.java rename to src/main/java/org/traccar/reports/Trips.java diff --git a/src/org/traccar/reports/model/BaseReport.java b/src/main/java/org/traccar/reports/model/BaseReport.java similarity index 100% rename from src/org/traccar/reports/model/BaseReport.java rename to src/main/java/org/traccar/reports/model/BaseReport.java diff --git a/src/org/traccar/reports/model/DeviceReport.java b/src/main/java/org/traccar/reports/model/DeviceReport.java similarity index 100% rename from src/org/traccar/reports/model/DeviceReport.java rename to src/main/java/org/traccar/reports/model/DeviceReport.java diff --git a/src/org/traccar/reports/model/StopReport.java b/src/main/java/org/traccar/reports/model/StopReport.java similarity index 100% rename from src/org/traccar/reports/model/StopReport.java rename to src/main/java/org/traccar/reports/model/StopReport.java diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/main/java/org/traccar/reports/model/SummaryReport.java similarity index 100% rename from src/org/traccar/reports/model/SummaryReport.java rename to src/main/java/org/traccar/reports/model/SummaryReport.java diff --git a/src/org/traccar/reports/model/TripReport.java b/src/main/java/org/traccar/reports/model/TripReport.java similarity index 100% rename from src/org/traccar/reports/model/TripReport.java rename to src/main/java/org/traccar/reports/model/TripReport.java diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/main/java/org/traccar/reports/model/TripsConfig.java similarity index 100% rename from src/org/traccar/reports/model/TripsConfig.java rename to src/main/java/org/traccar/reports/model/TripsConfig.java diff --git a/src/org/traccar/sms/HttpSmsClient.java b/src/main/java/org/traccar/sms/HttpSmsClient.java similarity index 100% rename from src/org/traccar/sms/HttpSmsClient.java rename to src/main/java/org/traccar/sms/HttpSmsClient.java diff --git a/src/org/traccar/sms/SmsManager.java b/src/main/java/org/traccar/sms/SmsManager.java similarity index 91% rename from src/org/traccar/sms/SmsManager.java rename to src/main/java/org/traccar/sms/SmsManager.java index 1e3d40f6e..3b0cbda7f 100644 --- a/src/org/traccar/sms/SmsManager.java +++ b/src/main/java/org/traccar/sms/SmsManager.java @@ -24,6 +24,6 @@ public interface SmsManager { String destAddress, String message, boolean command) throws InterruptedException, MessageException; void sendMessageAsync( - final String destAddress, final String message, final boolean command); + String destAddress, String message, boolean command); } diff --git a/src/org/traccar/sms/smpp/ClientSmppSessionHandler.java b/src/main/java/org/traccar/sms/smpp/ClientSmppSessionHandler.java similarity index 100% rename from src/org/traccar/sms/smpp/ClientSmppSessionHandler.java rename to src/main/java/org/traccar/sms/smpp/ClientSmppSessionHandler.java diff --git a/src/org/traccar/sms/smpp/EnquireLinkTask.java b/src/main/java/org/traccar/sms/smpp/EnquireLinkTask.java similarity index 100% rename from src/org/traccar/sms/smpp/EnquireLinkTask.java rename to src/main/java/org/traccar/sms/smpp/EnquireLinkTask.java diff --git a/src/org/traccar/sms/smpp/ReconnectionTask.java b/src/main/java/org/traccar/sms/smpp/ReconnectionTask.java similarity index 100% rename from src/org/traccar/sms/smpp/ReconnectionTask.java rename to src/main/java/org/traccar/sms/smpp/ReconnectionTask.java diff --git a/src/org/traccar/sms/smpp/SmppClient.java b/src/main/java/org/traccar/sms/smpp/SmppClient.java similarity index 100% rename from src/org/traccar/sms/smpp/SmppClient.java rename to src/main/java/org/traccar/sms/smpp/SmppClient.java diff --git a/src/org/traccar/sms/smpp/TextMessageEventHandler.java b/src/main/java/org/traccar/sms/smpp/TextMessageEventHandler.java similarity index 100% rename from src/org/traccar/sms/smpp/TextMessageEventHandler.java rename to src/main/java/org/traccar/sms/smpp/TextMessageEventHandler.java diff --git a/src/org/traccar/web/ConsoleServlet.java b/src/main/java/org/traccar/web/ConsoleServlet.java similarity index 100% rename from src/org/traccar/web/ConsoleServlet.java rename to src/main/java/org/traccar/web/ConsoleServlet.java diff --git a/src/org/traccar/web/CsvBuilder.java b/src/main/java/org/traccar/web/CsvBuilder.java similarity index 100% rename from src/org/traccar/web/CsvBuilder.java rename to src/main/java/org/traccar/web/CsvBuilder.java diff --git a/src/org/traccar/web/GpxBuilder.java b/src/main/java/org/traccar/web/GpxBuilder.java similarity index 100% rename from src/org/traccar/web/GpxBuilder.java rename to src/main/java/org/traccar/web/GpxBuilder.java diff --git a/src/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java similarity index 100% rename from src/org/traccar/web/WebServer.java rename to src/main/java/org/traccar/web/WebServer.java diff --git a/test/org/traccar/BaseTest.java b/src/test/java/org/traccar/BaseTest.java similarity index 100% rename from test/org/traccar/BaseTest.java rename to src/test/java/org/traccar/BaseTest.java diff --git a/test/org/traccar/ProtocolTest.java b/src/test/java/org/traccar/ProtocolTest.java similarity index 100% rename from test/org/traccar/ProtocolTest.java rename to src/test/java/org/traccar/ProtocolTest.java diff --git a/test/org/traccar/TestIdentityManager.java b/src/test/java/org/traccar/TestIdentityManager.java similarity index 100% rename from test/org/traccar/TestIdentityManager.java rename to src/test/java/org/traccar/TestIdentityManager.java diff --git a/test/org/traccar/WebDataHandlerTest.java b/src/test/java/org/traccar/WebDataHandlerTest.java similarity index 100% rename from test/org/traccar/WebDataHandlerTest.java rename to src/test/java/org/traccar/WebDataHandlerTest.java diff --git a/test/org/traccar/calendar/CalendarTest.java b/src/test/java/org/traccar/calendar/CalendarTest.java similarity index 100% rename from test/org/traccar/calendar/CalendarTest.java rename to src/test/java/org/traccar/calendar/CalendarTest.java diff --git a/test/org/traccar/config/ConfigTest.java b/src/test/java/org/traccar/config/ConfigTest.java similarity index 100% rename from test/org/traccar/config/ConfigTest.java rename to src/test/java/org/traccar/config/ConfigTest.java diff --git a/test/org/traccar/database/DataManagerTest.java b/src/test/java/org/traccar/database/DataManagerTest.java similarity index 100% rename from test/org/traccar/database/DataManagerTest.java rename to src/test/java/org/traccar/database/DataManagerTest.java diff --git a/test/org/traccar/database/GroupTreeTest.java b/src/test/java/org/traccar/database/GroupTreeTest.java similarity index 100% rename from test/org/traccar/database/GroupTreeTest.java rename to src/test/java/org/traccar/database/GroupTreeTest.java diff --git a/test/org/traccar/geocoder/AddressFormatTest.java b/src/test/java/org/traccar/geocoder/AddressFormatTest.java similarity index 100% rename from test/org/traccar/geocoder/AddressFormatTest.java rename to src/test/java/org/traccar/geocoder/AddressFormatTest.java diff --git a/test/org/traccar/geocoder/GeocoderTest.java b/src/test/java/org/traccar/geocoder/GeocoderTest.java similarity index 100% rename from test/org/traccar/geocoder/GeocoderTest.java rename to src/test/java/org/traccar/geocoder/GeocoderTest.java diff --git a/test/org/traccar/geofence/GeofenceCircleTest.java b/src/test/java/org/traccar/geofence/GeofenceCircleTest.java similarity index 100% rename from test/org/traccar/geofence/GeofenceCircleTest.java rename to src/test/java/org/traccar/geofence/GeofenceCircleTest.java diff --git a/test/org/traccar/geofence/GeofencePolygonTest.java b/src/test/java/org/traccar/geofence/GeofencePolygonTest.java similarity index 100% rename from test/org/traccar/geofence/GeofencePolygonTest.java rename to src/test/java/org/traccar/geofence/GeofencePolygonTest.java diff --git a/test/org/traccar/geofence/GeofencePolylineTest.java b/src/test/java/org/traccar/geofence/GeofencePolylineTest.java similarity index 100% rename from test/org/traccar/geofence/GeofencePolylineTest.java rename to src/test/java/org/traccar/geofence/GeofencePolylineTest.java diff --git a/test/org/traccar/geolocation/GeolocationProviderTest.java b/src/test/java/org/traccar/geolocation/GeolocationProviderTest.java similarity index 100% rename from test/org/traccar/geolocation/GeolocationProviderTest.java rename to src/test/java/org/traccar/geolocation/GeolocationProviderTest.java diff --git a/test/org/traccar/handler/ComputedAttributesTest.java b/src/test/java/org/traccar/handler/ComputedAttributesTest.java similarity index 100% rename from test/org/traccar/handler/ComputedAttributesTest.java rename to src/test/java/org/traccar/handler/ComputedAttributesTest.java diff --git a/test/org/traccar/handler/DistanceHandlerTest.java b/src/test/java/org/traccar/handler/DistanceHandlerTest.java similarity index 100% rename from test/org/traccar/handler/DistanceHandlerTest.java rename to src/test/java/org/traccar/handler/DistanceHandlerTest.java diff --git a/test/org/traccar/handler/FilterHandlerTest.java b/src/test/java/org/traccar/handler/FilterHandlerTest.java similarity index 100% rename from test/org/traccar/handler/FilterHandlerTest.java rename to src/test/java/org/traccar/handler/FilterHandlerTest.java diff --git a/test/org/traccar/handler/MotionHandlerTest.java b/src/test/java/org/traccar/handler/MotionHandlerTest.java similarity index 100% rename from test/org/traccar/handler/MotionHandlerTest.java rename to src/test/java/org/traccar/handler/MotionHandlerTest.java diff --git a/test/org/traccar/handler/events/AlertEventHandlerTest.java b/src/test/java/org/traccar/handler/events/AlertEventHandlerTest.java similarity index 100% rename from test/org/traccar/handler/events/AlertEventHandlerTest.java rename to src/test/java/org/traccar/handler/events/AlertEventHandlerTest.java diff --git a/test/org/traccar/handler/events/CommandResultEventHandlerTest.java b/src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java similarity index 100% rename from test/org/traccar/handler/events/CommandResultEventHandlerTest.java rename to src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java diff --git a/test/org/traccar/handler/events/IgnitionEventHandlerTest.java b/src/test/java/org/traccar/handler/events/IgnitionEventHandlerTest.java similarity index 100% rename from test/org/traccar/handler/events/IgnitionEventHandlerTest.java rename to src/test/java/org/traccar/handler/events/IgnitionEventHandlerTest.java diff --git a/test/org/traccar/handler/events/MotionEventHandlerTest.java b/src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java similarity index 100% rename from test/org/traccar/handler/events/MotionEventHandlerTest.java rename to src/test/java/org/traccar/handler/events/MotionEventHandlerTest.java diff --git a/test/org/traccar/handler/events/OverspeedEventHandlerTest.java b/src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java similarity index 100% rename from test/org/traccar/handler/events/OverspeedEventHandlerTest.java rename to src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java diff --git a/test/org/traccar/helper/BcdUtilTest.java b/src/test/java/org/traccar/helper/BcdUtilTest.java similarity index 100% rename from test/org/traccar/helper/BcdUtilTest.java rename to src/test/java/org/traccar/helper/BcdUtilTest.java diff --git a/test/org/traccar/helper/BitBufferTest.java b/src/test/java/org/traccar/helper/BitBufferTest.java similarity index 100% rename from test/org/traccar/helper/BitBufferTest.java rename to src/test/java/org/traccar/helper/BitBufferTest.java diff --git a/test/org/traccar/helper/BitUtilTest.java b/src/test/java/org/traccar/helper/BitUtilTest.java similarity index 100% rename from test/org/traccar/helper/BitUtilTest.java rename to src/test/java/org/traccar/helper/BitUtilTest.java diff --git a/test/org/traccar/helper/ChecksumTest.java b/src/test/java/org/traccar/helper/ChecksumTest.java similarity index 100% rename from test/org/traccar/helper/ChecksumTest.java rename to src/test/java/org/traccar/helper/ChecksumTest.java diff --git a/test/org/traccar/helper/DateBuilderTest.java b/src/test/java/org/traccar/helper/DateBuilderTest.java similarity index 100% rename from test/org/traccar/helper/DateBuilderTest.java rename to src/test/java/org/traccar/helper/DateBuilderTest.java diff --git a/test/org/traccar/helper/DateUtilTest.java b/src/test/java/org/traccar/helper/DateUtilTest.java similarity index 100% rename from test/org/traccar/helper/DateUtilTest.java rename to src/test/java/org/traccar/helper/DateUtilTest.java diff --git a/test/org/traccar/helper/DistanceCalculatorTest.java b/src/test/java/org/traccar/helper/DistanceCalculatorTest.java similarity index 100% rename from test/org/traccar/helper/DistanceCalculatorTest.java rename to src/test/java/org/traccar/helper/DistanceCalculatorTest.java diff --git a/test/org/traccar/helper/LocationTreeTest.java b/src/test/java/org/traccar/helper/LocationTreeTest.java similarity index 100% rename from test/org/traccar/helper/LocationTreeTest.java rename to src/test/java/org/traccar/helper/LocationTreeTest.java diff --git a/test/org/traccar/helper/LogTest.java b/src/test/java/org/traccar/helper/LogTest.java similarity index 100% rename from test/org/traccar/helper/LogTest.java rename to src/test/java/org/traccar/helper/LogTest.java diff --git a/test/org/traccar/helper/ObdDecoderTest.java b/src/test/java/org/traccar/helper/ObdDecoderTest.java similarity index 100% rename from test/org/traccar/helper/ObdDecoderTest.java rename to src/test/java/org/traccar/helper/ObdDecoderTest.java diff --git a/test/org/traccar/helper/PatternBuilderTest.java b/src/test/java/org/traccar/helper/PatternBuilderTest.java similarity index 100% rename from test/org/traccar/helper/PatternBuilderTest.java rename to src/test/java/org/traccar/helper/PatternBuilderTest.java diff --git a/test/org/traccar/helper/PatternUtilTest.java b/src/test/java/org/traccar/helper/PatternUtilTest.java similarity index 100% rename from test/org/traccar/helper/PatternUtilTest.java rename to src/test/java/org/traccar/helper/PatternUtilTest.java diff --git a/test/org/traccar/model/MiscFormatterTest.java b/src/test/java/org/traccar/model/MiscFormatterTest.java similarity index 100% rename from test/org/traccar/model/MiscFormatterTest.java rename to src/test/java/org/traccar/model/MiscFormatterTest.java diff --git a/test/org/traccar/notification/NotificiationMailTest.java b/src/test/java/org/traccar/notification/NotificiationMailTest.java similarity index 100% rename from test/org/traccar/notification/NotificiationMailTest.java rename to src/test/java/org/traccar/notification/NotificiationMailTest.java diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AdmProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AdmProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AdmProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/AdmProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/AdmProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/AdmProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/AisProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AisProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AisProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AisProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AlematicsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AlematicsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AlematicsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AlematicsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AnytrekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AnytrekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AnytrekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AnytrekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ApelProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ApelProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ApelProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ApelProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AplicomFrameDecoderTest.java b/src/test/java/org/traccar/protocol/AplicomFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AplicomFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/AplicomFrameDecoderTest.java diff --git a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AplicomProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AplicomProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AplicomProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AppelloProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AppelloProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AppelloProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AppelloProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AppletProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AppletProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AppletProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AppletProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AquilaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AquilaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Ardi01ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Ardi01ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ArknavProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArknavProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ArknavProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ArknavProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ArnaviProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArnaviProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ArnaviProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ArnaviProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AstraProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AstraProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AstraProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AstraProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/At2000FrameDecoderTest.java b/src/test/java/org/traccar/protocol/At2000FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/At2000FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/At2000FrameDecoderTest.java diff --git a/test/org/traccar/protocol/At2000ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/At2000ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/At2000ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/At2000ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AtrackFrameDecoderTest.java b/src/test/java/org/traccar/protocol/AtrackFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AtrackFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/AtrackFrameDecoderTest.java diff --git a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AtrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AuroProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AuroProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AuroProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AuroProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AustinNbProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AustinNbProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AustinNbProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AutoFonProtocolDecoderTest.java similarity index 97% rename from test/org/traccar/protocol/AutoFonProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AutoFonProtocolDecoderTest.java index 4c8199a13..9e17b437f 100644 --- a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/AutoFonProtocolDecoderTest.java @@ -1,41 +1,41 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolTest; - - -public class AutoFonProtocolDecoderTest extends ProtocolTest { - - @Test - public void testDecode() throws Exception { - - AutoFonProtocolDecoder decoder = new AutoFonProtocolDecoder(null); - - verifyNull(decoder, binary( - "10556103592310314825728F")); - - verifyPosition(decoder, binary( - "02080000251848470afa010262daa690013aa4046da83745f8812560df010001126a")); - - verifyPosition(decoder, binary( - "111E00000000000000000100007101010B0C020302010B0C0005A053FFFFFFFF02010B0C00276047FFFFFFFF1F5600FA000176F218C7850C0B0B0C203A033DBD46035783EF009E00320014FFFF45")); - - //verifyPosition(decoder, binary( - // "12060000007501010B0C00089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF02007601010B0C00269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF4A007601010B0C01089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF04007501010B0C01269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF80007601010B0C02089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFFA6007501010B0C02231F5600FA000176F218C70000000000000000000000000000000000000003E7FFFF9629")); - - verifyNull(decoder, binary( - "41035151305289931441139602662095148807")); - - verifyNull(decoder, binary( - "41032125656985547543619173484002123481")); - - verifyPosition(decoder, binary( - "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"), - position("2010-01-27 04:00:08.000", true, 54.73838, 56.10343)); - - verifyPosition(decoder, binary( - "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C")); - - } - -} +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + + +public class AutoFonProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + AutoFonProtocolDecoder decoder = new AutoFonProtocolDecoder(null); + + verifyNull(decoder, binary( + "10556103592310314825728F")); + + verifyPosition(decoder, binary( + "02080000251848470afa010262daa690013aa4046da83745f8812560df010001126a")); + + verifyPosition(decoder, binary( + "111E00000000000000000100007101010B0C020302010B0C0005A053FFFFFFFF02010B0C00276047FFFFFFFF1F5600FA000176F218C7850C0B0B0C203A033DBD46035783EF009E00320014FFFF45")); + + //verifyPosition(decoder, binary( + // "12060000007501010B0C00089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF02007601010B0C00269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF4A007601010B0C01089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF04007501010B0C01269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF80007601010B0C02089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFFA6007501010B0C02231F5600FA000176F218C70000000000000000000000000000000000000003E7FFFF9629")); + + verifyNull(decoder, binary( + "41035151305289931441139602662095148807")); + + verifyNull(decoder, binary( + "41032125656985547543619173484002123481")); + + verifyPosition(decoder, binary( + "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"), + position("2010-01-27 04:00:08.000", true, 54.73838, 56.10343)); + + verifyPosition(decoder, binary( + "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C")); + + } + +} diff --git a/test/org/traccar/protocol/AutoGradeProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AutoGradeProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AutoGradeProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AutoGradeProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AutoTrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AutoTrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AutoTrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AutoTrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/AvemaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AvemaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/AvemaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/AvemaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Avl301ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Avl301ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Avl301ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/BceProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/BceProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/BceProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/BceProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/BceProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/BceProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/BlackKiteProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/BlackKiteProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/BoxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/BoxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/BoxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/BoxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/C2stekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/C2stekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/C2stekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/C2stekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CalAmpProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CalAmpProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CarTrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CarTrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CarTrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CarscopProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CarscopProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CarscopProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CarscopProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CastelProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CastelProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CastelProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CastelProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/CastelProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/CastelProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/CastelProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/CautelaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CautelaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CautelaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CautelaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CellocatorProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CellocatorProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CellocatorProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/CellocatorProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/CellocatorProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/CellocatorProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/CguardProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CguardProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CguardProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CguardProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CityeasyProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CityeasyProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CityeasyProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/CityeasyProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/CityeasyProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/CityeasyProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/ContinentalProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ContinentalProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ContinentalProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ContinentalProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/CradlepointProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CradlepointProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/CradlepointProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/CradlepointProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/DishaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DishaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/DishaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/DishaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/DmtHttpProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/DmtHttpProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/DmtHttpProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/DmtProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DmtProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/DmtProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/DmtProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/DwayProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/DwayProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/DwayProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/DwayProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EelinkProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EelinkProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EelinkProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EelinkProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EelinkProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/EelinkProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/EelinkProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/EelinkProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/EgtsFrameDecoderTest.java b/src/test/java/org/traccar/protocol/EgtsFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EgtsFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/EgtsFrameDecoderTest.java diff --git a/test/org/traccar/protocol/EgtsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EgtsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EgtsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EgtsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EnforaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EnforaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EnforaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EnforaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EsealProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EsealProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EsealProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EsealProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/EsealProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/EsealProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/EsealProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/EsealProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/EskyFrameDecoderTest.java b/src/test/java/org/traccar/protocol/EskyFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EskyFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/EskyFrameDecoderTest.java diff --git a/test/org/traccar/protocol/EskyProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EskyProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/EskyProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/EskyProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ExtremTracProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ExtremTracProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FifotrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FifotrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FlespiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FlespiProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FlespiProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FlespiProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FlexCommProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FlexCommProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FlexCommProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FlexCommProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FlextrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FlextrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FlextrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FoxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FoxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FoxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FoxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FreedomProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FreedomProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FreedomProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/FreematicsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/FreematicsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GalileoFrameDecoderTest.java b/src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GalileoFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java diff --git a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GalileoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GalileoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GalileoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GalileoProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/GalileoProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/GalileoProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/GalileoProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/GatorProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GatorProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GatorProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GatorProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GenxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GenxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GenxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GenxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl100ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gl100ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gl100ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gl200FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gl200FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Gl200FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GlobalSatProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GnxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GnxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GnxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GnxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GoSafeProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GotopProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GotopProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GotopProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GotopProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gps056FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Gps056FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gps056FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Gps056FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Gps056ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gps056ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gps056ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gps056ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gps103ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gps103ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gps103ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Gps103ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gps103ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Gps103ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GpsGateProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GpsGateProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GpsGateProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GpsmtaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GpsmtaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/GranitFrameDecoderTest.java b/src/test/java/org/traccar/protocol/GranitFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GranitFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/GranitFrameDecoderTest.java diff --git a/test/org/traccar/protocol/GranitProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GranitProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/GranitProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/GranitProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt02ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gt02ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gt02ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gt06FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gt06FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Gt06FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gt06ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gt06ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Gt06ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Gt30ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt30ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Gt30ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Gt30ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/H02FrameDecoderTest.java b/src/test/java/org/traccar/protocol/H02FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/H02FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/H02FrameDecoderTest.java diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/H02ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/H02ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/H02ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/H02ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/H02ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/H02ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/HaicomProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HaicomProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HaicomProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/HaicomProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HomtecsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HomtecsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/HomtecsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/HuaShengFrameDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HuaShengFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/HuaShengFrameDecoderTest.java diff --git a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HuaShengProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/HuabaoFrameDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HuabaoFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/HuabaoFrameDecoderTest.java diff --git a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HuabaoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/HuabaoProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/HuabaoProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/HuabaoProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/HunterProProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HunterProProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/HunterProProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/HunterProProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/IdplProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/IdplProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/IdplProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/IdplProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/IntellitracProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/IntellitracProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/IntellitracProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ItsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ItsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ItsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Ivt401ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Ivt401ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/JpKorjarProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/JpKorjarProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Jt600FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Jt600FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Jt600FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Jt600FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Jt600ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Jt600ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Jt600ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Jt600ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Jt600ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Jt600ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Jt600ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/KenjiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/KenjiProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/KenjiProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/KenjiProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/KhdProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/KhdProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/KhdProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/KhdProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/KhdProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/KhdProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/L100FrameDecoderTest.java b/src/test/java/org/traccar/protocol/L100FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/L100FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/L100FrameDecoderTest.java diff --git a/test/org/traccar/protocol/L100ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/L100ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/L100ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/L100ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/LaipacProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/LaipacProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/LaipacProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/M2cProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/M2cProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/M2cProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/M2cProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/M2mProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/M2mProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/M2mProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/M2mProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MaestroProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MaestroProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MaestroProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MaestroProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ManPowerProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ManPowerProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ManPowerProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MegastekFrameDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MegastekFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MegastekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java b/src/test/java/org/traccar/protocol/MeiligaoFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeiligaoFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/MeiligaoFrameDecoderTest.java diff --git a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MeiligaoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MeiligaoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/MeiligaoProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/MeitrackFrameDecoderTest.java b/src/test/java/org/traccar/protocol/MeitrackFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeitrackFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/MeitrackFrameDecoderTest.java diff --git a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeitrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/MeitrackProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/MeitrackProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/MeitrackProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/MilesmateProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MilesmateProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MilesmateProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MilesmateProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/MiniFinderProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/MiniFinderProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/MtxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MtxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MtxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MtxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/MxtProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MxtProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/MxtProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/MxtProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NavigilProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NavigilProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NavigilProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NavisFrameDecoderTest.java b/src/test/java/org/traccar/protocol/NavisFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NavisFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/NavisFrameDecoderTest.java diff --git a/test/org/traccar/protocol/NavisProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NavisProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NavisProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NavisProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NeosProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NeosProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NeosProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NeosProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NoranProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NoranProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NoranProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NoranProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NoranProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/NoranProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/NoranProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/NoranProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/NvsFrameDecoderTest.java b/src/test/java/org/traccar/protocol/NvsFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NvsFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/NvsFrameDecoderTest.java diff --git a/test/org/traccar/protocol/NvsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NvsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NvsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NvsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/NyitechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/NyitechProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/NyitechProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/NyitechProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ObdDongleProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ObdDongleProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OigoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OigoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OigoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OigoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OkoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OkoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OkoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OkoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OpenGtsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OpenGtsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OrionProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OrionProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OrionProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OrionProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OsmAndProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OsmAndProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OsmAndProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/OwnTracksProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/OwnTracksProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/PathAwayProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PathAwayProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/PathAwayProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/PathAwayProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PiligrimProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/PiligrimProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/PiligrimProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/PretraceProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PretraceProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/PretraceProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/PretraceProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/PretraceProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/PretraceProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/PretraceProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/PretraceProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/PricolProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PricolProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/PricolProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/PricolProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ProgressProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ProgressProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ProgressProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Pt3000ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Pt3000ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Pt502FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Pt502FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Pt502FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Pt502FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Pt502ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Pt502ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Pt502ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Pt502ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Pt502ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Pt502ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Pt502ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Pt60ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Pt60ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Pt60ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Pt60ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RaveonProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RaveonProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RaveonProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RaveonProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RecodaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RecodaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RecodaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RecodaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RetranslatorProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RetranslatorProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RitiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RitiProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RitiProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RitiProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RoboTrackFrameDecoderTest.java b/src/test/java/org/traccar/protocol/RoboTrackFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RoboTrackFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/RoboTrackFrameDecoderTest.java diff --git a/test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RoboTrackProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RoboTrackProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/RuptelaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/RuptelaProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/RuptelaProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/RuptelaProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/RuptelaProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/SabertekFrameDecoderTest.java b/src/test/java/org/traccar/protocol/SabertekFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SabertekFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/SabertekFrameDecoderTest.java diff --git a/test/org/traccar/protocol/SabertekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SabertekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SabertekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SabertekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SanavProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SanavProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SanavProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SanavProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SatsolProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SatsolProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SatsolProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SatsolProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SigfoxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SigfoxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SiwiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SiwiProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SiwiProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SiwiProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SkypatrolProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SkypatrolProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SmartSoleProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SmartSoleProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SmokeyProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SmokeyProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SmokeyProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SpotProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SpotProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SpotProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SpotProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/StarLinkProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StarLinkProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/StarLinkProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/StarLinkProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Stl060ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Stl060ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Stl060ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SuntechProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SupermateProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SupermateProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SupermateProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SupermateProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/SviasProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SviasProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/SviasProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/SviasProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/T55ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/T55ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/T55ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/T57FrameDecoderTest.java b/src/test/java/org/traccar/protocol/T57FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/T57FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/T57FrameDecoderTest.java diff --git a/test/org/traccar/protocol/T57ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/T57ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/T57ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/T57ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/T800xProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/T800xProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/T800xProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/T800xProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/T800xProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/T800xProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/TaipProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TaipProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TaipProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TaipProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TekFrameDecoderTest.java b/src/test/java/org/traccar/protocol/TekFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TekFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/TekFrameDecoderTest.java diff --git a/test/org/traccar/protocol/TekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TelemaxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TelemaxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TelemaxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TelemaxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TelicFrameDecoderTest.java b/src/test/java/org/traccar/protocol/TelicFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TelicFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/TelicFrameDecoderTest.java diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TelicProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TelicProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TelicProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/TeltonikaProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/TeltonikaProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/TeltonikaProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tk102ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tk102ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tk102ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Tk103FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Tk103FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tk103FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Tk103FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tk103ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Tk103ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tk103ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Tk103ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tlt2hProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tlt2hProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TlvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TlvProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TlvProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TlvProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TmgFrameDecoderTest.java b/src/test/java/org/traccar/protocol/TmgFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TmgFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/TmgFrameDecoderTest.java diff --git a/test/org/traccar/protocol/TmgProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TmgProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TmgProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TmgProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TopflytechProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TopflytechProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TopflytechProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TotemFrameDecoderTest.java b/src/test/java/org/traccar/protocol/TotemFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TotemFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/TotemFrameDecoderTest.java diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TotemProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TotemProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TotemProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/TotemProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/TotemProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tr20ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tr20ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tr900ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tr900ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tr900ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrackboxProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TrackboxProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TrackboxProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TrakMateProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrakMateProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TrakMateProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TrakMateProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TramigoFrameDecoderTest.java b/src/test/java/org/traccar/protocol/TramigoFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TramigoFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/TramigoFrameDecoderTest.java diff --git a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TramigoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TramigoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TramigoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TrvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TrvProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tt8850ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Tt8850ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TytanProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TytanProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TytanProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TytanProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/TzoneProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java b/src/test/java/org/traccar/protocol/UlbotechFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/UlbotechFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/UlbotechFrameDecoderTest.java diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/UlbotechProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/UlbotechProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/UlbotechProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/UproProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/UproProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/UproProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/V680ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/V680ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/V680ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/V680ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/VisiontekProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/VisiontekProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/VisiontekProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Vt200FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Vt200FrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Vt200FrameDecoderTest.java rename to src/test/java/org/traccar/protocol/Vt200FrameDecoderTest.java diff --git a/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Vt200ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Vt200ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Vt200ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/VtfmsFrameDecoderTest.java b/src/test/java/org/traccar/protocol/VtfmsFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/VtfmsFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/VtfmsFrameDecoderTest.java diff --git a/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/VtfmsProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/VtfmsProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/VtfmsProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/WatchFrameDecoderTest.java b/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WatchFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WatchProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/WatchProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/WatchProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/WialonProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WialonProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/src/test/java/org/traccar/protocol/WondexFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WondexFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/WondexFrameDecoderTest.java diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WondexProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WondexProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/WondexProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/WondexProtocolEncoderTest.java similarity index 96% rename from test/org/traccar/protocol/WondexProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/WondexProtocolEncoderTest.java index 3d76cb677..8209fc412 100644 --- a/test/org/traccar/protocol/WondexProtocolEncoderTest.java +++ b/src/test/java/org/traccar/protocol/WondexProtocolEncoderTest.java @@ -1,24 +1,24 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolTest; -import org.traccar.model.Command; - -import static org.junit.Assert.assertEquals; - -public class WondexProtocolEncoderTest extends ProtocolTest { - @Test - public void testEncode() throws Exception { - - WondexProtocolEncoder encoder = new WondexProtocolEncoder(); - - Command command = new Command(); - command.setDeviceId(2); - command.setType(Command.TYPE_POSITION_SINGLE); - command.set(Command.KEY_DEVICE_PASSWORD, "0000"); - - assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command)); - - } - -} +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; +import org.traccar.model.Command; + +import static org.junit.Assert.assertEquals; + +public class WondexProtocolEncoderTest extends ProtocolTest { + @Test + public void testEncode() throws Exception { + + WondexProtocolEncoder encoder = new WondexProtocolEncoder(); + + Command command = new Command(); + command.setDeviceId(2); + command.setType(Command.TYPE_POSITION_SINGLE); + command.set(Command.KEY_DEVICE_PASSWORD, "0000"); + + assertEquals("$WP+GETLOCATION=0000", encoder.encodeCommand(command)); + + } + +} diff --git a/test/org/traccar/protocol/WristbandProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WristbandProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/WristbandProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/WristbandProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/XexunFrameDecoderTest.java b/src/test/java/org/traccar/protocol/XexunFrameDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/XexunFrameDecoderTest.java rename to src/test/java/org/traccar/protocol/XexunFrameDecoderTest.java diff --git a/test/org/traccar/protocol/XexunProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/XexunProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/XexunProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/XexunProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/XirgoProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/XirgoProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/XirgoProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/XirgoProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/XirgoProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/XirgoProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/XirgoProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Xrb28ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Xrb28ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Xrb28ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Xrb28ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Xrb28ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Xrb28ProtocolEncoderTest.java similarity index 100% rename from test/org/traccar/protocol/Xrb28ProtocolEncoderTest.java rename to src/test/java/org/traccar/protocol/Xrb28ProtocolEncoderTest.java diff --git a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Xt013ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Xt013ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Xt013ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Xt2400ProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/Xt2400ProtocolDecoderTest.java diff --git a/test/org/traccar/protocol/YwtProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/YwtProtocolDecoderTest.java similarity index 100% rename from test/org/traccar/protocol/YwtProtocolDecoderTest.java rename to src/test/java/org/traccar/protocol/YwtProtocolDecoderTest.java diff --git a/test/org/traccar/reports/ReportUtilsTest.java b/src/test/java/org/traccar/reports/ReportUtilsTest.java similarity index 100% rename from test/org/traccar/reports/ReportUtilsTest.java rename to src/test/java/org/traccar/reports/ReportUtilsTest.java diff --git a/test/org/traccar/web/WebServerTest.java b/src/test/java/org/traccar/web/WebServerTest.java similarity index 100% rename from test/org/traccar/web/WebServerTest.java rename to src/test/java/org/traccar/web/WebServerTest.java