Nidhi Sawhney
c77b4e6e6a
Changes required due to merge from master.
2012-07-02 11:05:41 +02:00
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
a155637a1a
finally fixing bug 567: swiss timing tests have two different competitor lists, getting cached by sail ID; fixed
2012-06-29 10:50:00 +02:00
Axel Uhl
9f8000b33d
pass on a NoWindException from maneuver analysis if tack cannot be determined
2012-06-28 22:17:11 +02:00
Axel Uhl
f6f5e7e85b
added use of track lock instead of synchronization where missing
2012-06-28 15:05:29 +02:00
Axel Uhl
a8081f71fc
fixing bug 815 by adding synchronization for raceTrackersByRegatta
2012-06-25 17:21:12 +02:00
fmittag
fe128232d1
Merge remote-tracking branch 'origin/master'
2012-06-19 11:02:41 +02:00
fmittag
1fd23701f4
second commit of adding a bundle tracker (missed some files before)
2012-06-19 11:00:29 +02:00
fmittag
a427a06d5c
added a BundleTracker as instrumentation for catching unexpected STOP events in bundles at runtime
2012-06-19 10:56:57 +02:00
Axel Uhl
1e01668a69
work towards a TracTrac simulator
2012-06-18 20:29:51 +02:00
Axel Uhl
afe7746d71
pass through a "simulation" parameter for the TracTrac tracker; doesn't do anything yet
2012-06-18 18:20:36 +02:00
Axel Uhl
f7aef32b74
avoid duplicate leaderboard updates upon initial load
2012-06-18 01:49:16 +02:00
Axel Uhl
89289ff0e5
added isCorrected to LeaderboardJsonExport for entries
2012-06-15 09:46:34 +02:00
Axel Uhl
eb7a8f4050
clear server state entirely before starting to import initial load;
...
particularly registering the replica service for tracked race additions in order to auto-link them
to leaderboards causes trouble if the server state is not cleared before. Replicated tracked races may
then get auto-linked to old leaderboards and regattas in the server that happen to point to races with
equal RaceIdentifiers.
Also, it is important to become tolerant against a non-existing default leaderboard which doesn't exist
yet when tracked races are imported. The default leaderboard will be replicated together with other
leaderboards.
2012-06-15 01:43:07 +02:00
Axel Uhl
d7ca838eb6
added com.sap.sailing.persistence to the dependencies of com.sap.sailing.server.replication; fixed class loading
...
During replication initial load a ClassNotFoundException was thrown because DelayedLeaderboardScoreCorrections
wasn't found. One problem was that obviously the Thread's context class loader set from getClass().getClassLoader()
was "only" the default class loader, not knowing about the OSGi bundle dependencies. Furthermore, the replication
bundle did not have a dependency on the domain.persistence bundle.
2012-06-15 00:14:38 +02:00
Axel Uhl
53e4c62814
use competitor now introduced in mark passing events instead of relying on a MarkPassing to be in the list
2012-06-14 22:21:12 +02:00
Axel Uhl
63ab846f0d
added competitor to change notification about mark passing events
2012-06-14 22:20:38 +02:00
Nidhi Sawhney
4dc0dce424
Name change for wind patterns. Using even timed points for the paths.
2012-06-14 10:27:39 +02:00
Axel Uhl
9ffd96f606
turned Pair into Triple for result of max points score correction update to also return whether score is corrected
2012-06-13 14:20:37 +02:00
Axel Uhl
718d0be68f
assembling result object in official score import dialog; implemented bulk score correction update service
2012-06-13 13:02:44 +02:00
Axel Uhl
5b72601de5
official scores pass to assignment dialog and need to be displayed / selected now
2012-06-12 15:42:24 +02:00
Axel Uhl
676c9db607
working towards displaying official scores for import
2012-06-12 01:27:42 +02:00
Axel Uhl
a4f3f9209e
fixed byg 754 by using LinkedHashMap; working towards import of Kieler Woche official results; still with warnings
2012-06-12 00:06:12 +02:00
Axel Uhl
43f763080c
steps towards registering b+m result service as OSGi service and grabbing it to deliver results from SailingService
2012-06-11 22:07:48 +02:00
fmittag
b6b22f7ed8
implemented "remove regatta" for the adminconsole "regatta" tab
2012-06-11 13:22:25 +02:00
Axel Uhl
394362230a
fixed bug 739 by using trackedRegatta.getRegatta() instead of getOrCreateDefaultRegatta on TracTrac DomainFactory
2012-06-10 22:24:01 +02:00
Axel Uhl
ddadb8b18e
added explicit dropping for LEADERBOARD and REGATTAS collections again because it still fails on Linux
2012-06-08 17:34:58 +02:00
Axel Uhl
fc1d91f8a6
added more logging
2012-06-08 14:50:57 +02:00
Axel Uhl
857921b192
more stubs for Kieler Woche result list parsing
2012-06-08 14:29:39 +02:00
Axel Uhl
db07cab2b0
added yet more logging
2012-06-08 14:11:43 +02:00
Axel Uhl
df45ba41fc
added more logging to find out how the regatta loses its column
2012-06-08 11:02:24 +02:00
Axel Uhl
4023f7a19c
reduced logging for bug 736 again
2012-06-08 01:47:34 +02:00
Axel Uhl
8bfe4d2ddf
ignore but log an unfound leaderboard or race column in ConnectTrackedRaceToLeaderboardColumn, related to bug 736
2012-06-08 01:46:02 +02:00
Axel Uhl
a7109a0ddc
more logging against bug 736; minor experiments for bug 735
2012-06-08 00:34:33 +02:00
Axel Uhl
43501e3a2a
added missing close() to print writer for debug output for fixing bug 736
2012-06-07 23:54:55 +02:00
Axel Uhl
a2bae85b61
to hopefully finally find and fix bug 736, added the stack trace to the INFO log for adding a regatta leaderboard
2012-06-07 23:31:48 +02:00
Axel Uhl
f67aaa19eb
added more logging
2012-06-07 21:45:48 +02:00
Axel Uhl
5fb51d906d
added logging to track down bug 736
2012-06-07 20:45:36 +02:00
Axel Uhl
f4928da853
fixing bug 723 by queuing Operations until initial load has completed
2012-06-07 18:20:51 +02:00
Axel Uhl
ae5910c50f
completed test showing that delayed leaderboard corrections replication works
2012-06-07 02:06:18 +02:00
Axel Uhl
3208a21d1b
whenever a RaceDefinition is added to a persistent Regatta owned by RacingEventService, record persistently
2012-06-06 23:03:20 +02:00
Axel Uhl
32427f3a2d
addressing bug 733: looking up a Regatta by raceID first in RacingEventService before using a default regatta
2012-06-06 22:43:14 +02:00
Axel Uhl
6518cd4569
fixed test for regatta leaderboard storing/loading by fixing the mocks for TrackedRace/TrackedRegatta
2012-06-06 22:10:12 +02:00
Axel Uhl
f9d182fd92
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
2012-06-06 21:56:10 +02:00
Axel Uhl
b090e11b5e
added persistence for raceID-to-Regatta associations in RacingEventServiceImpl
2012-06-06 20:55:12 +02:00
fmittag
2e0bcaa63d
Merge remote-tracking branch 'origin/master'
2012-06-06 18:59:09 +02:00
fmittag
7975291d48
finished basic creation of regattas with series and fleets etc.
2012-06-06 18:58:58 +02:00
Axel Uhl
8ca0ad7f5d
use WEB WindSource explicitly, not expecting it to already exist
2012-06-06 17:08:55 +02:00
Axel Uhl
d28d181132
set wind through REST/JSON only for existing tracked races, avoiding blocking
2012-06-06 17:02:23 +02:00
Axel Uhl
ace0080f33
enhanced test case for storing/loading regatta leaderboard
2012-06-06 16:35:02 +02:00
Nidhi Sawhney
Axel Uhl
fmittag