From 9a6cc11cdc5069314f9c64aa1e017f556baf8070 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 30 Dec 2012 11:33:40 +1300
Subject: Include all jetty libraries

---
 pom.xml               | 43 ++++++++++---------------------------------
 setup/linux/linux.cfg | 24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f7409628..a0996b916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,11 @@
     <url>http://www.traccar.org</url>
 
     <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -24,42 +29,14 @@
             <artifactId>netty</artifactId>
             <version>3.5.9.Final</version>
         </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-        </dependency>
-
-        <!-- Jetty -->
-        <dependency>
-            <groupId>org.eclipse.jetty.orbit</groupId>
-            <artifactId>javax.servlet</artifactId>
-            <version>3.0.0.v201112011016</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-continuation</artifactId>
-            <version>8.1.7.v20120910</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
-            <version>8.1.7.v20120910</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-            <version>8.1.7.v20120910</version>
-        </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>8.1.7.v20120910</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
+            <groupId>org.eclipse.jetty.aggregate</groupId>
+            <artifactId>jetty-all-server</artifactId>
             <version>8.1.7.v20120910</version>
         </dependency>
     </dependencies>
diff --git a/setup/linux/linux.cfg b/setup/linux/linux.cfg
index d0f11199a..6b60d5edc 100644
--- a/setup/linux/linux.cfg
+++ b/setup/linux/linux.cfg
@@ -159,5 +159,29 @@
     <!-- PT502 server configuration -->
     <entry key="pt502.enable">true</entry>
     <entry key="pt502.port">5017</entry>
+
+    <!-- TR20 server configuration -->
+    <entry key="tr20.enable">true</entry>
+    <entry key="tr20.port">5018</entry>
+
+    <!-- Navis server configuration -->
+    <entry key="navis.enable">true</entry>
+    <entry key="navis.port">5019</entry>
+
+    <!-- Meitrack server configuration -->
+    <entry key="meitrack.enable">true</entry>
+    <entry key="meitrack.port">5020</entry>
+
+    <!-- Skypatrol server configuration -->
+    <entry key="skypatrol.enable">true</entry>
+    <entry key="skypatrol.port">5021</entry>
+
+    <!-- GT02 server configuration -->
+    <entry key="gt02.enable">true</entry>
+    <entry key="gt02.port">5022</entry>
+
+    <!-- GT06 server configuration -->
+    <entry key="gt06.enable">true</entry>
+    <entry key="gt06.port">5023</entry>
     
 </properties>
-- 
cgit v1.2.3