Merge branch 'master' into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/pom.xml

java/com.sap.sailing.server.gateway/.classpath

@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/rome-1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF

@@ -22,10 +22,13 @@ Require-Bundle: com.sap.sailing.domain,
  javax.servlet;bundle-version="2.5.0",
  com.sap.sailing.domain.common,
  com.sap.sailing.udpconnector,
- com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
  org.jdom;bundle-version="1.0.0",
+ com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
+ javax.servlet.jsp.jstl;bundle-version="1.2.0",
+ javax.servlet.jsp;bundle-version="2.1.0",
+ javax.el;bundle-version="2.1.0",
+ rome;bundle-version="1.0.0",
  com.sap.sailing.domain.shared.android;bundle-version="1.0.0"
-Bundle-ClassPath: .,
- lib/rome-1.0.jar
+Bundle-ClassPath: .
 Web-ContextPath: /sailingserver
 Export-Package: com.sap.sailing.server.gateway

java/com.sap.sailing.server.gateway/WEB-INF/jsp/listEvents.jsp

@@ -1,19 +0,0 @@
-<%@ page import="com.sap.sailing.server.RacingEventService" %>
-<%@ page import="com.sap.sailing.domain.base.*" %>
-<html>
-<head>
-</head>
-<body>
-<%="Hello RacingEventService... !"%>
-
-<%
-	RacingEventService racingEventService = (RacingEventService) request.getAttribute("racingEventService");
-	for(Event event: racingEventService.getAllEvents()) {
-%>
-	<h3><%= event.getName() %></h3>
-<%    
-	}
-%>
-
-</body>
-</html>

java/com.sap.sailing.server.gateway/WEB-INF/web.xml

@@ -99,7 +99,7 @@
 		<servlet-name>LiveRaceRankingAsRssFeedServlet</servlet-name>
 		<url-pattern>/rss/liveRaceRanking</url-pattern>
 	</servlet-mapping>
-
+ 
 	<servlet id="jsp">
      <servlet-name>jspServet</servlet-name>
      <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
@@ -118,19 +118,10 @@
  
      <load-on-startup>0</load-on-startup>
    </servlet>
- 
+<!-- 
    <servlet-mapping>
      <servlet-name>jspServet</servlet-name>
      <url-pattern>*.jsp</url-pattern>
    </servlet-mapping>
-   
-   	<servlet>
-		<servlet-name>SimpleJspForwardServlet</servlet-name>
-		<servlet-class>com.sap.sailing.server.gateway.impl.SimpleJspForwardServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>SimpleJspForwardServlet</servlet-name>
-		<url-pattern>/events</url-pattern>
-	</servlet-mapping>
-   
+ --> 
  </web-app>

java/com.sap.sailing.server.gateway/build.properties

@@ -3,6 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                WEB-INF/,\
-               html/,\
-               lib/,\
-               lib/rome-1.0.jar
+               html/

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/AbstractCSVHttpServlet.java

@@ -0,0 +1,45 @@
+package com.sap.sailing.server.gateway;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Base servlet for CSV (comma separated file) exports
+ * @author Frank
+ */
+@SuppressWarnings("serial")
+public abstract class AbstractCSVHttpServlet extends SailingServerHttpServlet {
+
+    protected void setCSVResponseHeader(HttpServletResponse resp, String filename) {
+        resp.setContentType("text/csv");
+        resp.setHeader("Content-Disposition", "attachment;filename=\"" + filename + "\"");
+        resp.setCharacterEncoding("UTF-8");
+    }
+    
+    protected <T> void writeCsv (List<List<T>> csv, char separator, boolean quoteStrings, OutputStream output) throws IOException {
+        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(output, "UTF-8"));
+        for (List<T> row : csv) {
+            StringBuilder line = new StringBuilder();
+            for (Iterator<T> iter = row.iterator(); iter.hasNext();) {
+                T fieldObject = iter.next();
+                String field = String.valueOf(fieldObject).replace("\"", "\"\"");
+                if(fieldObject instanceof String && quoteStrings) {
+                    field = '"' + field + '"';
+                }
+                line.append(field);
+                if (iter.hasNext()) {
+                    line.append(separator);
+                }
+            }
+            writer.write(line.toString());
+            writer.newLine();
+        }
+        writer.flush();
+    }
+}

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/AbstractJsonHttpServlet.java

@@ -1,11 +1,13 @@
-package com.sap.sailing.server.gateway.impl;
+package com.sap.sailing.server.gateway;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.sap.sailing.server.gateway.SailingServerHttpServlet;
-
-public abstract class JsonExportServlet extends SailingServerHttpServlet {
-    private static final long serialVersionUID = 7007196727805110847L;
+/**
+ * Base servlet for json exports
+ * @author Frank
+ */
+@SuppressWarnings("serial")
+public abstract class AbstractJsonHttpServlet extends SailingServerHttpServlet {
 
     protected void setJsonResponseHeader(HttpServletResponse resp) {
         // to allow access to the json document directly from a client side javascript

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardGroupJsonExportServlet.java

@@ -22,8 +22,9 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
 import com.sap.sailing.domain.leaderboard.RegattaLeaderboard;
 import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;
 import com.sap.sailing.domain.tracking.TrackedRace;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 
-public class LeaderboardGroupJsonExportServlet extends JsonExportServlet {
+public class LeaderboardGroupJsonExportServlet extends AbstractJsonHttpServlet {
     private static final long serialVersionUID = 1351616646322956825L;
     private static final String PARAM_NAME_LEADERBOARDGROUPNAME = "leaderboardGroupName";
 

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonExportServlet.java

@@ -23,8 +23,9 @@ import com.sap.sailing.domain.common.TimePoint;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
 import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;
 import com.sap.sailing.domain.tracking.TrackedRace;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 
-public class LeaderboardJsonExportServlet extends JsonExportServlet {
+public class LeaderboardJsonExportServlet extends AbstractJsonHttpServlet {
     private static final long serialVersionUID = -2460691283231361152L;
     private static final String PARAM_NAME_LEADERBOARDNAME = "leaderboardName";
 

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardsJsonExportServlet.java

@@ -10,8 +10,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.simple.JSONArray;
 
 import com.sap.sailing.domain.leaderboard.Leaderboard;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 
-public class LeaderboardsJsonExportServlet extends JsonExportServlet {
+public class LeaderboardsJsonExportServlet extends AbstractJsonHttpServlet {
     private static final long serialVersionUID = -2193421590275280102L;
 
     @Override

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/RegattaAndRaceDataJsonExportServlet.java

@@ -34,9 +34,10 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
 import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.Wind;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 import com.sap.sailing.util.InvalidDateException;
 
-public class RegattaAndRaceDataJsonExportServlet extends JsonExportServlet {
+public class RegattaAndRaceDataJsonExportServlet extends AbstractJsonHttpServlet {
     private static final Logger logger = Logger.getLogger(RegattaAndRaceDataJsonExportServlet.class.getName());
     
     private static final long serialVersionUID = 1333207389294903999L;

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/SimpleJspForwardServlet.java

@@ -1,28 +0,0 @@
-package com.sap.sailing.server.gateway.impl;
-
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.sap.sailing.server.RacingEventService;
-import com.sap.sailing.server.gateway.SailingServerHttpServlet;
-
-public class SimpleJspForwardServlet extends SailingServerHttpServlet {
-    private static final long serialVersionUID = -1017961881555515288L;
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        RacingEventService racingEventService = getService();
-        if(racingEventService != null) {
-            request.setAttribute("racingEventService", racingEventService);           
-            ServletContext sc = getServletContext();
-            RequestDispatcher requestDispatcher = sc.getRequestDispatcher("/WEB-INF/jsp/listEvents.jsp");
-            requestDispatcher.forward(request, response);
-        }
-    }
-
-}

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddToRaceLogJsonExportServlet.java

@@ -17,6 +17,7 @@ import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.domain.racelog.RaceLogIdentifier;
 import com.sap.sailing.domain.racelog.impl.RaceLogIdentifierImpl;
 import com.sap.sailing.server.RacingEventService;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
 import com.sap.sailing.server.gateway.deserialization.impl.RaceLogCourseAreaChangedEventDeserializer;
@@ -24,9 +25,8 @@ import com.sap.sailing.server.gateway.deserialization.impl.RaceLogEventDeseriali
 import com.sap.sailing.server.gateway.deserialization.impl.RaceLogFlagEventDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.RaceLogRaceStatusEventDeserializer;
 import com.sap.sailing.server.gateway.deserialization.impl.RaceLogStartTimeEventDeserializer;
-import com.sap.sailing.server.gateway.impl.JsonExportServlet;
 
-public class AddToRaceLogJsonExportServlet extends JsonExportServlet {
+public class AddToRaceLogJsonExportServlet extends AbstractJsonHttpServlet {
 	private static final long serialVersionUID = 7704668926551060433L;
 	
 	public static final String PARAMS_LEADERBOARD_NAME = "leaderboard";

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventDataJsonExportServlet.java

@@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.simple.JSONArray;
 
 import com.sap.sailing.domain.base.EventData;
-import com.sap.sailing.server.gateway.impl.JsonExportServlet;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.CourseAreaJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.EventDataJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.VenueJsonSerializer;
 
-public class EventDataJsonExportServlet extends JsonExportServlet {
+public class EventDataJsonExportServlet extends AbstractJsonHttpServlet {
 	private static final long serialVersionUID = 4515246650108245796L;
 	
 	@Override

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java

@@ -15,20 +15,20 @@ import com.sap.sailing.domain.base.Event;
 import com.sap.sailing.domain.base.RaceGroup;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
 import com.sap.sailing.domain.racelog.RaceLog;
-import com.sap.sailing.server.gateway.impl.JsonExportServlet;
+import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.BoatClassJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.ColorJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.CourseAreaJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.FleetJsonSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceGroupJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceCellJsonSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceGroupJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowsOfSeriesWithRowsSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.SeriesWithRowsJsonSerializer;
 import com.sap.sailing.server.gateway.serialization.impl.racegroup.SeriesWithRowsOfRaceGroupSerializer;
 
-public class RaceGroupJsonExportServlet extends JsonExportServlet {
+public class RaceGroupJsonExportServlet extends AbstractJsonHttpServlet {
 	private static final long serialVersionUID = 4510175441769759252L;
 	
 	private static final String PARAM_COURSE_AREA_FILTER = "courseArea";