Merge branch 'master' into tracapi

Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java

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

@@ -13,6 +13,9 @@ Require-Bundle: com.tractrac.clientmodule;bundle-version="2.0.0",
  com.sap.sailing.domain.test;bundle-version="1.0.0",
  com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sailing.server;bundle-version="1.0.0",
- org.junit4;bundle-version="4.8.2"
+ org.junit4;bundle-version="4.8.2",
+ org.mockito.mockito-core;bundle-version="1.9.5",
+ org.objenesis;bundle-version="1.3.0",
+ com.sap.sse.common
 Import-Package: org.json.simple,
  org.json.simple.parser

java/com.sap.sailing.server.trackfiles.test/resources/equine-extensions.gpx

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<gpx  version="1.1"
+creator="TRACONTROL"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:EQUINE="http://sapsailing.com/equine/1/0"
+xmlns:nmea="http://trekbuddy.net/2009/01/gpx/nmea"
+xmlns="http://www.topografix.com/GPX/1/1"
+xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+<metadata>
+<name>GPS Receiver track log</name>
+<desc>W:\Projects\Stephan\ELEC\P2013_10_001_GPSTRACKER\Backend\TCPoffloader\GPSTRAC_DATA\20140421_NBG_GVP-kalibrierung\20140421125124-001343095BB2.gtc</desc>
+<author>
+<name>Stephan Daub</name>
+</author>
+<time>2014-04-21T13:07:42Z</time>
+<keywords>BRABANT</keywords>
+<bounds minlat="49" minlon="8" maxlat="49" maxlon="8"/>
+</metadata>
+<trk>
+<trkseg>
+<trkpt lat="49.154846" lon="8.718685">
+<ele>146.026</ele>
+<fix>3d</fix>
+<sat>7</sat>
+<pdop>2.96</pdop>
+<speed>1.854</speed>
+<time>2014-04-21T12:10:24Z</time>
+  <extensions>
+    <EQUINE:heartbeat>115</EQUINE:heartbeat>
+    <EQUINE:gallopStep>1</EQUINE:gallopStep>
+    <EQUINE:plannedMinute>0</EQUINE:plannedMinute>
+    <nmea:speed>2.0</nmea:speed>
+    <nmea:course>256.0</nmea:course>
+  </extensions>
+</trkpt>
+</trkseg>
+</trk>
+</gpx>

java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java

@@ -0,0 +1,58 @@
+package com.sap.sailing.server.trackfiles.test;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.w3c.dom.Element;
+
+import slash.navigation.base.BaseNavigationPosition;
+import slash.navigation.gpx.binding11.WptType;
+
+import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier;
+import com.sap.sailing.domain.tracking.GPSFix;
+import com.sap.sailing.server.trackfiles.impl.BaseRouteConverterGPSFixImporterImpl;
+import com.sap.sailing.server.trackfiles.impl.RouteConverterGPSFixImporterImpl;
+
+public class RouteConverterGpx11ExtensionsTest {
+    private boolean extensionsFound = false;
+
+    @Test
+    public void areExtensionsRead() throws Exception {
+        String testFile = "/equine-extensions.gpx";
+        InputStream in = getClass().getResourceAsStream(testFile);
+        assert in != null : new Exception("Input file not found");
+
+        BaseRouteConverterGPSFixImporterImpl importer = spy(new RouteConverterGPSFixImporterImpl());
+        doAnswer(new Answer<GPSFix>() {
+            @Override
+            public GPSFix answer(InvocationOnMock invocation) throws Throwable {
+                BaseNavigationPosition p = (BaseNavigationPosition) invocation.getArguments()[0];
+                WptType waypoint = p.asGpxPosition().getOrigin(WptType.class);
+                final List<Object> extensions = waypoint.getExtensions().getAny();
+                for (Object o : extensions) {
+                    Element el = (Element) o;
+                    System.out.println(el.getLocalName() + " " + el.getTextContent());
+                    extensionsFound = true;
+                }
+                
+                return (GPSFix) invocation.callRealMethod();
+            }
+        }).when(importer).convertToGPSFix(any(BaseNavigationPosition.class));
+
+        importer.importFixes(in, new com.sap.sailing.domain.trackimport.GPSFixImporter.Callback() {
+            @Override
+            public void addFix(GPSFix fix, TrackFileImportDeviceIdentifier device) {
+            }
+        }, false, "source");
+        
+        assertTrue(extensionsFound);
+    }
+}

java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java

@@ -4,11 +4,11 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier;
 import com.sap.sailing.domain.trackimport.FormatNotSupportedException;
 import com.sap.sailing.domain.trackimport.GPSFixImporter.Callback;
 import com.sap.sailing.domain.tracking.GPSFix;
@@ -28,34 +28,26 @@ public class TrackFileImportTest {
         InputStream in = getClass().getResourceAsStream("/Cardiff Race17 - COMPETITORS.gpx");
         new RouteConverterGPSFixImporterImpl().importFixes(in, new Callback() {
             @Override
-            public void addFix(GPSFix fix) {
+            public void addFix(GPSFix fix, TrackFileImportDeviceIdentifier device) {
                 if (fix instanceof GPSFixMoving) {
                     callbackCalled = true;
                 }
             }
-
-            @Override
-            public void startTrack(String name, Map<String, String> properties) {
-            }
-        }, false);
+        }, false, "source");
         assertTrue(callbackCalled);
     }
     
     @Test
     public void testKmlOnlyLatLong() throws IOException, FormatNotSupportedException {
-        InputStream in = getClass().getResourceAsStream("/sam002903 - COMPETITORS.kml");
+        InputStream in = getClass().getResourceAsStream("/Cardiff Race22 - COMPETITORS.kml");
         new RouteConverterGPSFixImporterImpl().importFixes(in, new Callback() {
             @Override
-            public void startTrack(String name, Map<String, String> properties) {
-            }
-
-            @Override
-            public void addFix(GPSFix fix) {
+            public void addFix(GPSFix fix, TrackFileImportDeviceIdentifier device) {
                 if (fix instanceof GPSFix) {
                     callbackCalled = true;
                 }
             }
-        }, false);
+        }, false, "source");
         assertTrue(callbackCalled);
     }
 }