From dcbaac71303e606662c8274d5b936fd8323a01b0 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 9 Jun 2011 08:50:44 +0000 Subject: --- nbproject/build-impl.xml | 241 +++++++++++++++++---- nbproject/genfiles.properties | 4 +- nbproject/project.properties | 18 +- src/net/sourceforge/opentracking/Server.java | 162 +++++++++++--- .../opentracking/TrackerEventHandler.java | 4 +- .../sourceforge/opentracking/TrackerServer.java | 29 +-- .../protocol/gps103/Gps103ProtocolDecoder.java | 15 +- .../protocol/tk103/Tk103ProtocolDecoder.java | 6 +- .../protocol/xexun/XexunProtocolDecoder.java | 2 - .../protocol/gps103/Gps103ProtocolDecoderTest.java | 3 +- .../protocol/tk103/Tk103ProtocolDecoderTest.java | 2 +- 11 files changed, 359 insertions(+), 127 deletions(-) diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index ce971292e..d1e971a8e 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -55,7 +55,14 @@ is divided into following sections: - + + + + + + + + @@ -70,8 +77,14 @@ is divided into following sections: + + + + + + @@ -84,41 +97,42 @@ is divided into following sections: - - - - - - - - - - - - + - + - + - + - + - + + + + + + + + + + + + + @@ -173,8 +187,17 @@ is divided into following sections: - + + + + + + + + + + @@ -302,7 +325,9 @@ is divided into following sections: - + + + @@ -312,7 +337,8 @@ is divided into following sections: - + + @@ -328,11 +354,56 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + @@ -427,6 +498,7 @@ is divided into following sections: + @@ -442,7 +514,7 @@ is divided into following sections: - + @@ -571,10 +643,10 @@ is divided into following sections: - + - + @@ -583,44 +655,53 @@ is divided into following sections: - To run this application from the command line without Ant, try: + To run this application from the command line without Ant, try: - java -cp "${run.classpath.with.dist.jar}" ${main.class} + java -cp "${run.classpath.with.dist.jar}" ${main.class} - + + + + + + + + + + + + + + - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" + + + - - - - - - - To run this application from the command line without Ant, try: + + + To run this application from the command line without Ant, try: - java -jar "${dist.jar.resolved}" + java -jar "${dist.jar.resolved}" + + + + + + - + + + + + + + + + + + Must select one file in the IDE or set profile.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Must select some files in the IDE or set javac.includes diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 3f1e5c781..cdea35abe 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.2.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=06177666 -nbproject/build-impl.xml.script.CRC32=48d0d70b -nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45 +nbproject/build-impl.xml.script.CRC32=6a8d24fd +nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 diff --git a/nbproject/project.properties b/nbproject/project.properties index 986777a28..4e1f3eb23 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -25,13 +25,15 @@ dist.jar=${dist.dir}/tracker-server.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.netty-3.2.3.Final.jar=C:\\Test\\traccar\\lib\\netty-3.2.3.Final.jar +file.reference.netty-3.2.4.Final.jar=C:\\Test\\traccar\\lib\\netty-3.2.4.Final.jar includes=** +jar.archive.disabled=${jnlp.enabled} jar.compress=false +jar.index=${jnlp.enabled} javac.classpath=\ ${libs.PostgreSQLDriver.classpath}:\ - ${file.reference.netty-3.2.3.Final.jar}:\ - ${libs.MySQLDriver.classpath} + ${libs.MySQLDriver.classpath}:\ + ${file.reference.netty-3.2.4.Final.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -54,9 +56,19 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= main.class=Main manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false platform.active=default_platform run.classpath=\ ${javac.classpath}:\ diff --git a/src/net/sourceforge/opentracking/Server.java b/src/net/sourceforge/opentracking/Server.java index 8769d1d04..18194b3e6 100644 --- a/src/net/sourceforge/opentracking/Server.java +++ b/src/net/sourceforge/opentracking/Server.java @@ -41,6 +41,12 @@ import net.sourceforge.opentracking.protocol.xexun.XexunFrameDecoder; import net.sourceforge.opentracking.protocol.xexun.XexunProtocolDecoder; import net.sourceforge.opentracking.protocol.gps103.Gps103ProtocolDecoder; import net.sourceforge.opentracking.protocol.tk103.Tk103ProtocolDecoder; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.channel.ChannelPipelineFactory; +import org.jboss.netty.channel.ChannelStateEvent; +import org.jboss.netty.channel.Channels; +import org.jboss.netty.channel.SimpleChannelHandler; /** * Server @@ -58,6 +64,10 @@ public class Server implements DataManager { serverList = new LinkedList(); loggerEnable = false; } + + public boolean isLoggerEnabled() { + return loggerEnable; + } /** * Init @@ -202,6 +212,53 @@ public class Server implements DataManager { } } + /** + * Open channel handler + */ + protected class OpenChannelHandler extends SimpleChannelHandler { + + private TrackerServer server; + + public OpenChannelHandler(TrackerServer server) { + this.server = server; + } + + @Override + public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) { + server.getChannelGroup().add(e.getChannel()); + } + } + + /** + * Xexun pipeline factory + */ + protected class XexunPipelineFactory implements ChannelPipelineFactory { + + private TrackerServer server; + private Server serverCreator; + private Integer resetDelay; + + public XexunPipelineFactory( + TrackerServer server, Server serverCreator, Integer resetDelay) { + this.server = server; + this.serverCreator = serverCreator; + this.resetDelay = resetDelay; + } + + public ChannelPipeline getPipeline() { + ChannelPipeline pipeline = Channels.pipeline(); + pipeline.addLast("openHandler", new OpenChannelHandler(server)); + if (serverCreator.isLoggerEnabled()) { + pipeline.addLast("logger", new LoggingHandler("logger")); + } + pipeline.addLast("frameDecoder", new XexunFrameDecoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new XexunProtocolDecoder(serverCreator, resetDelay)); + pipeline.addLast("handler", new TrackerEventHandler(serverCreator)); + return pipeline; + } + } + /** * Init Xexun server */ @@ -213,21 +270,47 @@ public class Server implements DataManager { TrackerServer server = new TrackerServer( Integer.valueOf(properties.getProperty("xexun.port"))); - if (loggerEnable) { - server.getPipeline().addLast("logger", new LoggingHandler("logger")); - } - server.getPipeline().addLast("frameDecoder", new XexunFrameDecoder()); - server.getPipeline().addLast("stringDecoder", new StringDecoder()); String resetDelay = properties.getProperty("xexun.resetDelay"); - server.getPipeline().addLast("objectDecoder", new XexunProtocolDecoder(this, - (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); - - server.getPipeline().addLast("handler", new TrackerEventHandler(this)); + server.setPipelineFactory(new XexunPipelineFactory( + server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); serverList.add(server); } } + /** + * Gps103 pipeline factory + */ + protected class Gps103PipelineFactory implements ChannelPipelineFactory { + + private TrackerServer server; + private Server serverCreator; + private Integer resetDelay; + + public Gps103PipelineFactory( + TrackerServer server, Server serverCreator, Integer resetDelay) { + this.server = server; + this.serverCreator = serverCreator; + this.resetDelay = resetDelay; + } + + public ChannelPipeline getPipeline() { + ChannelPipeline pipeline = Channels.pipeline(); + pipeline.addLast("openHandler", new OpenChannelHandler(server)); + if (serverCreator.isLoggerEnabled()) { + pipeline.addLast("logger", new LoggingHandler("logger")); + } + 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(serverCreator, resetDelay)); + pipeline.addLast("handler", new TrackerEventHandler(serverCreator)); + return pipeline; + } + } + /** * Init Gps103 server */ @@ -239,24 +322,47 @@ public class Server implements DataManager { TrackerServer server = new TrackerServer( Integer.valueOf(properties.getProperty("gps103.port"))); - if (loggerEnable) { - server.getPipeline().addLast("logger", new LoggingHandler("logger")); - } - byte delimiter[] = { (byte) ';' }; - server.getPipeline().addLast("frameDecoder", - new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); - server.getPipeline().addLast("stringDecoder", new StringDecoder()); - server.getPipeline().addLast("stringEncoder", new StringEncoder()); String resetDelay = properties.getProperty("gps103.resetDelay"); - server.getPipeline().addLast("objectDecoder", new Gps103ProtocolDecoder(this, - (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); - - server.getPipeline().addLast("handler", new TrackerEventHandler(this)); + server.setPipelineFactory(new Gps103PipelineFactory( + server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); serverList.add(server); } } + /** + * Tk103 pipeline factory + */ + protected class Tk103PipelineFactory implements ChannelPipelineFactory { + + private TrackerServer server; + private Server serverCreator; + private Integer resetDelay; + + public Tk103PipelineFactory( + TrackerServer server, Server serverCreator, Integer resetDelay) { + this.server = server; + this.serverCreator = serverCreator; + this.resetDelay = resetDelay; + } + + public ChannelPipeline getPipeline() { + ChannelPipeline pipeline = Channels.pipeline(); + pipeline.addLast("openHandler", new OpenChannelHandler(server)); + if (serverCreator.isLoggerEnabled()) { + pipeline.addLast("logger", new LoggingHandler("logger")); + } + 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(serverCreator, resetDelay)); + pipeline.addLast("handler", new TrackerEventHandler(serverCreator)); + return pipeline; + } + } + /** * Init Tk103 server */ @@ -268,19 +374,9 @@ public class Server implements DataManager { TrackerServer server = new TrackerServer( Integer.valueOf(properties.getProperty("tk103.port"))); - if (loggerEnable) { - server.getPipeline().addLast("logger", new LoggingHandler("logger")); - } - byte delimiter[] = { (byte) ')' }; - server.getPipeline().addLast("frameDecoder", - new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); - server.getPipeline().addLast("stringDecoder", new StringDecoder()); - server.getPipeline().addLast("stringEncoder", new StringEncoder()); String resetDelay = properties.getProperty("tk103.resetDelay"); - server.getPipeline().addLast("objectDecoder", new Tk103ProtocolDecoder(this, - (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); - - server.getPipeline().addLast("handler", new TrackerEventHandler(this)); + server.setPipelineFactory(new Tk103PipelineFactory( + server, this, (resetDelay == null) ? 0 : Integer.valueOf(resetDelay))); serverList.add(server); } diff --git a/src/net/sourceforge/opentracking/TrackerEventHandler.java b/src/net/sourceforge/opentracking/TrackerEventHandler.java index 7bd3f5501..28a8c8fad 100644 --- a/src/net/sourceforge/opentracking/TrackerEventHandler.java +++ b/src/net/sourceforge/opentracking/TrackerEventHandler.java @@ -19,12 +19,12 @@ import org.jboss.netty.channel.SimpleChannelHandler; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.ChannelPipelineCoverage; +import org.jboss.netty.channel.ChannelHandler; /** * Tracker message handler */ -@ChannelPipelineCoverage("all") +@ChannelHandler.Sharable public class TrackerEventHandler extends SimpleChannelHandler { /** diff --git a/src/net/sourceforge/opentracking/TrackerServer.java b/src/net/sourceforge/opentracking/TrackerServer.java index 4b38920c7..dc9981e61 100644 --- a/src/net/sourceforge/opentracking/TrackerServer.java +++ b/src/net/sourceforge/opentracking/TrackerServer.java @@ -23,34 +23,12 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.channel.group.ChannelGroup; import org.jboss.netty.channel.group.DefaultChannelGroup; import org.jboss.netty.channel.group.ChannelGroupFuture; -import org.jboss.netty.channel.SimpleChannelHandler; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelStateEvent; -import org.jboss.netty.channel.ChannelPipelineCoverage; /** * Tracker server */ public class TrackerServer extends ServerBootstrap { - /** - * Open channel handler - */ - @ChannelPipelineCoverage("all") - protected class OpenChannelHandler extends SimpleChannelHandler { - - TrackerServer server; - - public OpenChannelHandler(TrackerServer newServer) { - server = newServer; - } - - @Override - public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) { - server.getChannelGroup().add(e.getChannel()); - } - } - /** * Initialization */ @@ -60,11 +38,8 @@ public class TrackerServer extends ServerBootstrap { // Create channel factory setFactory(new NioServerSocketChannelFactory( - Executors.newFixedThreadPool(threadPoolSize), - Executors.newFixedThreadPool(threadPoolSize))); - - // Add open channel handler - getPipeline().addLast("openHandler", new OpenChannelHandler(this)); + Executors.newCachedThreadPool(), + Executors.newCachedThreadPool())); } public TrackerServer(Integer port) { diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java index 663ca22bb..30fdcb06f 100644 --- a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java @@ -17,7 +17,6 @@ package net.sourceforge.opentracking.protocol.gps103; import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.TimeZone; import java.util.Timer; import java.util.TimerTask; import java.util.regex.Pattern; @@ -25,7 +24,6 @@ import java.util.regex.Matcher; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; -import org.jboss.netty.channel.ChannelPipelineCoverage; import net.sourceforge.opentracking.Position; import net.sourceforge.opentracking.DataManager; import org.jboss.netty.channel.ChannelEvent; @@ -35,7 +33,6 @@ import org.jboss.netty.channel.ChannelStateEvent; /** * Gps 103 tracker protocol decoder */ -@ChannelPipelineCoverage("all") public class Gps103ProtocolDecoder extends OneToOneDecoder { /** @@ -63,8 +60,8 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder { "imei:" + "([\\d]+)," + // IMEI "[^,]+," + - "[\\d]+," + - "[\\d]*," + + "(\\d{2})(\\d{2})(\\d{2})[\\d]+," + // Date + "[+]?[\\d]*," + "[FL]," + // F - full / L - low "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS) "([AV])," + // Validity @@ -102,9 +99,15 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder { // Get device by IMEI String imei = parser.group(index++); position.setDeviceId(dataManager.getDeviceByImei(imei).getId()); + + // Date + Calendar time = new GregorianCalendar(); + time.clear(); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); // Time - Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC")); time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++))); time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++))); time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++))); diff --git a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java index ab88bf69c..c11d22a17 100644 --- a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java @@ -17,7 +17,6 @@ package net.sourceforge.opentracking.protocol.tk103; import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.TimeZone; import java.util.Timer; import java.util.TimerTask; import java.util.regex.Pattern; @@ -25,7 +24,6 @@ import java.util.regex.Matcher; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; -import org.jboss.netty.channel.ChannelPipelineCoverage; import net.sourceforge.opentracking.Position; import net.sourceforge.opentracking.DataManager; import org.jboss.netty.channel.ChannelEvent; @@ -35,7 +33,6 @@ import org.jboss.netty.channel.ChannelStateEvent; /** * Gps 103 tracker protocol decoder */ -@ChannelPipelineCoverage("all") public class Tk103ProtocolDecoder extends OneToOneDecoder { /** @@ -85,11 +82,14 @@ public class Tk103ProtocolDecoder extends OneToOneDecoder { String sentence = (String) msg; + System.out.println(sentence); // DELME + // TODO: Send response (?) // Parse message Matcher parser = pattern.matcher(sentence); if (!parser.matches()) { + System.out.println("Pattern doesn't match."); // DELME return null; } diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java index 94b1cb31b..865d1cf72 100644 --- a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java +++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java @@ -25,7 +25,6 @@ import java.util.TimerTask; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneDecoder; -import org.jboss.netty.channel.ChannelPipelineCoverage; import net.sourceforge.opentracking.Position; import net.sourceforge.opentracking.DataManager; import org.jboss.netty.channel.ChannelEvent; @@ -35,7 +34,6 @@ import org.jboss.netty.channel.ChannelStateEvent; /** * Xexun tracker protocol decoder */ -@ChannelPipelineCoverage("all") public class XexunProtocolDecoder extends OneToOneDecoder { /** diff --git a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java index 1372c1c2c..895cbb534 100644 --- a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java +++ b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java @@ -41,7 +41,8 @@ public class Gps103ProtocolDecoderTest { String testMsg1 = "##,imei:10000000000000,A"; // NEW MESSAGE: imei:359587017470280,tracker,0000000000,03184511405,L,; - String testMsg2 = "imei:10000000000000,help me,1004171910,,F,010203.000,A,0102.0003,N,00102.0003,E,1.02,"; + String testMsg2 = //"imei:10000000000000,help me,1004171910,,F,010203.000,A,0102.0003,N,00102.0003,E,1.02,"; + "imei:353451040164707,tracker,1105182344,+36304665439,F,214418.000,A,4804.2222,N,01916.7593,E,0.37,"; Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager(), 0); //assertNull(decoder.decode(null, null, testMsg1)); diff --git a/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java index a94657c04..e318fe5fb 100644 --- a/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java +++ b/test/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoderTest.java @@ -31,7 +31,7 @@ public class Tk103ProtocolDecoderTest { @Test public void testDecode() throws Exception { - String testMsg1 = "(035988863964BP05000035988863964110430A4241.8399N02318.8131E000.0110112311.8310000000L00000094"; + String testMsg1 = "(035988863964BP05000035988863964110524A4241.7977N02318.7561E000.0123536356.5100000000L000946BB"; Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new TestDataManager(), 0); Position position = (Position) decoder.decode(null, null, testMsg1); -- cgit v1.2.3