Merge branch 'master' into netty4

# Conflicts:
#	src/org/traccar/protocol/AquilaProtocolDecoder.java
#	src/org/traccar/protocol/L100FrameDecoder.java

1 files changed, 58 insertions, 0 deletions

diff --git a/src/org/traccar/protocol/SviasProtocol.java b/src/org/traccar/protocol/SviasProtocol.java
new file mode 100644
index 000000000..badf3d091
--- /dev/null
+++ b/src/org/traccar/protocol/SviasProtocol.java
@@ -0,0 +1,58 @@
+/*

+ * 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 org.jboss.netty.bootstrap.ServerBootstrap;

+import org.jboss.netty.channel.ChannelPipeline;

+import org.jboss.netty.handler.codec.string.StringDecoder;

+import org.jboss.netty.handler.codec.string.StringEncoder;

+import org.traccar.BaseProtocol;

+import org.traccar.CharacterDelimiterFrameDecoder;

+import org.traccar.TrackerServer;

+

+import java.util.List;

+import org.traccar.model.Command;

+

+public class SviasProtocol extends BaseProtocol {

+

+    public SviasProtocol() {

+        super("svias");

+        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);

+    }

+

+    @Override

+    public void initTrackerServers(List<TrackerServer> serverList) {

+        serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {

+            @Override

+            protected void addSpecificHandlers(ChannelPipeline pipeline) {

+                pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, "]"));

+                pipeline.addLast("stringEncoder", new StringEncoder());

+                pipeline.addLast("stringDecoder", new StringDecoder());

+                pipeline.addLast("objectEncoder", new SviasProtocolEncoder());

+                pipeline.addLast("objectDecoder", new SviasProtocolDecoder(SviasProtocol.this));

+            }

+        });

+    }

+

+}