Corrections of wrong "git fetch upstream"

6 files changed, 578 insertions, 435 deletions

diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java
index 2f1c7fce5..32a2888cc 100644
--- a/src/org/traccar/Server.java
+++ b/src/org/traccar/Server.java
@@ -21,6 +21,7 @@ import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
@@ -29,6 +30,7 @@ import java.util.logging.Formatter;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
 import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
@@ -47,407 +49,521 @@ import org.traccar.protocol.*;
  */
 public class Server {
 
-    /**
-     * Server list
-     */
-    private List<TrackerServer> serverList;
-
-    private boolean loggerEnabled;
-
-    public Server() {
-        serverList = new LinkedList<TrackerServer>();
-        loggerEnabled = false;
-    }
-
-    public boolean isLoggerEnabled() {
-        return loggerEnabled;
-    }
-
-    private DataManager dataManager;
-
-    private WebServer webServer;
-
-    private ReverseGeocoder geocoder;
-
-    /**
-     * Initialize
-     */
-    public void init(String[] arguments)
-            throws IOException, ClassNotFoundException, SQLException {
-
-        // Load properties
-        Properties properties = new Properties();
-        if (arguments.length > 0) {
-            properties.loadFromXML(new FileInputStream(arguments[0]));
-        }
-
-        dataManager = new DatabaseDataManager(properties);
-
-        initLogger(properties);
-        initGeocoder(properties);
-
-        initXexunServer(properties);
-        initGps103Server(properties);
-        initTk103Server(properties);
-        initGl100Server(properties);
-        initGl200Server(properties);
-        initT55Server(properties);
-        initXexun2Server(properties);
-        initAvl08Server(properties);
-        initEnforaServer(properties);
-        initMeiligaoServer(properties);
-
-        // Initialize web server
-        if (Boolean.valueOf(properties.getProperty("http.enable"))) {
-            Integer port = Integer.valueOf(properties.getProperty("http.port", "8082"));
-            webServer = new WebServer(port, dataManager);
-        }
-    }
-
-    /**
-     * Start
-     */
-    public void start() {
-        if (webServer != null) {
-            webServer.start();
-        }
-        for (Object server: serverList) {
-            ((TrackerServer) server).start();
-        }
+	/**
+	 * Server list
+	 */
+	private List<TrackerServer> serverList;
+
+	private boolean loggerEnabled;
+
+	public Server() {
+		serverList = new LinkedList<TrackerServer>();
+		loggerEnabled = false;
+	}
+
+	public boolean isLoggerEnabled() {
+		return loggerEnabled;
+	}
+
+	private DataManager dataManager;
+
+	private WebServer webServer;
+
+	private ReverseGeocoder geocoder;
+
+	public void mandaMSG()
+    {
+    	
+    	for (Iterator iterator = serverList.iterator(); iterator.hasNext();) {
+    		TrackerServer type = (TrackerServer) iterator.next();
+    		if(type.getPort().equals(8801)){
+    			
+    			for (Iterator it = type.getChannelGroup().iterator(); it.hasNext();) {
+    				Channel chanel = (Channel) it.next();
+    				    				System.out.println(chanel.getRemoteAddress());
+    			
+    			}
+    		}
+    	//	System.out.println(type.getPort());
+			
+		}
     }
 
-    /**
-     * Stop
-     */
-    public void stop() {
-        for (Object server: serverList) {
-            ((TrackerServer) server).stop();
-        }
-        if (webServer != null) {
-            webServer.stop();
-        }
-    }
-
-    /**
-     * Destroy
-     */
-    public void destroy() {
-        serverList.clear();
-    }
-
-    /**
-     * Initialize logger
-     */
-    private void initLogger(Properties properties) throws IOException {
-
-        loggerEnabled = Boolean.valueOf(properties.getProperty("logger.enable"));
-
-        if (loggerEnabled) {
-
-            String fileName = properties.getProperty("logger.file");
-            if (fileName != null) {
-
-                FileHandler file = new FileHandler(fileName, true);
-
-                // Simple formatter
-                file.setFormatter(new Formatter() {
-                    private final String LINE_SEPARATOR =
-                            System.getProperty("line.separator", "\n");
-
-                    private final DateFormat dateFormat =
-                            new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-
-                    public String format(LogRecord record) {
-                        String line = dateFormat.format(new Date(record.getMillis()));
-                        line += " " + record.getLevel().getName() + ": ";
-                        line += formatMessage(record);
-                        line += LINE_SEPARATOR;
-                        return line;
-                    }
-                });
-
-                // NOTE: Console logger level will remain INFO
-                Log.getLogger().setLevel(Level.ALL);
-                Log.getLogger().addHandler(file);
-            }
-        }
-    }
-
-    private void initGeocoder(Properties properties) throws IOException {
-        if (Boolean.parseBoolean(properties.getProperty("geocoder.enable"))) {
-            geocoder = new GoogleReverseGeocoder();
-        }
-    }
-
-    private boolean isProtocolEnabled(Properties properties, String protocol) {
-        String enabled = properties.getProperty(protocol + ".enable");
-        if (enabled != null) {
-            return Boolean.valueOf(enabled);
-        }
-        return false;
-    }
-
-    private Integer getProtocolPort(Properties properties, String protocol) {
-        String port = properties.getProperty(protocol + ".port");
-        if (port != null) {
-            return Integer.valueOf(port);
-        }
-        return 5000; // Magic number
-    }
-
-    private Integer getProtocolResetDelay(Properties properties, String protocol) {
-        String resetDelay = properties.getProperty(protocol + ".resetDelay");
-        if (resetDelay != null) {
-            return Integer.valueOf(resetDelay);
-        }
-        return 0;
-    }
-
-    /**
-     * Init Xexun server
-     */
-    private void initXexunServer(Properties properties) throws SQLException {
-
-        String protocol = "xexun";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new XexunFrameDecoder());
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new XexunProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Gps103 server
-     */
-    private void initGps103Server(Properties properties) throws SQLException {
-
-        String protocol = "gps103";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) ';' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("stringEncoder", new StringEncoder());
-                    pipeline.addLast("objectDecoder", new Gps103ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Tk103 server
-     */
-    private void initTk103Server(Properties properties) throws SQLException {
-
-        String protocol = "tk103";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) ')' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("stringEncoder", new StringEncoder());
-                    pipeline.addLast("objectDecoder", new Tk103ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Gl100 server
-     */
-    private void initGl100Server(Properties properties) throws SQLException {
-
-        String protocol = "gl100";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) 0x0 };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("stringEncoder", new StringEncoder());
-                    pipeline.addLast("objectDecoder", new Gl100ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Gl200 server
-     */
-    private void initGl200Server(Properties properties) throws SQLException {
-
-        String protocol = "gl200";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) '$' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("stringEncoder", new StringEncoder());
-                    pipeline.addLast("objectDecoder", new Gl200ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init T55 server
-     */
-    private void initT55Server(Properties properties) throws SQLException {
-
-        String protocol = "t55";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) '\r', (byte) '\n' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("stringEncoder", new StringEncoder());
-                    pipeline.addLast("objectDecoder", new T55ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Xexun 2 server
-     */
-    private void initXexun2Server(Properties properties) throws SQLException {
-
-        String protocol = "xexun2";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) '\n' }; // tracker bug \n\r
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new Xexun2ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init AVL-08 server
-     */
-    private void initAvl08Server(Properties properties) throws SQLException {
-
-        String protocol = "avl08";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    byte delimiter[] = { (byte) '\r', (byte) '\n' };
-                    pipeline.addLast("frameDecoder",
-                            new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter)));
-                    pipeline.addLast("stringDecoder", new StringDecoder());
-                    pipeline.addLast("objectDecoder", new Avl08ProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Enfora server
-     */
-    private void initEnforaServer(Properties properties) throws SQLException {
-
-        String protocol = "enfora";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 0, 2, -2, 2));
-                    pipeline.addLast("objectDecoder", new EnforaProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
-
-    /**
-     * Init Meiligao server
-     */
-    private void initMeiligaoServer(Properties properties) throws SQLException {
-
-        String protocol = "meiligao";
-        if (isProtocolEnabled(properties, protocol)) {
-
-            TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
-            final Integer resetDelay = getProtocolResetDelay(properties, protocol);
-
-            server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) {
-                protected void addSpecificHandlers(ChannelPipeline pipeline) {
-                    pipeline.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 2, -4, 4));
-                    pipeline.addLast("objectDecoder", new MeiligaoProtocolDecoder(getDataManager(), resetDelay));
-                }
-            });
-
-            serverList.add(server);
-        }
-    }
+	/**
+	 * Initialize
+	 */
+	public void init(String[] arguments) throws IOException,
+			ClassNotFoundException, SQLException {
+
+		// Load properties
+		Properties properties = new Properties();
+		if (arguments.length > 0) {
+			properties.loadFromXML(new FileInputStream(arguments[0]));
+		}
+
+		dataManager = new DatabaseDataManager(properties);
+
+		initLogger(properties);
+		initGeocoder(properties);
+
+		initXexunServer(properties);
+		initGps103Server(properties);
+		initTk103Server(properties);
+		initGl100Server(properties);
+		initGl200Server(properties);
+		initT55Server(properties);
+		initXexun2Server(properties);
+		initAvl08Server(properties);
+		initEnforaServer(properties);
+		initMeiligaoServer(properties);
+		initST210Server(properties);
+
+		// Initialize web server
+		if (Boolean.valueOf(properties.getProperty("http.enable"))) {
+			Integer port = Integer.valueOf(properties.getProperty("http.port","8082"));
+			webServer = new WebServer(port, dataManager);
+		}
+	}
+
+	/**
+	 * Start
+	 */
+	public void start() {
+		if (webServer != null) {
+			webServer.start();
+		}
+		for (Object server : serverList) {
+			((TrackerServer) server).start();
+		}
+	}
+
+	/**
+	 * Stop
+	 */
+	public void stop() {
+		for (Object server : serverList) {
+			((TrackerServer) server).stop();
+		}
+		if (webServer != null) {
+			webServer.stop();
+		}
+	}
+
+	/**
+	 * Destroy
+	 */
+	public void destroy() {
+		serverList.clear();
+	}
+
+	/**
+	 * Initialize logger
+	 */
+	private void initLogger(Properties properties) throws IOException {
+
+		loggerEnabled = Boolean.valueOf(properties.getProperty("logger.enable"));
+
+		if (loggerEnabled) {
+
+			String fileName = properties.getProperty("logger.file");
+			if (fileName != null) {
+
+				FileHandler file = new FileHandler(fileName, true);
+
+				// Simple formatter
+				file.setFormatter(new Formatter() {
+					private final String LINE_SEPARATOR = System.getProperty("line.separator", "\n");
+
+					private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+
+					public String format(LogRecord record) {
+						String line = dateFormat.format(new Date(record.getMillis()));
+						line += " " + record.getLevel().getName() + ": ";
+						line += formatMessage(record);
+						line += LINE_SEPARATOR;
+						return line;
+					}
+				});
+
+				// NOTE: Console logger level will remain INFO
+				Log.getLogger().setLevel(Level.ALL);
+				Log.getLogger().addHandler(file);
+			}
+		}
+	}
+
+	private void initGeocoder(Properties properties) throws IOException {
+		if (Boolean.parseBoolean("geocoder.enable")) {
+			geocoder = new GoogleReverseGeocoder();
+		}
+	}
+
+	private boolean isProtocolEnabled(Properties properties, String protocol) {
+		String enabled = properties.getProperty(protocol + ".enable");
+		if (enabled != null) {
+			return Boolean.valueOf(enabled);
+		}
+		return false;
+	}
+
+	private Integer getProtocolPort(Properties properties, String protocol) {
+		String port = properties.getProperty(protocol + ".port");
+		if (port != null) {
+			return Integer.valueOf(port);
+		}
+		return 5000; // Magic number
+	}
+
+	private Integer getProtocolResetDelay(Properties properties, String protocol) {
+		String resetDelay = properties.getProperty(protocol + ".resetDelay");
+		if (resetDelay != null) {
+			return Integer.valueOf(resetDelay);
+		}
+		return 0;
+	}
+
+	/**
+	 * Init Xexun server
+	 */
+	private void initXexunServer(Properties properties) throws SQLException {
+
+		String protocol = "xexun";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					pipeline.addLast("frameDecoder", new XexunFrameDecoder());
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("objectDecoder", new XexunProtocolDecoder(getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Gps103 server
+	 */
+	private void initGps103Server(Properties properties) throws SQLException {
+
+		String protocol = "gps103";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) ';' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("stringEncoder", new StringEncoder());
+					pipeline.addLast("objectDecoder",
+							new Gps103ProtocolDecoder(getDataManager(),
+									resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Tk103 server
+	 */
+	private void initTk103Server(Properties properties) throws SQLException {
+
+		String protocol = "tk103";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) ')' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("stringEncoder", new StringEncoder());
+					pipeline.addLast("objectDecoder", new Tk103ProtocolDecoder(
+							getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Gl100 server
+	 */
+	private void initGl100Server(Properties properties) throws SQLException {
+
+		String protocol = "gl100";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) 0x0 };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("stringEncoder", new StringEncoder());
+					pipeline.addLast("objectDecoder", new Gl100ProtocolDecoder(
+							getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Gl200 server
+	 */
+	private void initGl200Server(Properties properties) throws SQLException {
+
+		String protocol = "gl200";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) '$' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("stringEncoder", new StringEncoder());
+					pipeline.addLast("objectDecoder", new Gl200ProtocolDecoder(
+							getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init T55 server
+	 */
+	private void initT55Server(Properties properties) throws SQLException {
+
+		String protocol = "t55";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) '\r', (byte) '\n' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("stringEncoder", new StringEncoder());
+					pipeline.addLast("objectDecoder", new T55ProtocolDecoder(
+							getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Xexun 2 server
+	 */
+	private void initXexun2Server(Properties properties) throws SQLException {
+
+		String protocol = "xexun2";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) '\n' }; // tracker bug \n\r
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("objectDecoder",
+							new Xexun2ProtocolDecoder(getDataManager(),
+									resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init AVL-08 server
+	 */
+	private void initAvl08Server(Properties properties) throws SQLException {
+
+		String protocol = "avl08";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) '\r', (byte) '\n' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("objectDecoder", new Avl08ProtocolDecoder(
+							getDataManager(), resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Enfora server
+	 */
+	private void initEnforaServer(Properties properties) throws SQLException {
+
+		String protocol = "enfora";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					pipeline.addLast("frameDecoder",
+							new LengthFieldBasedFrameDecoder(1024, 0, 2, -2, 2));
+					pipeline.addLast("objectDecoder",
+							new EnforaProtocolDecoder(getDataManager(),
+									resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	/**
+	 * Init Meiligao server
+	 */
+	private void initMeiligaoServer(Properties properties) throws SQLException {
+
+		String protocol = "meiligao";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					pipeline.addLast("frameDecoder",
+							new LengthFieldBasedFrameDecoder(1024, 2, 2, -4, 4));
+					pipeline.addLast("objectDecoder",
+							new MeiligaoProtocolDecoder(getDataManager(),
+									resetDelay));
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+		}
+	}
+
+	private void initST210Server(Properties properties) throws SQLException {
+
+		String protocol = "st210";
+		if (isProtocolEnabled(properties, protocol)) {
+
+			TrackerServer server = new TrackerServer(getProtocolPort(
+					properties, protocol));
+			final Integer resetDelay = getProtocolResetDelay(properties,
+					protocol);
+
+			server.setPipelineFactory(new GenericPipelineFactory(server,
+					dataManager, isLoggerEnabled(), geocoder) {
+				protected void addSpecificHandlers(ChannelPipeline pipeline) {
+					byte delimiter[] = { (byte) '\r' };
+					pipeline.addLast(
+							"frameDecoder",
+							new DelimiterBasedFrameDecoder(1024, ChannelBuffers
+									.wrappedBuffer(delimiter)));
+					pipeline.addLast("stringDecoder", new StringDecoder());
+					pipeline.addLast("objectDecoder", new ST210ProtocolDecoder(
+							getDataManager(), resetDelay));
+					
+				}
+			});
+
+			serverList.add(server);
+			Log.info("Activating protocol " + protocol + " @ " + getProtocolPort(properties, protocol));
+
+		}
+	}
 
 }
diff --git a/src/org/traccar/TrackerEventHandler.java b/src/org/traccar/TrackerEventHandler.java
index 9e46372ca..2a66a084f 100644
--- a/src/org/traccar/TrackerEventHandler.java
+++ b/src/org/traccar/TrackerEventHandler.java
@@ -56,7 +56,8 @@ public class TrackerEventHandler extends SimpleChannelHandler {
                         ", altitude: " + position.getAltitude() +
                         ", speed: " + position.getSpeed() +
                         ", course: " + position.getCourse() +
-                        ", power: " + position.getPower());
+                        ", power: " + position.getPower() +
+                        ", mode: " + position.getMode());
             }
 
             // Write position to database
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index 6c79e6421..e379a0a9a 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -146,14 +146,15 @@ public class WebServer {
                         Iterator<Position> i = dataManager.getPositions(Long.valueOf(deviceId)).iterator();
                         while (i.hasNext()) {
                             Position position = i.next();
-                            out.format("{'device_id':%d,'time':'%tF %tT','valid':%b,'latitude':%f,'longitude':%f,'speed':%f,'course':%f}",
+                            out.format("{'device_id':%d,'time':'%s','valid':%b,'latitude':%s,'longitude':%s,'speed':%s,'course':%s,'mode':%d}",
                                     position.getDeviceId(),
-                                    position.getTime(), position.getTime(),
+                                    position.getTimeFormated(),
                                     position.getValid(),
-                                    position.getLatitude(),
-                                    position.getLongitude(),
-                                    position.getSpeed(),
-                                    position.getCourse());
+                                    position.getLatitude().toString(),
+                                    position.getLongitude().toString(),
+                                    position.getSpeed().toString(),
+                                    position.getCourse().toString(),
+                                    position.getMode());
                             if (i.hasNext()) out.print(",");
                         }
                     }
diff --git a/src/org/traccar/model/DatabaseDataManager.java b/src/org/traccar/model/DatabaseDataManager.java
index 384d87828..2207d272b 100644
--- a/src/org/traccar/model/DatabaseDataManager.java
+++ b/src/org/traccar/model/DatabaseDataManager.java
@@ -210,6 +210,7 @@ public class DatabaseDataManager implements DataManager {
             position.setSpeed(result.getDouble("speed"));
             position.setCourse(result.getDouble("course"));
             position.setPower(result.getDouble("power"));
+            position.setMode(result.getInt("mode"));
             positionList.add(position);
         }
 
@@ -229,6 +230,7 @@ public class DatabaseDataManager implements DataManager {
         queryAddPosition.setDouble("speed", position.getSpeed());
         queryAddPosition.setDouble("course", position.getCourse());
         queryAddPosition.setDouble("power", position.getPower());
+        queryAddPosition.setInt("mode", position.getMode());
         queryAddPosition.setString("address", position.getAddress());
         queryAddPosition.setString("extended_info", position.getExtendedInfo());
 
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index b408dbbf2..e6ac46de1 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.model;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -56,6 +57,12 @@ public class Position {
     public Date getTime() {
         return time;
     }
+    
+    public String getTimeFormated(){
+    	SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+		df.setLenient(false);
+    	return df.format(time);
+    }
 
     public void setTime(Date time) {
         this.time = time;
@@ -151,6 +158,18 @@ public class Position {
     public void setPower(Double power) {
         this.power = power;
     }
+    /**
+     * Mode / 1 - Parking | 2 - Driving
+     */
+    private int mode;
+
+    public int getMode() {
+        return mode;
+    }
+
+    public void setMode(int mode) {
+        this.mode = mode;
+    }
 
     /**
      * Address
diff --git a/src/web/index.html b/src/web/index.html
index cde73f47b..dcc4771db 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -1,7 +1,9 @@
-<!doctype html>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Traccar Manager</title>
+<title>Jornada Beta</title>
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+
 <link rel="stylesheet" type="text/css" href="http://cdn.sencha.io/ext-4.1.0-gpl/resources/css/ext-all.css" />
 <script type="text/javascript" src="http://cdn.sencha.io/ext-4.1.0-gpl/ext-all.js"></script>
 
@@ -758,6 +760,7 @@ Ext.onReady(function() {
         ]
     });
 
+    
     Ext.define('Position', {
         extend: 'Ext.data.Model',
         fields: [
@@ -768,7 +771,8 @@ Ext.onReady(function() {
             {name: 'longitude', type: 'float'},
             {name: 'speed', type: 'float'},
             {name: 'course', type: 'float'},
-            {name: 'power', type: 'float'}
+            {name: 'power', type: 'float'},
+            {name: 'mode', type: 'int'}
         ]
     });
 
@@ -806,7 +810,8 @@ Ext.onReady(function() {
             'longitude',
             'speed',
             'course',
-            'power'
+            'power',
+            'mode'
         ],
         proxy: {
             type: 'ajax',
@@ -824,7 +829,7 @@ Ext.onReady(function() {
     });
 
     var devicesPanel = Ext.create('Ext.grid.Panel', {
-        title: 'Devices',
+        title: 'Dispositivos',
         region: 'west',
         split: true,
         width: 300,
@@ -837,16 +842,16 @@ Ext.onReady(function() {
         tbar: [
             {
                 id: 'device_update',
-                text: 'Update',
+                text: 'Atualizar',
                 handler : function() {
                     devices.load();
                 }
             },
             {
                 id: 'device_add',
-                text: 'Add',
+                text: 'Incluir',
                 handler : function() {
-                    Ext.Msg.prompt('Add', 'Device IMEI:', function(btn, text) {
+                    Ext.Msg.prompt('Incluir', 'IMEI do Dispositivo:', function(btn, text) {
                         if (btn == 'ok') {
                             devices.add({imei: text});
                         }
@@ -855,10 +860,10 @@ Ext.onReady(function() {
             },
             {
                 id: 'device_remove',
-                text: 'Remove',
+                text: 'Remover',
                 disabled: true,
                 handler : function() {
-                    Ext.Msg.confirm('Remove', 'Are you sure to remove item?', function(btn) {
+                    Ext.Msg.confirm('Remover', 'Confirma remoção do item?', function(btn) {
                         if (btn == 'yes') {
                             devices.remove(devicesPanel.getSelectionModel().getLastSelected());
                         }
@@ -867,10 +872,10 @@ Ext.onReady(function() {
             },
             {
                 id: 'device_edit',
-                text: 'Edit',
+                text: 'Alterar',
                 disabled: true,
                 handler : function() {
-                    Ext.Msg.prompt('Edit', 'Device IMEI:', function(btn, text) {
+                    Ext.Msg.prompt('Alterar', 'IMEI do Dispositivo:', function(btn, text) {
                         if (btn == 'ok') {
                             devicesPanel.getSelectionModel().getLastSelected().set('imei', text);
                         }
@@ -888,11 +893,11 @@ Ext.onReady(function() {
                     Ext.getCmp('device_remove').enable();
                     Ext.getCmp('device_edit').enable();
 
-                    positions.getProxy().url = positionsUrl + '?deviceId=' +
-                        devicesPanel.getSelectionModel().getLastSelected().get('id');
+                    positions.getProxy().url = positionsUrl + '?deviceId=' + devicesPanel.getSelectionModel().getLastSelected().get('id');
                     positions.load();
                     Ext.getCmp('position_update').enable();
-                } else {
+                } 
+                else {
                     Ext.getCmp('position_update').disable();
                     positions.getProxy().url = positionsUrl;
                     positions.load();
@@ -905,7 +910,7 @@ Ext.onReady(function() {
     });
 
     var positionsPanel = Ext.create('Ext.grid.Panel', {
-        title: 'Positions',
+        title: 'Posicionamentos',
         region: 'south',
         split: true,
         height: 300,
@@ -918,7 +923,7 @@ Ext.onReady(function() {
         tbar: [
             {
                 id: 'position_update',
-                text: 'Update',
+                text: 'Atualizar',
                 disabled: true,
                 handler : function() {
                     positions.load();
@@ -926,19 +931,18 @@ Ext.onReady(function() {
             }
         ],
         columns: [
-            {header: 'Device Id', dataIndex: 'device_id'},
-            {
-                header: 'Time',
-                dataIndex: 'time',
+            {header: 'Id Dispositivo', dataIndex: 'device_id'},
+            {header: 'Data/Hora',dataIndex: 'time',
                 flex: 1,
-                renderer: Ext.util.Format.dateRenderer('Y-m-d H:i:s')
+                renderer: Ext.util.Format.dateRenderer('d/m/Y H:i:s')
             },
-            {header: 'Valid', dataIndex: 'valid'},
+            {header: 'Válido', dataIndex: 'valid'},
             {header: 'Latitude', dataIndex: 'latitude'},
             {header: 'Longitude', dataIndex: 'longitude'},
-            {header: 'Speed', dataIndex: 'speed'},
-            {header: 'Course', dataIndex: 'course'},
-            {header: 'Power', dataIndex: 'power'}
+            {header: 'Velocidade', dataIndex: 'speed'},
+            {header: 'Curso', dataIndex: 'course'},
+            {header: 'Voltagem', dataIndex: 'power'},
+            {header: 'Modo',  dataIndex: 'mode'}
         ],
         listeners: {
             selectionchange: function(sender, selected, eOpts) {
@@ -955,7 +959,7 @@ Ext.onReady(function() {
     });
 
     var mapPanel = Ext.create('Ext.panel.Panel', {
-        title: 'Map',
+        title: 'Mapa',
         region: 'center',
         margins: {top: 5, bottom: 0, right: 5, left: 0},