major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android

2026-10-16 09:11:02 +00:00 · 2015-01-22 10:57:00 +01:00
1 parent 76e52fefab
commit 9fb859a8b3
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import com.sap.sailing.domain.common.Cloner;
+import com.sap.sse.common.Cloner;
 import com.sap.sse.common.Util;

 /**
@@ -14,4 +14,5 @@ Require-Bundle: com.sap.sailing.domain.common;bundle-version="1.0.0",
 com.sap.sailing.domain.test,
 com.sap.sailing.domain.racelogtrackingadapter.testsupport;bundle-version="1.0.0",
 com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sse.shared.android
@@ -11,7 +11,7 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;

-import com.sap.sailing.util.impl.ConcurrentHashBag;
+import com.sap.sse.concurrent.ConcurrentHashBag;

 /**
 * Initiated by bug 2502 (http://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=2502), this test tries to reproduce a
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
@@ -4,10 +4,11 @@ Bundle-Name: com.sap.sailing.domain.shared.android
 Bundle-SymbolicName: com.sap.sailing.domain.shared.android
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.sap.sailing.domain.common,
 com.sap.sse.datamining.shared,
- com.sap.sse.common
+ com.sap.sse.common,
+ com.sap.sse.shared.android
 Export-Package: com.sap.sailing.domain.abstractlog,
 com.sap.sailing.domain.abstractlog.impl,
 com.sap.sailing.domain.abstractlog.race,
@@ -46,5 +47,4 @@ Export-Package: com.sap.sailing.domain.abstractlog,
 com.sap.sailing.domain.racelogtracking,
 com.sap.sailing.domain.racelogtracking.impl,
 com.sap.sailing.domain.tracking,
- com.sap.sailing.domain.tracking.impl,
- com.sap.sailing.util.impl
+ com.sap.sailing.domain.tracking.impl
@@ -28,7 +28,7 @@ import com.sap.sailing.domain.common.abstractlog.NotRevokableException;
 import com.sap.sailing.domain.tracking.Track;
 import com.sap.sailing.domain.tracking.impl.PartialNavigableSetView;
 import com.sap.sailing.domain.tracking.impl.TrackImpl;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;

 /**
 * {@link Track} implementation for {@link AbstractLogEvent}s.
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;

 import com.sap.sailing.domain.abstractlog.AbstractLog;
-import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.AbstractLogEvent;
+import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;

 /**
 * Finds all events in the log which is an {@code instanceof} {@link #ofType}.
@@ -1,8 +1,8 @@
 package com.sap.sailing.domain.abstractlog.impl;

 import com.sap.sailing.domain.abstractlog.AbstractLog;
-import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.AbstractLogEvent;
+import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;

 /**
 * Finds the most recent event in the log which is an {@code instanceof} {@link #ofType}.
@@ -5,8 +5,8 @@ import java.util.List;

 import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
-import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
+import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;

 /**
 * Returns all {@link RaceLogAdditionalScoringInformationEvent}s from the race log 
@@ -8,7 +8,7 @@ import com.sap.sailing.domain.abstractlog.race.impl.BaseRaceLogEventVisitor;
 import com.sap.sailing.domain.abstractlog.race.impl.RaceLogRaceStatusEventComparator;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRacingProcedure;
 import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

@@ -6,8 +6,8 @@ import java.util.List;
 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
 import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor;
 import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl;
-import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
+import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sse.common.TimePoint;

@@ -4,8 +4,8 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
 import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
 import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
-import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
+import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedurePrerequisiteAutoResolver;
@@ -10,8 +10,8 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer;
-import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
+import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.state.RaceState;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
 import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureFactory;
@@ -12,9 +12,9 @@ import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastPublishedCours
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastWindFixFinder;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.ProtestStartTimeFinder;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer;
+import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer.Clock;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RacingProcedureTypeAnalyzer;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinder;
-import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer.Clock;
 import com.sap.sailing.domain.abstractlog.race.impl.WeakRaceLogChangedVisitor;
 import com.sap.sailing.domain.abstractlog.race.state.RaceStateChangedListener;
 import com.sap.sailing.domain.abstractlog.race.state.RaceStateEvent;
@@ -1,10 +1,10 @@
 package com.sap.sailing.domain.abstractlog.regatta;

 import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogCloseOpenEndedDeviceMappingEvent;
+import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceCompetitorMappingEvent;
 import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceMarkMappingEvent;
 import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogRegisterCompetitorEvent;
 import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogRevokeEvent;
-import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceCompetitorMappingEvent;

 public interface RegattaLogEventVisitor {
    void visit(RegattaLogRevokeEvent event);
@@ -3,8 +3,8 @@ package com.sap.sailing.domain.abstractlog.regatta.impl;
 import java.io.Serializable;

 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
-import com.sap.sailing.domain.abstractlog.impl.LogEventComparator;
 import com.sap.sailing.domain.abstractlog.impl.AbstractLogImpl;
+import com.sap.sailing.domain.abstractlog.impl.LogEventComparator;
 import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
 import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent;
 import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEventVisitor;
@@ -1,8 +1,8 @@
 package com.sap.sailing.domain.abstractlog.shared.analyzing;

 import com.sap.sailing.domain.abstractlog.AbstractLog;
-import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.AbstractLogEvent;
+import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent;
 import com.sap.sse.common.WithID;

@@ -5,9 +5,9 @@ import java.util.ArrayList;
 import java.util.List;

 import com.sap.sailing.domain.abstractlog.AbstractLog;
-import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.AbstractLogEvent;
 import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
+import com.sap.sailing.domain.abstractlog.BaseLogAnalyzer;
 import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent;
 import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent;
 import com.sap.sailing.domain.racelogtracking.DeviceMapping;
@@ -1,10 +1,10 @@
 package com.sap.sailing.domain.base;

 import com.sap.sailing.domain.common.Color;
-import com.sap.sse.datamining.shared.annotations.Connector;
 import com.sap.sse.common.IsManagedByCache;
 import com.sap.sse.common.Named;
 import com.sap.sse.common.WithID;
+import com.sap.sse.datamining.shared.annotations.Connector;

 public interface Competitor extends Named, WithID, IsManagedByCache<SharedDomainFactory> {
    @Connector(messageKey="Team", ordinal=9)
@@ -21,8 +21,8 @@ import com.sap.sailing.domain.common.CountryCode;
 import com.sap.sailing.domain.common.dto.BoatClassDTO;
 import com.sap.sailing.domain.common.dto.CompetitorDTO;
 import com.sap.sailing.domain.common.dto.CompetitorDTOImpl;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 public class TransientCompetitorStoreImpl implements CompetitorStore, Serializable {
    private static final Logger logger = Logger.getLogger(TransientCompetitorStoreImpl.class.getName());
@@ -8,8 +8,8 @@ import java.util.List;

 import com.sap.sailing.domain.base.CourseArea;
 import com.sap.sailing.domain.base.Venue;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 public class VenueImpl implements Venue {
    private static final long serialVersionUID = 6854152040737643290L;
@@ -8,12 +8,12 @@ import java.util.NavigableSet;

 import com.sap.sailing.domain.base.Timed;
 import com.sap.sailing.domain.tracking.Track;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
-import com.sap.sailing.util.impl.UnmodifiableNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.TimePoint;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
+import com.sap.sse.util.impl.UnmodifiableNavigableSet;

 public class TrackImpl<FixType extends Timed> implements Track<FixType> {
    private static final long serialVersionUID = -4075853657857657528L;
@@ -24,7 +24,7 @@ import com.sap.sailing.domain.swisstimingreplayadapter.SwissTimingReplayListener
 import com.sap.sailing.domain.swisstimingreplayadapter.SwissTimingReplayRace;
 import com.sap.sailing.domain.swisstimingreplayadapter.SwissTimingReplayService;
 import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
-import com.sap.sailing.util.ByteArrayOutputStreamWithVisibleBuffer;
+import com.sap.sse.util.ByteArrayOutputStreamWithVisibleBuffer;

 public class SwissTimingReplayServiceImpl implements SwissTimingReplayService {

@@ -19,6 +19,7 @@ Require-Bundle: com.sap.sailing.domain,
 org.json.simple;bundle-version="1.1.0",
 com.sap.sse.common,
 com.sap.sse.replication,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sse.shared.android
 Export-Package: com.sap.sailing.domain.test,
 com.sap.sailing.domain.test.mock
@@ -1,5 +1,8 @@
 package com.sap.sailing.domain.common;

+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;

 import com.sap.sailing.domain.common.media.MediaTrack;
@@ -8,8 +11,6 @@ import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsDurationImpl;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

-import static org.junit.Assert.*;
-
 public class MediaTrackTest {
    
    private static final Duration ONE_MILLISECOND = new MillisecondsDurationImpl(1);
@@ -1,13 +1,14 @@
 package com.sap.sailing.domain.common;

+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;

 import com.sap.sailing.domain.common.media.MediaUtil;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

-import static org.junit.Assert.*;
-
 public class MediaUtilTest {

    @Test
@@ -1,7 +1,10 @@
 package com.sap.sailing.domain.common.test;

-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;

 import org.junit.Test;

@@ -23,7 +23,6 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;

-import com.sap.sailing.domain.common.Cloner;
 import com.sap.sailing.domain.common.Color;
 import com.sap.sailing.domain.common.dto.BoatClassDTO;
 import com.sap.sailing.domain.common.dto.CompetitorDTO;
@@ -37,9 +36,10 @@ import com.sap.sailing.domain.common.dto.LegEntryDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.domain.common.dto.RaceDTO;
 import com.sap.sailing.domain.test.StoredTrackBasedTest;
-import com.sap.sailing.util.ClonerImpl;
+import com.sap.sse.common.Cloner;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.ClonerImpl;

 /**
 * Tests the compressing / de-compressing functionality of {@link LeaderboardDTO} and {@link IncrementalLeaderboardDTO}.
@@ -1,13 +1,15 @@
 package com.sap.sailing.domain.common.test;

+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;

 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;

-import static org.junit.Assert.*;
-import static org.hamcrest.Matchers.*;
-
 public class TimePointTest {
    @Test
    public void compare() {
@@ -11,7 +11,7 @@ import java.util.Set;

 import org.junit.Test;

-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;

 public class ArrayListNavigableSetTest {
    @Test
@@ -10,8 +10,8 @@ import java.util.concurrent.ConcurrentLinkedQueue;

 import org.junit.Test;

-import com.sap.sailing.util.impl.ConcurrentHashBag;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.ConcurrentHashBag;

 /**
 * Measures the performance of different concurrent collections types and shows their add and remove behavior for
@@ -10,7 +10,7 @@ import java.util.Set;

 import org.junit.Test;

-import com.sap.sailing.util.impl.ConcurrentWeakHashMap;
+import com.sap.sse.concurrent.ConcurrentWeakHashMap;

 /**
 * Tests the class {@link ConcurrentWeakHashMap}.
@@ -15,10 +15,9 @@ import com.sap.sailing.domain.base.PositionWithConfidence;
 import com.sap.sailing.domain.base.impl.PositionWithConfidenceImpl;
 import com.sap.sailing.domain.common.Bearing;
 import com.sap.sailing.domain.common.Position;
-import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager;
-import com.sap.sailing.domain.confidence.ConfidenceFactory;
 import com.sap.sailing.domain.common.confidence.BearingWithConfidence;
 import com.sap.sailing.domain.common.confidence.BearingWithConfidenceCluster;
+import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager;
 import com.sap.sailing.domain.common.confidence.HasConfidence;
 import com.sap.sailing.domain.common.confidence.HasConfidenceAndIsScalable;
 import com.sap.sailing.domain.common.confidence.Weigher;
@@ -32,6 +31,7 @@ import com.sap.sailing.domain.common.impl.NauticalMileDistance;
 import com.sap.sailing.domain.common.impl.RadianBearingImpl;
 import com.sap.sailing.domain.common.scalablevalue.impl.ScalablePosition;
 import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager;
+import com.sap.sailing.domain.confidence.ConfidenceFactory;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindWithConfidence;
 import com.sap.sailing.domain.tracking.impl.ScalableWind;
@@ -72,7 +72,7 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
 import com.sap.sailing.domain.tracking.impl.MarkPassingImpl;
 import com.sap.sailing.domain.tracking.impl.TimedComparator;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
@@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals;

 import org.junit.Test;

-import com.sap.sailing.util.AutoCloseableReadLock;
-import com.sap.sailing.util.AutoCloseableWriteLock;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
+import com.sap.sse.util.AutoCloseableReadLock;
+import com.sap.sse.util.AutoCloseableWriteLock;

 public class LockAsResourceTest {
    @Test
@@ -14,9 +14,9 @@ import org.junit.Test;
 import com.sap.sailing.domain.test.measurements.Measurement;
 import com.sap.sailing.domain.test.measurements.MeasurementCase;
 import com.sap.sailing.domain.test.measurements.MeasurementXMLFile;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 public class LockTraceTest {
    private static class LockingThread extends Thread {
@@ -4,8 +4,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;

 import org.junit.Test;

-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * {@link ReentrantReadWriteLock} can produce a lock between readers and other readers if the lock
@@ -12,8 +12,8 @@ import org.junit.Test;
 import com.sap.sailing.domain.base.Course;
 import com.sap.sailing.domain.tractracadapter.DomainFactory;
 import com.sap.sailing.domain.tractracadapter.Receiver;
-import com.tractrac.model.lib.api.route.IControlRoute;
 import com.sap.sse.common.Util;
+import com.tractrac.model.lib.api.route.IControlRoute;
 import com.tractrac.subscription.lib.api.control.IControlRouteChangeListener;

 public class RouteAssemblyTest extends AbstractTracTracLiveTest {
@@ -28,9 +28,9 @@ import com.sap.sailing.domain.tracking.DynamicGPSFixTrack;
 import com.sap.sailing.domain.tracking.GPSFixMoving;
 import com.sap.sailing.domain.tracking.impl.WindImpl;
 import com.sap.sailing.domain.tractracadapter.ReceiverType;
-import com.tractrac.model.lib.api.event.CreateModelException;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.tractrac.model.lib.api.event.CreateModelException;
 import com.tractrac.subscription.lib.api.SubscriberInitializationException;

 public class SerializationWithOnlineRaceTest extends OnlineTracTracBasedTest {
@@ -15,11 +15,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.EmptyUpdateInterval;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.EmptyUpdateInterval;

 /**
 * When the thread reading a value from the cache holds a fair read lock, and another thread is trying to obtain the
@@ -13,9 +13,9 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.junit.Ignore;
 import org.junit.Test;

-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.EmptyUpdateInterval;
-import com.sap.sailing.util.SmartFutureCache.UpdateInterval;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.EmptyUpdateInterval;
+import com.sap.sse.util.SmartFutureCache.UpdateInterval;

 public class SmartFutureCacheTest {
    @Test
@@ -30,10 +30,10 @@ import com.sap.sailing.domain.tracking.WindTrack;
 import com.sap.sailing.domain.tracking.impl.TrackBasedEstimationWindTrackImpl;
 import com.sap.sailing.domain.tracking.impl.WindImpl;
 import com.sap.sailing.domain.tractracadapter.ReceiverType;
-import com.tractrac.model.lib.api.event.CreateModelException;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.tractrac.model.lib.api.event.CreateModelException;
 import com.tractrac.subscription.lib.api.SubscriberInitializationException;

 public class WindEstimationOnKielerWoche505Race2DataTest extends OnlineTracTracBasedTest {
@@ -37,10 +37,10 @@ import com.sap.sailing.domain.tracking.GPSFixMoving;
 import com.sap.sailing.domain.tracking.MarkPassing;
 import com.sap.sailing.domain.tracking.impl.WindImpl;
 import com.sap.sailing.domain.tractracadapter.ReceiverType;
-import com.tractrac.model.lib.api.event.CreateModelException;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.tractrac.model.lib.api.event.CreateModelException;
 import com.tractrac.subscription.lib.api.SubscriberInitializationException;

 public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest {
@@ -73,11 +73,11 @@ import com.sap.sailing.domain.tractracadapter.ReceiverType;
 import com.sap.sailing.domain.tractracadapter.TracTracConfiguration;
 import com.sap.sailing.domain.tractracadapter.TracTracControlPoint;
 import com.sap.sailing.domain.tractracadapter.TracTracRaceTracker;
-import com.sap.sailing.util.WeakIdentityHashMap;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.WeakIdentityHashMap;
 import com.tractrac.model.lib.api.data.IPosition;
 import com.tractrac.model.lib.api.event.CreateModelException;
 import com.tractrac.model.lib.api.event.ICompetitor;
@@ -30,10 +30,11 @@ Export-Package: com.sap.sailing.domain.base,
 com.sap.sailing.util.impl;x-friends:="com.sap.sailing.server.replication,com.sap.sailing.domain.test"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0",
- com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
+ com.sap.sailing.domain.shared.android,
 com.sap.sailing.domain.common,
 org.json.simple;bundle-version="1.1.0",
 com.sap.sailing.geocoding,
- com.sap.sse.datamining.shared;bundle-version="1.0.0",
+ com.sap.sse.datamining.shared,
 com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sse.shared.android
@@ -23,10 +23,10 @@ import com.sap.sailing.domain.base.Leg;
 import com.sap.sailing.domain.base.Waypoint;
 import com.sap.sailing.domain.common.PassingInstruction;
 import com.sap.sailing.util.CourseAsWaypointList;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.NamedImpl;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 import difflib.DiffUtils;
 import difflib.Patch;
@@ -22,9 +22,9 @@ import com.sap.sailing.domain.racelog.RaceLogIdentifier;
 import com.sap.sailing.domain.tracking.RaceChangeListener;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener;
-import com.sap.sailing.util.impl.ConcurrentWeakHashMap;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.ConcurrentWeakHashMap;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * Manages a {@link LeaderboardCache}. When a {@link Leaderboard} is {@link LeaderboardCache#add added} to the cache, it
@@ -24,10 +24,10 @@ import com.sap.sailing.domain.leaderboard.ScoreCorrection;
 import com.sap.sailing.domain.leaderboard.ScoreCorrectionListener;
 import com.sap.sailing.domain.tracking.RaceChangeListener;
 import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
 import com.sap.sse.util.impl.ThreadFactoryWithPriority;

 /**
@@ -80,13 +80,13 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
 import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache;
 import com.sap.sailing.domain.tracking.WindPositionMode;
 import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sailing.util.impl.RaceColumnListeners;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
 import com.sap.sse.util.impl.ThreadFactoryWithPriority;

 /**
@@ -5,8 +5,8 @@ import java.util.concurrent.Callable;

 import com.sap.sailing.domain.abstractlog.race.RaceLog;
 import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder;
-import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
+import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.base.Fleet;
 import com.sap.sailing.domain.base.RaceColumn;
@@ -7,8 +7,8 @@ import com.sap.sailing.domain.base.CourseArea;
 import com.sap.sailing.domain.leaderboard.Leaderboard;
 import com.sap.sailing.domain.leaderboard.ScoringScheme;
 import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 public class FlexibleMetaLeaderboard extends AbstractMetaLeaderboard {
    private static final long serialVersionUID = 789076326144062944L;
@@ -12,8 +12,8 @@ import com.sap.sailing.domain.base.RaceDefinition;
 import com.sap.sailing.domain.common.WindSource;
 import com.sap.sailing.domain.common.WindSourceType;
 import com.sap.sailing.domain.tracking.impl.CombinedWindTrackImpl;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;


 public abstract class TrackedRaceWithWindEssentials implements TrackedRace {
@@ -5,10 +5,10 @@ import java.util.NavigableSet;
 import com.sap.sailing.domain.common.WindSourceType;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.Wind;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.UnmodifiableNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.impl.UnmodifiableNavigableSet;

 /**
 * The only "raw" fix produced by this wind track implementation is based on the course layout of the tracked race to
@@ -26,11 +26,11 @@ import com.sap.sailing.domain.tracking.RaceChangeListener;
 import com.sap.sailing.domain.tracking.Track;
 import com.sap.sailing.domain.tracking.TrackedLeg;
 import com.sap.sailing.domain.tracking.TrackedRace;
-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.CacheUpdater;
-import com.sap.sailing.util.SmartFutureCache.UpdateInterval;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.CacheUpdater;
+import com.sap.sse.util.SmartFutureCache.UpdateInterval;

 /**
 * (Re-)computing the cross track error for a competitor causes significant amounts of CPU cycles. The cross track error
@@ -6,11 +6,11 @@ import java.util.NavigableSet;

 import com.sap.sailing.domain.common.Distance;
 import com.sap.sailing.domain.tracking.GPSFix;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * Computing {@link #getDistanceTraveled(TimePoint, TimePoint)} is more expensive the longer the track is and the
@@ -54,11 +54,11 @@ import com.sap.sailing.domain.tracking.TrackedRegatta;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindStore;
 import com.sap.sailing.domain.tracking.WindTrack;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 public class DynamicTrackedRaceImpl extends TrackedRaceImpl implements
 DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
@@ -42,7 +42,7 @@ import com.sap.sailing.domain.tracking.GPSFixMoving;
 import com.sap.sailing.domain.tracking.GPSFixTrack;
 import com.sap.sailing.domain.tracking.GPSTrackListener;
 import com.sap.sailing.domain.tracking.WithValidityCache;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
@@ -12,12 +12,12 @@ import com.sap.sailing.domain.tracking.GPSFix;
 import com.sap.sailing.domain.tracking.GPSFixMoving;
 import com.sap.sailing.domain.tracking.GPSFixTrack;
 import com.sap.sailing.domain.tracking.GPSTrackListener;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * Re-calculating the maximum speed over a {@link GPSFixTrack} is time consuming. When the track grows the way it
@@ -33,15 +33,15 @@ import com.sap.sailing.domain.tracking.TrackedRaceStatus;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindTrack;
 import com.sap.sailing.domain.tracking.WindWithConfidence;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.common.impl.AbstractTimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
 import com.sap.sse.common.impl.SerializableComparator;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * A virtual wind track that computes and caches the wind bearing based on the boat tracks recorded in the tracked race
@@ -31,7 +31,7 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache;
 import com.sap.sailing.domain.tracking.WindPositionMode;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
@@ -112,17 +112,17 @@ import com.sap.sailing.domain.tracking.WindPositionMode;
 import com.sap.sailing.domain.tracking.WindStore;
 import com.sap.sailing.domain.tracking.WindTrack;
 import com.sap.sailing.domain.tracking.WindWithConfidence;
-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.AbstractCacheUpdater;
-import com.sap.sailing.util.SmartFutureCache.EmptyUpdateInterval;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.AbstractCacheUpdater;
+import com.sap.sse.util.SmartFutureCache.EmptyUpdateInterval;

 import difflib.DiffUtils;
 import difflib.Patch;
@@ -10,10 +10,10 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindTrack;
 import com.sap.sailing.domain.tracking.impl.WindTrackImpl.DummyWind;
-import com.sap.sailing.util.impl.AbstractUnmodifiableNavigableSet;
-import com.sap.sailing.util.impl.DescendingNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.impl.AbstractUnmodifiableNavigableSet;
+import com.sap.sse.util.impl.DescendingNavigableSet;

 /**
 * Emulates a collection of {@link Wind} fixes for a {@link TrackedRace}. Subclasses have to specify a resolution and a
@@ -25,7 +25,7 @@ import com.sap.sailing.domain.tracking.Wind;
 import com.sap.sailing.domain.tracking.WindListener;
 import com.sap.sailing.domain.tracking.WindTrack;
 import com.sap.sailing.domain.tracking.WindWithConfidence;
-import com.sap.sailing.util.impl.ArrayListNavigableSet;
+import com.sap.sse.common.ArrayListNavigableSet;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;

@@ -16,9 +16,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import com.sap.sailing.domain.common.Base64Utils;
 import com.sap.sailing.domain.common.RegattaScoreCorrections;
 import com.sap.sailing.domain.common.ScoreCorrectionProvider;
+import com.sap.sse.common.Base64Utils;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
@@ -7,9 +7,9 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.logging.Logger;

-import com.sap.sailing.domain.common.Base64Utils;
 import com.sap.sailing.domain.common.HttpMessageSenderServletConstants;
 import com.sap.sailing.expeditionconnector.impl.HttpServletMessageReceiver.Receiver;
+import com.sap.sse.common.Base64Utils;

 public class HttpServletMessageReceiverReader implements Runnable {
    private static final Logger logger = Logger.getLogger(HttpServletMessageReceiverReader.class.getName());
@@ -2,7 +2,7 @@ package com.sap.sailing.gwt.ui.server;

 import com.sap.sailing.domain.common.dto.IncrementalLeaderboardDTO;
 import com.sap.sailing.domain.common.dto.LeaderboardDTO;
-import com.sap.sailing.util.ClonerImpl;
+import com.sap.sse.util.ClonerImpl;

 /**
 * Uses reflection to clone all properties of a {@link LeaderboardDTO} into a new instance of type {@link IncrementalLeaderboardDTO}.
@@ -14,9 +14,9 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener;
 import com.sap.sailing.gwt.ui.shared.QuickRankDTO;
 import com.sap.sailing.server.masterdata.DummyTrackedRace;
-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.AbstractCacheUpdater;
-import com.sap.sailing.util.SmartFutureCache.UpdateInterval;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.AbstractCacheUpdater;
+import com.sap.sse.util.SmartFutureCache.UpdateInterval;

 /**
 * Calculating the quick ranks for many clients for a live race is expensive and therefore benefits from consolidation
@@ -20,7 +20,8 @@ Require-Bundle:
 com.sap.sse.datamining,
 com.sap.sse.datamining.shared;bundle-version="1.0.0",
 com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ com.sap.sse.shared.android
 Import-Package: 
 com.sap.sailing.util,
 com.sap.sse.common
@@ -27,7 +27,7 @@ import com.sap.sailing.polars.data.PolarFix;
 import com.sap.sailing.polars.generation.PolarSheetGenerator;
 import com.sap.sailing.polars.mining.PolarDataMiner;
 import com.sap.sailing.polars.regression.NotEnoughDataHasBeenAddedException;
-import com.sap.sailing.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache;

 /**
 * Uses two chained {@link SmartFutureCache}s. One to store {@link PolarFix}es extracted from {@link TrackedRace}s and
@@ -6,8 +6,8 @@ import java.io.Serializable;
 import com.sap.sailing.domain.common.Speed;
 import com.sap.sailing.domain.common.impl.KnotSpeedImpl;
 import com.sap.sailing.polars.mining.IncrementalRegressionProcessor;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * Supplies incremental arithmetic mean for confidence and speed.
@@ -46,7 +46,8 @@ Require-Bundle: com.sap.sailing.domain,
 com.sap.sse.common,
 com.sap.sse.replication,
 com.sap.sse,
- com.sap.sailing.server.gateway.serialization.shared.android
+ com.sap.sailing.server.gateway.serialization.shared.android,
+ com.sap.sse.shared.android
 Bundle-ClassPath: .
 Web-ContextPath: /sailingserver
 Export-Package: com.sap.sailing.server.gateway,
@@ -11,9 +11,9 @@ import javax.servlet.http.HttpServletResponse;

 import org.osgi.framework.BundleContext;

-import com.sap.sailing.domain.common.Base64Utils;
 import com.sap.sailing.domain.common.HttpMessageSenderServletConstants;
 import com.sap.sailing.server.RacingEventService;
+import com.sap.sse.common.Base64Utils;

 public abstract class HttpMessageSenderServletRequestHandler {
    private static final Logger logger = Logger.getLogger(AbstractHttpPostServlet.class.getName());
@@ -9,8 +9,8 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Logger;

 import javax.servlet.ServletException;
@@ -36,12 +36,12 @@ import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.server.gateway.AbstractJsonHttpServlet;
 import com.sap.sailing.server.gateway.HttpRequestUtils;
 import com.sap.sailing.server.gateway.ParseHttpParameterException;
-import com.sap.sailing.util.SmartFutureCache;
-import com.sap.sailing.util.SmartFutureCache.CacheUpdater;
-import com.sap.sailing.util.SmartFutureCache.UpdateInterval;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
+import com.sap.sse.util.SmartFutureCache;
+import com.sap.sse.util.SmartFutureCache.CacheUpdater;
+import com.sap.sse.util.SmartFutureCache.UpdateInterval;

 /**
 * Exports a leaderboard to the JSON format. Uses a {@link SmartFutureCache}.
@@ -29,7 +29,8 @@ Require-Bundle: com.sap.sailing.domain,
 com.sap.sse.operationaltransformation,
 com.sap.sse.replication,
 com.sap.sse,
- com.sap.sailing.server.gateway.serialization.shared.android
+ com.sap.sailing.server.gateway.serialization.shared.android,
+ com.sap.sse.shared.android
 Bundle-ClassPath: .
 Export-Package: com.sap.sailing.server,
 com.sap.sailing.server.impl;
@@ -56,6 +56,7 @@ import com.sap.sailing.domain.persistence.DomainObjectFactory;
 import com.sap.sailing.domain.persistence.MongoObjectFactory;
 import com.sap.sailing.domain.racelog.tracking.GPSFixStore;
 import com.sap.sailing.domain.tracking.DynamicTrackedRace;
+import com.sap.sailing.domain.tracking.RaceListener;
 import com.sap.sailing.domain.tracking.RaceTracker;
 import com.sap.sailing.domain.tracking.TrackedRace;
 import com.sap.sailing.domain.tracking.TrackedRegatta;
@@ -16,9 +16,9 @@ import java.util.concurrent.ConcurrentMap;

 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 import com.sap.sailing.domain.common.media.MediaTrack;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.common.TimePoint;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 class MediaLibrary {

@@ -191,8 +191,6 @@ import com.sap.sailing.server.operationaltransformation.UpdateStartTimeReceived;
 import com.sap.sailing.server.operationaltransformation.UpdateTrackedRaceStatus;
 import com.sap.sailing.server.operationaltransformation.UpdateWindAveragingTime;
 import com.sap.sailing.server.operationaltransformation.UpdateWindSourcesToExclude;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
 import com.sap.sse.BuildVersion;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util;
@@ -200,6 +198,8 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
 import com.sap.sse.common.search.KeywordQuery;
 import com.sap.sse.common.search.Result;
 import com.sap.sse.common.search.ResultImpl;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
 import com.sap.sse.replication.OperationExecutionListener;
 import com.sap.sse.replication.OperationWithResult;
 import com.sap.sse.replication.ReplicationMasterDescriptor;
@@ -11,8 +11,8 @@ import com.sap.sailing.server.operationaltransformation.CreateOrUpdateDataImport
 import com.sap.sailing.server.operationaltransformation.DataImportFailed;
 import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation;
 import com.sap.sailing.server.operationaltransformation.SetDataImportDeleteProgressFromMapTimer;
-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

 /**
 * This lock is used to allow only one master data import operation be performed at once. It also keeps information
@@ -50,8 +50,8 @@ import com.sap.sailing.server.RacingEventService;
 import com.sap.sailing.server.RacingEventServiceOperation;
 import com.sap.sailing.server.masterdata.DataImportLockWithProgress;
 import com.sap.sailing.server.masterdata.DummyTrackedRace;
-import com.sap.sailing.util.impl.LockUtil;
 import com.sap.sse.common.Util;
+import com.sap.sse.concurrent.LockUtil;

 public class ImportMasterDataOperation extends
        AbstractRacingEventServiceOperation<MasterDataImportObjectCreationCountImpl> {
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.common;

 import java.io.Serializable;
 import java.util.ArrayList;
@@ -1,4 +1,4 @@
-package com.sap.sailing.domain.common;
+package com.sap.sse.common;

 /*
 * Copyright 2009 Google Inc.
@@ -1,4 +1,4 @@
-package com.sap.sailing.domain.common;
+package com.sap.sse.common;

 public interface Cloner {
    void clone(Object from, Object to);
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.common;

 import java.util.AbstractList;
 import java.util.List;
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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="output" path="bin"/>
+</classpath>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sse.shared.android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Android
+Bundle-SymbolicName: com.sap.sse.shared.android
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.sap.sse.common
+Export-Package: com.sap.sse.concurrent,
+ com.sap.sse.util.impl
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.concurrent;

 import java.util.AbstractCollection;
 import java.util.Map.Entry;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.concurrent;

 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.concurrent;

 import java.util.HashMap;
 import java.util.HashSet;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.concurrent;

 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.util.impl;

 import java.io.Serializable;
 import java.util.Collection;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.util.impl;

 import java.util.Collection;
 import java.util.Collections;
@@ -1,4 +1,4 @@
-package com.sap.sailing.util.impl;
+package com.sap.sse.util.impl;

 import java.util.Collection;
 import java.util.Collections;
@@ -10,4 +10,5 @@ Export-Package: com.sap.sse,
 com.sap.sse.util.impl,
 com.sap.sse.util.kmeans
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.sap.sse.common
+Require-Bundle: com.sap.sse.common,
+ com.sap.sse.shared.android
@@ -1,7 +1,8 @@
-package com.sap.sailing.util;
+package com.sap.sse.util;
+
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;

 public class AutoCloseableReadLock implements AutoCloseable {
    private final NamedReentrantReadWriteLock lock;
@@ -1,7 +1,8 @@
-package com.sap.sailing.util;
+package com.sap.sse.util;
+
+import com.sap.sse.concurrent.LockUtil;
+import com.sap.sse.concurrent.NamedReentrantReadWriteLock;

-import com.sap.sailing.util.impl.LockUtil;
-import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;

 public class AutoCloseableWriteLock implements AutoCloseable {
    private final NamedReentrantReadWriteLock lock;