Nidhi Sawhney
fc208742ce
Merge remote-tracking branch 'origin/master' into simulator
...
Conflicts:
java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF
java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
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.tractracadapter/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/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/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/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.js
java/com.sap.sailing.gwt.ui/highcharts/js/modules/exporting.js
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/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/CompetitorSelectionProvider.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/RaceTimePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanelSettingsDialogComponent.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/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/RaceBoardViewModes.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CourseDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkPassingTimesDTO.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/components/ComponentResources.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.css
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/controls/slider/SliderBar.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatCanvasOverlay.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/RaceMapSettings.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
java/com.sap.sailing.kiworesultimport.test/.project
java/com.sap.sailing.kiworesultimport/.project
java/com.sap.sailing.kiworesultimport/pom.xml
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/MongoDBConfiguration.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).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/site.xml
java/com.sap.sailing.targetplatform/scripts/createLocalBaseP2repository.sh
java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEvents.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRace.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/XcelsiusApp.java
java/com.tractrac.resultapi/META-INF/MANIFEST.MF
java/com.tractrac.resultapi/javadoc/allclasses-frame.html
java/com.tractrac.resultapi/javadoc/allclasses-noframe.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/LiveResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/LiveResultItem.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/MarkResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/MarkResultItem.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/PerLegResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/ResultGenerator.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/LiveResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/LiveResultItem.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/MarkResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/MarkResultItem.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/PerLegResult.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/class-use/ResultGenerator.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/package-frame.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/package-summary.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/package-tree.html
java/com.tractrac.resultapi/javadoc/com/tractrac/ResultAPI/package-use.html
java/com.tractrac.resultapi/javadoc/constant-values.html
java/com.tractrac.resultapi/javadoc/deprecated-list.html
java/com.tractrac.resultapi/javadoc/help-doc.html
java/com.tractrac.resultapi/javadoc/index-files/index-1.html
java/com.tractrac.resultapi/javadoc/index-files/index-2.html
java/com.tractrac.resultapi/javadoc/index-files/index-3.html
java/com.tractrac.resultapi/javadoc/index-files/index-4.html
java/com.tractrac.resultapi/javadoc/index-files/index-5.html
java/com.tractrac.resultapi/javadoc/index-files/index-6.html
java/com.tractrac.resultapi/javadoc/index-files/index-7.html
java/com.tractrac.resultapi/javadoc/index-files/index-8.html
java/com.tractrac.resultapi/javadoc/index-files/index-9.html
java/com.tractrac.resultapi/javadoc/index.html
java/com.tractrac.resultapi/javadoc/overview-tree.html
java/com.tractrac.resultapi/javadoc/package-list
java/com.tractrac.resultapi/javadoc/stylesheet.css
java/com.tractrac.resultapi/src/com/tractrac/ResultAPITester.java
java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
java/org.moxieapps.gwt.highcharts/pom.xml
java/pom.xml
java/target/configuration/jetty/etc/jetty.xml
java/target/configuration/logging.properties
java/target/configuration/logging_debug.properties
java/target/install
python/.gitignore
python/bootstrap.py
python/buildout.cfg
python/dev.cfg
python/prod.cfg
python/src/sailing.connector/README.txt
python/src/sailing.connector/docs/HISTORY.txt
python/src/sailing.connector/sailing/__init__.py
python/src/sailing.connector/sailing/connector/__init__.py
python/src/sailing.connector/sailing/connector/provider.py
python/src/sailing.connector/setup.py
python/src/sailing.db/README.txt
python/src/sailing.db/docs/HISTORY.txt
python/src/sailing.db/sailing/__init__.py
python/src/sailing.db/sailing/db/__init__.py
python/src/sailing.db/sailing/db/config.py
python/src/sailing.db/sailing/db/database.py
python/src/sailing.db/sailing/db/model/__init__.py
python/src/sailing.db/sailing/db/model/base.py
python/src/sailing.db/sailing/db/model/entities.py
python/src/sailing.db/sailing/db/model/util.py
python/src/sailing.db/sailing/db/monitoring.py
python/src/sailing.db/setup.py
python/src/sailing.web/MANIFEST.in
python/src/sailing.web/README.txt
python/src/sailing.web/docs/HISTORY.txt
python/src/sailing.web/sailing/__init__.py
python/src/sailing.web/sailing/web/__init__.py
python/src/sailing.web/sailing/web/adapter/configure.zcml
python/src/sailing.web/sailing/web/browser/configure.zcml
python/src/sailing.web/sailing/web/browser/core.py
python/src/sailing.web/sailing/web/browser/functions.py
python/src/sailing.web/sailing/web/browser/moderator-static/app.js
python/src/sailing.web/sailing/web/browser/moderator-static/index.html
python/src/sailing.web/sailing/web/browser/moderator-static/iphone.html
python/src/sailing.web/sailing/web/browser/moderator-static/jquery.js
python/src/sailing.web/sailing/web/browser/moderator-static/mobile.css
python/src/sailing.web/sailing/web/browser/moderator-static/overall.html
python/src/sailing.web/sailing/web/browser/moderator-static/screen.css
python/src/sailing.web/sailing/web/browser/static/core.js
python/src/sailing.web/sailing/web/browser/static/css/jquery-ui-1.8.11.custom.css.txt
python/src/sailing.web/sailing/web/browser/static/css/jquery.timeslider.css.txt
python/src/sailing.web/sailing/web/browser/static/css/styles.css.txt
python/src/sailing.web/sailing/web/browser/static/js/jquery-1.4.4.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui-timepicker-addon.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery-ui-i18n.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-af.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ar-DZ.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ar.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-az.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-bg.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-bs.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ca.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-cs.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-da.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-de.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-el.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-en-AU.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-en-GB.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-en-NZ.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-eo.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-es.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-et.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-eu.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-fa.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-fi.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-fo.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-fr-CH.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-fr.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-gl.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-he.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-hr.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-hu.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-hy.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-id.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-is.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-it.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ja.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ko.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-kz.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-lt.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-lv.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ml.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ms.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-nl.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-no.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-pl.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-pt-BR.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-pt.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-rm.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ro.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ru.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sk.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sl.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sq.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sr-SR.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sr.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-sv.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-ta.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-th.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-tj.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-tr.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-uk.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-vi.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-zh-CN.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-zh-HK.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/i18n/jquery.ui.datepicker-zh-TW.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.effects.core.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.accordion.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.autocomplete.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.core.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.datepicker.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.dialog.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.mouse.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.position.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.resizable.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.selectable.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.slider.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.sortable.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.tabs.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery-ui/jquery.ui.widget.min.js
python/src/sailing.web/sailing/web/browser/static/js/jquery.form.js
python/src/sailing.web/sailing/web/browser/static/js/jquery.googlemaps1.01.js
python/src/sailing.web/sailing/web/browser/static/js/jquery.timeslider.js
python/src/sailing.web/sailing/web/browser/static/js/mapmarker.js
python/src/sailing.web/sailing/web/browser/static/maps.js
python/src/sailing.web/sailing/web/browser/templates/database-stats.pt
python/src/sailing.web/sailing/web/browser/templates/general-competitor-info.pt
python/src/sailing.web/sailing/web/browser/templates/general-race-info.pt
python/src/sailing.web/sailing/web/browser/templates/iphone-status.pt
python/src/sailing.web/sailing/web/browser/templates/java-connector-custom-race.pt
python/src/sailing.web/sailing/web/browser/templates/java-connector-select-races.pt
python/src/sailing.web/sailing/web/browser/templates/java-connector.pt
python/src/sailing.web/sailing/web/browser/templates/leaderboard-info.pt
python/src/sailing.web/sailing/web/browser/templates/leaderboard-live.pt
python/src/sailing.web/sailing/web/browser/templates/leaderboard.pt
python/src/sailing.web/sailing/web/browser/templates/live-info-view.pt
python/src/sailing.web/sailing/web/browser/templates/live-info.pt
python/src/sailing.web/sailing/web/browser/templates/maintemplate.pt
python/src/sailing.web/sailing/web/browser/templates/map-overview-details.pt
python/src/sailing.web/sailing/web/browser/templates/map-overview.pt
python/src/sailing.web/sailing/web/browser/templates/udp-configurator.pt
python/src/sailing.web/sailing/web/browser/templates/waypoint-info.pt
python/src/sailing.web/sailing/web/browser/templates/wind-settings-info.pt
python/src/sailing.web/sailing/web/browser/templates/wind-settings.pt
python/src/sailing.web/sailing/web/config.py
python/src/sailing.web/sailing/web/configure.zcml
python/src/sailing.web/sailing/web/interfaces.py
python/src/sailing.web/sailing/web/tests/data/events.txt
python/src/sailing.web/sailing/web/tests/data/events2.txt
python/src/sailing.web/sailing/web/tests/data/events2updated.txt
python/src/sailing.web/sailing/web/tests/data/fixes.txt
python/src/sailing.web/sailing/web/tests/data/race.txt
python/src/sailing.web/sailing/web/tests/data/race_t1.txt
python/src/sailing.web/sailing/web/tests/data/waypoints.txt
python/src/sailing.web/sailing/web/tests/test_base.py
python/src/sailing.web/sailing/web/tests/utils.py
python/src/sailing.web/sailing/web/util.py
python/src/sailing.web/setup.py
python/templates/app_debug.sh
python/templates/app_production_start.sh
python/templates/app_production_stop.sh
python/templates/db-dev.ini
python/templates/db.ini
python/templates/mongodb-master.cfg
python/templates/webserver-dev.ini
python/templates/webserver-prod.ini
2012-07-02 11:01:41 +02:00
Axel Uhl
bcacf0b81a
added more necessary locking to tests
2012-06-29 10:10:09 +02:00
Axel Uhl
72faf2e17d
eliminated unused variable in Xcelsiusadapter
2012-06-12 10:32:56 +02:00
D048538
f8b8f277d4
Xcelsius adapter final
2012-06-12 10:07:26 +02:00
D048538
21c4e83ea3
adjusted after Event was renamed to Regatta
2012-05-21 10:54:06 +02:00
D048538
47df0e4e57
Merge remote-tracking branch 'origin/master' into xcelsiusadapter_development
...
Conflicts:
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java
2012-05-21 10:16:21 +02:00
Axel Uhl
1eb791b644
renamed further occurrences of "...event..." to "...regatta...", including XcelsiusApp servlet
2012-05-14 15:43:03 +02:00
Axel Uhl
81e24391f7
text search/replace for eventName and trackedEvent to regattaName and trackedRegatta
2012-05-14 14:30:24 +02:00
Axel Uhl
2799b7c287
renaming all trackedEvent occurrences to trackedRegatta
2012-05-14 14:23:39 +02:00
Axel Uhl
28ad1dbad2
renaming Event to Regatta; still missing many parameter and local variable names
2012-05-14 14:22:12 +02:00
fmittag
1b2a6ee621
Merge remote-tracking branch 'origin/master'
2012-05-08 14:20:13 +02:00
Nidhi Sawhney
58f2201db5
Merge remote-tracking branch 'origin/master' into simulator
...
Conflicts:
doc/DEVELOPMENT
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/RaceBoard.css
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/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/shared/MarkPassingTimesDTO.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/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/ZoomTypeFormatter.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/src/com/sap/sailing/server/RacingEventService.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/site.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local-frank.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-p2admin.target
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local-extern.target
java/com.sap.sailing.www/main.css
java/pom.xml
java/target/configuration/jetty/etc/realm.properties
2012-05-08 11:06:59 +02:00
Axel Uhl
e54a1605e5
set context class loader for current thread before deserializing
2012-05-07 14:55:18 +02:00
fmittag
e9c56b1a06
- Unified naming of getStartOfRace() and getEndOfRace() in TrackedRace
...
- Aligned sliderbar start and end psoition with charts start and end position
- Added new mark on sliderbar -> "E" like End of Race
2012-05-07 14:46:44 +02:00
Julian Breunung
db1dc7af17
removed unnecessary imports and functions
2012-05-02 10:08:03 +02:00
Julian Breunung
a8506e8f22
added service to show currently loaded events
2012-04-30 17:18:23 +02:00
Julian Breunung
f3e55e8e35
added method for response as xml file
...
changed output for EventDataPerLeg to file
2012-04-30 14:11:45 +02:00
Julian Breunung
ef06775859
added maneuvers to output
2012-04-26 16:20:32 +02:00
Julian Breunung
e151549f8f
removed unneeded variables
2012-04-26 14:57:41 +02:00
Julian Breunung
7a85cf53ab
Added new function that gets Competitor Data per Leg for a given Event
2012-04-26 14:17:13 +02:00
Nidhi Sawhney
698ada3fb1
Merge remote-tracking branch 'origin/master' into simulator
2012-04-22 16:27:21 +02:00
Axel Uhl
6b124da7e3
turned timeInMilliseconds into a Long, returning null if leg hasn't started yet
2012-03-18 10:23:55 +01:00
Axel Uhl
22b24c0450
switched all projects to Java7 except for those used by as GWT source
2012-01-19 10:01:36 +01:00
Axel Uhl
f9a85ed043
added web.xml to build.properties
2012-01-16 17:57:58 +01:00
Axel Uhl
95eeb692f4
removed require-bundle again; it didn't help
2012-01-16 17:52:19 +01:00
Axel Uhl
bef22cf34a
added javax.servlet as Require-bundle in addition to imported packages for xcelsiusadapter
2012-01-16 17:38:59 +01:00
Axel Uhl
dd90952cb6
removed xcelsius activator; continues with UI component work
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/components/Component.java
2012-01-16 14:58:42 +01:00
Lennart Hensler
02a293360e
Moved QuadTree to *.common + Added Cache to Geocoder
2012-01-12 18:23:54 +01:00
Lennart Hensler
ec3bb51440
Refactoring done
2012-01-10 16:33:46 +01:00
fmittag
531aa0166f
clean up of all version in all pom.xml files
...
- changed 0.0.1-SNAPSHOT to 1.0.0-SNAPSHOT
- changed product version from 1.1.0 to 1.0.0
- removed unnecessary <version> tags in plugins
2012-01-04 16:04:23 +01:00
Axel Uhl
9f3968e07b
moved Tack and LegType enumerations to domain.common bundle
2011-12-30 10:00:27 +01:00
Axel Uhl
9e388831e3
moved Util class to domain.common and use its Pair/Triple utility classes also in gwt.ui
2011-12-30 09:49:02 +01:00
Axel Uhl
d58fd5a447
adjusted context path for xcelsius web bundle
2011-12-29 16:25:06 +01:00
Axel Uhl
5c8e8a9637
Merge branch 'gwt' into osgi_mvn_refactoring
...
Conflicts:
java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
2011-12-29 14:56:10 +01:00
Axel Uhl
4398a0e3e2
introduced com.sap.sailing.domain.common project which lets us share between domain and gwt.ui
2011-12-29 10:57:25 +01:00
fmittag
86f8236dbc
add missing .gitignore files
2011-12-13 11:58:28 +01:00
fmittag
956532b362
first version... the PDE build works against a target platform referencing local p2 repositories generated by a script file...
2011-12-06 16:42:25 +01:00
Axel Uhl
bea104611b
avoid NPE in xcelsius adapter
2011-11-25 11:09:22 +01:00
Axel Uhl
7949c644aa
refactored SailingServiceImpl such that it doesn't directly use the SwissTimingConnector;
...
instead it turns to the RacingEventService which then knows the SwissTimingConnector
2011-11-16 17:52:26 +01:00
Fabian Schwarz-Fritz
2bfe3a5b14
Changed getRankPerLeg2 column structure.
2011-11-16 00:49:13 +01:00
Axel Uhl
ef4547357f
Moved top-level cache for TrackedEvent from TracTrac-specific DomainFactory to RacingEventService;
...
introduced a TrackedEventRegistry interface in com.sap.sailing.domain that is now extended by
RacingEventService as well as a dummy implementation for use by tests
2011-11-14 17:00:17 +01:00
Axel Uhl
34b3d6bb7a
reformatting
2011-11-14 16:43:13 +01:00
Fabian Schwarz-Fritz
86e3d98b33
changed RankPerLeg2 - improved getRankPerLeg2
2011-11-08 13:03:49 +01:00
Fabian Schwarz-Fritz
eca186a772
Added CXelsius Adapter "method" of servlet getRankPerLeg2. Values for
...
xcelsius where updated, and changed in getRankPerLeg2 (XML structure)
2011-11-04 14:15:07 +01:00
Fabian Schwarz-Fritz
57ae9b42a7
corrected launch configuratoin of gwt branch
2011-11-04 09:31:13 +01:00
Axel Uhl
df517938f3
fixed upwind/downwind display
2011-11-03 09:32:23 +01:00
Axel Uhl
7ef80d5891
removed GPS position again from xcelsius rankPerLeg service and added a placeholder
...
gpsPerRace service which does deliver the GPS coordinates; this latter service hasn't
been aligned with the Xcelsius requirements yet and is merely a code sample for accessing
the tracking information about positions.
2011-10-26 16:56:52 +02:00
Axel Uhl
79c0ec8bbd
treat null values in enhanced RankPerLeg functionality properly
2011-10-07 13:11:49 +02:00
Axel Uhl
c5c43931be
added columns as requested by Kersten
2011-10-07 11:46:22 +02:00
Axel Uhl
cdf0d49d0e
a first Douglas-Peucker implementation with a first few naive tests
2011-10-07 11:42:32 +02:00
Nidhi Sawhney
Axel Uhl
D048538
fmittag
Julian Breunung
Lennart Hensler
Fabian Schwarz-Fritz