diff --git a/java/com.googlecode.mgwt/META-INF/MANIFEST.MF b/java/com.googlecode.mgwt/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index cbad3b64500..8f2067ad1ea --- a/java/com.googlecode.mgwt/META-INF/MANIFEST.MF +++ b/java/com.googlecode.mgwt/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.mongodb.driver/.classpath b/java/com.mongodb.driver/.classpath deleted file mode 100644 index 2813f7273c1..00000000000 --- a/java/com.mongodb.driver/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/java/com.mongodb.driver/.gitignore b/java/com.mongodb.driver/.gitignore deleted file mode 100644 index 44519b5db33..00000000000 --- a/java/com.mongodb.driver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bin/ diff --git a/java/com.mongodb.driver/.project b/java/com.mongodb.driver/.project deleted file mode 100755 index 61eea193841..00000000000 --- a/java/com.mongodb.driver/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - com.mongodb.driver - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/java/com.mongodb.driver/.settings/org.eclipse.jdt.core.prefs b/java/com.mongodb.driver/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a698e59674f..00000000000 --- a/java/com.mongodb.driver/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -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 diff --git a/java/com.mongodb.driver/.settings/org.eclipse.m2e.core.prefs b/java/com.mongodb.driver/.settings/org.eclipse.m2e.core.prefs deleted file mode 100755 index d5b0da240e7..00000000000 --- a/java/com.mongodb.driver/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Jul 29 09:33:56 CEST 2011 -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/java/com.mongodb.driver/.settings/org.eclipse.pde.core.prefs b/java/com.mongodb.driver/.settings/org.eclipse.pde.core.prefs deleted file mode 100755 index c1a415bd7d5..00000000000 --- a/java/com.mongodb.driver/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Jun 08 13:41:06 CEST 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/java/com.mongodb.driver/META-INF/MANIFEST.MF b/java/com.mongodb.driver/META-INF/MANIFEST.MF deleted file mode 100644 index b7992ad8bd7..00000000000 --- a/java/com.mongodb.driver/META-INF/MANIFEST.MF +++ /dev/null @@ -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 diff --git a/java/com.mongodb.driver/build.properties b/java/com.mongodb.driver/build.properties deleted file mode 100755 index 1957d654bdf..00000000000 --- a/java/com.mongodb.driver/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -bin.includes = META-INF/,\ - .,\ - lib/mongo-2.6.2.jar diff --git a/java/com.mongodb.driver/lib/mongo-2.6.2.jar b/java/com.mongodb.driver/lib/mongo-2.6.2.jar deleted file mode 100755 index 3f64a8991bb..00000000000 Binary files a/java/com.mongodb.driver/lib/mongo-2.6.2.jar and /dev/null differ diff --git a/java/com.mongodb.driver/pom.xml b/java/com.mongodb.driver/pom.xml deleted file mode 100644 index 1d905b3f915..00000000000 --- a/java/com.mongodb.driver/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.mongodb.driver - 2.6.2 - eclipse-plugin - diff --git a/java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 59848e02ac8..7bd94febbcb --- a/java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF index 58103f9a1ff..e13bab9db78 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java index 5c7dad552b8..45f79453834 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java @@ -19,7 +19,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { public Iterable getAccessTokens() { List 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())); } diff --git a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF index bfc38039265..daaa255460c 100644 --- a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF index a36a2c2895d..c169680edd6 100644 --- a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index c93c16eca94..d5523dd550d 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -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(), diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 98c9abff2bf..64e3e014fcf 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -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; } diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/impl/MediaDBImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/impl/MediaDBImpl.java index c56a1b970f6..2fbd5ba854c 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/impl/MediaDBImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/media/impl/MediaDBImpl.java @@ -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()); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF index 0fa0ba74d6f..eb7048450f1 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF index ccd9c941566..ab5f50f9c87 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF index a73e519d31c..5133df9643f 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF index 3a9de8a9222..1b6d41de6cb 100644 --- a/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF index faa0eb1a9b0..6431fe5e794 100644 --- a/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF index 8223a8c384f..e327c07a9c4 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java index ed986b6c4e0..fb4d0e33ead 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java @@ -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)) { diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF index 848c68a4fe2..719c89203da 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 1098f1d683c..8f3cd37b203 --- a/java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF index 953265121d1..682a42bbc63 100644 --- a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java index 62b6fc9adc8..179886f4b48 100755 --- a/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java @@ -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)) { diff --git a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 81ee7d0a467..a9856674f3d --- a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF @@ -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 diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java index fb9e7fb803a..7ae14521751 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LowPoint.java @@ -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); + } + } diff --git a/java/com.sap.sailing.feature.p2build/raceanalysis.product b/java/com.sap.sailing.feature.p2build/raceanalysis.product index b6866bd5441..ae006e24870 100755 --- a/java/com.sap.sailing.feature.p2build/raceanalysis.product +++ b/java/com.sap.sailing.feature.p2build/raceanalysis.product @@ -59,7 +59,6 @@ - diff --git a/java/com.sap.sailing.feature/feature.xml b/java/com.sap.sailing.feature/feature.xml index 301eaad9578..00b023d577a 100755 --- a/java/com.sap.sailing.feature/feature.xml +++ b/java/com.sap.sailing.feature/feature.xml @@ -409,6 +409,13 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al version="0.0.0" unpack="false"/> + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/Debug SailingGWT SDM on Chrome.launch b/java/com.sap.sailing.gwt.ui/Debug SailingGWT SDM on Chrome.launch new file mode 100644 index 00000000000..928d304587c --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/Debug SailingGWT SDM on Chrome.launch @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/Forward SailingGWT Ports for Android.launch.template b/java/com.sap.sailing.gwt.ui/Forward SailingGWT Ports for Android.launch.template new file mode 100644 index 00000000000..680251d912a --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/Forward SailingGWT Ports for Android.launch.template @@ -0,0 +1,6 @@ + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 8aee6550dd3..0f82a9aec59 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF @@ -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, diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 74c0ed79c05..b0332ffab3a 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -69,7 +69,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/AutoPlayEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/AutoPlayEntryPoint.java index 7f3edada15b..2fe067ddd87 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/AutoPlayEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/AutoPlayEntryPoint.java @@ -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 { 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 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java index 201075af2f0..fa7328bcd73 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/HomeEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/HomeEntryPoint.java index 8497267eb30..e0aa0674cd7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/HomeEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/HomeEntryPoint.java @@ -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 { 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 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/CompactEventHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/CompactEventHeader.java index d3c74a845c9..957e55051ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/CompactEventHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/CompactEventHeader.java @@ -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)); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.gss similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.gss index 222152e00aa..882411e8673 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.gss @@ -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; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.java index d8bbe253cfb..2541b07cdc6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeader.java @@ -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); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderLarge.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderLarge.css deleted file mode 100644 index 3b8bede771c..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderLarge.css +++ /dev/null @@ -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 {} - diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderResources.java index 1fa43159b65..21bd3c3c77b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/header/EventHeaderResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.gss similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.gss index e9deba83975..21e5c533e21 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverview.gss @@ -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; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverviewResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverviewResources.java index 2dffd7be71e..6f0a09878df 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverviewResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/overview/EventOverviewResources.java @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.gss similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.gss index 3be9d68d82a..68cd8d3e668 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.gss @@ -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; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.java index 5fa910d549c..f35469ef404 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/Regatta.java @@ -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)); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaLarge.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaLarge.css deleted file mode 100644 index 72dd98d48f4..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaLarge.css +++ /dev/null @@ -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 {} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaResources.java index d976e611cf2..805850e25cf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regatta/RegattaResources.java @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.gss similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.gss index 8197a9e24f2..07553abf5ff 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeader.gss @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeaderResources.java index 517a4563c55..f346f4c0e51 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaheader/EventRegattaHeaderResources.java @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.gss similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.gss index cfd3dddf088..965f4828976 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.gss @@ -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; + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.java index 4ffdaab3a65..ba74db48285 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRaces.java @@ -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)); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesMedium.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesMedium.css deleted file mode 100644 index eef89812601..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesMedium.css +++ /dev/null @@ -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 {} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesResources.java index 4e4f4e4e35c..16f7a4157f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesResources.java @@ -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 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.gss similarity index 87% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.gss index 34c5bc4815b..635f294ebfe 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecent.gss @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecentResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecentResources.java index 7886298d3e7..feb782f23d9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecentResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/events/recent/EventsOverviewRecentResources.java @@ -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 { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.gss similarity index 69% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.gss index dac94600d63..1e8ed513bc6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.gss @@ -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; + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.java index 0163cf12a55..4bfa74d0ccb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.java @@ -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)); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterMedium.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterMedium.css deleted file mode 100644 index 9bf1be73265..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterMedium.css +++ /dev/null @@ -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 {} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterResources.java index 4367af2c3e5..adfe48ef546 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/FooterResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.gss similarity index 93% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.gss index befaa556476..bf019bff8d2 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.gss @@ -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; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.java index 82d1104a946..1c4281bf930 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/Header.java @@ -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 }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderLarge.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderLarge.css deleted file mode 100644 index 3a6091ea707..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderLarge.css +++ /dev/null @@ -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 {} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderResources.java index bf80474e882..7f1a8cff0b8 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/header/HeaderResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.gss similarity index 68% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.gss index 712d17087a6..59a1bc73961 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.gss @@ -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; + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.java index 2504b8b6ff7..1c51502d339 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/Solutions.java @@ -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)); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsLarge.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsLarge.css deleted file mode 100644 index b4241f0e940..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsLarge.css +++ /dev/null @@ -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{} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsMedium.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsMedium.css deleted file mode 100644 index 8cbe5257a12..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsMedium.css +++ /dev/null @@ -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{} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsResources.java index cb774a8e237..1911f2b217a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/solutions/SolutionsResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.gss similarity index 69% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.gss index f9f3565787d..fd77deb043b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/Stage.gss @@ -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; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/StageResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/StageResources.java index 4cecaa39601..03a77400a34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/StageResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/stage/StageResources.java @@ -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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java index f4c9f0b8cd2..a779a8b589c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java @@ -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 regattaOverviewURLParameters = new HashMap(); + 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()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java index f39f52a990c..8f31b6c480f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java @@ -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 eventNameColumn = new Column(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 eventLinkParameters = new HashMap(); + eventLinkParameters.put("navigationTab", "Regattas"); + link = EntryPointLinkFactory.createEventLink(eventLinkParameters, event.id.toString()); + } return ANCHORTEMPLATE.cell(link, event.getName()); } }; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EntryPointLinkFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EntryPointLinkFactory.java index 2c92dc65e79..37678ea2e92 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EntryPointLinkFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EntryPointLinkFactory.java @@ -21,6 +21,10 @@ public class EntryPointLinkFactory extends AbstractEntryPointLinkFactory { return createEntryPointLink("/gwt/Home.html#EventPlace:eventId="+eventId, parameters); } + public static String createRegattaOverviewLink(Map parameters) { + return createEntryPointLink("/gwt/RegattaOverview.html", parameters); + } + public static String createDashboardLink(Map parameters) { return createEntryPointLink("/dashboards/RibDashboard.html", parameters); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index 0720861da09..a66c90200b5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -164,8 +164,6 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS List getLeaderboards(); - List getLeaderboardsByRegatta(RegattaDTO regatta); - List getLeaderboardsByEvent(EventDTO event); StrippedLeaderboardDTO updateLeaderboard(String leaderboardName, String newLeaderboardName, String newLeaderboardDisplayName, int[] newDiscardingThreasholds, UUID newCourseAreaId); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index e95502447d5..90c914384a3 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -207,8 +207,6 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM void getLeaderboards(AsyncCallback> callback); - void getLeaderboardsByRegatta(RegattaDTO regatta, AsyncCallback> callback); - void getLeaderboardsByRaceAndRegatta(RaceDTO race, RegattaIdentifier regattaIdentifier, AsyncCallback> callback); @@ -562,9 +560,9 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM void getEventById(UUID id, boolean withStatisticalData, AsyncCallback callback); - void showCachedPolarSheetForBoatClass(String boatClassName, AsyncCallback asyncCallback); + void getLeaderboardsByEvent(EventDTO event, AsyncCallback> callback); void denoteForRaceLogTracking(String leaderboardName, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 8f096309d22..8221cc56afc 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -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); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 281bf885929..0c8ee44f347 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -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 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 1f83398a922..70655e0bdd5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -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} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index 6d65b7754d3..44a8eea37be 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -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} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index bd49b4e15c2..efe9616b827 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -2247,8 +2247,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S return results; } - @Override - public List getLeaderboardsByRegatta(RegattaDTO regatta) { + private List getLeaderboardsByRegatta(RegattaDTO regatta) { List results = new ArrayList(); if (regatta != null && regatta.races != null) { for (RaceDTO race : regatta.races) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/AutoPlay.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/AutoPlay.gwt.xml index bc064044cd2..4dd6d237e48 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/AutoPlay.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/AutoPlay.gwt.xml @@ -55,11 +55,13 @@ - + + + diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml index 4060ce41978..332e969c40a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml @@ -65,7 +65,6 @@ - @@ -74,7 +73,9 @@ - + + + diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/large.css b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/large.css deleted file mode 100755 index d11efc56638..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/large.css +++ /dev/null @@ -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 { -} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.css b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.css rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss index 242cbf5e827..165741b4e90 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.css +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss @@ -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; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.css b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.css deleted file mode 100644 index 598c991e761..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.css +++ /dev/null @@ -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 { -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.gss b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.gss new file mode 100644 index 00000000000..4bc2520fab6 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.gss @@ -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; + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/medium.css b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/medium.css deleted file mode 100755 index 7634ab13486..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/medium.css +++ /dev/null @@ -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 { -} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml index 6646bb8d30d..1e59d1b029d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml @@ -40,7 +40,6 @@ - diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml index 8508911d511..fb8c0741481 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml @@ -34,7 +34,6 @@ - diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml index bf85b508d1a..f753b74b6ad 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml @@ -45,8 +45,6 @@ - diff --git a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF index 4a9952f771c..86266b2b867 100644 --- a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF @@ -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", diff --git a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java index 2b575666043..1e0e90d58ad 100644 --- a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java +++ b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java @@ -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 diff --git a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java index 425bf369413..4c70ea73458 100644 --- a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java +++ b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java @@ -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(); diff --git a/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 9f5043908a8..5fd34711b67 --- a/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF @@ -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 + diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java index 1093cdb29ed..75f10fdbd1a 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java @@ -9,6 +9,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; @@ -31,20 +32,18 @@ public abstract class AbstractMongoDBTest { } protected Mongo newMongo() throws UnknownHostException, MongoException { - return new Mongo(dbConfiguration.getHostName(), dbConfiguration.getPort()); + return new MongoClient(dbConfiguration.getHostName(), dbConfiguration.getPort()); } @Before public void dropTestDB() throws UnknownHostException, MongoException, InterruptedException { assertNotNull(mongo); - db.requestStart(); dropAllCollections(db); assertNotNull(db); } @After public void tearDown() { - db.requestDone(); } private void dropAllCollections(DB theDB) throws InterruptedException { diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java index 41da56eb7bb..a1b3e64e31b 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java @@ -178,7 +178,7 @@ public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest { private static final String OldFormatRaceLogIdentifier = "A%2EA%2EB%2EB%2EC%2EC"; private String createOldFormatRaceLogEventJson(Serializable id) { - return "{ \"_id\" : { \"$oid\" : \""+ new ObjectId().toStringMongod() + "\"} , \"RACE_LOG_IDENTIFIER\" : \"" + OldFormatRaceLogIdentifier + "\" , \"RACE_LOG_EVENT\" : " + return "{ \"_id\" : { \"$oid\" : \""+ new ObjectId().toHexString() + "\"} , \"RACE_LOG_IDENTIFIER\" : \"" + OldFormatRaceLogIdentifier + "\" , \"RACE_LOG_EVENT\" : " + "{ \"TIME_AS_MILLIS\" : 42 , \"RACE_LOG_EVENT_CREATED_AT\" : 1376058090051 , \"RACE_LOG_EVENT_ID\" : { \"$uuid\" : \"" + id.toString() + "\"} , " + "\"RACE_LOG_EVENT_PASS_ID\" : 42 , \"RACE_LOG_EVENT_INVOLVED_BOATS\" : [ ] , \"RACE_LOG_EVENT_CLASS\" : \"RaceLogFlagEvent\" , \"RACE_LOG_EVENT_FLAG_UPPER\" : \"ALPHA\" , " + "\"RACE_LOG_EVENT_FLAG_LOWER\" : \"BRAVO\" , \"RACE_LOG_EVENT_FLAG_DISPLAYED\" : \"true\"}}"; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java index 85dd0f2cc3a..1359256c846 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java @@ -55,7 +55,8 @@ public class TestRaceLogRemovalInRegatta extends AbstractTestStoringAndRetrievin RaceLogStartTimeEvent expectedEventBlue = RaceLogEventFactory.INSTANCE.createStartTimeEvent(now, author, 0, MillisecondsTimePoint.now()); blueLog.add(expectedEventBlue); // these events are now expected to be stored persistently in the race log store - db.getLastError(); // synchronize on DB + //getLastError() is now deprecated - seems to run fine without (at least locally) + //db.getLastError(); // synchronize on DB qualification.removeRaceColumn(raceColumnName); qualification.addRaceColumn(raceColumnName, /* trackedRegattaRegistry */ null /* no re-association with tracked regatta required */); RaceLog yellowLogAfterRecreation = qualification.getRaceColumnByName(raceColumnName).getRaceLog(yellowFleet); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java index 9ba8b08d2a0..befdd06a53e 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java @@ -125,9 +125,11 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD Fleet defaultFleet = leaderboard.getFleet(null); RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); raceColumn.getRaceLog(defaultFleet).add(expectedEvent); - db.getLastError(); // sync DB + //getLastError() is now deprecated - seems to run fine without (at least locally) + //db.getLastError(); // sync DB leaderboard.removeRaceColumn(raceColumnName); - db.getLastError(); // sync DB + //getLastError() is now deprecated - seems to run fine without (at least locally) + //db.getLastError(); // sync DB leaderboard.addRaceColumn(raceColumnName, /* medalRace */false); // now assert that the race log is empty because the column was removed and so should have been the race log RaceLog loadedRaceLog = leaderboard.getRaceColumnByName(raceColumnName).getRaceLog(leaderboard.getRaceColumnByName(raceColumnName).getFleets().iterator().next()); @@ -149,10 +151,12 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD Fleet defaultFleet = leaderboard.getFleet(null); RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); raceColumn.getRaceLog(defaultFleet).add(expectedEvent); - db.getLastError(); // sync DB to ensure event is stored + //getLastError() is now deprecated - seems to run fine without (at least locally) + //db.getLastError(); // sync DB to ensure event is stored final String newColumnName = "New "+raceColumnName; service.renameLeaderboardColumn(leaderboardName, raceColumnName, newColumnName); - db.getLastError(); // sync DB + //getLastError() is now deprecated - seems to run fine without (at least locally) + //db.getLastError(); // sync DB // now assert that the race log still holds the original race log event because the column was only renamed RaceLog renamedRaceLog = leaderboard.getRaceColumnByName(newColumnName).getRaceLog(leaderboard.getRaceColumnByName(newColumnName).getFleets().iterator().next()); renamedRaceLog.lockForRead(); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 5b60e2bf20d..bf8931f5d89 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -14,6 +14,7 @@ import org.junit.Test; import com.mongodb.DB; import com.mongodb.Mongo; +import com.mongodb.MongoClient; import com.mongodb.MongoException; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; @@ -60,7 +61,7 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive } private Mongo newMongo() throws UnknownHostException, MongoException { - return new Mongo(dbConfiguration.getHostName(), + return new MongoClient(dbConfiguration.getHostName(), dbConfiguration.getPort()); } diff --git a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF index 30df672565c..5d967ca8b4f 100644 --- a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0", org.junit4;bundle-version="4.8.2", org.openqa.selenium.osgi;bundle-version="2.40.0", com.sap.sse.mongodb;bundle-version="1.0.0", - 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.sse.common Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar, diff --git a/java/com.sap.sailing.selenium.test/pom.xml b/java/com.sap.sailing.selenium.test/pom.xml index 64e11bbd8b4..b6a347abc8d 100644 --- a/java/com.sap.sailing.selenium.test/pom.xml +++ b/java/com.sap.sailing.selenium.test/pom.xml @@ -88,11 +88,6 @@ 3 true - - com.sap.sse.mail - 4 - true - com.sap.sse.security 3 diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java index a39a6dab073..e138920caad 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java @@ -91,7 +91,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString()); Integer[] expectedPointsForFindelJens = new Integer[] {2, 18, 12, 4, 7}; - Integer[] expectedRankForFindelJens = new Integer[] {3, 9, 11, 7, 6}; + Integer[] expectedRankForFindelJens = new Integer[] {2, 9, 11, 7, 6}; // Bogacki with no score in R1 expected to end up at end of leaderboard // Link the races and check the leaderboard again for (int i = 0; i < 5; i++) { diff --git a/java/com.sap.sailing.server.gateway.ess40/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.ess40/META-INF/MANIFEST.MF index b94ba1f61af..f91c2c01d96 100644 --- a/java/com.sap.sailing.server.gateway.ess40/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.ess40/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sailing.domain.tractracadapter, com.sap.sailing.domain.persistence, com.sap.sse.mongodb, - com.mongodb.driver;bundle-version="2.6.2", + org.mongodb.mongo-java-driver;bundle-version="2.13.0", javax.servlet;bundle-version="2.6.0", com.sap.sailing.domain.common, com.sap.sailing.server.gateway, diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization.shared.android/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF index 32c34e17f71..5a14c4424a4 100644 --- a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF @@ -1,20 +1,20 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Gateway Serialization -Bundle-SymbolicName: com.sap.sailing.server.gateway.serialization -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.json.simple -Require-Bundle: com.sap.sailing.domain.common, - com.sap.sailing.domain.shared.android, - com.sap.sailing.domain, - net.sf.marineapi;bundle-version="0.5.0", - com.sap.sse, - com.sap.sse.common, - com.sap.sailing.server.gateway.serialization.shared.android -Export-Package: com.sap.sailing.server.gateway.deserialization.impl, - com.sap.sailing.server.gateway.serialization.impl, - com.sap.sailing.server.gateway.serialization.racelog.tracking, - com.sap.sailing.server.gateway.serialization.racelog.tracking.impl -Bundle-ActivationPolicy: lazy +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Gateway Serialization +Bundle-SymbolicName: com.sap.sailing.server.gateway.serialization +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: org.json.simple +Require-Bundle: com.sap.sailing.domain.common, + com.sap.sailing.domain.shared.android, + com.sap.sailing.domain, + net.sf.marineapi;bundle-version="0.5.0", + com.sap.sse, + com.sap.sse.common, + com.sap.sailing.server.gateway.serialization.shared.android +Export-Package: com.sap.sailing.server.gateway.deserialization.impl, + com.sap.sailing.server.gateway.serialization.impl, + com.sap.sailing.server.gateway.serialization.racelog.tracking, + com.sap.sailing.server.gateway.serialization.racelog.tracking.impl +Bundle-ActivationPolicy: lazy diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF index 91c6d959b86..41fcf805f1d 100644 --- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF @@ -1,56 +1,56 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Sailing Server Gateway -Bundle-SymbolicName: com.sap.sailing.server.gateway -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.sap.sailing.polars, - com.sap.sailing.polars.regression, - com.sap.sailing.polars.windestimation, - com.sap.sailing.server, - com.sap.sailing.server.operationaltransformation, - javax.ws.rs;version="1.1.1", - javax.ws.rs.core;version="1.1.1", - javax.ws.rs.ext;version="1.1.1", - org.apache.commons.lang, - org.json.simple, - org.json.simple.parser, - org.osgi.framework;version="1.3.0", - org.osgi.util.tracker;version="1.3.1" -Require-Bundle: com.sap.sailing.domain, - com.sap.sailing.expeditionconnector, - com.sap.sailing.declination, - com.sap.sailing.domain.tractracadapter, - com.sap.sailing.domain.persistence, - com.sap.sse.mongodb, - com.mongodb.driver;bundle-version="2.6.2", - javax.servlet;bundle-version="2.6.0", - com.sap.sailing.domain.common, - com.sap.sailing.udpconnector, - org.jdom;bundle-version="1.0.0", - com.sap.sailing.server.gateway.serialization, - com.sap.sailing.domain.shared.android, - com.sap.sailing.server.trackfiles, - org.eclipse.jetty.websocket.api;bundle-version="9.0.4", - org.eclipse.jetty.websocket.server;bundle-version="9.0.4", - org.eclipse.jetty.websocket.servlet;bundle-version="9.0.4", - org.eclipse.jetty.websocket.client;bundle-version="9.0.4", - org.eclipse.jetty.websocket.common;bundle-version="9.0.4", - javax.validation;bundle-version="1.0.0", - com.sun.jersey;bundle-version="1.17.0", - org.objectweb.asm;bundle-version="3.3.1", - org.apache.commons.fileupload;bundle-version="1.2.2", - com.sap.sailing.domain.igtimiadapter, - com.sap.sse.common, - com.sap.sse.replication, - com.sap.sse, - com.sap.sailing.server.gateway.serialization.shared.android, - com.sap.sse.shared.android, - com.sap.sse.filestorage, - com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.1" -Bundle-ClassPath: . -Web-ContextPath: /sailingserver -Export-Package: com.sap.sailing.server.gateway, - com.sap.sailing.server.gateway.jaxrs, - com.sap.sailing.server.gateway.jaxrs.spi +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Sailing Server Gateway +Bundle-SymbolicName: com.sap.sailing.server.gateway +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.sap.sailing.polars, + com.sap.sailing.polars.regression, + com.sap.sailing.polars.windestimation, + com.sap.sailing.server, + com.sap.sailing.server.operationaltransformation, + javax.ws.rs;version="1.1.1", + javax.ws.rs.core;version="1.1.1", + javax.ws.rs.ext;version="1.1.1", + org.apache.commons.lang, + org.json.simple, + org.json.simple.parser, + org.osgi.framework;version="1.3.0", + org.osgi.util.tracker;version="1.3.1" +Require-Bundle: com.sap.sailing.domain, + com.sap.sailing.expeditionconnector, + com.sap.sailing.declination, + com.sap.sailing.domain.tractracadapter, + com.sap.sailing.domain.persistence, + com.sap.sse.mongodb, + org.mongodb.mongo-java-driver;bundle-version="2.13.0", + javax.servlet;bundle-version="2.6.0", + com.sap.sailing.domain.common, + com.sap.sailing.udpconnector, + org.jdom;bundle-version="1.0.0", + com.sap.sailing.server.gateway.serialization, + com.sap.sailing.domain.shared.android, + com.sap.sailing.server.trackfiles, + org.eclipse.jetty.websocket.api;bundle-version="9.0.4", + org.eclipse.jetty.websocket.server;bundle-version="9.0.4", + org.eclipse.jetty.websocket.servlet;bundle-version="9.0.4", + org.eclipse.jetty.websocket.client;bundle-version="9.0.4", + org.eclipse.jetty.websocket.common;bundle-version="9.0.4", + javax.validation;bundle-version="1.0.0", + com.sun.jersey;bundle-version="1.17.0", + org.objectweb.asm;bundle-version="3.3.1", + org.apache.commons.fileupload;bundle-version="1.2.2", + com.sap.sailing.domain.igtimiadapter, + com.sap.sse.common, + com.sap.sse.replication, + com.sap.sse, + com.sap.sailing.server.gateway.serialization.shared.android, + com.sap.sse.shared.android, + com.sap.sse.filestorage, + com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.1" +Bundle-ClassPath: . +Web-ContextPath: /sailingserver +Export-Package: com.sap.sailing.server.gateway, + com.sap.sailing.server.gateway.jaxrs, + com.sap.sailing.server.gateway.jaxrs.spi diff --git a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 87dbe7fb84c..29dcfc7528e --- a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF @@ -1,30 +1,30 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Server Replication Test -Bundle-SymbolicName: com.sap.sailing.server.replication.test -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Fragment-Host: com.sap.sse.replication -Import-Package: com.rabbitmq.client;version="2.8.4" -Require-Bundle: com.sap.sailing.server, - com.sap.sailing.domain.common, - com.sap.sailing.domain, - com.sap.sailing.domain.test, - com.sap.sse.mongodb, - com.mongodb.driver;bundle-version="2.6.2", - com.sap.sailing.domain.persistence, - com.sap.sailing.domain.tractracadapter, - com.tractrac.clientmodule;bundle-version="2.0.0", - com.sap.sailing.expeditionconnector, - com.sap.sailing.domain.swisstimingadapter, - org.json.simple;bundle-version="1.1.0", - org.junit4;bundle-version="4.8.2", - org.hamcrest;bundle-version="1.1.0", - com.sap.sailing.polars, - com.sap.sse.common, - org.mockito.mockito-core;bundle-version="1.9.5", - com.sap.sailing.domain.shared.android, - com.sap.sse.replication.testsupport, - com.sap.sse.filestorage, - com.sap.sse.shared.android +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Server Replication Test +Bundle-SymbolicName: com.sap.sailing.server.replication.test +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Fragment-Host: com.sap.sse.replication +Import-Package: com.rabbitmq.client;version="2.8.4" +Require-Bundle: com.sap.sailing.server, + com.sap.sailing.domain.common, + com.sap.sailing.domain, + com.sap.sailing.domain.test, + com.sap.sse.mongodb, + org.mongodb.mongo-java-driver;bundle-version="2.13.0", + com.sap.sailing.domain.persistence, + com.sap.sailing.domain.tractracadapter, + com.tractrac.clientmodule;bundle-version="2.0.0", + com.sap.sailing.expeditionconnector, + com.sap.sailing.domain.swisstimingadapter, + org.json.simple;bundle-version="1.1.0", + org.junit4;bundle-version="4.8.2", + org.hamcrest;bundle-version="1.1.0", + com.sap.sailing.polars, + com.sap.sse.common, + org.mockito.mockito-core;bundle-version="1.9.5", + com.sap.sailing.domain.shared.android, + com.sap.sse.replication.testsupport, + com.sap.sse.filestorage, + com.sap.sse.shared.android diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java index 522b32f12a4..44d0a431ec4 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java @@ -21,8 +21,6 @@ import com.sap.sailing.domain.common.dto.RegattaCreationParametersDTO; import com.sap.sailing.domain.common.dto.SeriesCreationParametersDTO; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; import com.sap.sailing.domain.leaderboard.impl.LowPoint; -import com.sap.sailing.domain.persistence.MongoObjectFactory; -import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.server.impl.RacingEventServiceImpl; import com.sap.sailing.server.operationaltransformation.AddSpecificRegatta; @@ -39,14 +37,11 @@ public abstract class AbstractLogReplicationTest assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); MediaTrack mediaTrackToImport = new MediaTrack(dbId, "title", "url", MillisecondsTimePoint.now(), @@ -118,7 +118,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTarget_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -146,7 +146,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToExistingOtherTrack_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -155,7 +155,7 @@ public class MasterDataImporterMediaTest { createRacingEventService(existingMediaTrack); - String dbId2 = new ObjectId().toStringMongod(); + String dbId2 = new ObjectId().toHexString(); MediaTrack mediaTrackToImport = new MediaTrack(dbId2, existingMediaTrack.title, existingMediaTrack.url, existingMediaTrack.startTime, existingMediaTrack.duration, mimeType, existingMediaTrack.assignedRaces); mediaTracksToImport.add(mediaTrackToImport); @@ -174,7 +174,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedTitle_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -205,7 +205,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackWithNullTitleToSameTargetWithTitle_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -236,7 +236,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedTitle_NoOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -267,7 +267,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedUrl_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -298,7 +298,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedStarttime_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -329,7 +329,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedDuration_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); @@ -359,7 +359,7 @@ public class MasterDataImporterMediaTest { @Test public void testImportOneTrackToSameTargetWithChangedAssignedRaces_WithOverride() throws Exception { - String dbId = new ObjectId().toStringMongod(); + String dbId = new ObjectId().toHexString(); MimeType mimeType = MimeType.mp3; Set assignedRaces = new HashSet(); assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index d3afc5356a4..bbccc27371c 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -298,7 +298,6 @@ public class MasterDataImportTest { inputStream = new ByteArrayInputStream(os.toByteArray()); MasterDataImporter importer = new MasterDataImporter(domainFactory, destService); importer.importFromStream(inputStream, randomUUID, false); - db.getLastError(); // make sure the write has finished before reads are used } finally { os.close(); inputStream.close(); diff --git a/java/com.sap.sailing.server/META-INF/MANIFEST.MF b/java/com.sap.sailing.server/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 77586cd9435..592e424d212 --- a/java/com.sap.sailing.server/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server/META-INF/MANIFEST.MF @@ -1,47 +1,47 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Sailing Server -Bundle-SymbolicName: com.sap.sailing.server -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.sap.sailing.server.impl.Activator -Bundle-Vendor: SAP -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.sap.sailing.polars, - com.sap.sailing.polars.factory, - com.sap.sailing.server.gateway.deserialization, - org.json.simple, - org.json.simple.parser, - org.osgi.framework;version="1.3.0", - org.osgi.util.tracker;version="1.3.1" -Bundle-ActivationPolicy: lazy -Require-Bundle: com.sap.sailing.domain, - com.sap.sailing.expeditionconnector, - com.sap.sailing.declination, - com.sap.sse.mongodb, - com.mongodb.driver;bundle-version="2.6.2", - com.sap.sailing.domain.persistence, - com.sap.sailing.domain.common, - com.sap.sailing.udpconnector, - com.sap.sailing.domain.shared.android, - com.sap.sailing.server.gateway.serialization, - com.sap.sailing.polars, - com.sap.sse.common, - com.sap.sse.operationaltransformation, - com.sap.sse.replication, - com.sap.sse, - com.sap.sailing.server.gateway.serialization.shared.android, - com.sap.sse.shared.android, - com.sap.sse.filestorage -Bundle-ClassPath: . -Export-Package: com.sap.sailing.server, - com.sap.sailing.server.impl; - x-friends:="com.sap.sailing.mongodb.test, - com.sap.sailing.server.test, - com.sap.sailing.server.gateway.test, - com.sap.sailing.domain.swisstimingadapter.test, - com.sap.sailing.gwt.ui.test, - com.sap.sailing.server.replication.test, - com.sap.sailing.domain.racelogtrackingadapter.test", - com.sap.sailing.server.masterdata, - com.sap.sailing.server.operationaltransformation - +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Sailing Server +Bundle-SymbolicName: com.sap.sailing.server +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: com.sap.sailing.server.impl.Activator +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Import-Package: com.sap.sailing.polars, + com.sap.sailing.polars.factory, + com.sap.sailing.server.gateway.deserialization, + org.json.simple, + org.json.simple.parser, + org.osgi.framework;version="1.3.0", + org.osgi.util.tracker;version="1.3.1" +Bundle-ActivationPolicy: lazy +Require-Bundle: com.sap.sailing.domain, + com.sap.sailing.expeditionconnector, + com.sap.sailing.declination, + com.sap.sse.mongodb, + org.mongodb.mongo-java-driver;bundle-version="2.13.0", + com.sap.sailing.domain.persistence, + com.sap.sailing.domain.common, + com.sap.sailing.udpconnector, + com.sap.sailing.domain.shared.android, + com.sap.sailing.server.gateway.serialization, + com.sap.sailing.polars, + com.sap.sse.common, + com.sap.sse.operationaltransformation, + com.sap.sse.replication, + com.sap.sse, + com.sap.sailing.server.gateway.serialization.shared.android, + com.sap.sse.shared.android, + com.sap.sse.filestorage +Bundle-ClassPath: . +Export-Package: com.sap.sailing.server, + com.sap.sailing.server.impl; + x-friends:="com.sap.sailing.mongodb.test, + com.sap.sailing.server.test, + com.sap.sailing.server.gateway.test, + com.sap.sailing.domain.swisstimingadapter.test, + com.sap.sailing.gwt.ui.test, + com.sap.sailing.server.replication.test, + com.sap.sailing.domain.racelogtrackingadapter.test", + com.sap.sailing.server.masterdata, + com.sap.sailing.server.operationaltransformation + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch index b26b6f9bb1a..8ebe22907c2 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch @@ -34,5 +34,5 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch index 77e494a85c3..5daca9029a3 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch @@ -33,5 +33,5 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch index d930d8863f2..47e189fd705 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch @@ -27,6 +27,6 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch index b1bf39016a2..5cdd0a51e6d 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch @@ -16,7 +16,7 @@ - + @@ -27,6 +27,6 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch index dffcfa6a813..c33a2b9512e 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch @@ -1,31 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch index 138ec9b55d8..b29f8efd126 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch @@ -15,7 +15,7 @@ - + @@ -26,5 +26,5 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch index 3840425304c..7154fe55d29 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch index bc6d8443af3..acb8f4f7ae4 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch @@ -34,6 +34,6 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch index 7a6ef7430b1..fe9ffeda563 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch @@ -27,6 +27,6 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch index cb2904874cb..187ee5a685a 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch @@ -16,7 +16,7 @@ - + @@ -26,5 +26,5 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch b/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch index 24ba2ffa54e..02ecc596ff9 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch @@ -26,5 +26,5 @@ - + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch index 2f1261d6a1c..43cc42e85e6 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml index 08bcf8e68eb..a960807da65 100755 --- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml +++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml @@ -130,6 +130,7 @@ install-size="0" version="1.17.1" unpack="false"/> + + + + + + + + + + + diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar new file mode 100644 index 00000000000..6555bbd36f0 Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/mongo-java-driver-2.13.0.jar differ diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/README b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/README index 8cb44f1d018..3ec8626ccc3 100644 --- a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/README +++ b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/README @@ -1 +1,3 @@ -bundles (already OSGi-ified) copied from http://repo1.maven.org/maven2/com/fasterxml/jackson/ +2.5.0 bundles (already OSGi-ified) copied from http://repo1.maven.org/maven2/com/fasterxml/jackson/ + +jackon 1.9.13 bundles and jettison-1.3.7 are optional [transitive] depedencies of the newer jackson bundles and com.sun.jersey \ No newline at end of file diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-core-lgpl-1.9.13.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-core-lgpl-1.9.13.jar new file mode 100644 index 00000000000..df84945d9a4 Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-core-lgpl-1.9.13.jar differ diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-jaxrs-1.9.13.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-jaxrs-1.9.13.jar new file mode 100644 index 00000000000..b85f45cf407 Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-jaxrs-1.9.13.jar differ diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-mapper-lgpl-1.9.13.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-mapper-lgpl-1.9.13.jar new file mode 100644 index 00000000000..208e92d7d7b Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jackson-mapper-lgpl-1.9.13.jar differ diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jettison-1.3.7.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jettison-1.3.7.jar new file mode 100644 index 00000000000..56e2b019a73 Binary files /dev/null and b/java/com.sap.sailing.targetplatform.base/plugins/target-jackson/jettison-1.3.7.jar differ diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target index 946492ff276..fc3bc7a06be 100755 --- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target +++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target @@ -1,5 +1,5 @@ - + @@ -71,6 +71,10 @@ + + + + @@ -220,6 +224,7 @@ + diff --git a/java/com.sap.sailing.www/WEB-INF/web.xml b/java/com.sap.sailing.www/WEB-INF/web.xml index 219cfd64e31..340b9e60850 100644 --- a/java/com.sap.sailing.www/WEB-INF/web.xml +++ b/java/com.sap.sailing.www/WEB-INF/web.xml @@ -1,6 +1,17 @@ - - - + + + + + default + org.eclipse.jetty.servlet.DefaultServlet + + + useFileMappedBuffer + false + + + + diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html index 6b7b052c738..498e6866eeb 100644 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -25,6 +25,14 @@

Release Notes - Administration Console

+

February 2015

+
    +
  • The Event panel now links the event name to the event page in the new design. The old "RegattaOverview" + link is now shown in the panel below, shown when selecting the event in the table above, called + "Event Overview." +
  • +
+

December 2014

  • We added user management. The /gwt/AdminConsole.html entry point for a fresh server set-up uses diff --git a/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF index 98d70b203e1..1d11bdf45a4 100644 --- a/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.xrr.resultimport.test/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Test -Bundle-SymbolicName: com.sap.sailing.xrr.resultimport.test -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Fragment-Host: com.sap.sailing.xrr.resultimport -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit4;bundle-version="4.8.2", - com.sap.sse.common -Export-Package: com.sap.sailing.xrr.resultimport.test +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Test +Bundle-SymbolicName: com.sap.sailing.xrr.resultimport.test +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Fragment-Host: com.sap.sailing.xrr.resultimport +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.junit4;bundle-version="4.8.2", + com.sap.sse.common +Export-Package: com.sap.sailing.xrr.resultimport.test Import-Package: com.sap.sailing.xrr.schema diff --git a/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF index 490f8570201..58883e77295 100644 --- a/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Resultimport -Bundle-SymbolicName: com.sap.sailing.xrr.resultimport -Bundle-Version: 1.0.0.qualifier -Bundle-Vendor: SAP -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: com.sap.sailing.xrr.resultimport, - com.sap.sailing.xrr.resultimport.impl -Import-Package: com.google.gwt.json.client, - com.sap.sailing.server, - com.sap.sailing.server.impl, - com.sap.sailing.server.operationaltransformation, - com.sap.sailing.xrr.schema, - org.json.simple, - org.json.simple.parser, - org.osgi.framework;version="1.6.0" -Require-Bundle: com.sap.sailing.domain, - com.sap.sailing.domain.common, - com.sap.sailing.resultimport, - com.sap.sse.common +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Resultimport +Bundle-SymbolicName: com.sap.sailing.xrr.resultimport +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Export-Package: com.sap.sailing.xrr.resultimport, + com.sap.sailing.xrr.resultimport.impl +Import-Package: com.google.gwt.json.client, + com.sap.sailing.server, + com.sap.sailing.server.impl, + com.sap.sailing.server.operationaltransformation, + com.sap.sailing.xrr.schema, + org.json.simple, + org.json.simple.parser, + org.osgi.framework;version="1.6.0" +Require-Bundle: com.sap.sailing.domain, + com.sap.sailing.domain.common, + com.sap.sailing.resultimport, + com.sap.sse.common Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator diff --git a/java/com.sap.sailing.xrr.schema/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.schema/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index f2d8afce059..4df238efad2 --- a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Require-Bundle: org.apache.servicemix.bundles.aws-java-sdk;bundle-version="1.9.8 org.apache.commons.logging;bundle-version="1.1.3", com.sap.sse.common, com.sap.sse.mongodb, - com.mongodb.driver;bundle-version="2.6.2", com.sap.sse.replication, com.sap.sse.operationaltransformation, com.sap.sse, - org.apache.commons.io + org.apache.commons.io, + org.mongodb.mongo-java-driver;bundle-version="2.13.0" diff --git a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java index c38bc6a19e6..9e0988cb7d9 100644 --- a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java +++ b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java @@ -25,7 +25,7 @@ public class MongoFileStorageServicePropertyStoreImpl implements FileStorageServ propertiesCollection = dbService.getDB().getCollection(PROPERTIES_COLLECTION_NAME); DBObject index = new BasicDBObjectBuilder().add(FieldNames.SERVICE_NAME.name(), true) .add(FieldNames.PROPERTY_NAME.name(), true).get(); - propertiesCollection.ensureIndex(index, "unique service name/property name combination", true); + propertiesCollection.createIndex(index, "unique service name/property name combination", true); activeServiceCollection = dbService.getDB().getCollection(ACTIVE_SERVICE_COLLECTION_NAME); } diff --git a/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt.adminconsole/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF index d12bd5a9f90..194578782aa 100644 --- a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: com.sap.sse.mongodb Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: com.mongodb.driver;bundle-version="2.6.2", - com.sap.sse.common +Require-Bundle: com.sap.sse.common, + org.mongodb.mongo-java-driver;bundle-version="2.13.0" Export-Package: com.sap.sse.mongodb Bundle-ActivationPolicy: lazy Import-Package: com.sap.sailing.util, diff --git a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java index 12bfb61bd23..1c007c60580 100644 --- a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java +++ b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java @@ -8,6 +8,7 @@ import java.util.logging.Logger; import com.mongodb.DB; import com.mongodb.Mongo; +import com.mongodb.MongoClient; import com.sap.sse.mongodb.AlreadyRegisteredException; import com.sap.sse.mongodb.MongoDBConfiguration; import com.sap.sse.mongodb.MongoDBService; @@ -65,7 +66,7 @@ public class MongoDBServiceImpl implements MongoDBService { if (db == null) { Mongo mongo = mongos.get(key); if (mongo == null) { - mongo = new Mongo(mongoDBConfiguration.getHostName(), mongoDBConfiguration.getPort()); + mongo = new MongoClient(mongoDBConfiguration.getHostName(), mongoDBConfiguration.getPort()); mongos.put(key, mongo); } db = mongo.getDB(mongoDBConfiguration.getDatabaseName()); diff --git a/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sse.security.common/META-INF/MANIFEST.MF b/java/com.sap.sse.security.common/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 15b1ae22c52..8945be6f73c --- a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit4;bundle-version="4.8.2", com.sap.sse.security.userstore.mongodb, com.sap.sse.mongodb, - com.mongodb.driver, com.rabbitmq.client, + org.mongodb.mongo-java-driver;bundle-version="2.13.0", com.sap.sse.replication.testsupport, com.sap.sse.replication.testsupport diff --git a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java index 54d7628f87f..14eccc103aa 100755 --- a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java +++ b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java @@ -7,13 +7,10 @@ import com.sap.sse.mongodb.MongoDBService; import com.sap.sse.replication.testsupport.AbstractServerReplicationTest; import com.sap.sse.security.SecurityService; import com.sap.sse.security.impl.SecurityServiceImpl; -import com.sap.sse.security.userstore.mongodb.MongoObjectFactory; -import com.sap.sse.security.userstore.mongodb.PersistenceFactory; import com.sap.sse.security.userstore.mongodb.UserStoreImpl; public abstract class AbstractSecurityReplicationTest extends AbstractServerReplicationTest { private MongoDBService mongoDBService; - private MongoObjectFactory mongoObjectFactory; @Override protected void persistenceSetUp(boolean dropDB) { @@ -21,8 +18,6 @@ public abstract class AbstractSecurityReplicationTest extends AbstractServerRepl if (dropDB) { mongoDBService.getDB().dropDatabase(); } - mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(mongoDBService); - mongoObjectFactory.getDatabase().requestStart(); } @Override @@ -36,9 +31,4 @@ public abstract class AbstractSecurityReplicationTest extends AbstractServerRepl protected SecurityServiceImpl createNewReplica() { return new SecurityServiceImpl(new UserStoreImpl()); } - - @Override - protected void persistenceTearDown() { - mongoObjectFactory.getDatabase().requestDone(); - } } diff --git a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF index 1247c3ec236..bfc2d1b32f4 100644 --- a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Fragment-Host: com.sap.sse.security Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit4;bundle-version="4.8.2", com.sap.sse.security.userstore.mongodb, - com.mongodb.driver, + org.mongodb.mongo-java-driver;bundle-version="2.13.0", com.sap.sse.mongodb, com.sap.sse.mail diff --git a/java/com.sap.sse.security.ui/Security UI sdm.launch b/java/com.sap.sse.security.ui/Security UI sdm.launch old mode 100755 new mode 100644 index 4655b59b08e..c74715a12d6 --- a/java/com.sap.sse.security.ui/Security UI sdm.launch +++ b/java/com.sap.sse.security.ui/Security UI sdm.launch @@ -1,49 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sse.security.ui/WEB-INF/web.xml b/java/com.sap.sse.security.ui/WEB-INF/web.xml index 12e77ad4efc..6a4bf7d0912 100644 --- a/java/com.sap.sse.security.ui/WEB-INF/web.xml +++ b/java/com.sap.sse.security.ui/WEB-INF/web.xml @@ -3,6 +3,16 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> + + + default + org.eclipse.jetty.servlet.DefaultServlet + + + useFileMappedBuffer + false + + diff --git a/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF index 142723bcd75..12b89a6475f 100644 --- a/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Import-Package: org.osgi.framework;version="1.3.0" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Require-Bundle: com.sap.sse.security, - com.mongodb.driver;bundle-version="2.6.2", + org.mongodb.mongo-java-driver;bundle-version="2.13.0", org.apache.shiro.core;bundle-version="1.2.2", com.sap.sse.mongodb, com.sap.sse.common, diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java index 53e1fadb6d8..fe9e9ef3feb 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java @@ -33,7 +33,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storeUser(User user) { DBCollection usersCollection = db.getCollection(CollectionNames.USERS.name()); - usersCollection.ensureIndex(FieldNames.User.NAME.name()); + usersCollection.createIndex(new BasicDBObject(FieldNames.User.NAME.name(), null)); DBObject dbUser = new BasicDBObject(); DBObject query = new BasicDBObject(FieldNames.User.NAME.name(), user.getName()); dbUser.put(FieldNames.User.NAME.name(), user.getName()); @@ -84,7 +84,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storeSettings(Map settings) { DBCollection settingCollection = db.getCollection(CollectionNames.SETTINGS.name()); - settingCollection.ensureIndex(FieldNames.Settings.NAME.name()); + settingCollection.createIndex(new BasicDBObject(FieldNames.Settings.NAME.name(), null)); DBObject dbSettings = new BasicDBObject(); DBObject query = new BasicDBObject(FieldNames.Settings.NAME.name(), FieldNames.Settings.VALUES.name()); dbSettings.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.VALUES.name()); @@ -96,7 +96,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storePreferences(String username, Map userMap) { DBCollection settingCollection = db.getCollection(CollectionNames.PREFERENCES.name()); - settingCollection.ensureIndex(FieldNames.Preferences.USERNAME.name()); + settingCollection.createIndex(new BasicDBObject(FieldNames.Preferences.USERNAME.name(), null)); BasicDBList dbSettings = new BasicDBList(); for (Entry e : userMap.entrySet()) { DBObject entry = new BasicDBObject(); @@ -113,7 +113,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storeSettingTypes(Map> settingTypes) { DBCollection settingCollection = db.getCollection(CollectionNames.SETTINGS.name()); - settingCollection.ensureIndex(FieldNames.Settings.NAME.name()); + settingCollection.createIndex(new BasicDBObject(FieldNames.Settings.NAME.name(), null)); DBObject dbSettingTypes = new BasicDBObject(); DBObject query = new BasicDBObject(FieldNames.Settings.NAME.name(), FieldNames.Settings.TYPES.name()); dbSettingTypes.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.TYPES.name()); diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF index e8ca35e3510..d7c272be079 100644 --- a/java/com.sap.sse.security/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Import-Package: com.sap.sse.util, javax.ws.rs;version="1.1.1", javax.ws.rs.core;version="1.1.1", javax.ws.rs.ext;version="1.1.1", + org.codehaus.jackson.jaxrs;version="1.9.13", org.osgi.framework;version="1.3.0", org.osgi.util.tracker;version="1.5.1" Bundle-ActivationPolicy: lazy diff --git a/java/com.sap.sse.shared.android/META-INF/MANIFEST.MF b/java/com.sap.sse.shared.android/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/com.sap.sse/META-INF/MANIFEST.MF b/java/com.sap.sse/META-INF/MANIFEST.MF old mode 100755 new mode 100644 diff --git a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF old mode 100755 new mode 100644 index 7a4966d0521..f4258435c9b --- a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF +++ b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Moxie Apps GWT Highcharts -Bundle-SymbolicName: org.moxieapps.gwt.highcharts -Bundle-Version: 1.6.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.moxieapps.gwt.highcharts.client.plotOptions;uses:="o - rg.moxieapps.gwt.highcharts.client,com.google.gwt.json.client,org.moxie - apps.gwt.highcharts.client.events,org.moxieapps.gwt.highcharts.client.l - abels";version="1.5.0",org.moxieapps.gwt.highcharts;version="1.5.0",org - .moxieapps.gwt.highcharts.client;uses:="com.google.gwt.core.client,com. - google.gwt.dom.client,com.google.gwt.json.client,org.moxieapps.gwt.high - charts.client.plotOptions,com.google.gwt.user.client,org.moxieapps.gwt. - highcharts.client.events,org.moxieapps.gwt.highcharts.client.labels,com - .google.gwt.user.client.ui";version="1.5.0",org.moxieapps.gwt.highchart - s.client.events;uses:="com.google.gwt.core.client,com.google.gwt.dom.cl - ient,org.moxieapps.gwt.highcharts.client";version="1.5.0",org.moxieapps - .gwt.highcharts.client.labels;uses:="com.google.gwt.core.client,org.mox - ieapps.gwt.highcharts.client,com.google.gwt.json.client";version="1.5.0 - " -Bundle-ActivationPolicy: lazy -Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0" +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Moxie Apps GWT Highcharts +Bundle-SymbolicName: org.moxieapps.gwt.highcharts +Bundle-Version: 1.6.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.moxieapps.gwt.highcharts.client.plotOptions;uses:="o + rg.moxieapps.gwt.highcharts.client,com.google.gwt.json.client,org.moxie + apps.gwt.highcharts.client.events,org.moxieapps.gwt.highcharts.client.l + abels";version="1.5.0",org.moxieapps.gwt.highcharts;version="1.5.0",org + .moxieapps.gwt.highcharts.client;uses:="com.google.gwt.core.client,com. + google.gwt.dom.client,com.google.gwt.json.client,org.moxieapps.gwt.high + charts.client.plotOptions,com.google.gwt.user.client,org.moxieapps.gwt. + highcharts.client.events,org.moxieapps.gwt.highcharts.client.labels,com + .google.gwt.user.client.ui";version="1.5.0",org.moxieapps.gwt.highchart + s.client.events;uses:="com.google.gwt.core.client,com.google.gwt.dom.cl + ient,org.moxieapps.gwt.highcharts.client";version="1.5.0",org.moxieapps + .gwt.highcharts.client.labels;uses:="com.google.gwt.core.client,org.mox + ieapps.gwt.highcharts.client,com.google.gwt.json.client";version="1.5.0 + " +Bundle-ActivationPolicy: lazy +Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0" diff --git a/java/pom.xml b/java/pom.xml index 6a147f8817c..d3fbc338c41 100755 --- a/java/pom.xml +++ b/java/pom.xml @@ -60,7 +60,6 @@ com.google.gwt.osgi com.tractrac.clientmodule org.json.simple - com.mongodb.driver com.googlecode.java-diff-utils com.googlecode.mgwt com.sap.sailing.dashboards.gwt diff --git a/wiki/extreme-sailing-series.md b/wiki/extreme-sailing-series.md index 039e9b61d79..8bfaadbb665 100644 --- a/wiki/extreme-sailing-series.md +++ b/wiki/extreme-sailing-series.md @@ -91,6 +91,18 @@ The setup for such an event usually consists of the following departments: * Sunset & Vine APP (TV) * Sarah Greene (Manager) +## Team Contact Information + +
    +The Wave	Rob Wilson	rob@robwilsonsailing.com
    +Team Russia	Alberto Barovier	abarovier@gmail.com
    +Red Bull	Nick Blackman	njblackman@gmail.com
    +SAP	Michael Hestbek	michael.hestbek@sapextremesailing.com
    +Oman Air	Rob Wilson	rob@robwilsonsailing.com
    +GAC Pindar	Tyson Lamond	tysonlamond@me.com
    +Team Turx	Edhem Dirvana	edhemdirvana@gmail.com
    +
    + ## Technical Architecture The technical infrastructure can be divided into two major parts. @@ -492,20 +504,18 @@ There is a web interface that is configued in `/etc/httpd/conf.d/squid.conf` tha * (Caching) squidclient -h 192.168.1.202 cache_object://localhost/ mgr:info * (Caching) http://192.168.1.202/Squid/cgi-bin/cachemgr.cgi?host=localhost&port=3128&user_name=&operation=counters&auth= -### Competitor colors for 2014 +### Competitor colors for 2015
    -#33CC33 Groupama
    -#FF0000 Alinghi
    -#2AFFFF GAC
    -#000010 ETNZ
    -#FFFFFF Gazprom
    -#999999 JP Morgan
    -#FFC61E SAP
    -#B07A00 Oman Air
    -#000099 Realteam
    -#990099 Red Bull
    -#16A6ED The Wave
    +The Wave #16A6ED
    +Oman Air #B07A00
    +Gazprom Team Russia #FFFFFF
    +Lino Sonego Team Italia #000099
    +SAP Extreme Sailing Team #FFC61E
    +Invite #FFFF00
    +Beko Team Turx #FF0000
    +GAC Pindar #2AFFFF
    +Red Bull Sailing Team #990099
     
    ### Opening replication channel for Sailing Analytics server diff --git a/wiki/super-dev-mode.md b/wiki/super-dev-mode.md index ad820f320e9..324705d600b 100644 --- a/wiki/super-dev-mode.md +++ b/wiki/super-dev-mode.md @@ -19,6 +19,8 @@ You can add "GWT.debugger();" statements to your Java code. This will force the JavaScript debugger to stop at this statement. So you don't have to manually open the file in the dev tools and set a break point. +In addition, there's a composite launch configuration "SailingGWT All SDM.launch" that will start SDM for the SailingGWT modules as well as the Security UI modules. + ## Using Eclipse debugger for GWT SuperDevMode Debugging Java Code in the browser is very inconvenient (e.g. you have to manually open the files you already opened in Eclipse). @@ -29,16 +31,12 @@ Using Using Eclipse debugger for GWT SuperDevMode [[SDBG|http://sdbg.github.io/] To start SDM debugging in Eclipse, do the following: * Start the backend as you would always do. -* Start GWT Super Dev Mode by launching "SailingGWT sdm.launch". +* Start GWT Super Dev Mode by launching "SailingGWT sdm.launch" or "SailingGWT All SDM.launch". * Do not Click on the URLs provided in "Development view"! -* Copy one of the URLs instead -* Go to Run -> Run Configurations ... -* Create a new configuration of type "Launch Chrome" -* Paste the URL and select the UI project you launched SDM for -* Save and run => A new instance of Chrome is started and you will see a debug session running in Eclipse +* Run "Debug SailingGWT SDM on Chrome.launch" +* A new instance of Chrome is started and you will see a debug session running in Eclipse * Your Eclipse break points will now work in the running debug session. - -The created and save run configuration can be used for subsequent launches. +* You are free to change the URL or navigate to other pages in the automatically openend browser window (debugging will go on) ### Noteworthy information & Troubleshooting @@ -57,3 +55,56 @@ Be aware that some of the Eclipse debugger features do NOT work with this kind o * Variable naming is not 1:1 what you expect in the Java world * Stacks look different but clicking on Stack elements should * [[Stack Traces logged in Chrome do not use source maps|https://code.google.com/p/chromium/issues/detail?id=357958]], so you see the JavaScript Stack Trace instead. + +## Debugging SDM on Android devices + +### Requirements + +To enable [[https://developer.chrome.com/devtools/docs/remote-debugging|remote debugging for your Android device]] do the following steps: + +* Go to the System settings +* If you do not see the "Developer options" menu, go to "About the device" and tap multiple times on "Build number" until a message appears +* Go to the "Developer options" menu +* Activate "USB debugging" +* A notification apears in the system notification center while USB-debugging is turned on + +Other requirements: + +* You need Android 4.0+ to make remote debugging work +* You need a recent version of Chrome installed on both, the Android device and your development system + +To be able to discover your Chrome browser running on the Android device from your development system you need to do the following: + +* Connect your device with USB-debugging turned on to your development system +* Open Chrome on the Android device + +### Debugging via Desktop Chrome + +Do the following to start a debugging session via Chrome installed on your development system: + +* Open Chrome on your development system and navigate to [[chrome://inspect/#devices]] +* Only the first time you need to configure the needed ports: + * Check "Discover USB Devices + * Click the button "Port forwarding ..." + * Add an Entry for Port "8888" for address "localhost:8888" + * Add an Entry for Port "9876" for address "localhost:9876" + * Close the dialog +* Enter the URL (e.g. [[http://localhost:8888/gwt/Home.html]]) nearby the connected Chrome browser of your device and press open +* The specified URL will be opended in a new tab on your android device +* A new window with an instance of the developer tools will appear on the development system + * If it doesn't open automatically press "inspect" for the browser tab +* You can now go to "Sources" and debug the source-mapped JS source as it is a local browser tab + +### Debugging via SDBG + +To debug SDM on your Android Chrome via SDBG do the following: + +* Get to know your Device ID + * Navigate to [[chrome://inspect/#devices]] using your desktop Chrome while the device is connected with USB-Debugging turned on + * The Device ID is shown next to the device name + * Take the Device ID without the prefixed "#" +* Copy the launch configuration templates "Debug SailingGWT SDM on Android.launch.template" and "Forward SailingGWT Ports for Android.launch.template" as *.launch files +* Replace with your concrete Device ID +* Launch "Forward SailingGWT Ports for Android.launch" +* Launch "Debug SailingGWT SDM on Android.launch" +* You should now be able to debug in Eclipse as described above