 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
|
cf0f19999d
|
notify listeners while still holding the write lock in CourseImpl
|
2012-06-29 13:25:01 +02:00 |
|
|
Axel Uhl
|
2dac75da97
|
added more missing locking to replication tests
|
2012-06-29 13:05:47 +02:00 |
|
|
Axel Uhl
|
e5b1262768
|
manage cancellation of maneuver cache recalculation futures
|
2012-06-29 12:59:25 +02:00 |
|
|
Axel Uhl
|
64c32db47a
|
added more locking to expeditionconnector test case
|
2012-06-29 12:38:20 +02:00 |
|
|
Axel Uhl
|
c18b212ef6
|
obtain course read lock before serializing TrackedRace
|
2012-06-29 11:33:56 +02:00 |
|
|
Axel Uhl
|
6c14f408f3
|
fixing bug 828 by introducing reentrant read/write lock on Course and using it to protect leg access against concurrent course modification
|
2012-06-29 11:23:20 +02:00 |
|
|
Axel Uhl
|
094b337bf4
|
added more missing locking to test cases
|
2012-06-29 11:14:05 +02:00 |
|
|
Axel Uhl
|
d70c4f12dd
|
added more necessary logging to SwissTiming test
|
2012-06-29 10:54:50 +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
|
d51b6b3e19
|
fixed locking in Mongo tests; made SwissTiming StoreAndForward robust against concurrent database drops
|
2012-06-29 10:18:31 +02:00 |
|
|
Axel Uhl
|
bcacf0b81a
|
added more necessary locking to tests
|
2012-06-29 10:10:09 +02:00 |
|
|
Axel Uhl
|
73c3d8805e
|
use Future in direction of first leg cache to avoid needing to synchronize on the cache during the calculation
|
2012-06-29 09:53:03 +02:00 |
|
|
Axel Uhl
|
4f44e7188f
|
synchronize writeObject to avoid concurrent modification exception during serialization
|
2012-06-28 22:50:31 +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
|
aeb8a672c6
|
optionally delay maneuver cache updates; optionally respond from stale maneuver cache
|
2012-06-28 18:19:43 +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
|
14ac9978b4
|
more lock handling in test cases
|
2012-06-28 14:21:40 +02:00 |
|
|
Axel Uhl
|
7e9b5910f1
|
added more missing lock handling to test cases
|
2012-06-28 14:09:27 +02:00 |
|
|
Axel Uhl
|
e7785506c9
|
added lock management to test cases
|
2012-06-28 14:06:45 +02:00 |
|
|
Axel Uhl
|
64f3d4c2dd
|
use ReentrantReadWriteLock on TrackImpl and all subclasses to increase concurrency while maintaining consistency
|
2012-06-28 14:00:39 +02:00 |
|
|
Axel Uhl
|
71d48e92a3
|
avoid NPE in TracTracRaceTrackerImpl; use ReadWriteLock in CourseImpl
|
2012-06-28 11:01:45 +02:00 |
|
 Christopher Ronnewinkel (D036654)
|
be8d81d298
|
fix dp wind speed = 0 & turnloss calculation
|
2012-06-27 16:54:55 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
91e2b5e109
|
add 1-turners based on optimal angles; fix ordering of PathCanvasOverlays
|
2012-06-27 16:49:04 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
fcdffa0524
|
Merge remote-tracking branch 'origin/simulator' into simulator
|
2012-06-27 14:46:21 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
10db8dd442
|
choose constant wind as default in WindControlParameters.java
|
2012-06-27 14:45:36 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
8abd13d54d
|
remove unused imports
|
2012-06-27 14:40:24 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
22b3f5f7c7
|
ensure endpoint is in eventimed path; restrict eventimed paths to 50 steps (to avoid JavaScript performance issues)
|
2012-06-27 14:39:10 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
3beb55942f
|
reverse order of path plotting
|
2012-06-27 14:34:40 +02:00 |
|
|
Axel Uhl
|
430b6ddbe1
|
added "embedded" parameter also to Leaderboard.html entry point
|
2012-06-26 16:25:00 +02:00 |
|
|
Axel Uhl
|
8ba4adb21b
|
fixing simulator behavior regarding the fetching and translating of static start/stop tracking times
|
2012-06-26 15:03:49 +02:00 |
|
|
Axel Uhl
|
c8bd62b18f
|
fixing bug 819: evaluate filter condition when re-loading leaderboard config page contents
|
2012-06-26 14:37:57 +02:00 |
|
|
Axel Uhl
|
adc783a4bb
|
use a second Executor instance in SailingServiceImpl to avoid a deadlock across FutureTasks waiting in the same Executor
|
2012-06-26 14:12:32 +02:00 |
|
|
Axel Uhl
|
fd08026e18
|
fixing bug 820: another concurrent modification exception, this time unsynchronized access to markPassingsTimes cache
|
2012-06-26 13:07:02 +02:00 |
|
|
Axel Uhl
|
f543e4de8b
|
Merge remote-tracking branch 'server/mak-playbutton'
|
2012-06-26 09:18:58 +02:00 |
|
|
Axel Uhl
|
85a096e303
|
added TODO comment regarding bug 596
|
2012-06-26 09:18:23 +02:00 |
|
|
Axel Uhl
|
a8081f71fc
|
fixing bug 815 by adding synchronization for raceTrackersByRegatta
|
2012-06-25 17:21:12 +02:00 |
|
|
Axel Uhl
|
0d35aa348c
|
fixing bug 796: concurrent modification exception during leaderboard group updates
|
2012-06-25 13:23:33 +02:00 |
|
|
Axel Uhl
|
78e380375b
|
latest export of official results of Kieler Woche 2012
|
2012-06-25 13:23:19 +02:00 |
|
|
Axel Uhl
|
1601a2ed9e
|
completed work on bug 811, setting table max row count to 10000 consistently
|
2012-06-25 10:03:37 +02:00 |
|
 fmittag
|
ef1f16f5c7
|
quick production fix for bug 811
|
2012-06-24 13:39:05 +02:00 |
|
|
Axel Uhl
|
7a99a4d2f5
|
use multiple geonames.org accounts
|
2012-06-23 19:58:20 +02:00 |
|
|
Axel Uhl
|
12cb23d3ca
|
wind measurement was missing in what was believed to be wind messages
|
2012-06-23 01:05:49 +02:00 |
|
|
Axel Uhl
|
4dc7b88684
|
send messages in one go
|
2012-06-23 00:49:41 +02:00 |
|
|
Axel Uhl
|
1788d436d7
|
gradually fixing UDP test case
|
2012-06-23 00:47:40 +02:00 |
|
|
Axel Uhl
|
9575133bad
|
to fix new expedition test, also allow for invalid messages
|
2012-06-23 00:40:30 +02:00 |
|
|
Axel Uhl
|
79b22c37b5
|
fixed bug 808 regarding the seemingly randomjumps of expedition positions
|
2012-06-23 00:14:32 +02:00 |
|
|
Axel Uhl
|
f2b28d9f39
|
Merge remote-tracking branch 'server/master'
|
2012-06-22 23:45:20 +02:00 |
|
|
Axel Uhl
|
b528a7a7c0
|
factored out those parts that get along without instance members
|
2012-06-22 23:41:57 +02:00 |
|