Commit Graph
355 Commits
Author SHA1 Message Date
Axel Uhl f2d5196e46 re-added Igtimi tests as the server's tokens supposedly have been restored 2013-12-23 00:28:50 +01:00
Lennart Hensler dcfb249e01 Merge branch 'master' into dataMining
Conflicts:
	java/pom.xml
2013-12-21 17:10:11 +01:00
Axel Uhl 08b61b0bb3 skip Igtimi tests for now because Igtimi server is down; this should make our Hudson tests green again for now 2013-12-20 16:16:02 +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
Frederik Petersen bc9f0354a6 Merge branch 'master' into polar-api
Conflicts:
	java/pom.xml
2013-12-11 09:50:08 +01:00
Frederik Petersen 3534be6736 Added polars bundle and polar data interface 2013-12-04 15:18:25 +01:00
Lukas Niemeier e8835a26e6 # moved utf-8 compliance up to workspace 2013-12-02 22:30:52 +01:00
Lukas Niemeier 1ab0468739 # mavenized the mobile folder 2013-11-30 14:21:02 +01:00
Lukas Niemeier 04e8671a11 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Axel Uhl 70e7d3ea5d added igtimiadapter.test bundle to pom.xml hierarchy 2013-11-20 15:06:55 +01:00
Lukas Niemeier 953eaaa668 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-11-20 12:25:57 +01:00
Lennart Hensler 79db9b61a4 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.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 (Proxy).launch
2013-11-19 18:01:25 +01:00
Lukas Niemeier f468b71024 # added surefire test reporting
# added option "-r" to build script for enabling reporting
2013-11-18 14:31:18 +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 32b94fcd19 Merge branch 'master' into dataMining 2013-11-14 16:27:12 +01:00
Jens Rommel fc6a63c1d6 Changed mongo host and tractract tunnel host from hard-wired IP adress of local hudson server to "localhost".
This change became necessary after local hudson server could no longer be used for tunneling.
2013-11-14 13:31:42 +01:00
Lennart Hensler 7dad61c471 Merge branch 'master' into dataMining
Conflicts:
	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/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
2013-10-23 14:10:07 +02:00
fmittag b13d0f6d23 changed the order of maven repositories in main pom.xml to let maven first resolve our own maven repository under sapsailing.com (/home/trac/maven-repositories) 2013-10-21 18:27:03 +02:00
Lennart Hensler 0ccdb93814 Merge remote-tracking branch 'extern/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2013-10-02 13:48:48 +02:00
fmittag 51f07555ed upgraded maven-surefire-plugin maven plugin (2.11 -> 2.16) 2013-09-02 11:45:11 +02:00
fmittag 66d0ef2996 updated tycho version (0.13 -> 0.18.1) and eclipse build version (indigo -> kepler) in main pom.xml 2013-08-30 15:17:10 +02:00
fmittag 0e26eaffa1 Added support for enums in toJSONString() method of JSONValue 2013-08-30 12:36:07 +02:00
Lennart Hensler 42b3468150 Merge remote-tracking branch 'extern/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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/pom.xml
2013-08-14 17:41:44 +02:00
Axel Uhl 5f385d7b6b Merge branch 'master' into jetty9
Conflicts:
	java/pom.xml
2013-08-10 10:59:23 +02:00
Simon Pamies 5bd89949fa Making it possible to disable selenium tests also reordered modules to have better overview over test setup 2013-08-09 20:31:50 +02:00
Axel Uhl fa8b76ed07 added missing pom.xml for gwt.ws project and linked in java/pom.xml 2013-08-09 18:14:28 +02:00
Lennart Hensler f1c6018fe6 Added a test for filter criterias 2013-08-09 11:01:16 +02:00
Lennart Hensler 3097de9ce4 Added a new project for the data mining stuff. 2013-07-09 14:49:04 +02:00
Fredrik Teschke 48d57ead7e added export functionality 2013-06-28 19:10:17 +02:00
Simon Pamies b1ba8e6740 Fixed hostname 2013-06-20 15:20:52 +02:00
fmittag 23afa76c91 initial commit of bundles for the import of Manage2sail results in XRR format 2013-06-05 18:53:12 +02:00
Christopher Ronnewinkel (D036654) 3a3884d376 update simulator tests; 2013-05-27 11:33:41 +02:00
Axel Uhl 85bab7c6ab commented out the simulator tests from maven top-level pom.xml 2013-05-17 23:13:04 +02:00
Axel Uhl 3091de6e73 added com.sap.sailing.simulator[.test] to top-level pom.xml 2013-05-17 14:21:24 +02:00
Christopher Ronnewinkel (D036654) 09587e3216 Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	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/client/Timer.java
	java/pom.xml
2013-05-14 18:43:12 +02:00
Christopher Ronnewinkel (D036654) d414551c03 Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	.gitignore
	java/com.google.gwt.osgi/META-INF/MANIFEST.MF
	java/com.google.gwt.osgi/pom.xml
	java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/Util.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java
	java/com.sap.sailing.domain.tractracadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BearingWithConfidenceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/ScalablePosition.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/ScalableSpeedWithBearing.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/ScalableValue.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ScalableDouble.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ScalableWind.java
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesBarColumn.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardRaceConfigImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.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/client/TimePanelSettingsDialogComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/CollapsablePanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/CollapsablePanelHeader.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/ComponentGroup.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/ComponentResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/ComponentSettings.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/ComponentViewer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/ImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/components/IsEmbeddableComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/slider/SliderBar.css
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/slider/SliderBar.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/slider/TimeSlider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CanvasOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/ImageTransformer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapImageManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RectangleOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/WindSensorOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/CollapsableComponentViewer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardViewModes.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/PositionDTO.java
	java/com.sap.sailing.kiworesultimport.test/.project
	java/com.sap.sailing.kiworesultimport/.project
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/HttpAction.java
	java/pom.xml
	java/target/start
2013-05-13 15:50:27 +02:00
fmittag 71f174b0ed initial project creation for Velum and Sailwave result importer 2013-04-29 18:25:12 +02:00
Axel Uhl 87e89d5a75 adjusted pom.xml to removal of odf result importer and rename winretatta-->barbados 2013-04-17 09:31:37 +02:00
Axel Uhl ae4361892e fixed java/pom.xml after merge accident 2013-04-17 09:28:51 +02:00
Axel Uhl 524b67dacd Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
Conflicts:
	java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
	java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ResultImportUrlsManagementPanel.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.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/CompetitorRowImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/DefaultCompetitorEntryImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/RegattaScoreCorrectionsImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForRaceImpl.java
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/pom.xml
2013-04-12 16:09:54 +02:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
fmittag 8a8657fd9b Merge remote-tracking branch 'origin/master' into winregatta_resultimport
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.freg.resultimport.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
	java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorEntryImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorRowImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/RegattaScoreCorrectionsImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForRaceImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.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/ResultImportUrlsManagementPanel.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.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
	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, 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/pom.xml
2013-04-08 14:20:52 +02:00
Christopher Ronnewinkel (D036654) 906bd30dc9 Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/pom.xml
2013-03-25 14:45:06 +01:00
Armin Zamani 6b4efe7af5 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonExportServlet.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
2013-03-22 13:51:55 +01:00
Christopher Ronnewinkel (D036654) 4ffe88a150 Merge remote-tracking branch 'origin/master' into simulator_dev
Conflicts:
	.gitignore
	java/.gitignore
	java/com.google.gwt.osgi/META-INF/MANIFEST.MF
	java/com.google.gwt.osgi/pom.xml
	java/com.googlecode.java-diff-utils.test/META-INF/MANIFEST.MF
	java/com.googlecode.java-diff-utils.test/src/diffutils/Example.java
	java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java
	java/com.googlecode.java-diff-utils/src/difflib/Chunk.java
	java/com.googlecode.java-diff-utils/src/difflib/Patch.java
	java/com.googlecode.java-diff-utils/src/difflib/myers/MyersDiff.java
	java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.declination/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KilometersPerHourSpeedImpl.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/Util.java
	java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
	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.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/SwissTimingAdapterPersistence.java
	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
	java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/ui/EditCCG.java
	java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterLiveSimulatorConnectorImpl.java
	java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BearingWithConfidenceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/ScalablePosition.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/ScalableSpeedWithBearing.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/ScalableValue.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ScalableDouble.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ScalableWind.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/InvalidDateException.java
	java/com.sap.sailing.ess40.resultimport.test/.gitignore
	java/com.sap.sailing.expeditionconnector.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.feature.runtime/feature.xml
	java/com.sap.sailing.geocoding.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
	java/com.sap.sailing.gwt.ui/.classpath
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/.project
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/AdminConsole.css
	java/com.sap.sailing.gwt.ui/CommonControls.css
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/RaceBoard.css
	java/com.sap.sailing.gwt.ui/RaceBoard.html
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/highcharts/js/adapters/mootools-adapter.js
	java/com.sap.sailing.gwt.ui/highcharts/js/adapters/prototype-adapter.js
	java/com.sap.sailing.gwt.ui/highcharts/js/highcharts-more.js
	java/com.sap.sailing.gwt.ui/highcharts/js/highcharts.js
	java/com.sap.sailing.gwt.ui/highcharts/js/modules/exporting.js
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.gwt.ui/reset.css
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetBoatPositionsAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetCompetitorsRaceDataAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetCoursePositionsAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetQuickRankAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetRaceMapDataAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetWindInfoAction.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardRaceConfigImagesBarCell.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnInLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
	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/ErrorReporter.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LogoAndTitlePanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/ParallelExecutionHolder.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.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/client/TimePanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SimpleComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SimpleComponentGroup.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SimpleComponentSettings.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SimpleComponentViewer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/UserManagementServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CoursePositionsDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/PositionDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceMapDataDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindDTO.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/IsEmbeddableComponent.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CanvasOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CombinedWindPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/ImageTransformer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapImageManager.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapResources.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMapSettings.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindSensorOverlay.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoDBService.java
	java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/internal/MongoDBServiceImpl.java
	java/com.sap.sailing.operationaltransformation.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerMock.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 (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/WEB-INF/web.xml
	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
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform.base/features/target-test/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-p2admin.target
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
	java/com.sap.sailing.www.events/build.properties
	java/com.sap.sailing.www.events/main.css
	java/com.sap.sailing.www.events/winnercircle2012/index.html
	java/com.sap.sailing.www/build.properties
	java/com.sap.sailing.www/fontface.css
	java/com.sap.sailing.www/index.html
	java/com.sap.sailing.www/main.css
	java/com.sap.sailing.www/webfonts/Ubuntu-B-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-BI-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-C-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-L-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-LI-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-M-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-MI-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-R-webfont.svg
	java/com.sap.sailing.www/webfonts/Ubuntu-RI-webfont.svg
	java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.xcelsiusadapter/WEB-INF/web.xml
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRaceAction.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/HttpAction.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEventsAction.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2Action.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLegAction.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRaceAction.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/StringUtility.java
	java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/XcelsiusServlet.java
	java/com.tractrac.clientmodule/META-INF/MANIFEST.MF
	java/com.tractrac.clientmodule/javadoc/allclasses-frame.html
	java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/LiveResultItem.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/MarkResult.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/MarkResultItem.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/PerLegResult.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/ResultGenerator.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/class-use/LiveResult.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/class-use/LiveResultItem.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/class-use/MarkResult.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/ResultAPI/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/Competitor.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/CompetitorClass.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/ControlPoint.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/Event.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/Race.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/RaceCompetitor.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/Route.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/Competitor.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/CompetitorClass.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/ControlPoint.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/Event.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/Race.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/RaceCompetitor.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/class-use/Route.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/CompetitorPositionOffsetData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/CompetitorPositionRawData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/CompetitorPositionSnappedData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/ControlPointPositionData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/DataController.Listener.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/DataController.TimeListener.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/DataController.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/EventLocationData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/Helpers.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/ICallbackData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/MarkPassingsData.Entry.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/MarkPassingsData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/MessageData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/Position.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/RouteData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/StartStopTimesData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/TimeObject.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/CompetitorPositionOffsetData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/CompetitorPositionRawData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/CompetitorPositionSnappedData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/ControlPointPositionData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/DataController.Listener.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/DataController.TimeListener.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/DataController.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/Helpers.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/ICallbackData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/MarkPassingsData.Entry.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/MarkPassingsData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/MessageData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/Position.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/RouteData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/StartStopTimesData.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/class-use/TimeObject.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/CompetitorPositionOffsetContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/CompetitorPositionRawContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/CompetitorPositionSnappedContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/ControlPointPositionContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/IDataHook.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/ITimeObjectContainer.Factory.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/ITimeObjectContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/MarkPassingsContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/MessageContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/RouteContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/StartStopTimesContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/TimestampContainer.Factory.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/TimestampContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/CompetitorPositionOffsetContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/CompetitorPositionRawContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/CompetitorPositionSnappedContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/ControlPointPositionContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/IDataHook.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/ITimeObjectContainer.Factory.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/ITimeObjectContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/MarkPassingsContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/MessageContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/RouteContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/StartStopTimesContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/TimestampContainer.Factory.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/class-use/TimestampContainer.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/containers/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/data/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/AttKey.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/AttachmentKeys.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/Attachments.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/IdBase.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/IdBaseNamed.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/class-use/AttKey.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/class-use/AttachmentKeys.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/class-use/Attachments.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/class-use/IdBase.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/class-use/IdBaseNamed.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/details/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/metadata/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/metadata/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/metadata/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/Info.LineWriter.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/Info.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/KeyValue.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/class-use/Info.LineWriter.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/class-use/Info.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/class-use/KeyValue.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/setup/package-use.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/TestTTCM.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/class-use/TestTTCM.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/package-frame.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/package-summary.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/package-tree.html
	java/com.tractrac.clientmodule/javadoc/com/tractrac/clientmodule/test/package-use.html
	java/com.tractrac.clientmodule/javadoc/constant-values.html
	java/com.tractrac.clientmodule/javadoc/deprecated-list.html
	java/com.tractrac.clientmodule/javadoc/help-doc.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-1.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-10.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-11.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-12.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-13.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-14.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-15.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-16.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-2.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-3.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-4.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-5.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-6.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-7.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-8.html
	java/com.tractrac.clientmodule/javadoc/index-files/index-9.html
	java/com.tractrac.clientmodule/javadoc/index.html
	java/com.tractrac.clientmodule/javadoc/overview-frame.html
	java/com.tractrac.clientmodule/javadoc/overview-summary.html
	java/com.tractrac.clientmodule/javadoc/overview-tree.html
	java/com.tractrac.clientmodule/javadoc/package-list
	java/com.tractrac.clientmodule/pom.xml
	java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
	java/org.moxieapps.gwt.highcharts/pom.xml
	java/pom.xml
	java/target/configuration/jetty/etc/realm.properties
	java/target/configuration/logging.properties
	java/target/configuration/logging_debug.properties
	java/target/install
	java/target/start
	java/target/swisstiminglistener
	settings.xml
2013-03-21 11:48:40 +01:00
fmittag 8aa04590ff Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test 2013-03-20 15:33:54 +01:00
Armin Zamani 619f0fead9 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
2013-03-19 19:08:36 +01:00
fmittag b1101a4740 created a gateway test bundle and added it to the main pom.xml 2013-03-15 16:05:20 +01:00
Axel Uhl b0372f3e2b added bundle and test fragment for XRR import 2013-03-14 13:25:41 +01:00
Axel Uhl c71387480f Merge branch 'master' into odf 2013-03-12 10:50:28 +01:00