diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-07 09:30:38 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-07 09:30:38 +1300 |
commit | 4bd9a1afc970159323a7535d3ed004b499e0fbc3 (patch) | |
tree | fabb920703c88e78e61ce11dcc5b9dc66903fe46 | |
parent | f1282f639721c46a7b2abb653366f909f6703c63 (diff) | |
download | traccar-server-4bd9a1afc970159323a7535d3ed004b499e0fbc3.tar.gz traccar-server-4bd9a1afc970159323a7535d3ed004b499e0fbc3.tar.bz2 traccar-server-4bd9a1afc970159323a7535d3ed004b499e0fbc3.zip |
Rename protocol from auru to auro
-rw-r--r-- | debug.xml | 2 | ||||
-rw-r--r-- | setup/unix/traccar.xml | 2 | ||||
-rw-r--r-- | setup/windows/traccar.xml | 2 | ||||
-rw-r--r-- | src/org/traccar/protocol/AuroProtocol.java (renamed from src/org/traccar/protocol/AuruProtocol.java) | 8 | ||||
-rw-r--r-- | src/org/traccar/protocol/AuroProtocolDecoder.java (renamed from src/org/traccar/protocol/AuruProtocolDecoder.java) | 4 | ||||
-rw-r--r-- | test/org/traccar/protocol/AuroProtocolDecoderTest.java (renamed from test/org/traccar/protocol/AuruProtocolDecoderTest.java) | 4 | ||||
-rw-r--r-- | tools/opengts.xml | 2 |
7 files changed, 12 insertions, 12 deletions
@@ -264,7 +264,7 @@ <entry key='watch.port'>5093</entry> <entry key='t800x.port'>5094</entry> <entry key='upro.port'>5095</entry> - <entry key='auru.port'>5096</entry> + <entry key='auro.port'>5096</entry> <entry key='disha.port'>5097</entry> <entry key='thinkrace.port'>5098</entry> <entry key='pathaway.port'>5099</entry> diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml index a186e35de..5eb64e7b0 100644 --- a/setup/unix/traccar.xml +++ b/setup/unix/traccar.xml @@ -239,7 +239,7 @@ <entry key='watch.port'>5093</entry> <entry key='t800x.port'>5094</entry> <entry key='upro.port'>5095</entry> - <entry key='auru.port'>5096</entry> + <entry key='auro.port'>5096</entry> <entry key='disha.port'>5097</entry> <entry key='thinkrace.port'>5098</entry> <entry key='pathaway.port'>5099</entry> diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index 074827955..c1e675254 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -239,7 +239,7 @@ <entry key='watch.port'>5093</entry>
<entry key='t800x.port'>5094</entry>
<entry key='upro.port'>5095</entry>
- <entry key='auru.port'>5096</entry>
+ <entry key='auro.port'>5096</entry>
<entry key='disha.port'>5097</entry>
<entry key='thinkrace.port'>5098</entry>
<entry key='pathaway.port'>5099</entry>
diff --git a/src/org/traccar/protocol/AuruProtocol.java b/src/org/traccar/protocol/AuroProtocol.java index be312383d..cada65f72 100644 --- a/src/org/traccar/protocol/AuruProtocol.java +++ b/src/org/traccar/protocol/AuroProtocol.java @@ -24,10 +24,10 @@ import org.traccar.TrackerServer; import java.util.List; -public class AuruProtocol extends BaseProtocol { +public class AuroProtocol extends BaseProtocol { - public AuruProtocol() { - super("auru"); + public AuroProtocol() { + super("auro"); } @Override @@ -37,7 +37,7 @@ public class AuruProtocol extends BaseProtocol { protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024)); pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new AuruProtocolDecoder(AuruProtocol.this)); + pipeline.addLast("objectDecoder", new AuroProtocolDecoder(AuroProtocol.this)); } }); } diff --git a/src/org/traccar/protocol/AuruProtocolDecoder.java b/src/org/traccar/protocol/AuroProtocolDecoder.java index 89aa91d0b..fd7690733 100644 --- a/src/org/traccar/protocol/AuruProtocolDecoder.java +++ b/src/org/traccar/protocol/AuroProtocolDecoder.java @@ -27,9 +27,9 @@ import org.traccar.model.Position; import java.net.SocketAddress; import java.util.regex.Pattern; -public class AuruProtocolDecoder extends BaseProtocolDecoder { +public class AuroProtocolDecoder extends BaseProtocolDecoder { - public AuruProtocolDecoder(AuruProtocol protocol) { + public AuroProtocolDecoder(AuroProtocol protocol) { super(protocol); } diff --git a/test/org/traccar/protocol/AuruProtocolDecoderTest.java b/test/org/traccar/protocol/AuroProtocolDecoderTest.java index 9c4dcf1bc..e9b13c57d 100644 --- a/test/org/traccar/protocol/AuruProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AuroProtocolDecoderTest.java @@ -3,12 +3,12 @@ package org.traccar.protocol; import org.junit.Test; import org.traccar.ProtocolTest; -public class AuruProtocolDecoderTest extends ProtocolTest { +public class AuroProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - AuruProtocolDecoder decoder = new AuruProtocolDecoder(new AuruProtocol()); + AuroProtocolDecoder decoder = new AuroProtocolDecoder(new AuroProtocol()); verifyPosition(decoder, text( "M0028T0000816398975I357325031465123E00001W*****110620150437000068DA#RD01DA240000000001+100408425+013756121100620152137231112240330004400")); diff --git a/tools/opengts.xml b/tools/opengts.xml index 60bcb9953..a2c0ae7e3 100644 --- a/tools/opengts.xml +++ b/tools/opengts.xml @@ -130,7 +130,7 @@ <entry key='watch.port'>5093</entry> <entry key='t800x.port'>5094</entry> <entry key='upro.port'>5095</entry> - <entry key='auru.port'>5096</entry> + <entry key='auro.port'>5096</entry> <entry key='disha.port'>5097</entry> <entry key='thinkrace.port'>5098</entry> <entry key='pathaway.port'>5099</entry> |