Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation

Conflicts: java/com.sap.sailing.server/SailingServer (No Proxy).launch java/com.sap.sailing.server/SailingServer (Proxy).launch java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2026-11-07 11:32:16 +00:00 · 2015-02-13 08:29:41 +01:00
commit 4cb7b535c8
@@ -1,95 +1,95 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: mgwt
-Bundle-SymbolicName: com.googlecode.mgwt
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: GOOGLE
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: lib/mgwt-2.0.0.jar,
- .
-Export-Package: com.googlecode.mgwt.collection.client,
- com.googlecode.mgwt.collection.shared,
- com.googlecode.mgwt.collection.shared.java,
- com.googlecode.mgwt.css.client.updater,
- com.googlecode.mgwt.css.rebind,
- com.googlecode.mgwt.dom.client.event.animation,
- com.googlecode.mgwt.dom.client.event.mouse,
- com.googlecode.mgwt.dom.client.event.orientation,
- com.googlecode.mgwt.dom.client.event.tap,
- com.googlecode.mgwt.dom.client.event.touch,
- com.googlecode.mgwt.dom.client.recognizer,
- com.googlecode.mgwt.dom.client.recognizer.longtap,
- com.googlecode.mgwt.dom.client.recognizer.pinch,
- com.googlecode.mgwt.dom.client.recognizer.swipe,
- com.googlecode.mgwt.dom.client.recognizer.tap,
- com.googlecode.mgwt.image.client,
- com.googlecode.mgwt.linker.client.cache,
- com.googlecode.mgwt.linker.client.cache.event,
- com.googlecode.mgwt.linker.client.cache.html5,
- com.googlecode.mgwt.linker.linker,
- com.googlecode.mgwt.linker.server,
- com.googlecode.mgwt.linker.server.propertyprovider,
- com.googlecode.mgwt.mvp.client,
- com.googlecode.mgwt.mvp.client.history,
- com.googlecode.mgwt.ui.client,
- com.googlecode.mgwt.ui.client.animation,
- com.googlecode.mgwt.ui.client.editor,
- com.googlecode.mgwt.ui.client.theme.platform.button,
- com.googlecode.mgwt.ui.client.theme.platform.buttonbar,
- com.googlecode.mgwt.ui.client.theme.platform.carousel,
- com.googlecode.mgwt.ui.client.theme.platform.dialog.options,
- com.googlecode.mgwt.ui.client.theme.platform.dialog.panel,
- com.googlecode.mgwt.ui.client.theme.platform.form,
- com.googlecode.mgwt.ui.client.theme.platform.header,
- com.googlecode.mgwt.ui.client.theme.platform.input,
- com.googlecode.mgwt.ui.client.theme.platform.input.checkbox,
- com.googlecode.mgwt.ui.client.theme.platform.input.listbox,
- com.googlecode.mgwt.ui.client.theme.platform.input.radio,
- com.googlecode.mgwt.ui.client.theme.platform.input.search,
- com.googlecode.mgwt.ui.client.theme.platform.input.slider,
- com.googlecode.mgwt.ui.client.theme.platform.list.celllist,
- com.googlecode.mgwt.ui.client.theme.platform.list.widgetlist,
- com.googlecode.mgwt.ui.client.theme.platform.main,
- com.googlecode.mgwt.ui.client.theme.platform.panel,
- com.googlecode.mgwt.ui.client.theme.platform.panel.pull,
- com.googlecode.mgwt.ui.client.theme.platform.progress,
- com.googlecode.mgwt.ui.client.theme.platform.tabbar,
- com.googlecode.mgwt.ui.client.util,
- com.googlecode.mgwt.ui.client.util.impl,
- com.googlecode.mgwt.ui.client.widget.animation,
- com.googlecode.mgwt.ui.client.widget.animation.bundle,
- com.googlecode.mgwt.ui.client.widget.animation.impl,
- com.googlecode.mgwt.ui.client.widget.base,
- com.googlecode.mgwt.ui.client.widget.button,
- com.googlecode.mgwt.ui.client.widget.button.image,
- com.googlecode.mgwt.ui.client.widget.buttonbar,
- com.googlecode.mgwt.ui.client.widget.carousel,
- com.googlecode.mgwt.ui.client.widget.dialog,
- com.googlecode.mgwt.ui.client.widget.dialog.options,
- com.googlecode.mgwt.ui.client.widget.dialog.overlay,
- com.googlecode.mgwt.ui.client.widget.dialog.panel,
- com.googlecode.mgwt.ui.client.widget.form,
- com.googlecode.mgwt.ui.client.widget.header,
- com.googlecode.mgwt.ui.client.widget.image,
- com.googlecode.mgwt.ui.client.widget.input,
- com.googlecode.mgwt.ui.client.widget.input.checkbox,
- com.googlecode.mgwt.ui.client.widget.input.listbox,
- com.googlecode.mgwt.ui.client.widget.input.radio,
- com.googlecode.mgwt.ui.client.widget.input.search,
- com.googlecode.mgwt.ui.client.widget.input.slider,
- com.googlecode.mgwt.ui.client.widget.list.celllist,
- com.googlecode.mgwt.ui.client.widget.list.widgetlist,
- com.googlecode.mgwt.ui.client.widget.main,
- com.googlecode.mgwt.ui.client.widget.menu.overlay,
- com.googlecode.mgwt.ui.client.widget.menu.swipe,
- com.googlecode.mgwt.ui.client.widget.panel,
- com.googlecode.mgwt.ui.client.widget.panel.flex,
- com.googlecode.mgwt.ui.client.widget.panel.pull,
- com.googlecode.mgwt.ui.client.widget.panel.scroll,
- com.googlecode.mgwt.ui.client.widget.panel.scroll.impl,
- com.googlecode.mgwt.ui.client.widget.progress,
- com.googlecode.mgwt.ui.client.widget.tabbar,
- com.googlecode.mgwt.ui.client.widget.tabbar.resources,
- com.googlecode.mgwt.ui.client.widget.touch,
- com.googlecode.mgwt.ui.generator,
- com.googlecode.mgwt.ui.server.util
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: mgwt
+Bundle-SymbolicName: com.googlecode.mgwt
+Bundle-Version: 2.0.0.qualifier
+Bundle-Vendor: GOOGLE
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/mgwt-2.0.0.jar,
+ .
+Export-Package: com.googlecode.mgwt.collection.client,
+ com.googlecode.mgwt.collection.shared,
+ com.googlecode.mgwt.collection.shared.java,
+ com.googlecode.mgwt.css.client.updater,
+ com.googlecode.mgwt.css.rebind,
+ com.googlecode.mgwt.dom.client.event.animation,
+ com.googlecode.mgwt.dom.client.event.mouse,
+ com.googlecode.mgwt.dom.client.event.orientation,
+ com.googlecode.mgwt.dom.client.event.tap,
+ com.googlecode.mgwt.dom.client.event.touch,
+ com.googlecode.mgwt.dom.client.recognizer,
+ com.googlecode.mgwt.dom.client.recognizer.longtap,
+ com.googlecode.mgwt.dom.client.recognizer.pinch,
+ com.googlecode.mgwt.dom.client.recognizer.swipe,
+ com.googlecode.mgwt.dom.client.recognizer.tap,
+ com.googlecode.mgwt.image.client,
+ com.googlecode.mgwt.linker.client.cache,
+ com.googlecode.mgwt.linker.client.cache.event,
+ com.googlecode.mgwt.linker.client.cache.html5,
+ com.googlecode.mgwt.linker.linker,
+ com.googlecode.mgwt.linker.server,
+ com.googlecode.mgwt.linker.server.propertyprovider,
+ com.googlecode.mgwt.mvp.client,
+ com.googlecode.mgwt.mvp.client.history,
+ com.googlecode.mgwt.ui.client,
+ com.googlecode.mgwt.ui.client.animation,
+ com.googlecode.mgwt.ui.client.editor,
+ com.googlecode.mgwt.ui.client.theme.platform.button,
+ com.googlecode.mgwt.ui.client.theme.platform.buttonbar,
+ com.googlecode.mgwt.ui.client.theme.platform.carousel,
+ com.googlecode.mgwt.ui.client.theme.platform.dialog.options,
+ com.googlecode.mgwt.ui.client.theme.platform.dialog.panel,
+ com.googlecode.mgwt.ui.client.theme.platform.form,
+ com.googlecode.mgwt.ui.client.theme.platform.header,
+ com.googlecode.mgwt.ui.client.theme.platform.input,
+ com.googlecode.mgwt.ui.client.theme.platform.input.checkbox,
+ com.googlecode.mgwt.ui.client.theme.platform.input.listbox,
+ com.googlecode.mgwt.ui.client.theme.platform.input.radio,
+ com.googlecode.mgwt.ui.client.theme.platform.input.search,
+ com.googlecode.mgwt.ui.client.theme.platform.input.slider,
+ com.googlecode.mgwt.ui.client.theme.platform.list.celllist,
+ com.googlecode.mgwt.ui.client.theme.platform.list.widgetlist,
+ com.googlecode.mgwt.ui.client.theme.platform.main,
+ com.googlecode.mgwt.ui.client.theme.platform.panel,
+ com.googlecode.mgwt.ui.client.theme.platform.panel.pull,
+ com.googlecode.mgwt.ui.client.theme.platform.progress,
+ com.googlecode.mgwt.ui.client.theme.platform.tabbar,
+ com.googlecode.mgwt.ui.client.util,
+ com.googlecode.mgwt.ui.client.util.impl,
+ com.googlecode.mgwt.ui.client.widget.animation,
+ com.googlecode.mgwt.ui.client.widget.animation.bundle,
+ com.googlecode.mgwt.ui.client.widget.animation.impl,
+ com.googlecode.mgwt.ui.client.widget.base,
+ com.googlecode.mgwt.ui.client.widget.button,
+ com.googlecode.mgwt.ui.client.widget.button.image,
+ com.googlecode.mgwt.ui.client.widget.buttonbar,
+ com.googlecode.mgwt.ui.client.widget.carousel,
+ com.googlecode.mgwt.ui.client.widget.dialog,
+ com.googlecode.mgwt.ui.client.widget.dialog.options,
+ com.googlecode.mgwt.ui.client.widget.dialog.overlay,
+ com.googlecode.mgwt.ui.client.widget.dialog.panel,
+ com.googlecode.mgwt.ui.client.widget.form,
+ com.googlecode.mgwt.ui.client.widget.header,
+ com.googlecode.mgwt.ui.client.widget.image,
+ com.googlecode.mgwt.ui.client.widget.input,
+ com.googlecode.mgwt.ui.client.widget.input.checkbox,
+ com.googlecode.mgwt.ui.client.widget.input.listbox,
+ com.googlecode.mgwt.ui.client.widget.input.radio,
+ com.googlecode.mgwt.ui.client.widget.input.search,
+ com.googlecode.mgwt.ui.client.widget.input.slider,
+ com.googlecode.mgwt.ui.client.widget.list.celllist,
+ com.googlecode.mgwt.ui.client.widget.list.widgetlist,
+ com.googlecode.mgwt.ui.client.widget.main,
+ com.googlecode.mgwt.ui.client.widget.menu.overlay,
+ com.googlecode.mgwt.ui.client.widget.menu.swipe,
+ com.googlecode.mgwt.ui.client.widget.panel,
+ com.googlecode.mgwt.ui.client.widget.panel.flex,
+ com.googlecode.mgwt.ui.client.widget.panel.pull,
+ com.googlecode.mgwt.ui.client.widget.panel.scroll,
+ com.googlecode.mgwt.ui.client.widget.panel.scroll.impl,
+ com.googlecode.mgwt.ui.client.widget.progress,
+ com.googlecode.mgwt.ui.client.widget.tabbar,
+ com.googlecode.mgwt.ui.client.widget.tabbar.resources,
+ com.googlecode.mgwt.ui.client.widget.touch,
+ com.googlecode.mgwt.ui.generator,
+ com.googlecode.mgwt.ui.server.util
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/mongo-2.6.2.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://api.mongodb.org/java/2.6.2/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
@@ -1 +0,0 @@
-bin/
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.mongodb.driver</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>
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-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.8
@@ -1,5 +0,0 @@
-#Fri Jul 29 09:33:56 CEST 2011
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
@@ -1,4 +0,0 @@
-#Wed Jun 08 13:41:06 CEST 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Driver
-Bundle-SymbolicName: com.mongodb.driver
-Bundle-Version: 2.6.2
-Bundle-Vendor: MONGODB
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: lib/mongo-2.6.2.jar,
- .
-Export-Package: com.mongodb,
- com.mongodb.gridfs,
- com.mongodb.io,
- com.mongodb.util,
- org.bson,
- org.bson.io,
- org.bson.types,
- org.bson.util
@@ -1,3 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               lib/mongo-2.6.2.jar
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>root</artifactId>
-    <groupId>com.sap.sailing</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>com.mongodb.driver</artifactId>
-  <version>2.6.2</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SAP Sailing Common
-Bundle-SymbolicName: com.sap.sailing.domain.common
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
-Export-Package: com.sap.sailing.domain.common,
- com.sap.sailing.domain.common.abstractlog,
- com.sap.sailing.domain.common.confidence,
- com.sap.sailing.domain.common.confidence.impl,
- com.sap.sailing.domain.common.configuration,
- com.sap.sailing.domain.common.dto,
- com.sap.sailing.domain.common.impl,
- com.sap.sailing.domain.common.media,
- com.sap.sailing.domain.common.quadtree,
- com.sap.sailing.domain.common.quadtree.impl;x-friends:="com.sap.sailing.domain.test",
- com.sap.sailing.domain.common.racelog,
- com.sap.sailing.domain.common.racelog.tracking,
- com.sap.sailing.domain.common.racelog.utils,
- com.sap.sailing.domain.common.scalablevalue.impl,
- com.sap.sailing.domain.common.trackfiles
-Require-Bundle: com.sap.sse.datamining.shared,
- com.sap.sse.common
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SAP Sailing Common
+Bundle-SymbolicName: com.sap.sailing.domain.common
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Export-Package: com.sap.sailing.domain.common,
+ com.sap.sailing.domain.common.abstractlog,
+ com.sap.sailing.domain.common.confidence,
+ com.sap.sailing.domain.common.confidence.impl,
+ com.sap.sailing.domain.common.configuration,
+ com.sap.sailing.domain.common.dto,
+ com.sap.sailing.domain.common.impl,
+ com.sap.sailing.domain.common.media,
+ com.sap.sailing.domain.common.quadtree,
+ com.sap.sailing.domain.common.quadtree.impl;x-friends:="com.sap.sailing.domain.test",
+ com.sap.sailing.domain.common.racelog,
+ com.sap.sailing.domain.common.racelog.tracking,
+ com.sap.sailing.domain.common.racelog.utils,
+ com.sap.sailing.domain.common.scalablevalue.impl,
+ com.sap.sailing.domain.common.trackfiles
+Require-Bundle: com.sap.sse.datamining.shared,
+ com.sap.sse.common
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.mongodb,
- com.mongodb.driver;bundle-version="2.6.2"
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0"
 Export-Package: com.sap.sailing.domain.igtimiadapter.persistence
 Import-Package: org.osgi.framework
 Bundle-Activator: com.sap.sailing.domain.igtimiadapter.persistence.impl.Activator
@@ -19,7 +19,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
    public Iterable<String> getAccessTokens() {
        List<String> result = new ArrayList<>();
        final DBCollection accessTokenCollection = db.getCollection(CollectionNames.IGTIMI_ACCESS_TOKENS.name());
-        accessTokenCollection.ensureIndex(new BasicDBObject(FieldNames.IGTIMI_ACCESS_TOKENS_ACCESS_TOKEN.name(), 1));
+        accessTokenCollection.createIndex(new BasicDBObject(FieldNames.IGTIMI_ACCESS_TOKENS_ACCESS_TOKEN.name(), 1));
        for (Object o : accessTokenCollection.find()) {
            result.add((String) ((DBObject) o).get(FieldNames.IGTIMI_ACCESS_TOKENS_ACCESS_TOKEN.name()));
        }
@@ -27,7 +27,8 @@ Import-Package: javax.ws.rs;version="1.1.1",
 org.eclipse.jetty.websocket.api.extensions;version="9.0.0",
 org.eclipse.jetty.websocket.client;version="9.0.0",
 org.eclipse.jetty.websocket.common;version="9.0.0",
- org.osgi.framework;version="1.7.0"
+ org.osgi.framework;version="1.7.0",
+ org.codehaus.jackson.jaxrs;version="1.9.13"
 Web-ContextPath: /igtimi
 Bundle-Activator: com.sap.sailing.domain.igtimiadapter.impl.Activator
 Export-Package: com.sap.sailing.domain.igtimiadapter,
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.sap.sailing.domain.persistence.impl.Activator
 Require-Bundle: com.sap.sse.mongodb,
 com.sap.sailing.domain,
- com.mongodb.driver;bundle-version="2.6.2",
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sailing.domain.common,
 com.sap.sailing.domain.shared.android,
 com.sap.sailing.server.gateway.serialization,
@@ -277,14 +277,14 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
    }

    private void ensureIndicesOnWindTracks(DBCollection windTracks) {
-        windTracks.ensureIndex(FieldNames.RACE_ID.name()); // for new programmatic access
-        windTracks.ensureIndex(FieldNames.REGATTA_NAME.name()); // for export or human look-up
+        windTracks.createIndex(new BasicDBObject(FieldNames.RACE_ID.name(), 1)); // for new programmatic access
+        windTracks.createIndex(new BasicDBObject(FieldNames.REGATTA_NAME.name(), 1)); // for export or human look-up
        // for legacy access to not yet migrated fixes
-        windTracks.ensureIndex(new BasicDBObjectBuilder().add(FieldNames.EVENT_NAME.name(), 1)
+        windTracks.createIndex(new BasicDBObjectBuilder().add(FieldNames.EVENT_NAME.name(), 1)
                .add(FieldNames.RACE_NAME.name(), 1).get());
        // Unique index
        try {
-            windTracks.ensureIndex(
+            windTracks.createIndex(
                    new BasicDBObjectBuilder().add(FieldNames.RACE_ID.name(), 1)
                            .add(FieldNames.WIND_SOURCE_NAME.name(), 1).add(FieldNames.WIND_SOURCE_ID.name(), 1)
                            .add(FieldNames.WIND.name() + "." + FieldNames.TIME_AS_MILLIS.name(), 1).get(),
@@ -201,7 +201,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {

    public DBCollection getWindTrackCollection() {
        DBCollection result = database.getCollection(CollectionNames.WIND_TRACKS.name());
-        result.ensureIndex(new BasicDBObject(FieldNames.REGATTA_NAME.name(), null));
+        result.createIndex(new BasicDBObject(FieldNames.REGATTA_NAME.name(), null));
        return result;
    }

@@ -210,7 +210,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
        DBObject index = new BasicDBObject();
        index.put(FieldNames.DEVICE_ID.name(), null);
        index.put(FieldNames.TIME_AS_MILLIS.name(), null);
-        gpsFixCollection.ensureIndex(index);
+        gpsFixCollection.createIndex(index);
        return gpsFixCollection;
    }

@@ -218,7 +218,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
        DBCollection collection = database.getCollection(CollectionNames.GPS_FIXES_METADATA.name());
        DBObject index = new BasicDBObject();
        index.put(FieldNames.DEVICE_ID.name(), null);
-        collection.ensureIndex(index);
+        collection.createIndex(index);
        return collection;
    }
    
@@ -263,7 +263,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
    public void storeLeaderboard(Leaderboard leaderboard) {
        DBCollection leaderboardCollection = database.getCollection(CollectionNames.LEADERBOARDS.name());
        try {
-            leaderboardCollection.ensureIndex(FieldNames.LEADERBOARD_NAME.name());
+            leaderboardCollection.createIndex(new BasicDBObject(FieldNames.LEADERBOARD_NAME.name(), 1));
        } catch (NullPointerException npe) {
            // sometimes, for reasons yet to be clarified, ensuring an index on the name field causes an NPE
            logger.log(Level.SEVERE, "storeLeaderboard", npe);
@@ -438,7 +438,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
        DBCollection leaderboardCollection = database.getCollection(CollectionNames.LEADERBOARDS.name());

        try {
-            leaderboardGroupCollection.ensureIndex(FieldNames.LEADERBOARD_GROUP_NAME.name());
+            leaderboardGroupCollection.createIndex(new BasicDBObject(FieldNames.LEADERBOARD_GROUP_NAME.name(), 1));
        } catch (NullPointerException npe) {
            // sometimes, for reasons yet to be clarified, ensuring an index on the name field causes an NPE
            logger.log(Level.SEVERE, "storeLeaderboardGroup", npe);
@@ -494,7 +494,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
    @Override
    public void storeSailingServer(RemoteSailingServerReference server) {
        DBCollection serverCollection = database.getCollection(CollectionNames.SAILING_SERVERS.name());
-        serverCollection.ensureIndex(FieldNames.SERVER_NAME.name());
+        serverCollection.createIndex(new BasicDBObject(FieldNames.SERVER_NAME.name(), 1));
        DBObject query = new BasicDBObject();
        query.put(FieldNames.SERVER_NAME.name(), server.getName());
        DBObject serverDBObject = new BasicDBObject();
@@ -513,7 +513,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
    @Override
    public void storeEvent(Event event) {
        DBCollection eventCollection = database.getCollection(CollectionNames.EVENTS.name());
-        eventCollection.ensureIndex(FieldNames.EVENT_ID.name());
+        eventCollection.createIndex(new BasicDBObject(FieldNames.EVENT_ID.name(), 1));
        DBObject query = new BasicDBObject();
        query.put(FieldNames.EVENT_ID.name(), event.getId());
        DBObject eventDBObject = new BasicDBObject();
@@ -545,7 +545,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
        eventCollection.update(query, eventDBObject, /* upsrt */ true, /* multi */ false, WriteConcern.SAFE);
        // now store the links to the leaderboard groups
        DBCollection linksCollection = database.getCollection(CollectionNames.LEADERBOARD_GROUP_LINKS_FOR_EVENTS.name());
-        linksCollection.ensureIndex(FieldNames.EVENT_ID.name());
+        linksCollection.createIndex(new BasicDBObject(FieldNames.EVENT_ID.name(), 1));
        BasicDBList lgUUIDs = new BasicDBList();
        for (LeaderboardGroup lg : event.getLeaderboardGroups()) {
            lgUUIDs.add(lg.getId());
@@ -588,8 +588,8 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
    @Override
    public void storeRegatta(Regatta regatta) {
        DBCollection regattasCollection = database.getCollection(CollectionNames.REGATTAS.name());
-        regattasCollection.ensureIndex(FieldNames.REGATTA_NAME.name());
-        regattasCollection.ensureIndex(FieldNames.REGATTA_ID.name());
+        regattasCollection.createIndex(new BasicDBObject(FieldNames.REGATTA_NAME.name(), 1));
+        regattasCollection.createIndex(new BasicDBObject(FieldNames.REGATTA_ID.name(), 1));
        DBObject dbRegatta = new BasicDBObject();
        DBObject query = new BasicDBObject(FieldNames.REGATTA_NAME.name(), regatta.getName());
        dbRegatta.put(FieldNames.REGATTA_NAME.name(), regatta.getName());
@@ -690,7 +690,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {

    public DBCollection getRaceLogCollection() {
        DBCollection result = database.getCollection(CollectionNames.RACE_LOGS.name());
-        result.ensureIndex(new BasicDBObject(FieldNames.RACE_LOG_IDENTIFIER.name(), null));
+        result.createIndex(new BasicDBObject(FieldNames.RACE_LOG_IDENTIFIER.name(), null));
        return result;
    }
    
@@ -1279,7 +1279,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
        DBCollection result = database.getCollection(CollectionNames.REGATTA_LOGS.name());
        DBObject index = new BasicDBObject(FieldNames.REGATTA_LOG_IDENTIFIER_TYPE.name(), null);
        index.put(FieldNames.REGATTA_LOG_IDENTIFIER_NAME.name(), null);
-        result.ensureIndex(index);
+        result.createIndex(index);
        return result;
    }
    
@@ -14,7 +14,7 @@ import com.mongodb.DB;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
-import com.mongodb.MongoException;
+import com.mongodb.DuplicateKeyException;
 import com.mongodb.WriteConcern;
 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 import com.sap.sailing.domain.common.RegattaNameAndRaceName;
@@ -70,7 +70,7 @@ public class MediaDBImpl implements MediaDB {
        dbMediaTrack.put(DbNames.Fields.ASSIGNED_RACES.name(), assignedRacesDb);
        DBCollection dbVideos = getVideoCollection();
        dbVideos.insert(dbMediaTrack);
-        return ((ObjectId) dbMediaTrack.get(DbNames.Fields._id.name())).toStringMongod();
+        return ((ObjectId) dbMediaTrack.get(DbNames.Fields._id.name())).toHexString();
    }

    @Override
@@ -99,7 +99,7 @@ public class MediaDBImpl implements MediaDB {
        DBCollection dbVideos = getVideoCollection();
        try {
            dbVideos.insert(dbMediaTrack);
-        } catch (MongoException.DuplicateKey e) {
+        } catch (DuplicateKeyException e) {
            throw new IllegalArgumentException("Duplicate key '" + dbId
                    + "' caused an error when importing media (title: '" + title + "')", e);
        }
@@ -109,7 +109,7 @@ public class MediaDBImpl implements MediaDB {
        try {
            DBCollection dbVideos = database.getCollection(DbNames.Collections.VIDEOS.name());
            dbVideos.setWriteConcern(WriteConcern.FSYNC_SAFE);
-            dbVideos.ensureIndex(DbNames.Collections.VIDEOS.name());
+            dbVideos.createIndex(new BasicDBObject(DbNames.Collections.VIDEOS.name(), 1));
            return dbVideos;
        } catch (NullPointerException e) {
            // sometimes, for reasons yet to be clarified, ensuring an index on the name field causes an NPE
@@ -118,7 +118,7 @@ public class MediaDBImpl implements MediaDB {
    }

    private MediaTrack createMediaTrackFromDb(DBObject dbObject) {
-        String dbId = ((ObjectId) dbObject.get(DbNames.Fields._id.name())).toStringMongod();
+        String dbId = ((ObjectId) dbObject.get(DbNames.Fields._id.name())).toHexString();
        String title = (String) dbObject.get(DbNames.Fields.MEDIA_TITLE.name());
        String url = (String) dbObject.get(DbNames.Fields.MEDIA_URL.name());
        Date startTime = (Date) dbObject.get(DbNames.Fields.STARTTIME.name());
@@ -11,7 +11,7 @@ Require-Bundle: org.junit4;bundle-version="4.8.2",
 org.mockito.mockito-core;bundle-version="1.9.5",
 org.objenesis;bundle-version="1.3.0",
 org.hamcrest;bundle-version="1.1.0",
- com.mongodb.driver;bundle-version="2.6.2",
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.common
 Import-Package: com.sap.sailing.domain.abstractlog.regatta.events,
 com.sap.sailing.domain.persistence.impl,
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Testsupport
-Bundle-SymbolicName: com.sap.sailing.domain.racelogtrackingadapter.testsupport
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.sap.sailing.domain.shared.android,
- com.sap.sailing.domain,
- com.sap.sailing.domain.common,
- com.mongodb.driver,
- com.sap.sailing.domain.persistence,
- com.sap.sailing.domain.racelogtrackingadapter,
- com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
- org.json.simple;bundle-version="1.1.0",
- org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
- org.junit4;bundle-version="4.8.2",
- com.sap.sse.common,
- com.sap.sailing.server.gateway.serialization.shared.android
-Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Testsupport
+Bundle-SymbolicName: com.sap.sailing.domain.racelogtrackingadapter.testsupport
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sap.sailing.domain.shared.android,
+ com.sap.sailing.domain,
+ com.sap.sailing.domain.common,
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
+ com.sap.sailing.domain.persistence,
+ com.sap.sailing.domain.racelogtrackingadapter,
+ com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
+ org.json.simple;bundle-version="1.1.0",
+ org.mockito.mockito-core;bundle-version="1.9.5",
+ org.hamcrest;bundle-version="1.1.0",
+ org.junit4;bundle-version="4.8.2",
+ com.sap.sse.common,
+ com.sap.sailing.server.gateway.serialization.shared.android
+Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
@@ -13,7 +13,7 @@ Require-Bundle: com.sap.sailing.domain,
 com.sap.sailing.domain.persistence,
 com.sap.sailing.server,
 com.googlecode.java-diff-utils;bundle-version="1.3.0",
- com.mongodb.driver,
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.common,
 com.sap.sse.replication,
 com.sap.sse,
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: com.sap.sailing.domain.shared.android.test
-Bundle-SymbolicName: com.sap.sailing.domain.shared.android.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.sap.sailing.domain.common;bundle-version="1.0.0",
- com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
- org.hamcrest;bundle-version="1.1.0",
- org.junit4;bundle-version="4.8.2",
- org.objenesis;bundle-version="1.3.0",
- org.mockito.mockito-core;bundle-version="1.9.5",
- 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.shared.android
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.sap.sailing.domain.shared.android.test
+Bundle-SymbolicName: com.sap.sailing.domain.shared.android.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sap.sailing.domain.common;bundle-version="1.0.0",
+ com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
+ org.hamcrest;bundle-version="1.1.0",
+ org.junit4;bundle-version="4.8.2",
+ org.objenesis;bundle-version="1.3.0",
+ org.mockito.mockito-core;bundle-version="1.9.5",
+ 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.shared.android
@@ -1,50 +1,50 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-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.7
-Require-Bundle: com.sap.sailing.domain.common,
- com.sap.sse.datamining.shared,
- 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,
- com.sap.sailing.domain.abstractlog.race.analyzing.impl,
- com.sap.sailing.domain.abstractlog.race.impl,
- com.sap.sailing.domain.abstractlog.race.scoring,
- com.sap.sailing.domain.abstractlog.race.scoring.impl,
- com.sap.sailing.domain.abstractlog.race.state,
- com.sap.sailing.domain.abstractlog.race.state.impl,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic.impl,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.impl,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26,
- com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl,
- com.sap.sailing.domain.abstractlog.race.tracking,
- com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl,
- com.sap.sailing.domain.abstractlog.race.tracking.impl,
- com.sap.sailing.domain.abstractlog.regatta,
- com.sap.sailing.domain.abstractlog.regatta.events,
- com.sap.sailing.domain.abstractlog.regatta.events.impl,
- com.sap.sailing.domain.abstractlog.regatta.impl,
- com.sap.sailing.domain.abstractlog.shared.analyzing,
- com.sap.sailing.domain.abstractlog.shared.events,
- com.sap.sailing.domain.base,
- com.sap.sailing.domain.base.configuration,
- com.sap.sailing.domain.base.configuration.impl,
- com.sap.sailing.domain.base.configuration.procedures,
- com.sap.sailing.domain.base.impl,
- com.sap.sailing.domain.base.racegroup,
- com.sap.sailing.domain.base.racegroup.impl,
- com.sap.sailing.domain.racelogtracking,
- com.sap.sailing.domain.racelogtracking.impl,
- com.sap.sailing.domain.tracking,
- com.sap.sailing.domain.tracking.impl
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+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.7
+Require-Bundle: com.sap.sailing.domain.common,
+ com.sap.sse.datamining.shared,
+ 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,
+ com.sap.sailing.domain.abstractlog.race.analyzing.impl,
+ com.sap.sailing.domain.abstractlog.race.impl,
+ com.sap.sailing.domain.abstractlog.race.scoring,
+ com.sap.sailing.domain.abstractlog.race.scoring.impl,
+ com.sap.sailing.domain.abstractlog.race.state,
+ com.sap.sailing.domain.abstractlog.race.state.impl,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic.impl,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.impl,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26,
+ com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl,
+ com.sap.sailing.domain.abstractlog.race.tracking,
+ com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl,
+ com.sap.sailing.domain.abstractlog.race.tracking.impl,
+ com.sap.sailing.domain.abstractlog.regatta,
+ com.sap.sailing.domain.abstractlog.regatta.events,
+ com.sap.sailing.domain.abstractlog.regatta.events.impl,
+ com.sap.sailing.domain.abstractlog.regatta.impl,
+ com.sap.sailing.domain.abstractlog.shared.analyzing,
+ com.sap.sailing.domain.abstractlog.shared.events,
+ com.sap.sailing.domain.base,
+ com.sap.sailing.domain.base.configuration,
+ com.sap.sailing.domain.base.configuration.impl,
+ com.sap.sailing.domain.base.configuration.procedures,
+ com.sap.sailing.domain.base.impl,
+ com.sap.sailing.domain.base.racegroup,
+ com.sap.sailing.domain.base.racegroup.impl,
+ com.sap.sailing.domain.racelogtracking,
+ com.sap.sailing.domain.racelogtracking.impl,
+ com.sap.sailing.domain.tracking,
+ com.sap.sailing.domain.tracking.impl
@@ -7,7 +7,7 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sailing.domain.swisstimingadapter,
- com.mongodb.driver;bundle-version="2.6.2",
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.mongodb,
 com.sap.sailing.domain,
 com.sap.sailing.domain.common
@@ -87,7 +87,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
    @Override
    public void storeSwissTimingConfiguration(SwissTimingConfiguration swissTimingConfiguration) {
        DBCollection stConfigCollection = database.getCollection(CollectionNames.SWISSTIMING_CONFIGURATIONS.name());
-        stConfigCollection.ensureIndex(CollectionNames.SWISSTIMING_CONFIGURATIONS.name());
+        stConfigCollection.createIndex(new BasicDBObject(CollectionNames.SWISSTIMING_CONFIGURATIONS.name(), 1));
        BasicDBObject result = new BasicDBObject();
        result.put(FieldNames.ST_CONFIG_NAME.name(), swissTimingConfiguration.getName());
        for (DBObject equallyNamedConfig : stConfigCollection.find(result)) {
@@ -104,7 +104,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
    public void storeSwissTimingArchiveConfiguration(
            SwissTimingArchiveConfiguration createSwissTimingArchiveConfiguration) {
        DBCollection stArchiveConfigCollection = database.getCollection(CollectionNames.SWISSTIMING_ARCHIVE_CONFIGURATIONS.name());
-        stArchiveConfigCollection.ensureIndex(CollectionNames.SWISSTIMING_ARCHIVE_CONFIGURATIONS.name());
+        stArchiveConfigCollection.createIndex(new BasicDBObject(CollectionNames.SWISSTIMING_ARCHIVE_CONFIGURATIONS.name(), 1));
        BasicDBObject result = new BasicDBObject();
        result.put(FieldNames.ST_ARCHIVE_JSON_URL.name(), createSwissTimingArchiveConfiguration.getJsonUrl());
        for (DBObject equallyNamedConfig : stArchiveConfigCollection.find(result)) {
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: com.sap.sailing.domain.swisstimingadapter
 Require-Bundle: com.sap.sailing.domain,
 com.sap.sailing.udpconnector,
- com.mongodb.driver;bundle-version="2.6.2",
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.mongodb,
 com.googlecode.java-diff-utils;bundle-version="1.3.0",
 com.sap.sailing.server,
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Swisstimingadapter
-Bundle-SymbolicName: com.sap.sailing.domain.swisstimingadapter
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Require-Bundle: com.sap.sailing.domain,
- com.sap.sailing.udpconnector,
- com.googlecode.java-diff-utils;bundle-version="1.3.0",
- com.sap.sailing.domain.common,
- com.sap.sailing.xrr.resultimport,
- com.sap.sse.common,
- com.sap.sse,
- com.sap.sailing.xrr.schema
-Export-Package: com.sap.sailing.domain.swisstimingadapter,
- com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.server.test"
-Import-Package: com.sap.sailing.xrr.schema,
- org.osgi.framework
-Bundle-Activator: com.sap.sailing.domain.swisstimingadapter.impl.Activator
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Swisstimingadapter
+Bundle-SymbolicName: com.sap.sailing.domain.swisstimingadapter
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Require-Bundle: com.sap.sailing.domain,
+ com.sap.sailing.udpconnector,
+ com.googlecode.java-diff-utils;bundle-version="1.3.0",
+ com.sap.sailing.domain.common,
+ com.sap.sailing.xrr.resultimport,
+ com.sap.sse.common,
+ com.sap.sse,
+ com.sap.sailing.xrr.schema
+Export-Package: com.sap.sailing.domain.swisstimingadapter,
+ com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.server.test"
+Import-Package: com.sap.sailing.xrr.schema,
+ org.osgi.framework
+Bundle-Activator: com.sap.sailing.domain.swisstimingadapter.impl.Activator
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
+Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.mongodb,
 com.sap.sailing.domain.tractracadapter,
 com.sap.sailing.domain,
@@ -18,7 +18,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
    @Override
    public void storeTracTracConfiguration(TracTracConfiguration tracTracConfiguration) {
        DBCollection ttConfigCollection = database.getCollection(CollectionNames.TRACTRAC_CONFIGURATIONS.name());
-        ttConfigCollection.ensureIndex(CollectionNames.TRACTRAC_CONFIGURATIONS.name());
+        ttConfigCollection.createIndex(new BasicDBObject(CollectionNames.TRACTRAC_CONFIGURATIONS.name(), 1));
        BasicDBObject result = new BasicDBObject();
        result.put(FieldNames.TT_CONFIG_NAME.name(), tracTracConfiguration.getName());
        for (DBObject equallyNamedConfig : ttConfigCollection.find(result)) {
@@ -1,40 +1,40 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Domain
-Bundle-SymbolicName: com.sap.sailing.domain
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: .
-Export-Package: com.sap.sailing.domain.base,
- com.sap.sailing.domain.base.impl,
- com.sap.sailing.domain.confidence,
- com.sap.sailing.domain.leaderboard,
- com.sap.sailing.domain.leaderboard.caching,
- com.sap.sailing.domain.leaderboard.impl,
- com.sap.sailing.domain.leaderboard.meta,
- com.sap.sailing.domain.markpassingcalculation,
- com.sap.sailing.domain.markpassingcalculation.splining,
- com.sap.sailing.domain.masterdataimport,
- com.sap.sailing.domain.racelog,
- com.sap.sailing.domain.racelog.impl,
- com.sap.sailing.domain.racelog.tracking,
- com.sap.sailing.domain.regattalike,
- com.sap.sailing.domain.regattalog,
- com.sap.sailing.domain.regattalog.impl,
- com.sap.sailing.domain.trackfiles,
- com.sap.sailing.domain.trackimport,
- com.sap.sailing.domain.tracking,
- com.sap.sailing.domain.tracking.impl,
- com.sap.sailing.util,
- 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,
- com.sap.sailing.domain.common,
- org.json.simple;bundle-version="1.1.0",
- com.sap.sailing.geocoding,
- com.sap.sse.datamining.shared,
- com.sap.sse.common,
- com.sap.sse,
- com.sap.sse.shared.android
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Domain
+Bundle-SymbolicName: com.sap.sailing.domain
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: .
+Export-Package: com.sap.sailing.domain.base,
+ com.sap.sailing.domain.base.impl,
+ com.sap.sailing.domain.confidence,
+ com.sap.sailing.domain.leaderboard,
+ com.sap.sailing.domain.leaderboard.caching,
+ com.sap.sailing.domain.leaderboard.impl,
+ com.sap.sailing.domain.leaderboard.meta,
+ com.sap.sailing.domain.markpassingcalculation,
+ com.sap.sailing.domain.markpassingcalculation.splining,
+ com.sap.sailing.domain.masterdataimport,
+ com.sap.sailing.domain.racelog,
+ com.sap.sailing.domain.racelog.impl,
+ com.sap.sailing.domain.racelog.tracking,
+ com.sap.sailing.domain.regattalike,
+ com.sap.sailing.domain.regattalog,
+ com.sap.sailing.domain.regattalog.impl,
+ com.sap.sailing.domain.trackfiles,
+ com.sap.sailing.domain.trackimport,
+ com.sap.sailing.domain.tracking,
+ com.sap.sailing.domain.tracking.impl,
+ com.sap.sailing.util,
+ 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,
+ com.sap.sailing.domain.common,
+ org.json.simple;bundle-version="1.1.0",
+ com.sap.sailing.geocoding,
+ com.sap.sse.datamining.shared,
+ com.sap.sse.common,
+ com.sap.sse,
+ com.sap.sse.shared.android
@@ -64,4 +64,16 @@ public class LowPoint extends AbstractScoringSchemeImpl {
    public boolean isValidInTotalScore(Leaderboard leaderboard, RaceColumn raceColumn, TimePoint at) {
        return true;
    }
+
+    /**
+     * For low-point scoring schemes, we don't want to see boats at the top of the leaderboard just because they have
+     * not scored in any races yet. Although generally we don't want to consider the number of races, this implementation
+     * makes an exception for the case that no races were sailed by a competitor. No races is worse than one or more races.
+     * Other than that, this implementation ignores the number of races.
+     */
+    @Override
+    public int compareByNumberOfRacesScored(int competitor1NumberOfRacesScored, int competitor2NumberOfRacesScored) {
+        return (int) Math.signum(competitor2NumberOfRacesScored) - (int) Math.signum(competitor1NumberOfRacesScored);
+    }
+
 }
@@ -59,7 +59,6 @@
      <plugin id="com.sap.sailing.xmlexport" autoStart="true" startLevel="4" />
      <plugin id="com.sap.sailing.xrr.resultimport" autoStart="true" startLevel="3" />
      <plugin id="com.sap.sse.filestorage" autoStart="true" startLevel="3" />
-      <plugin id="com.sap.sse.mail" autoStart="true" startLevel="4" />
      <plugin id="com.sap.sse.replication" autoStart="true" startLevel="4" />
      <plugin id="com.sap.sse.security.ui" autoStart="true" startLevel="5" />
      <plugin id="com.sap.sse.security.userstore.mongodb" autoStart="true" startLevel="3" />
@@ -409,6 +409,13 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
         version="0.0.0"
         unpack="false"/>

+   <plugin
+         id="com.sap.sailing.dashboards.gwt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
   <plugin
         id="com.sap.sse.mail"
         download-size="0"
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.github.sdbg.debug.core.chromeMobileConnLaunchConfig">
+<stringAttribute key="applicationName" value=""/>
+<stringAttribute key="device" value="<YOUR-DEVICE>"/>
+<booleanAttribute key="launchFile" value="false"/>
+<booleanAttribute key="launchTabWithUrl" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.sap.sailing.gwt.ui"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="projectName" value="com.sap.sailing.gwt.ui"/>
+<stringAttribute key="url" value="http://localhost:8888/gwt/Home.html"/>
+</launchConfiguration>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.github.sdbg.debug.core.chromeLaunchConfig">
+<stringAttribute key="applicationArguments" value=""/>
+<stringAttribute key="applicationName" value=""/>
+<booleanAttribute key="launchFile" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.sap.sailing.gwt.ui"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="projectName" value="com.sap.sailing.gwt.ui"/>
+<booleanAttribute key="showLaunchOutput" value="false"/>
+<stringAttribute key="url" value="http://127.0.0.1:8888/gwt/Home.html"/>
+<stringAttribute key="urlQueryParams" value=""/>
+</launchConfiguration>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.github.sdbg.debug.core.androidReverseForwardsLaunchConfig">
+<stringAttribute key="device" value="<YOUR-DEVICE>"/>
+<intAttribute key="deviceCommandPort" value="6565"/>
+<stringAttribute key="reverseForwards" value="localhost:8888:8888,localhost:9876:9876,localhost:9875:9875"/>
+</launchConfiguration>
@@ -10,7 +10,7 @@ Require-Bundle: com.sap.sailing.domain,
 com.sap.sailing.server,
 com.sap.sailing.domain.tractracadapter,
 com.sap.sse.mongodb,
- com.mongodb.driver;bundle-version="2.6.2",
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sailing.domain.swisstimingadapter,
 com.sap.sailing.domain.persistence,
 com.sap.sailing.domain.swisstimingadapter.persistence,
@@ -69,7 +69,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-superDevMode -incremental -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/Home.html com.sap.sailing.gwt.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.ui.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator -startupUrl /gwt/VideoPopup.html com.sap.sailing.gwt.ui.VideoPopup com.sap.sailing.gwt.AutoPlay com.sap.sailing.gwt.ui.YoutubePopup com.sap.sailing.gwt.ui.RaceBoard com.sap.sailing.gwt.Home com.sap.sailing.gwt.ui.DataMining com.sap.sailing.gwt.ui.LeaderboardEditing com.sap.sailing.gwt.ui.AdminConsole com.sap.sailing.gwt.ui.Spectator com.sap.sailing.gwt.ui.RegattaOverview com.sap.sailing.gwt.ui.PolarSheets com.sap.sailing.gwt.ui.Leaderboard com.sap.sailing.gwt.ui.Simulator"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-superDevMode -incremental -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/Home.html com.sap.sailing.gwt.Home -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.ui.RegattaOverview -startupUrl /gwt/DataMining.html com.sap.sailing.gwt.ui.DataMining -startupUrl /gwt/Simulator.html com.sap.sailing.gwt.ui.Simulator -startupUrl /gwt/VideoPopup.html com.sap.sailing.gwt.ui.VideoPopup com.sap.sailing.gwt.AutoPlay com.sap.sailing.gwt.ui.YoutubePopup"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx3072m"/>
 </launchConfiguration>
@@ -1,7 +1,6 @@
 package com.sap.sailing.gwt.autoplay.client;

 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.sap.sailing.gwt.autoplay.client.app.AutoPlayAppActivityMapper;
 import com.sap.sailing.gwt.autoplay.client.app.AutoPlayAppClientFactory;
@@ -26,9 +25,6 @@ public class AutoPlayEntryPoint extends AbstractMvpEntryPoint<StringMessages> {

        SharedResources.INSTANCE.mediaCss().ensureInjected();
        SharedResources.INSTANCE.mainCss().ensureInjected();
-
-        StyleInjector.injectAtEnd("@media (min-width: 25em) { "+SharedResources.INSTANCE.mediumCss().getText()+"}");
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+SharedResources.INSTANCE.largeCss().getText()+"}");
    }
    
    @Override
@@ -8,24 +8,12 @@ import com.google.gwt.resources.client.CssResource.Shared;
 public interface SharedResources extends ClientBundle {
    public static final SharedResources INSTANCE = GWT.create(SharedResources.class);

-    @Source("com/sap/sailing/gwt/home/main.css")
+    @Source("com/sap/sailing/gwt/home/main.gss")
    MainCss mainCss();

-    @Source("com/sap/sailing/gwt/home/media.css")
+    @Source("com/sap/sailing/gwt/home/media.gss")
    MediaCss mediaCss();

-    public interface MinWidth25emCss extends MediaCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/medium.css")
-    MinWidth25emCss mediumCss();
-
-    public interface MinWidth50emCss extends MediaCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/large.css")
-    MinWidth50emCss largeCss();
-
    @Shared 
    public interface MainCss extends CssResource {
        String grid();
@@ -1,7 +1,6 @@
 package com.sap.sailing.gwt.home.client;

 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.sap.sailing.gwt.common.client.SharedResources;
 import com.sap.sailing.gwt.home.client.app.ApplicationActivityMapper;
@@ -22,9 +21,6 @@ public class HomeEntryPoint extends AbstractMvpEntryPoint<StringMessages> {

        SharedResources.INSTANCE.mediaCss().ensureInjected();
        SharedResources.INSTANCE.mainCss().ensureInjected();
-
-        StyleInjector.injectAtEnd("@media (min-width: 25em) { "+SharedResources.INSTANCE.mediumCss().getText()+"}");
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+SharedResources.INSTANCE.largeCss().getText()+"}");
    }
    
    @Override
@@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.client.place.event.header;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.ImageElement;
 import com.google.gwt.dom.client.SpanElement;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -43,7 +42,6 @@ public class CompactEventHeader extends Composite {
        this.placeNavigator = placeNavigator;
        
        EventHeaderResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+EventHeaderResources.INSTANCE.largeCss().getText()+"}");
        
        initWidget(uiBinder.createAndBindUi(this));
        
@@ -1,6 +1,6 @@
 .dropdown {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  width: 20em;
  max-width: 100%;
  display: inline-block;
@@ -62,12 +62,12 @@
 }
 .leaderboardquickaccess {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  text-align: right;
 }
 .eventheaderwrapper {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventheaderwrapper[data-navigationtype='compact'] .eventheader,
 .eventheaderwrapper[data-navigationtype='compact'] .eventnavigationnormal {
@@ -85,7 +85,7 @@
 }
 .eventheader {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  background: #f2f2f2;
  padding: 2em 0;
  border-bottom: 1px solid darkgray;
@@ -97,7 +97,7 @@
 }
 .eventheader_intro_description {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventheader_intro_logo {
  -webkit-box-shadow: 0 0 5px rgba(204,204,204,0.25);
@@ -137,7 +137,7 @@
 .eventheader_intro_details_item:first-child {
  padding-left: 0;
 }
-.eventheader_intro_details_item:nth-child\(2\) {
+.eventheader_intro_details_item:nth-child(2) {
  border: none;
 }
 .eventheader_intro_details_item:last-child {
@@ -146,6 +146,14 @@
  border: none;
  margin: 0;
 }
+@media (min-width: 50em) {
+  .eventheader_intro_details_item:nth-child(2) {
+    border-right: 1px solid #ddd;
+  }
+  .eventheader_intro_details_item:last-child {
+    display: inline-block;
+  }
+}
 .eventheader_sharing {
  text-align: right;
 }
@@ -187,7 +195,7 @@
 }
 .eventnavigation {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventnavigationnormal {
  position: relative;
@@ -5,7 +5,6 @@ import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.ImageElement;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -121,7 +120,6 @@ public class EventHeader extends AbstractEventComposite {

    private void initResources() {
        EventHeaderResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+EventHeaderResources.INSTANCE.largeCss().getText()+"}");
        
        initWidget(uiBinder.createAndBindUi(this));
    }
@@ -168,7 +166,7 @@ public class EventHeader extends AbstractEventComposite {
            seriesLeaderboardAnchor.setHref(seriesAnalyticsNavigation.getTargetUrl());
            
            StrippedLeaderboardDTO leaderboardFittingToEvent = findLeaderboardWithSameCourseArea(event);
-            if(leaderboardFittingToEvent != null) {
+            if (leaderboardFittingToEvent != null) {
                regattaNameInSeriesDiv.setInnerText(leaderboardFittingToEvent.displayName);
            } else {
                regattaNameInSeriesDiv.getStyle().setDisplay(Display.NONE);
@@ -1,42 +0,0 @@
-.eventheader_intro_details_item:nth-child\(2\) {
-  border-right: 1px solid #ddd;
-}
-.eventheader_intro_details_item:last-child {
-  display: inline-block;
-}
-.dropdown {}
-.dropdown_head {}
-.dropdown_head_title {}
-.dropdown_head_titlebutton {}
-.dropdown_content {}
-.dropdown_content_link {}
-.dropdown_content_link_title {}
-.dropdown_content_link_subtitle {}
-.leaderboardquickaccess {}
-.eventheaderwrapper {}
-.eventheader {}
-.eventheader_intro {}
-.eventheader_intro_description {}
-.eventheader_intro_logo {}
-.eventheader_intro_logo_image {}
-.eventheader_intro_name {}
-.eventheader_intro_details {}
-.eventheader_intro_details_item {}
-.eventheader_intro_details_itemlink {}
-.eventheader_sharing {}
-.eventheader_sharing_item {}
-.eventheader_sharing_itememail {}
-.eventheader_sharing_itemtwitter {}
-.eventheader_sharing_itemfacebook {}
-.locationicon {}
-.eventnavigation {}
-.eventnavigationnormal {}
-.eventnavigationcompact,
-.eventnavigationcompactfloating {}
-.eventnavigationcompact_logo,
-.eventnavigationcompactfloating_logo {}
-.eventnavigationcompactfloating {}
-.eventnavigationcompactfloating.eventnavigationfixed {}
-.eventnavigation_link {}
-.eventnavigation_linkactive {}
-
@@ -9,15 +9,9 @@ import com.google.gwt.resources.client.ImageResource;
 public interface EventHeaderResources extends ClientBundle {
    public static final EventHeaderResources INSTANCE = GWT.create(EventHeaderResources.class);

-    @Source("com/sap/sailing/gwt/home/client/place/event/header/EventHeader.css")
+    @Source("com/sap/sailing/gwt/home/client/place/event/header/EventHeader.gss")
    LocalCss css();

-    public interface MinWidth50emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/place/event/header/EventHeaderLarge.css")
-    MinWidth50emCss largeCss();
-
    @Shared
    public interface LocalCss extends CssResource {
        String dropdown();
@@ -3,7 +3,7 @@
 */
 .latestraceresults {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  margin-top: 1.875em;
  margin-bottom: 4.0625em;
 }
@@ -76,7 +76,7 @@
 }
 .mediateaser {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  margin-top: 1.875em;
  margin-bottom: 4.0625em;
 }
@@ -184,7 +184,7 @@
 }
 .upcomingraceshort {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  padding: 0.8125em 0.625em;
  zoom: 1;
 }
@@ -247,7 +247,7 @@
 }
 .weathershort {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  font-weight: 600;
  background: #eee;
  height: 5em;
@@ -287,7 +287,7 @@
 }
 .newsupdate {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .newsupdate_date {
  font-size: 0.875em;
@@ -296,7 +296,7 @@
 }
 .dropdown {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  width: 18.75em;
  display: inline-block;
 }
@@ -360,12 +360,12 @@
 }
 .eventquickfinder.dropdown {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  float: right;
 }
 .eventlivebox {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  margin-top: 1.875em;
 }
 .eventlivebox_video_container {
@@ -381,7 +381,7 @@
  background: #000;
  opacity: 0.4;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
-  filter: literal("alpha(opacity=40)");
+  filter: alpha(opacity=40);
  position: absolute;
  bottom: 0px;
  height: 5em;
@@ -460,5 +460,5 @@
 }
 .eventoverview {
  font-size: 16px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
@@ -7,7 +7,7 @@ import com.google.gwt.resources.client.CssResource;
 public interface EventOverviewResources extends ClientBundle {
    public static final EventOverviewResources INSTANCE = GWT.create(EventOverviewResources.class);

-    @Source("com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.css")
+    @Source("com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.gss")
    LocalCss css();

    public interface LocalCss extends CssResource {
@@ -1,6 +1,6 @@
 .regatta {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  border-bottom: 1px solid #d9d9d9;
  padding: 1.333333333333333em 0;
 }
@@ -16,11 +16,11 @@
 .regatta[data-rendermode='link']:focus {
  background-color: #fcfcfc;
 }
-.regatta[data-rendermode='link']:nth-child\(odd\) {
+.regatta[data-rendermode='link']:nth-child(odd) {
  background-color: #f8f8f8;
 }
-.regatta[data-rendermode='link']:nth-child\(odd\):hover,
-.regatta[data-rendermode='link']:nth-child\(odd\):focus {
+.regatta[data-rendermode='link']:nth-child(odd):hover,
+.regatta[data-rendermode='link']:nth-child(odd):focus {
  background-color: #f3f3f3;
 }
 .regatta_intro {
@@ -91,6 +91,12 @@
  min-height: 2.666666666666667em;

 }
+@media (min-width: 50em) {
+  .regatta_intro_phases_phase {
+    display: inline-block;
+    border-right: 1px solid #ccc;
+  }
+}
 .regatta_intro_phases_phase_name {
  font-size: 0.866666666666667em;
 }
@@ -8,7 +8,6 @@ import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.HeadingElement;
 import com.google.gwt.dom.client.SpanElement;
 import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -97,7 +96,6 @@ public class Regatta extends Composite {
 //        competitorWithRank3 = new RegattaCompetitor(3, null);
        
        RegattaResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+RegattaResources.INSTANCE.largeCss().getText()+"}");

        initWidget(uiBinder.createAndBindUi(this));
    }
@@ -1,33 +0,0 @@
-.regatta_intro_phases_phase {
-  display: inline-block;
-  border-right: 1px solid #ccc;
-}
-.regatta {}
-.regatta_intro {}
-.regatta_intro_image {}
-.regatta_intro_header {}
-.regatta_intro_header_name {}
-.regatta_intro_header_namelink:hover,
-.regatta_intro_header_namelink:focus {}
-.regatta_intro_header_details {}
-.regatta_intro_header_details_item {}
-.regatta_intro_header_details_item_value {}
-.regatta_intro_header_details_label {}
-.regatta_intro_phases {}
-.regatta_intro_phases_phase_name {}
-.regatta_intro_phases_phase_races {}
-.regatta_intro_phases_phase_races_race {}
-.regatta_intro_phases_leaderboardlink {}
-.regatta_intro_scheduled {}
-.regatta_intro_results {}
-.regatta_intro_results_competitor {}
-.regatta_intro_results_competitor_name {}
-.regatta_intro_fleets {}
-.regatta_intro_fleets_fleet {}
-.regatta_intro_fleets_fleet:last-child {}
-.regatta_intro_fleets_fleet_item {}
-.regatta_intro_fleets_fleet_itemfirst {}
-.regatta_intro_fleets_fleet_item_value {}
-.regatta_intro_fleets_fleet_item_flag {}
-.regatta_intro_fleets_fleet_live {}
-.regatta_intro_details_itemhideoncompact {}
@@ -8,13 +8,8 @@ import com.google.gwt.resources.client.CssResource.Shared;
 public interface RegattaResources extends ClientBundle {
    public static final RegattaResources INSTANCE = GWT.create(RegattaResources.class);

-    @Source("com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.css")
+    @Source("com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.gss")
    LocalCss css();
-    public interface MinWidth50emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/place/event/regatta/RegattaLarge.css")
-    MinWidth50emCss largeCss();

    @Shared
    public interface LocalCss extends CssResource {
@@ -52,12 +52,12 @@
 .regattalink:hover .regatta_intro_image {
  opacity: 0.9;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
-  filter: literal("alpha(opacity=90)");
+  filter: alpha(opacity=90);
 }
-.regattalink:nth-child\(even\) {
+.regattalink:nth-child(even) {
  background-color: #f8f8f8;
 }
-.regattalink:nth-child\(even\):hover {
+.regattalink:nth-child(even):hover {
  background-color: #f3f3f3;
 }
 .regatta_intro {
@@ -7,7 +7,7 @@ import com.google.gwt.resources.client.CssResource;
 public interface EventRegattaHeaderResources extends ClientBundle {
    public static final EventRegattaHeaderResources INSTANCE = GWT.create(EventRegattaHeaderResources.class);

-    @Source("com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.css")
+    @Source("com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.gss")
    LocalCss css();

    public interface LocalCss extends CssResource {
@@ -1,6 +1,6 @@
 .eventregattaraces {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventregattaraces_phase {
  margin: 2em 0;
@@ -69,7 +69,7 @@
 .eventregattaraces_legend_item:before {
  content: ' ';
  position: absolute;
-  top: literal("-0.2em");
+  top: -0.2em;
  left: 0.666666666666667em;
  width: 1.733333333333333em;
  height: 1.733333333333333em;
@@ -130,7 +130,7 @@
  display: block;
  float: none;
  margin-right: 0.555555555555556em;
-  margin-top: literal("-0.194444444444444em");
+  margin-top: -0.194444444444444em;
  font-size: 2.4em;
  color: #ccc;
  font-weight: 700;
@@ -168,7 +168,7 @@
 .eventregattarace_features_list,
 .eventregattarace_legs_list {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventregattarace_features {
  min-height: 0;
@@ -252,7 +252,7 @@
 }
 .regattanavigation {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  text-align: center;
  border-bottom: 1px solid #ddd;
 }
@@ -277,3 +277,11 @@
 .regattanavigation_linkactive:focus {
  border-bottom-color: #d89a00;
 }
+@media (min-width: 25em) {
+  .eventregattarace_nameshort {
+    float: left;
+  }
+  .eventregattarace_flag {
+    display: inline-block;
+  }
+}
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;

 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.HTMLPanel;
@@ -43,7 +42,6 @@ public class EventRegattaRaces extends AbstractEventComposite {
        regatta = new Regatta(event, timerForClientServerOffset, true, placeNavigator, pageNavigator);
        
        EventRegattaRacesResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 25em) { "+EventRegattaRacesResources.INSTANCE.mediumCss().getText()+"}");
        initWidget(uiBinder.createAndBindUi(this));
    }
    
@@ -1,50 +0,0 @@
-.eventregattarace_nameshort {
-  float: left;
-}
-.eventregattarace_flag {
-  display: inline-block;
-}
-.eventregattaraces {}
-.eventregattaraces_phase {}
-.eventregattaraces_phase_name {}
-.eventregattaraces_phase_day {}
-.eventregattaraces_phase_races {}
-.eventregattaraces_phase_fleets {}
-.eventregattaraces_phase_fleet {}
-.eventregattaraces_phase_fleet_name {}
-.eventregattaraces_phase_fleet_count {}
-.eventregattaraces_legend {}
-.eventregattaraces_legend_item {}
-.eventregattarace {}
-.eventregattarace_fleetindicator {}
-.eventregattarace_details {}
-.eventregattarace_name {}
-.eventregattarace_flag {}
-.eventregattarace_wind {}
-.eventregattarace_wind_strength {}
-.eventregattarace_leader {}
-.eventregattarace_leader_name {}
-.eventregattarace_features,
-.eventregattarace_legs {}
-.eventregattarace_features_list,
-.eventregattarace_legs_list {}
-.eventregattarace_features {}
-.eventregattarace_legs_leg {}
-.eventregattarace_action {}
-.eventregattarace_action_watch,
-.eventregattarace_action_analyze {}
-.eventregattarace_action_watch {}
-.eventregattarace_actiondisabled {}
-.eventregattarace_feature {}
-.eventregattarace_featuregps {}
-.eventregattarace_featurewind {}
-.eventregattarace_featurevideo {}
-.eventregattarace_featureaudio {}
-.eventregattarace_featureunavailable {}
-.regattanavigation {}
-.regattanavigation_link {}
-.regattanavigation_linkactive {}
-.eventregattaraces_legend_itemgps {}
-.eventregattaraces_legend_itemwind {}
-.eventregattaraces_legend_itemvideo {}
-.eventregattaraces_legend_itemaudio {}
@@ -8,13 +8,7 @@ import com.google.gwt.resources.client.CssResource.Shared;
 public interface EventRegattaRacesResources extends ClientBundle {
    public static final EventRegattaRacesResources INSTANCE = GWT.create(EventRegattaRacesResources.class);

-    public interface MinWidth25emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesMedium.css")
-    MinWidth25emCss mediumCss();
-
-    @Source("com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.css")
+    @Source("com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.gss")
    LocalCss css();

    @Shared
@@ -1,13 +1,13 @@
 .eventteasercontainer {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  text-align: center;
  width: 100%;
  height: 24em;
 }
 .eventteaser {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  display: inline-block;
  margin-bottom: 3em;
  text-align: left;
@@ -22,7 +22,7 @@
 .eventteaser:hover .eventteaser_image {
  opacity: 0.9;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
-  filter: literal("alpha(opacity=90)");
+  filter: alpha(opacity=90);
 }
 .eventteaser_image {
  position: relative;
@@ -45,24 +45,24 @@
 }
 .eventsoverviewnavigation {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventsoverviewnavigation .gridalternator {
  overflow: visible;
 }
 .eventsoverviewrecent {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .eventsoverviewrecent_year {
  border-bottom: 1px solid #ccc;
  transiton: opacity 0.1s;
 }
-.eventsoverviewrecent_year:nth-child\(even\) {
+.eventsoverviewrecent_year:nth-child(even) {
  background: #f8f8f8;
 }
-.eventsoverviewrecent_year:nth-child\(even\) .eventsoverviewrecent_year_header:hover,
-.eventsoverviewrecent_year:nth-child\(even\) .eventsoverviewrecent_year_header:focus {
+.eventsoverviewrecent_year:nth-child(even) .eventsoverviewrecent_year_header:hover,
+.eventsoverviewrecent_year:nth-child(even) .eventsoverviewrecent_year_header:focus {
  background-color: #f3f3f3;
 }
 .eventsoverviewrecent_yearcollapsed .eventsoverviewrecent_year_header_info_arrow_image {
@@ -7,7 +7,7 @@ import com.google.gwt.resources.client.CssResource;
 public interface EventsOverviewRecentResources extends ClientBundle {
    public static final EventsOverviewRecentResources INSTANCE = GWT.create(EventsOverviewRecentResources.class);

-    @Source("com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.css")
+    @Source("com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.gss")
    LocalCss css();

    public interface LocalCss extends CssResource {
@@ -1,6 +1,6 @@
 .sitefooter {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  background: #333;
  border-top: 5px solid #fff;
  color: #fff;
@@ -35,3 +35,17 @@
  cursor: pointer;
  margin-left: 0.666666666666667em;
 }
+@media (min-width: 25em) {
+  .sitefooter {
+    line-height: 4.666666666666667em;
+  }
+  .sitefooter_copyright {
+    float: left;
+  }
+  .sitefooter_links_link {
+    display: inline-block;
+  }
+  .sitefooter_language {
+    text-align: right;
+  }
+}
@@ -7,7 +7,6 @@ import java.util.Map.Entry;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Style.Display;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.http.client.UrlBuilder;
 import com.google.gwt.i18n.client.LocaleInfo;
@@ -20,11 +19,11 @@ import com.google.gwt.user.client.Window.Location;
 import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.impl.HyperlinkImpl;
 import com.sap.sailing.gwt.home.client.app.HomePlacesNavigator;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
 import com.sap.sailing.gwt.home.client.place.whatsnew.WhatsNewPlace;
 import com.sap.sailing.gwt.home.client.place.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs;
-import com.google.gwt.user.client.ui.impl.HyperlinkImpl;

 public class Footer extends Composite {
    private static FooterPanelUiBinder uiBinder = GWT.create(FooterPanelUiBinder.class);
@@ -52,7 +51,6 @@ public class Footer extends Composite {
        localeAndLanguages.put("de", "Deutsch");
        
        FooterResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 25em) { "+FooterResources.INSTANCE.mediumCss().getText()+"}");

        initWidget(uiBinder.createAndBindUi(this));
        
@@ -1,18 +0,0 @@
-.sitefooter {
-  line-height: 4.666666666666667em;
-}
-.sitefooter_copyright {
-  float: left;
-}
-.sitefooter_links_link {
-  display: inline-block;
-}
-.sitefooter_language {
-  text-align: right;
-}
-.sitefooter_copyright {}
-.sitefooter_links {}
-.sitefooter_links_link {}
-.sitefooter_links_link:last-child {}
-.sitefooter_language {}
-.sitefooter_language_link {}
@@ -3,21 +3,14 @@ package com.sap.sailing.gwt.home.client.shared.footer;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.CssResource.NotStrict;
 import com.google.gwt.resources.client.CssResource.Shared;

 public interface FooterResources extends ClientBundle {
    public static final FooterResources INSTANCE = GWT.create(FooterResources.class);

-    @Source("com/sap/sailing/gwt/home/client/shared/footer/Footer.css")
+    @Source("com/sap/sailing/gwt/home/client/shared/footer/Footer.gss")
    LocalCss css();

-    public interface MinWidth25emCss extends LocalCss {
-    }
-@NotStrict
-    @Source("com/sap/sailing/gwt/home/client/shared/footer/FooterMedium.css")
-    MinWidth25emCss mediumCss();
-
    @Shared
    public interface LocalCss extends CssResource {
        String sitefooter();
@@ -1,6 +1,6 @@
 .siteheader {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  background: #333;
  border-bottom: 5px solid #f0ab00;
  min-height: 4.333333333333333em;
@@ -22,6 +22,11 @@
  line-height: 4.333333333333333em;
  color: #f6f9fc;
 }
+@media (min-width: 50em) {
+  .logotitle {
+    display: inline;
+  }
+}
 .sitenavigation {
  float: right;
  text-align: right;
@@ -69,7 +74,7 @@
 }
 .search {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  display: inline-block;
  width: 100%;
  margin-top: 0.2em;
@@ -102,7 +107,7 @@
 .searchsmall .search_textfield {
  opacity: 0;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: literal("alpha(opacity=0)");
+  filter: alpha(opacity=0);
  pointer-events: none;
  -webkit-transition: height 0.1s ease;
  -moz-transition: height 0.1s ease;
@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.List;

 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.event.dom.client.KeyPressEvent;
@@ -56,7 +55,6 @@ public class Header extends Composite {
        this.navigator = navigator;

        HeaderResources.INSTANCE.css().ensureInjected();
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+HeaderResources.INSTANCE.largeCss().getText()+"}");

        initWidget(uiBinder.createAndBindUi(this));
        links = Arrays.asList(new Anchor[] { startPageLink, eventsPageLink, solutionsPageLink });
@@ -1,25 +0,0 @@
-.logotitle {
-  display: inline;
-}
-.siteheader {}
-.siteheader_full {}
-.logo {}
-.sitenavigation {}
-.sitenavigation_link {}
-.sitenavigation_link:hover,
-.sitenavigation_link:focus {}
-.sitenavigation_linkactive,
-.sitenavigation_link:hover,
-.sitenavigation_link:focus {}
-.sitenavigation_search {}
-.sitenavigationexpanded .searchsmall {}
-.sitenavigationexpanded .searchsmall .search_textfield {}
-.search {}
-.search_textfield {}
-.search_button {}
-.search_button:hover,
-.search_button:focus {}
-.searchsmall {}
-.searchsmall .search_textfield {}
-.searchsmall .search_button {}
-.submit {}
@@ -9,15 +9,9 @@ import com.google.gwt.resources.client.ImageResource;
 public interface HeaderResources extends ClientBundle {
    public static final HeaderResources INSTANCE = GWT.create(HeaderResources.class);

-    @Source("com/sap/sailing/gwt/home/client/shared/header/Header.css")
+    @Source("com/sap/sailing/gwt/home/client/shared/header/Header.gss")
    LocalCss css();

-    public interface MinWidth50emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/shared/header/HeaderLarge.css")
-    MinWidth50emCss largeCss();
-
    @Shared
    public interface LocalCss extends CssResource {
        String siteheader();
@@ -1,6 +1,6 @@
 .solutions {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  padding-top: 3.4em;
 }
 .solutions_nav {
@@ -44,10 +44,10 @@
  position: relative;
  z-index: 2;
 }
-.solutions_content:nth-child\(odd\) {
+.solutions_content:nth-child(odd) {
  background-color: #f8f8f8;
 }
-.solutions_content:nth-child\(even\) {
+.solutions_content:nth-child(even) {
  background-color: #fff;
 }
 .solutions_content .parallax {
@@ -77,14 +77,14 @@
 }
 .solutions_contentrace {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contentrace .gridalternator {
  padding: 2.666666666666667em 0 10%;
 }
 .solutions_contentrace .parallax {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contentrace .parallax .background {
  margin: auto;
@@ -105,7 +105,7 @@
 }
 .solutions_contentpost {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contentpost .gridalternator {
  background-repeat: no-repeat;
@@ -118,14 +118,14 @@
 }
 .solutions_contenttraining {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contenttraining .gridalternator {
  padding-top: 5em;
 }
 .solutions_contenttraining .parallax {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contenttraining .parallax .background {
  margin: auto;
@@ -143,7 +143,7 @@
 }
 .solutions_contentsimulator {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .solutions_contentsimulator .gridalternator {
  background-repeat: no-repeat;
@@ -158,3 +158,56 @@
  display: inline-block;
  margin-top: 2.666666666666667em;
 }
+
+@media (min-width: 25em) {
+  .solutions_nav_link {
+    margin-right: 1em;
+  }
+  .solutions_content .gridalternator {
+    padding: 5em 0;
+  }
+  .solutions_contentsap .gridalternator {
+    padding: 5em 0 5.666666666666667em;
+  }
+  .solutions_contentrace .gridalternator {
+    padding: 4em 0 15%;
+  }
+  .solutions_contentrace .parallax .background {
+    background-position: center 16.666666666666668em;
+  }
+  .solutions_contentpost .gridalternator {
+    padding: 3.333333333333333em 0;
+  }
+  .solutions_contenttraining .gridalternator {
+    padding-top: 6.666666666666667em;
+  }
+  .solutions_contentsimulator .gridalternator {
+    padding: 5em 0 6.666666666666667em;
+  }
+}
+@media (min-width: 50em) {
+  .solutions_nav_link {
+    margin-right: 2em;
+  }
+  .solutions_content .gridalternator {
+    padding: 6.666666666666667em 0;
+  }
+  .solutions_contentsap .gridalternator {
+    padding: 6.666666666666667em 0 12em;
+  }
+  .solutions_contentrace .gridalternator {
+    padding: 4em 0 20%;
+  }
+  .solutions_contentrace .parallax .background {
+    background-position: center 13.333333333333334em;
+  }
+  .solutions_contentpost .gridalternator {
+    padding: 5em 0;
+  }
+  .solutions_contenttraining .gridalternator {
+    padding-top: 8.333333333333334em;
+  }
+  .solutions_contentsimulator .gridalternator {
+    padding: 6.666666666666667em 0 13.333333333333334em;
+  }
+}
@@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.client.shared.solutions;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.DivElement;
-import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -63,9 +62,6 @@ public class Solutions extends Composite {
        this.placesNavigator = placesNavigator;
        
        SolutionsResources.INSTANCE.css().ensureInjected();
-        
-        StyleInjector.injectAtEnd("@media (min-width: 25em) { "+SolutionsResources.INSTANCE.mediumCss().getText()+"}");
-        StyleInjector.injectAtEnd("@media (min-width: 50em) { "+SolutionsResources.INSTANCE.largeCss().getText()+"}");

        initWidget(uiBinder.createAndBindUi(this));
        
@@ -1,30 +0,0 @@
-.solutions_nav_link {
-  margin-right: 2em;
-}
-.solutions_content .gridalternator {
-  padding: 6.666666666666667em 0;
-}
-.solutions_contentsap .gridalternator {
-  padding: 6.666666666666667em 0 12em;
-}
-.solutions_contentrace .gridalternator {
-  padding: 4em 0 20%;
-}
-.solutions_contentrace .parallax .background {
-  background-position: center 13.333333333333334em;
-}
-.solutions_contentpost .gridalternator {
-  padding: 5em 0;
-}
-.solutions_contenttraining .gridalternator {
-  padding-top: 8.333333333333334em;
-}
-.solutions_contentsimulator .gridalternator {
-  padding: 6.666666666666667em 0 13.333333333333334em;
-}
-.solutions_content_linkappstore{}
-.noparallax{}
-.solutions{}
-.solutions_nav{}
-.solutions_nav_linkactive{}
-.solutions_navsticky{}
@@ -1,30 +0,0 @@
-.solutions_nav_link {
-  margin-right: 1em;
-}
-.solutions_content .gridalternator {
-  padding: 5em 0;
-}
-.solutions_contentsap .gridalternator {
-  padding: 5em 0 5.666666666666667em;
-}
-.solutions_contentrace .gridalternator {
-  padding: 4em 0 15%;
-}
-.solutions_contentrace .parallax .background {
-  background-position: center 16.666666666666668em;
-}
-.solutions_contentpost .gridalternator {
-  padding: 3.333333333333333em 0;
-}
-.solutions_contenttraining .gridalternator {
-  padding-top: 6.666666666666667em;
-}
-.solutions_contentsimulator .gridalternator {
-  padding: 5em 0 6.666666666666667em;
-}
-.solutions_content_linkappstore{}
-.noparallax{}
-.solutions{}
-.solutions_nav{}
-.solutions_nav_linkactive{}
-.solutions_navsticky{}
@@ -8,21 +8,9 @@ import com.google.gwt.resources.client.CssResource.Shared;
 public interface SolutionsResources extends ClientBundle {
    public static final SolutionsResources INSTANCE = GWT.create(SolutionsResources.class);

-    @Source("com/sap/sailing/gwt/home/client/shared/solutions/Solutions.css")
+    @Source("com/sap/sailing/gwt/home/client/shared/solutions/Solutions.gss")
    LocalCss css();

-    public interface MinWidth25emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/shared/solutions/SolutionsMedium.css")
-    MinWidth25emCss mediumCss();
-
-    public interface MinWidth50emCss extends LocalCss {
-    }
-
-    @Source("com/sap/sailing/gwt/home/client/shared/solutions/SolutionsLarge.css")
-    MinWidth50emCss largeCss();
-
    @Shared
    public interface LocalCss extends CssResource {
        String solutions();
@@ -6,72 +6,17 @@
  -moz-backface-visibility: hidden;
  -ms-backface-visibility: hidden;
  -o-backface-visibility: hidden;
-  -webkit-backface-visibility: hidden;
-  -moz-backface-visibility: hidden;
-  -ms-backface-visibility: hidden;
  backface-visibility: hidden;
  z-index: 1;
 }
-.swiperwrapper {
-  position: relative;
-  width: 100%;
-  -webkit-transition-property: -webkit-transform, left, top;
-  -webkit-transition-duration: 0s;
-  -webkit-transform: translate3d(0px, 0, 0);
-  -webkit-transition-timing-function: ease;
-  -moz-transition-property: -moz-transform, left, top;
-  -moz-transition-duration: 0s;
-  -moz-transform: translate3d(0px, 0, 0);
-  -moz-transition-timing-function: ease;
-  -o-transition-property: -o-transform, left, top;
-  -o-transition-duration: 0s;
-  -o-transform: translate3d(0px, 0, 0);
-  -o-transition-timing-function: ease;
-  -o-transform: translate(0px, 0px);
-  -ms-transition-property: -ms-transform, left, top;
-  -ms-transition-duration: 0s;
-  -ms-transform: translate3d(0px, 0, 0);
-  -ms-transition-timing-function: ease;
-  -webkit-transition-property: -webkit-transform, left, top;
-  -moz-transition-property: -moz-transform, left, top;
-  -o-transition-property: -o-transform, left, top;
-  -ms-transition-property: -ms-transform, left, top;
-  transition-property: transform, left, top;
-  -webkit-transition-duration: 0s;
-  -moz-transition-duration: 0s;
-  -o-transition-duration: 0s;
-  -ms-transition-duration: 0s;
-  transition-duration: 0s;
-  -webkit-transform: translate3d(0px, 0, 0);
-  -moz-transform: translate3d(0px, 0, 0);
-  -o-transform: translate3d(0px, 0, 0);
-  -ms-transform: translate3d(0px, 0, 0);
-  transform: translate3d(0px, 0, 0);
-  -webkit-transition-timing-function: ease;
-  -moz-transition-timing-function: ease;
-  -o-transition-timing-function: ease;
-  -ms-transition-timing-function: ease;
-  transition-timing-function: ease;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
 .swiperslide {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  float: left;
 }
-.swiperwp8horizontal {
-  -ms-touch-action: pan-y;
-}
-.swiperwp8vertical {
-  -ms-touch-action: pan-x;
-}
 .countdown {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .countdown_pane {
  border: 0.266666666666667em solid #fff;
@@ -99,7 +44,7 @@
 }
 .stageteaser {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  position: relative;
  width: 100%;
 }
@@ -147,7 +92,7 @@
 .stageteaser_content_headerhidden {
  opacity: 0;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: literal("alpha(opacity=0)");
+  filter: alpha(opacity=0);
 }
 .stageteaser_content_header_subtitle {
  font-size: 2em;
@@ -163,7 +108,7 @@
 }
 .stageteaser_content_header_countdown {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .stageteaser_content_band {
  position: absolute;
@@ -211,7 +156,7 @@
 }
 .stageteaser_content_band_item[data-bandcount="1"] .stageteaser_content_band_text {
  font-size: 18px;
-  font-size: 1.2rem;
+  /* @alternate */ font-size: 1.2rem;
 }
 .stageteaser_content_band_item[data-bandcount="1"] .stageteaser_content_band_text_headline {
  display: inline-block;
@@ -230,7 +175,7 @@
 }
 .stage {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  height: 38.666666666666664em;
  position: relative;
  clear: both;
@@ -241,7 +186,7 @@
 }
 .stage_controls {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .stage_progress {
  height: 0.333333333333333em;
@@ -8,7 +8,7 @@ import com.google.gwt.resources.client.ImageResource;
 public interface StageResources extends ClientBundle {
    public static final StageResources INSTANCE = GWT.create(StageResources.class);

-    @Source("com/sap/sailing/gwt/home/client/shared/stage/Stage.css")
+    @Source("com/sap/sailing/gwt/home/client/shared/stage/Stage.gss")
    LocalCss css();

    public interface LocalCss extends CssResource {
@@ -32,10 +32,7 @@ public interface StageResources extends ClientBundle {
        String stageteaser_content_band_text_name();
        String stageteaser_content_band_action();
        String swipercontainer();
-        String swiperwrapper();
        String swiperslide();
-        String swiperwp8horizontal();
-        String swiperwp8vertical();
        String stage();
        String stage_teasers();
        String stage_controls();
@@ -1,7 +1,9 @@
 package com.sap.sailing.gwt.ui.adminconsole;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
@@ -15,6 +17,7 @@ import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
 import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.shared.CourseAreaDTO;
@@ -34,6 +37,7 @@ public class EventDetailsComposite extends Composite  {
    private final Label endDate;
    private final Label isPublic;
    private final Anchor officialWebsiteURL;
+    private final Anchor eventOverviewURL;
    private final Anchor logoImageURL;
    private final SimpleStringListComposite courseAreaNamesList;
    private final SimpleStringListComposite imageURLList;
@@ -52,7 +56,7 @@ public class EventDetailsComposite extends Composite  {
        VerticalPanel vPanel = new VerticalPanel();
        mainPanel.add(vPanel);

-        int rows = 14;
+        int rows = 15;
        Grid grid = new Grid(rows, 2);
        vPanel.add(grid);
        
@@ -65,6 +69,7 @@ public class EventDetailsComposite extends Composite  {
        endDate = createLabelAndValueWidget(grid, currentRow++, stringMessages.endDate(), "EndDateLabel");
        isPublic = createLabelAndValueWidget(grid, currentRow++, stringMessages.isPublic(), "IsPublicLabel");
        officialWebsiteURL = createAnchorAndValueWidget(grid, currentRow++, stringMessages.eventOfficialWebsiteURL(), "OfficialWebsiteURLLabel");
+        eventOverviewURL = createAnchorAndValueWidget(grid, currentRow++, stringMessages.eventOverviewURL(), "EventOverviewURLLabel");
        logoImageURL = createAnchorAndValueWidget(grid, currentRow++, stringMessages.eventLogoImageURL(), "LogoImageURLLabel");
        courseAreaNamesList = createLableAndValueListWidget(grid, currentRow++, stringMessages.courseAreas(), "CourseAreaValueList");
        imageURLList = createLableAndValueListWidget(grid, currentRow++, stringMessages.imageURLs(), "ImageURLValueList");
@@ -126,6 +131,11 @@ public class EventDetailsComposite extends Composite  {
            isPublic.setText(String.valueOf(event.isPublic));
            officialWebsiteURL.setText(event.getOfficialWebsiteURL());
            officialWebsiteURL.setHref(event.getOfficialWebsiteURL());
+            Map<String, String> regattaOverviewURLParameters = new HashMap<String, String>();
+            regattaOverviewURLParameters.put("event", event.id.toString());
+            String regattaOverviewLink = EntryPointLinkFactory.createRegattaOverviewLink(regattaOverviewURLParameters);
+            eventOverviewURL.setText(regattaOverviewLink);
+            eventOverviewURL.setHref(regattaOverviewLink);
            logoImageURL.setText(event.getLogoImageURL());
            logoImageURL.setHref(event.getLogoImageURL());
     
@@ -4,8 +4,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;

@@ -34,6 +36,7 @@ import com.google.gwt.view.client.ListDataProvider;
 import com.google.gwt.view.client.MultiSelectionModel;
 import com.google.gwt.view.client.SelectionChangeEvent;
 import com.sap.sailing.domain.common.impl.NaturalComparator;
+import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
 import com.sap.sailing.gwt.ui.client.EventSelectionProvider;
 import com.sap.sailing.gwt.ui.client.EventsRefresher;
 import com.sap.sailing.gwt.ui.client.LeaderboardGroupsDisplayer;
@@ -48,7 +51,6 @@ import com.sap.sailing.gwt.ui.shared.RegattaDTO;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.gwt.client.ErrorReporter;
-import com.sap.sse.gwt.client.URLEncoder;
 import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback;
 import com.sap.sse.gwt.client.panels.LabeledAbstractFilterablePanel;

@@ -214,9 +216,12 @@ public class EventListComposite extends Composite implements EventsRefresher, Le
        Column<EventDTO, SafeHtml> eventNameColumn = new Column<EventDTO, SafeHtml>(anchorCell) {
            @Override
            public SafeHtml getValue(EventDTO event) {
-                String debugParam = Window.Location.getParameter("gwt.codesvr");
-                String link = URLEncoder.encode("/gwt/RegattaOverview.html?event=" + event.id
-                        + (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : ""));
+                String link = "";
+                if(event != null && event.id != null){
+                    Map<String, String> eventLinkParameters = new HashMap<String, String>();
+                    eventLinkParameters.put("navigationTab", "Regattas");
+                    link = EntryPointLinkFactory.createEventLink(eventLinkParameters, event.id.toString());
+                }
                return ANCHORTEMPLATE.cell(link, event.getName());
            }
        };
@@ -21,6 +21,10 @@ public class EntryPointLinkFactory extends AbstractEntryPointLinkFactory {
        return createEntryPointLink("/gwt/Home.html#EventPlace:eventId="+eventId, parameters);
    }
    
+    public static String createRegattaOverviewLink(Map<String, String> parameters) {
+        return createEntryPointLink("/gwt/RegattaOverview.html", parameters);
+    }
+    
    public static String createDashboardLink(Map<String, String> parameters) {
        return createEntryPointLink("/dashboards/RibDashboard.html", parameters);
    }
@@ -164,8 +164,6 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS

    List<StrippedLeaderboardDTO> getLeaderboards();
    
-    List<StrippedLeaderboardDTO> getLeaderboardsByRegatta(RegattaDTO regatta);
-    
    List<StrippedLeaderboardDTO> getLeaderboardsByEvent(EventDTO event);
    
    StrippedLeaderboardDTO updateLeaderboard(String leaderboardName, String newLeaderboardName, String newLeaderboardDisplayName, int[] newDiscardingThreasholds, UUID newCourseAreaId);
@@ -207,8 +207,6 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM

    void getLeaderboards(AsyncCallback<List<StrippedLeaderboardDTO>> callback);

-    void getLeaderboardsByRegatta(RegattaDTO regatta, AsyncCallback<List<StrippedLeaderboardDTO>> callback);
-
    void getLeaderboardsByRaceAndRegatta(RaceDTO race, RegattaIdentifier regattaIdentifier,
            AsyncCallback<List<StrippedLeaderboardDTO>> callback);

@@ -562,9 +560,9 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM
    
    void getEventById(UUID id, boolean withStatisticalData, AsyncCallback<EventDTO> callback);
    
-
    void showCachedPolarSheetForBoatClass(String boatClassName,
            AsyncCallback<PolarSheetGenerationResponse> asyncCallback);
+    
    void getLeaderboardsByEvent(EventDTO event, AsyncCallback<List<StrippedLeaderboardDTO>> callback);

    void denoteForRaceLogTracking(String leaderboardName,
@@ -1050,6 +1050,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages {
    String advancePassId();
    String pleaseSelectAScoringResult();
    String eventOfficialWebsiteURL();
+    String eventOverviewURL();
    String eventLogoImageURL();
    String showPingMarkMappings();
    String errorFetchingWindStreamletData(String message);
@@ -964,7 +964,6 @@ calculateThe=Calculate the
 groupingProvider=Grouping Provider
 releaseNotes=News and Release History
 hasSplitFleetContiguousScoring=Split fleets scored contiguously
-eventOverview=Event Overview
 addRaceLogTracker=Add RaceLog Tracker
 addRaceLogTrackers=Add RaceLog Trackers
 denoteForRaceLogTracking=Denote for RaceLog tracking
@@ -1032,6 +1031,7 @@ invalidSelection=The current selection isn''t valid.
 advancePassId=Advance Pass ID
 pleaseSelectAScoringResult=Please select a scoring result...
 eventOfficialWebsiteURL=Official Website URL
+eventOverviewURL=Event Overview URL
 eventLogoImageURL=Logo Image URL
 showPingMarkMappings=Show Mappings for pinged Marks
 regattaNameMustNotContainSlashes=Regatta name must not contain slashes
@@ -960,7 +960,6 @@ calculateThe=Berechne die
 groupingProvider=Gruppierungs-Versorger
 releaseNotes=Neuigkeiten und Änderungshistorie
 hasSplitFleetContiguousScoring=Gruppen durchgängig bepunkten
-eventOverview=Event Übersicht
 addRaceLogTracker=RaceLog Tracker hinzufügen
 addRaceLogTrackers=RaceLog Tracker hinzufügen
 denoteForRaceLogTracking=Für RaceLog Tracking markieren
@@ -1026,6 +1025,7 @@ invalidSelection=Die aktuelle Selektion ist nicht gültig.
 advancePassId=Pass ID erhöhen
 pleaseSelectAScoringResult=Bitte ein Ergebnis auswählen...
 eventOfficialWebsiteURL=URL der offiziellen Veranstaltungs-Website
+eventOverviewURL=URL der Eventübersicht
 eventLogoImageURL=URL des Veranstaltungs-Logos
 showPingMarkMappings=Mappings für gepingte Marks zeigen
 errorFetchingWindStreamletData=Fehler beim Empfang der Streamlet-Winddaten: {0}
@@ -984,6 +984,7 @@ videoURLs=Video URLs
 sponsorImageURLs=Sponsor Image URLs
 pleaseSelectAScoringResult=Please select a scoring result...
 eventOfficialWebsiteURL=Official Website URL
+eventOverviewURL=Event Overview URL
 eventLogoImageURL=Logo Image URL
 showPingMarkMappings=Show Mappings for pinged Marks
 errorFetchingWindStreamletData=Error fetching wind streamlet data: {0}
@@ -2247,8 +2247,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
        return results;
    }

-    @Override
-    public List<StrippedLeaderboardDTO> getLeaderboardsByRegatta(RegattaDTO regatta) {
+    private List<StrippedLeaderboardDTO> getLeaderboardsByRegatta(RegattaDTO regatta) {
        List<StrippedLeaderboardDTO> results = new ArrayList<StrippedLeaderboardDTO>();
        if (regatta != null && regatta.races != null) {
            for (RaceDTO race : regatta.races) {
@@ -55,11 +55,13 @@
 	<set-property name="gwt.logging.enabled" value="TRUE"/> 
 	<set-property name="gwt.logging.logLevel" value="INFO"/>
 	
-	<set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
 	<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
 	<set-property name="gwt.logging.developmentModeHandler" value="DISABLED" />
 	<set-property name="gwt.logging.systemHandler" value="ENABLED" />
 	
+	<set-configuration-property name="CssResource.enableGss" value="true" />
+	<set-configuration-property name="CssResource.legacy" value="true" />
+	
 	<source path='ui/common' />
 	<source path='ui/client' />
 	<source path='ui/shared' />
@@ -65,7 +65,6 @@
 	<set-property name="gwt.logging.enabled" value="TRUE"/> 
 	<set-property name="gwt.logging.logLevel" value="INFO"/>
 	
-	<set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
 	<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
 	<set-property name="gwt.logging.developmentModeHandler" value="DISABLED" />
 	<set-property name="gwt.logging.systemHandler" value="ENABLED" />
@@ -74,7 +73,9 @@
 	<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
 	<set-configuration-property name="devModeRedirectEnabled" value="true" />
    <set-property name="compiler.useSourceMaps" value="true" />
-	
+    
+    <set-configuration-property name="CssResource.enableGss" value="true" />
+    <set-configuration-property name="CssResource.legacy" value="true" />
 	
 	<source path='home' />
 	<source path='common' />
@@ -1,209 +0,0 @@
-.large1 {
-  width: 8.3333333333333%;
-}
-.large2 {
-  width: 16.6666666666667%;
-}
-.large3 {
-  width: 25%;
-}
-.large4 {
-  width: 33.3333333333333%;
-}
-.large5 {
-  width: 41.6666666666667%;
-}
-.large6 {
-  width: 50%;
-}
-.large7 {
-  width: 58.3333333333333%;
-}
-.large8 {
-  width: 66.6666666666667%;
-}
-.large9 {
-  width: 75%;
-}
-.large10 {
-  width: 83.3333333333333%;
-}
-.large11 {
-  width: 91.6666666666667%;
-}
-.large12 {
-  width: 100%;
-}
-.largeoffset0 {
-  margin-left: 0% !important;
-}
-.largeoffset1 {
-  margin-left: 8.3333333333333% !important;
-}
-.largeoffset2 {
-  margin-left: 16.6666666666667% !important;
-}
-.largeoffset3 {
-  margin-left: 25% !important;
-}
-.largeoffset4 {
-  margin-left: 33.3333333333333% !important;
-}
-.largeoffset5 {
-  margin-left: 41.6666666666667% !important;
-}
-.largeoffset6 {
-  margin-left: 50% !important;
-}
-.largeoffset7 {
-  margin-left: 58.3333333333333% !important;
-}
-.largeoffset8 {
-  margin-left: 66.6666666666667% !important;
-}
-.largeoffset9 {
-  margin-left: 75% !important;
-}
-.largeoffset10 {
-  margin-left: 83.3333333333333% !important;
-}
-.largeoffset11 {
-  margin-left: 91.6666666666667% !important;
-}
-.showonsmall {
-  display: none !important;
-}
-.hideonsmall {
-  display: inherit !important;
-}
-.showonmedium {
-  display: none !important;
-}
-.hideonmedium {
-  display: inherit !important;
-}
-.showonlarge {
-  display: inherit !important;
-}
-.hideonlarge {
-  display: none !important;
-}
-.column.largecentered,
-.columns.largecentered {
-  margin-left: auto;
-  margin-right: auto;
-  float: none;
-}
-.column.largeuncentered,
-.columns.largeuncentered {
-  margin-left: 0;
-  margin-right: 0;
-  float: left !important;
-}
-
-.smallcentered {
-}
-.smalluncentered {
-}
-.mediumcentered {
-}
-.mediumuncentered {
-}
-
-.small1 {
-}
-.small2 {
-}
-.small3 {
-}
-.small4 {
-}
-.small5 {
-}
-.small6 {
-}
-.small7 {
-}
-.small8 {
-}
-.small9 {
-}
-.small10 {
-}
-.small11 {
-}
-.small12 {
-}
-.smalloffset0 {
-}
-.smalloffset1 {
-}
-.smalloffset2 {
-}
-.smalloffset3 {
-}
-.smalloffset4 {
-}
-.smalloffset5 {
-}
-.smalloffset6 {
-}
-.smalloffset7 {
-}
-.smalloffset8 {
-}
-.smalloffset9 {
-}
-.smalloffset10 {
-}
-.smalloffset11 {
-}
-
-.medium1 {
-}
-.medium2 {
-}
-.medium3 {
-}
-.medium4 {
-}
-.medium5 {
-}
-.medium6 {
-}
-.medium7 {
-}
-.medium8 {
-}
-.medium9 {
-}
-.medium10 {
-}
-.medium11 {
-}
-.medium12 {
-}
-.mediumoffset0 {
-}
-.mediumoffset1 {
-}
-.mediumoffset2 {
-}
-.mediumoffset3 {
-}
-.mediumoffset4 {
-}
-.mediumoffset5 {
-}
-.mediumoffset6 {
-}
-.mediumoffset7 {
-}
-.mediumoffset8 {
-}
-.mediumoffset9 {
-}
-.mediumoffset10 {
-}
-.mediumoffset11 {
-}
@@ -36,7 +36,7 @@ a img {
 }
 hr {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  margin: 0;
  height: 1px;
  border: none;
@@ -103,13 +103,13 @@ figcaption {
 .stackenblochen .stackenblochen {
  width: auto;
  max-width: none;
-  margin-left: literal("-1rem");
-  margin-right: literal("-1rem");
+  margin-left: -1rem;
+  margin-right: -1rem;
 }

 .navbar {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  padding: 1.333333333333333em 0;
  border-bottom: 1px solid #eee;
 }
@@ -145,7 +145,7 @@ figcaption {
 }
 .button {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  display: inline-block;
  font-weight: 600;
  color: #fff;
@@ -202,7 +202,7 @@ figcaption {
 .label {
  display: inline-block;
  font-size: 11.25px;
-  font-size: 0.75rem;
+  /* @alternate */ font-size: 0.75rem;
  font-weight: 600;
  color: #fff;
  padding: 0.133333333333333em 0.933333333333333em;
@@ -248,7 +248,7 @@ figcaption {
 }
 .dummy {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  min-height: 25em;
  position: relative;
 }
@@ -285,15 +285,15 @@ figcaption {
 }
 .lightbox {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
 .lightbox_overlay {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
  background: #000;
  opacity: 0.7;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-  filter: literal("alpha(opacity=70)");
+  filter: alpha(opacity=70);
  width: 100%;
  height: 100%;
  position: fixed;
@@ -309,7 +309,7 @@ figcaption {
 .lightbox_overlayhidden {
  opacity: 0;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: literal("alpha(opacity=0)");
+  filter: alpha(opacity=0);
 }
 .lightbox_content {
  position: fixed;
@@ -332,7 +332,7 @@ figcaption {
 .lightbox_contenthidden {
  opacity: 0;
  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: literal("alpha(opacity=0)");
+  filter: alpha(opacity=0);
 }
 .lightbox_content_enlargeditem {
  -webkit-transition: margin 0.7s linear;
@@ -373,5 +373,5 @@ figcaption {
 }
 .lightbox_item {
  font-size: 15px;
-  font-size: 1rem;
+  /* @alternate */ font-size: 1rem;
 }
@@ -1,222 +0,0 @@
-.column,
-.columns {
-  float: left;
-  padding: 0 1rem;
-  position: relative;
-  width: 100%;
-}
-.column img,
-.columns img {
-  max-width: 100%;
-  height: auto;
-  ms-interpolation-mode: bicubic;
-}
-.small1 {
-  width: 8.3333333333333%;
-}
-.small2 {
-  width: 16.6666666666667%;
-}
-.small3 {
-  width: 25%;
-}
-.small4 {
-  width: 33.3333333333333%;
-}
-.small5 {
-  width: 41.6666666666667%;
-}
-.small6 {
-  width: 50%;
-}
-.small7 {
-  width: 58.3333333333333%;
-}
-.small8 {
-  width: 66.6666666666667%;
-}
-.small9 {
-  width: 75%;
-}
-.small10 {
-  width: 83.3333333333333%;
-}
-.small11 {
-  width: 91.6666666666667%;
-}
-.small12 {
-  width: 100%;
-}
-.smalloffset0 {
-  margin-left: 0% !important;
-}
-.smalloffset1 {
-  margin-left: 8.3333333333333% !important;
-}
-.smalloffset2 {
-  margin-left: 16.6666666666667% !important;
-}
-.smalloffset3 {
-  margin-left: 25% !important;
-}
-.smalloffset4 {
-  margin-left: 33.3333333333333% !important;
-}
-.smalloffset5 {
-  margin-left: 41.6666666666667% !important;
-}
-.smalloffset6 {
-  margin-left: 50% !important;
-}
-.smalloffset7 {
-  margin-left: 58.3333333333333% !important;
-}
-.smalloffset8 {
-  margin-left: 66.6666666666667% !important;
-}
-.smalloffset9 {
-  margin-left: 75% !important;
-}
-.smalloffset10 {
-  margin-left: 83.3333333333333% !important;
-}
-.smalloffset11 {
-  margin-left: 91.6666666666667% !important;
-}
-.showonsmall {
-  display: inherit !important;
-}
-.hideonsmall {
-  display: none !important;
-}
-.showonmedium {
-  display: none !important;
-}
-.hideonmedium {
-  display: inherit !important;
-}
-.showonlarge {
-  display: none !important;
-}
-.hideonlarge {
-  display: inherit !important;
-}
-.column.smallcentered,
-.columns.smallcentered {
-  margin-left: auto;
-  margin-right: auto;
-  float: none;
-}
-.column.smalluncentered,
-.columns.smalluncentered {
-  margin-left: 0;
-  margin-right: 0;
-  float: left !important;
-}
-
-.largecentered {
-}
-.largeuncentered {
-}
-.mediumcentered {
-}
-.mediumuncentered {
-}
-
-.medium1 {
-}
-.medium2 {
-}
-.medium3 {
-}
-.medium4 {
-}
-.medium5 {
-}
-.medium6 {
-}
-.medium7 {
-}
-.medium8 {
-}
-.medium9 {
-}
-.medium10 {
-}
-.medium11 {
-}
-.medium12 {
-}
-.mediumoffset0 {
-}
-.mediumoffset1 {
-}
-.mediumoffset2 {
-}
-.mediumoffset3 {
-}
-.mediumoffset4 {
-}
-.mediumoffset5 {
-}
-.mediumoffset6 {
-}
-.mediumoffset7 {
-}
-.mediumoffset8 {
-}
-.mediumoffset9 {
-}
-.mediumoffset10 {
-}
-.mediumoffset11 {
-}
-
-.large1 {
-}
-.large2 {
-}
-.large3 {
-}
-.large4 {
-}
-.large5 {
-}
-.large6 {
-}
-.large7 {
-}
-.large8 {
-}
-.large9 {
-}
-.large10 {
-}
-.large11 {
-}
-.large12 {
-}
-.largeoffset0 {
-}
-.largeoffset1 {
-}
-.largeoffset2 {
-}
-.largeoffset3 {
-}
-.largeoffset4 {
-}
-.largeoffset5 {
-}
-.largeoffset6 {
-}
-.largeoffset7 {
-}
-.largeoffset8 {
-}
-.largeoffset9 {
-}
-.largeoffset10 {
-}
-.largeoffset11 {
-}
@@ -0,0 +1,431 @@
+.column,
+.columns {
+  float: left;
+  padding: 0 1rem;
+  position: relative;
+  width: 100%;
+}
+.column img,
+.columns img {
+  max-width: 100%;
+  height: auto;
+  ms-interpolation-mode: bicubic;
+}
+.small1 {
+  width: 8.3333333333333%;
+}
+.small2 {
+  width: 16.6666666666667%;
+}
+.small3 {
+  width: 25%;
+}
+.small4 {
+  width: 33.3333333333333%;
+}
+.small5 {
+  width: 41.6666666666667%;
+}
+.small6 {
+  width: 50%;
+}
+.small7 {
+  width: 58.3333333333333%;
+}
+.small8 {
+  width: 66.6666666666667%;
+}
+.small9 {
+  width: 75%;
+}
+.small10 {
+  width: 83.3333333333333%;
+}
+.small11 {
+  width: 91.6666666666667%;
+}
+.small12 {
+  width: 100%;
+}
+.smalloffset0 {
+  margin-left: 0% !important;
+}
+.smalloffset1 {
+  margin-left: 8.3333333333333% !important;
+}
+.smalloffset2 {
+  margin-left: 16.6666666666667% !important;
+}
+.smalloffset3 {
+  margin-left: 25% !important;
+}
+.smalloffset4 {
+  margin-left: 33.3333333333333% !important;
+}
+.smalloffset5 {
+  margin-left: 41.6666666666667% !important;
+}
+.smalloffset6 {
+  margin-left: 50% !important;
+}
+.smalloffset7 {
+  margin-left: 58.3333333333333% !important;
+}
+.smalloffset8 {
+  margin-left: 66.6666666666667% !important;
+}
+.smalloffset9 {
+  margin-left: 75% !important;
+}
+.smalloffset10 {
+  margin-left: 83.3333333333333% !important;
+}
+.smalloffset11 {
+  margin-left: 91.6666666666667% !important;
+}
+.showonsmall {
+  display: inherit !important;
+}
+.hideonsmall {
+  display: none !important;
+}
+.showonmedium {
+  display: none !important;
+}
+.hideonmedium {
+  display: inherit !important;
+}
+.showonlarge {
+  display: none !important;
+}
+.hideonlarge {
+  display: inherit !important;
+}
+.column.smallcentered,
+.columns.smallcentered {
+  margin-left: auto;
+  margin-right: auto;
+  float: none;
+}
+.column.smalluncentered,
+.columns.smalluncentered {
+  margin-left: 0;
+  margin-right: 0;
+  float: left !important;
+}
+
+.largecentered {
+}
+.largeuncentered {
+}
+.mediumcentered {
+}
+.mediumuncentered {
+}
+
+.medium1 {
+}
+.medium2 {
+}
+.medium3 {
+}
+.medium4 {
+}
+.medium5 {
+}
+.medium6 {
+}
+.medium7 {
+}
+.medium8 {
+}
+.medium9 {
+}
+.medium10 {
+}
+.medium11 {
+}
+.medium12 {
+}
+.mediumoffset0 {
+}
+.mediumoffset1 {
+}
+.mediumoffset2 {
+}
+.mediumoffset3 {
+}
+.mediumoffset4 {
+}
+.mediumoffset5 {
+}
+.mediumoffset6 {
+}
+.mediumoffset7 {
+}
+.mediumoffset8 {
+}
+.mediumoffset9 {
+}
+.mediumoffset10 {
+}
+.mediumoffset11 {
+}
+
+.large1 {
+}
+.large2 {
+}
+.large3 {
+}
+.large4 {
+}
+.large5 {
+}
+.large6 {
+}
+.large7 {
+}
+.large8 {
+}
+.large9 {
+}
+.large10 {
+}
+.large11 {
+}
+.large12 {
+}
+.largeoffset0 {
+}
+.largeoffset1 {
+}
+.largeoffset2 {
+}
+.largeoffset3 {
+}
+.largeoffset4 {
+}
+.largeoffset5 {
+}
+.largeoffset6 {
+}
+.largeoffset7 {
+}
+.largeoffset8 {
+}
+.largeoffset9 {
+}
+.largeoffset10 {
+}
+.largeoffset11 {
+}
+
+@media (min-width: 25em) {
+  .medium1 {
+    width: 8.3333333333333%;
+  }
+  .medium2 {
+    width: 16.6666666666667%;
+  }
+  .medium3 {
+    width: 25%;
+  }
+  .medium4 {
+    width: 33.3333333333333%;
+  }
+  .medium5 {
+    width: 41.6666666666667%;
+  }
+  .medium6 {
+    width: 50%;
+  }
+  .medium7 {
+    width: 58.3333333333333%;
+  }
+  .medium8 {
+    width: 66.6666666666667%;
+  }
+  .medium9 {
+    width: 75%;
+  }
+  .medium10 {
+    width: 83.3333333333333%;
+  }
+  .medium11 {
+    width: 91.6666666666667%;
+  }
+  .medium12 {
+    width: 100%;
+  }
+  .mediumoffset0 {
+    margin-left: 0% !important;
+  }
+  .mediumoffset1 {
+    margin-left: 8.3333333333333% !important;
+  }
+  .mediumoffset2 {
+    margin-left: 16.6666666666667% !important;
+  }
+  .mediumoffset3 {
+    margin-left: 25% !important;
+  }
+  .mediumoffset4 {
+    margin-left: 33.3333333333333% !important;
+  }
+  .mediumoffset5 {
+    margin-left: 41.6666666666667% !important;
+  }
+  .mediumoffset6 {
+    margin-left: 50% !important;
+  }
+  .mediumoffset7 {
+    margin-left: 58.3333333333333% !important;
+  }
+  .mediumoffset8 {
+    margin-left: 66.6666666666667% !important;
+  }
+  .mediumoffset9 {
+    margin-left: 75% !important;
+  }
+  .mediumoffset10 {
+    margin-left: 83.3333333333333% !important;
+  }
+  .mediumoffset11 {
+    margin-left: 91.6666666666667% !important;
+  }
+  .showonsmall {
+    display: none !important;
+  }
+  .hideonsmall {
+    display: inherit !important;
+  }
+  .showonmedium {
+    display: inherit !important;
+  }
+  .hideonmedium {
+    display: none !important;
+  }
+  .showonlarge {
+    display: none !important;
+  }
+  .hideonlarge {
+    display: inherit !important;
+  }
+  .column.mediumcentered,
+  .columns.mediumcentered {
+    margin-left: auto;
+    margin-right: auto;
+    float: none;
+  }
+  .column.mediumuncentered,
+  .columns.mediumuncentered {
+    margin-left: 0;
+    margin-right: 0;
+    float: left !important;
+  }
+}
+@media (min-width: 50em) {
+  .large1 {
+    width: 8.3333333333333%;
+  }
+  .large2 {
+    width: 16.6666666666667%;
+  }
+  .large3 {
+    width: 25%;
+  }
+  .large4 {
+    width: 33.3333333333333%;
+  }
+  .large5 {
+    width: 41.6666666666667%;
+  }
+  .large6 {
+    width: 50%;
+  }
+  .large7 {
+    width: 58.3333333333333%;
+  }
+  .large8 {
+    width: 66.6666666666667%;
+  }
+  .large9 {
+    width: 75%;
+  }
+  .large10 {
+    width: 83.3333333333333%;
+  }
+  .large11 {
+    width: 91.6666666666667%;
+  }
+  .large12 {
+    width: 100%;
+  }
+  .largeoffset0 {
+    margin-left: 0% !important;
+  }
+  .largeoffset1 {
+    margin-left: 8.3333333333333% !important;
+  }
+  .largeoffset2 {
+    margin-left: 16.6666666666667% !important;
+  }
+  .largeoffset3 {
+    margin-left: 25% !important;
+  }
+  .largeoffset4 {
+    margin-left: 33.3333333333333% !important;
+  }
+  .largeoffset5 {
+    margin-left: 41.6666666666667% !important;
+  }
+  .largeoffset6 {
+    margin-left: 50% !important;
+  }
+  .largeoffset7 {
+    margin-left: 58.3333333333333% !important;
+  }
+  .largeoffset8 {
+    margin-left: 66.6666666666667% !important;
+  }
+  .largeoffset9 {
+    margin-left: 75% !important;
+  }
+  .largeoffset10 {
+    margin-left: 83.3333333333333% !important;
+  }
+  .largeoffset11 {
+    margin-left: 91.6666666666667% !important;
+  }
+  .showonsmall {
+    display: none !important;
+  }
+  .hideonsmall {
+    display: inherit !important;
+  }
+  .showonmedium {
+    display: none !important;
+  }
+  .hideonmedium {
+    display: inherit !important;
+  }
+  .showonlarge {
+    display: inherit !important;
+  }
+  .hideonlarge {
+    display: none !important;
+  }
+  .column.largecentered,
+  .columns.largecentered {
+    margin-left: auto;
+    margin-right: auto;
+    float: none;
+  }
+  .column.largeuncentered,
+  .columns.largeuncentered {
+    margin-left: 0;
+    margin-right: 0;
+    float: left !important;
+  }
+}
@@ -1,209 +0,0 @@
-.medium1 {
-  width: 8.3333333333333%;
-}
-.medium2 {
-  width: 16.6666666666667%;
-}
-.medium3 {
-  width: 25%;
-}
-.medium4 {
-  width: 33.3333333333333%;
-}
-.medium5 {
-  width: 41.6666666666667%;
-}
-.medium6 {
-  width: 50%;
-}
-.medium7 {
-  width: 58.3333333333333%;
-}
-.medium8 {
-  width: 66.6666666666667%;
-}
-.medium9 {
-  width: 75%;
-}
-.medium10 {
-  width: 83.3333333333333%;
-}
-.medium11 {
-  width: 91.6666666666667%;
-}
-.medium12 {
-  width: 100%;
-}
-.mediumoffset0 {
-  margin-left: 0% !important;
-}
-.mediumoffset1 {
-  margin-left: 8.3333333333333% !important;
-}
-.mediumoffset2 {
-  margin-left: 16.6666666666667% !important;
-}
-.mediumoffset3 {
-  margin-left: 25% !important;
-}
-.mediumoffset4 {
-  margin-left: 33.3333333333333% !important;
-}
-.mediumoffset5 {
-  margin-left: 41.6666666666667% !important;
-}
-.mediumoffset6 {
-  margin-left: 50% !important;
-}
-.mediumoffset7 {
-  margin-left: 58.3333333333333% !important;
-}
-.mediumoffset8 {
-  margin-left: 66.6666666666667% !important;
-}
-.mediumoffset9 {
-  margin-left: 75% !important;
-}
-.mediumoffset10 {
-  margin-left: 83.3333333333333% !important;
-}
-.mediumoffset11 {
-  margin-left: 91.6666666666667% !important;
-}
-.showonsmall {
-  display: none !important;
-}
-.hideonsmall {
-  display: inherit !important;
-}
-.showonmedium {
-  display: inherit !important;
-}
-.hideonmedium {
-  display: none !important;
-}
-.showonlarge {
-  display: none !important;
-}
-.hideonlarge {
-  display: inherit !important;
-}
-.column.mediumcentered,
-.columns.mediumcentered {
-  margin-left: auto;
-  margin-right: auto;
-  float: none;
-}
-.column.mediumuncentered,
-.columns.mediumuncentered {
-  margin-left: 0;
-  margin-right: 0;
-  float: left !important;
-}
-
-.smallcentered {
-}
-.smalluncentered {
-}
-.largecentered {
-}
-.largeuncentered {
-}
-
-.small1 {
-}
-.small2 {
-}
-.small3 {
-}
-.small4 {
-}
-.small5 {
-}
-.small6 {
-}
-.small7 {
-}
-.small8 {
-}
-.small9 {
-}
-.small10 {
-}
-.small11 {
-}
-.small12 {
-}
-.smalloffset0 {
-}
-.smalloffset1 {
-}
-.smalloffset2 {
-}
-.smalloffset3 {
-}
-.smalloffset4 {
-}
-.smalloffset5 {
-}
-.smalloffset6 {
-}
-.smalloffset7 {
-}
-.smalloffset8 {
-}
-.smalloffset9 {
-}
-.smalloffset10 {
-}
-.smalloffset11 {
-}
-
-.large1 {
-}
-.large2 {
-}
-.large3 {
-}
-.large4 {
-}
-.large5 {
-}
-.large6 {
-}
-.large7 {
-}
-.large8 {
-}
-.large9 {
-}
-.large10 {
-}
-.large11 {
-}
-.large12 {
-}
-.largeoffset0 {
-}
-.largeoffset1 {
-}
-.largeoffset2 {
-}
-.largeoffset3 {
-}
-.largeoffset4 {
-}
-.largeoffset5 {
-}
-.largeoffset6 {
-}
-.largeoffset7 {
-}
-.largeoffset8 {
-}
-.largeoffset9 {
-}
-.largeoffset10 {
-}
-.largeoffset11 {
-}
@@ -40,7 +40,6 @@
 	<set-property name="gwt.logging.enabled" value="TRUE"/> 
 	<set-property name="gwt.logging.logLevel" value="FINE"/>
 	
-	<set-property name="gwt.logging.simpleRemoteHandler" value="ENABLED" />
 	<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
 	<set-property name="gwt.logging.developmentModeHandler" value="DISABLED" />
 	<set-property name="gwt.logging.systemHandler" value="ENABLED" />
@@ -34,7 +34,6 @@
 	<set-property name="gwt.logging.enabled" value="TRUE"/> 
 	<set-property name="gwt.logging.logLevel" value="FINE"/>
 	
-	<set-property name="gwt.logging.simpleRemoteHandler" value="ENABLED" />
 	<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
 	<set-property name="gwt.logging.developmentModeHandler" value="DISABLED" />
 	<set-property name="gwt.logging.systemHandler" value="ENABLED" />
@@ -45,8 +45,6 @@
 	<set-property name="gwt.logging.enabled" value="FALSE" />
 	<!-- Set logging level to INFO -->
 	<set-property name="gwt.logging.logLevel" value="INFO" />
-	<set-property name="gwt.logging.simpleRemoteHandler"
-		value="ENABLED" />
 	<!-- Add compiler.stackMode to get a readable stacktrace from JavaScript 
 		It generates a set of files in WEB-INF/deploy; those files need to be placed 
 		on the server -->
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.media.persistence.test
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
+Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="2.13.0",
 com.sap.sse.mongodb,
 org.json.simple;bundle-version="1.1.0",
 org.hamcrest.core;bundle-version="1.1.0",
@@ -8,6 +8,7 @@ import org.junit.Before;

 import com.mongodb.DB;
 import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
@@ -30,7 +31,7 @@ public abstract class AbstractMongoDBTest {
    }
    
    protected Mongo newMongo() throws UnknownHostException, MongoException {
-        return new Mongo(System.getProperty("mongo.host", "127.0.0.1"), dbConfiguration.getPort());
+        return new MongoClient(System.getProperty("mongo.host", "127.0.0.1"), dbConfiguration.getPort());
    }
    
    @Before
@@ -51,7 +51,7 @@ public class MediaDBTest extends AbstractMongoDBTest {
    
    @Test
    public void testCreateVideoTrackWithId() {
-        final String dbId = new ObjectId().toStringMongod();
+        final String dbId = new ObjectId().toHexString();
        final String videoTitle = "Test Video";
        final String url = "http://localhost:8888/media/HTML5/1809147112001_1842870496001_SAP-Regatta-Day02-Final_libtheora.ogv";
        MediaDB mongoDB = MediaDBFactory.INSTANCE.getMediaDB(getMongoService());
@@ -101,7 +101,7 @@ public class MediaDBTest extends AbstractMongoDBTest {
 //    @Test
 //    public void testImportVideoTrackToEmptyDb() throws Exception {
 //        //insert test object
-//        final String dbId = new ObjectId().toStringMongod();
+//        final String dbId = new ObjectId().toHexString();
 //        final String title = "Test Video";
 //        final String url = "test";
 //        Date date = new Date();
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test
-Bundle-SymbolicName: com.sap.sailing.mongodb.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Fragment-Host: com.sap.sse.mongodb
-Require-Bundle: com.sap.sailing.domain,
- com.sap.sailing.domain.shared.android,
- com.sap.sailing.domain.test,
- com.tractrac.clientmodule;bundle-version="2.0.0",
- com.sap.sailing.domain.tractracadapter,
- com.sap.sailing.domain.persistence,
- com.sap.sailing.server,
- com.sap.sailing.expeditionconnector,
- org.json.simple;bundle-version="1.1.0",
- com.sap.sailing.domain.swisstimingadapter,
- org.objenesis;bundle-version="1.3.0",
- org.junit4;bundle-version="4.8.2",
- org.hamcrest;bundle-version="1.1.0",
- org.mockito.mockito-core;bundle-version="1.9.5",
- com.sap.sailing.polars,
- com.sap.sailing.domain.racelogtrackingadapter.testsupport,
- com.sap.sailing.server.gateway,
- com.sap.sse.common,
- com.sap.sse.operationaltransformation,
- com.sap.sse.replication,
- com.sap.sse,
- com.sap.sse.filestorage
-Import-Package: com.sap.sailing.domain.common,
- com.sap.sailing.domain.common.impl,
- com.sap.sailing.domain.common.racelog,
- com.sap.sailing.domain.common.racelog.tracking
-
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: com.sap.sailing.mongodb.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Fragment-Host: com.sap.sse.mongodb
+Require-Bundle: com.sap.sailing.domain,
+ com.sap.sailing.domain.shared.android,
+ com.sap.sailing.domain.test,
+ com.tractrac.clientmodule;bundle-version="2.0.0",
+ com.sap.sailing.domain.tractracadapter,
+ com.sap.sailing.domain.persistence,
+ com.sap.sailing.server,
+ com.sap.sailing.expeditionconnector,
+ org.json.simple;bundle-version="1.1.0",
+ com.sap.sailing.domain.swisstimingadapter,
+ org.objenesis;bundle-version="1.3.0",
+ org.junit4;bundle-version="4.8.2",
+ org.hamcrest;bundle-version="1.1.0",
+ org.mockito.mockito-core;bundle-version="1.9.5",
+ com.sap.sailing.polars,
+ com.sap.sailing.domain.racelogtrackingadapter.testsupport,
+ com.sap.sailing.server.gateway,
+ com.sap.sse.common,
+ com.sap.sse.operationaltransformation,
+ com.sap.sse.replication,
+ com.sap.sse,
+ com.sap.sse.filestorage
+Import-Package: com.sap.sailing.domain.common,
+ com.sap.sailing.domain.common.impl,
+ com.sap.sailing.domain.common.racelog,
+ com.sap.sailing.domain.common.racelog.tracking
+