--- android/DroidRadarService/src/dk/thoerup/droidradarservice/LocationService.java	2009/08/25 05:43:58	278
+++ android/DroidRadarService/src/dk/thoerup/droidradarservice/LocationService.java	2009/08/25 05:55:51	279
@@ -6,13 +6,12 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
+
 
 public class LocationService extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -74,7 +73,7 @@
 		
 		StringBuffer buff = new StringBuffer();
 		
-		buff.append("<?xml version=\"1.0\"?>\n");
+		buff.append("<?xml version=\"1.0\" ?>\n");
 		buff.append("<droids>\n");
 		try
 		{
@@ -120,9 +119,7 @@
 		
 		Connection conn = null;
 		try {
-			Context ctx = new InitialContext();
-			DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/test");
-			conn = ds.getConnection();
+			conn = DBConnection.getConnection();
 			
 			updateDb(conn, imei, latitude, longitude, handle, group);