aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/XexunProtocol.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-06 23:14:56 +1200
committerGitHub <noreply@github.com>2018-06-06 23:14:56 +1200
commit6520327938582d5e4928d78fc70f95c60e9ac909 (patch)
treee9c8e8e14d5e8db8271475fdd0d511adc320aee6 /src/org/traccar/protocol/XexunProtocol.java
parent681b8f42633d7c6741e6fbac4308ba25c4aff9fa (diff)
parentc8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6 (diff)
downloadtrackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.gz
trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.bz2
trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.zip
Merge pull request #3913 from Abyss777/netty4_yxw
Migrate Y, X, W protocols
Diffstat (limited to 'src/org/traccar/protocol/XexunProtocol.java')
-rw-r--r--src/org/traccar/protocol/XexunProtocol.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/XexunProtocol.java b/src/org/traccar/protocol/XexunProtocol.java
index b90cbfaaf..11e0e0761 100644
--- a/src/org/traccar/protocol/XexunProtocol.java
+++ b/src/org/traccar/protocol/XexunProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 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.
@@ -15,16 +15,16 @@
*/
package org.traccar.protocol;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.Context;
+import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
import org.traccar.model.Command;
+import io.netty.handler.codec.LineBasedFrameDecoder;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+
import java.util.List;
public class XexunProtocol extends BaseProtocol {
@@ -38,9 +38,9 @@ public class XexunProtocol extends BaseProtocol {
@Override
public void initTrackerServers(List<TrackerServer> serverList) {
- serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
+ serverList.add(new TrackerServer(false, getName()) {
@Override
- protected void addSpecificHandlers(ChannelPipeline pipeline) {
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
boolean full = Context.getConfig().getBoolean(getName() + ".extended");
if (full) {
pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024)); // tracker bug \n\r