Axel Uhl
772fc78172
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java
2014-05-30 14:30:46 +02:00
Axel Uhl
0d0ae3f060
added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format
2014-05-30 10:59:39 +02:00
Axel Uhl
5c2fc3b888
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
Fredrik Teschke
bf31f4c1ea
Merge branch 'master' into gpsfixstore-independent-of-race
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-04-07 23:35:57 +02:00
Fredrik Teschke
5270eb7426
used fresh versions of launch configs from master, as launch order was messed up
2014-04-07 18:32:50 +02:00
Fredrik Teschke
821f1307bf
Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceCourseManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-03-28 18:34:58 +01:00
Axel Uhl
e959d76417
Merge branch 'master' into tracapi
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/pom.xml
2014-03-27 14:37:41 +01:00
Axel Uhl
b78eaa095d
re-added manage2sail bundle to launch configs
2014-03-22 15:50:12 +01:00
Axel Uhl
e978666d6d
Merge branch 'master' into swisstiming-2.0
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-03-22 15:46:26 +01:00
fmittag
61b5bbe2be
added new bundle com.sap.sailing.manage2sail to have a place for common manage2sail related code
2014-03-19 17:43:36 +01:00
fmittag
c902ddeea3
Merge remote-tracking branch 'origin/dataMining' into sse_gwt_refactoring
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
2014-03-18 14:29:55 +01:00
Lennart Hensler
42569d1b07
Merge remote-tracking branch 'origin/master' into dataMining
...
Conflicts:
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-17 22:25:39 +01:00
Axel Uhl
6af2162d82
fixed NPE in GPS Lag column
2014-03-17 17:52:44 +01:00
Lennart Hensler
a6dbf58d7e
Merge remote-tracking branch 'origin/master' into dataMining
...
Conflicts:
java/com.sap.sailing.datamining.shared/META-INF/MANIFEST.MF
java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
java/com.sap.sailing.datamining/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-15 08:18:56 +01:00
D049941
b27d364ac0
Launch configurations fixed
2014-03-14 15:52:37 +01:00
fmittag
c68a058a2c
Merge remote-tracking branch 'origin/master' into gwt26
2014-03-03 14:55:51 +01:00
fmittag
8d309ddf91
Upgrade to gwt 2.6
...
- added gwt version 2.6 jars
- added org.apache.commons.lang to all target platforms
- upgraded gwt-maven plugin to 2.6
2014-03-03 12:12:25 +01:00
Lennart Hensler
66d008630f
Merge remote-tracking branch 'origin/master' into dataMining
2014-03-01 17:50:51 +01:00
Axel Uhl
ac9e4b9a79
remove RaceBoard ViewMode enum which only had one literal left
2014-02-27 16:42:30 +01:00
Lennart Hensler
c5b562032b
Fixed Server launch config with proxy
2014-02-21 16:31:42 +01:00
Axel Uhl
97a1fc5d92
first working TracAPI-based tracking
2014-02-13 12:30:52 +01:00
Fredrik Teschke
5c714e5a31
restructured race log tracking: moved to racelogtrackingadapter bundles, renamed packages, moved some interfaces
2014-02-10 16:42:36 +01:00
Lennart Hensler
33ce9f5ec0
Extracted a DataMiningService from the SailingService
2014-02-05 17:46:06 +01:00
Fredrik Teschke
0879ca7600
added DeviceTypeIdentifier and related files from cmd-android-tracking branch
2014-01-28 18:12:21 +01:00
Axel Uhl
b56ce06a18
fixed launch config regarding gwt sse bundle
2014-01-20 14:39:45 +01:00
Lennart Hensler
0005562ae4
Extracted the data mining shared classes to its own project
2014-01-15 10:44:24 +01:00
Axel Uhl
dec22d638b
fixed launches to auto-start connector bundles; removed groovy from target platform; fixed SailingGWT launch again
2014-01-10 18:06:25 +01:00
Lennart Hensler
a4186302b4
Renamed SharedDimension to DimensionIdentifier
2014-01-08 18:19:05 +01:00
Lennart Hensler
6d22101407
Fixed launch configs after merge
2013-12-19 17:58:03 +01:00
Lennart Hensler
adbeb04b24
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/pom.xml
2013-12-19 17:25:47 +01:00
Axel Uhl
87e8870eae
let combined wind start four minutes before race start
2013-12-13 21:35:54 +01:00
Axel Uhl
3aea22dd01
offer system properties to configure Igtimi client ID, secret and redirect URI
2013-11-29 15:57:14 +01:00
Axel Uhl
bf522fc65a
error handling in access token callback servlet
2013-11-20 11:08:19 +01:00
Axel Uhl
3542cf7e67
using a GzipOutputStream to compress initial replication; results in a factor of 4 compression, roughly
2013-11-19 11:27:57 +01:00
Axel Uhl
80da9fa4c7
added Igtimi bundles to feature, launch configs and pom.xml
2013-11-15 15:49:45 +01:00
Lennart Hensler
361524ded2
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2013-11-13 14:55:10 +01:00
Axel Uhl
6af681ca0f
reload option works now that the team's nationality is updated upon reload
2013-11-07 10:50:57 +01:00
Lennart Hensler
93594fa380
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-11-05 17:02:44 +01:00
Axel Uhl
1806926058
Merge branch 'master' into persistentCompetitors
2013-11-05 13:31:46 +01:00
Christopher Ronnewinkel (D036654)
ecc99473d1
revert run configuration;
2013-11-04 17:51:17 +01:00
Axel Uhl
c0e88838c4
adjusted other launch configs to automatically start connector bundles now; required because connectors are now discovered using OSGi service lookup
2013-10-26 00:01:45 +02:00
Christopher Ronnewinkel (D036654)
7798dfd400
Merge branch 'origin/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/RegattaAreaCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
2013-10-23 15:06:54 +02:00
Lennart Hensler
39c1597f9f
Fixed launch configs and ui manifest after merge
2013-10-02 14:03:22 +02:00
Axel Uhl
e7200cfb3b
adjusted launch configurations to ensure the Manage2Sail result importer bundle is launched
2013-09-25 14:17:41 +02:00
fmittag
cf1135d12f
a try to switch the startup order of the gateway bundles to avoid bug 1511
2013-09-04 10:00:20 +02:00
fmittag
2feab09115
fixed issue in proxy launch config
2013-09-03 12:18:33 +02:00
fmittag
523e1ece66
updated launch configs for a workaround for Bug 1511 - Jetty synchronization bug when registering multiple web app bundles
2013-09-03 12:00:56 +02:00
fmittag
921f0663ff
update launch configs and classpaths to use the new libraries
2013-08-30 15:19:06 +02:00
Axel Uhl
fd33614194
use cp1252 codepage to avoid confusion with special characters in competitor names
2013-08-14 16:18:10 +02:00
Axel Uhl
96ce6aa75b
added a bit of web socket test code to AdminConsole to see what works
2013-08-08 18:29:02 +02:00
Axel Uhl
Fredrik Teschke
fmittag
Lennart Hensler
D049941
Lennart Hensler
Christopher Ronnewinkel (D036654)