D049941
6df282edf7
Merge branch 'master' into riccardo2
...
Conflicts:
configuration/udpsender.py
configuration/udpserver.py
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/DatabaseHelper.java
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on
8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java
2013-12-05 12:30:46 +01:00
Axel Uhl
ed35db38b4
removed setConfiguration from MongoDBService and replaced by MongoDBConfiguration.getService()
2013-11-29 13:28:42 +01:00
D049941
69b7096b3d
Merge remote-tracking branch 'origin/master' into riccardo
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PreviousCompetitorDTOImpl.java
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatClassJsonDeserializer.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RaceDataAccessEval.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RacingEventPersistence.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracReaderFromURLs.java
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracWriter.java
java/target/stop
2013-11-22 16:15:07 +01:00
Jens Rommel
df9445499b
- changed time stamp source from UTC (system time) to GPS Time
...
- replaced hard-wired column numbers by order given by header line
- fixed issue with Excel date conversion. Now settings miliseconds to zero.
2013-11-13 17:53:12 +01:00
D049941
983201e04a
Merge remote-tracking branch 'external/master' into riccardo
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/TracTracEventManagementPanel.java
2013-10-24 15:52:16 +02:00
Jens Rommel
3ed17d3766
- Made recordWind return a flag wether a wind fix has been considered for a tracked race
...
- Made Expedition importer tolerant for partially filled rows, collecting partial data until a fix is complete
2013-09-13 09:41:23 +02:00
fmittag
5ab7d5af96
unified usage of "require-bundle: org.junit4" for all test bundles
2013-09-02 11:47:06 +02:00
fmittag
2fc41f002e
refactoring of Webservice API to use JAX-RS as implementation technique
...
Added versioning for the webservices
2013-08-30 15:50:46 +02:00
fmittag
6bdb68b850
removed java.text.SimpleDateFormat from AbstractTimePoint which is now part of the common doamin (GWT-compatible) bundle
2013-08-30 12:02:27 +02:00
Axel Uhl
f1fa1d74f6
moved a few more distance and speed types to domain.common and fixed a grave bug in MeterPerSecondSpeed; added test for improved outlier filtering
2013-08-14 18:00:45 +02:00
Axel Uhl
c556a95b93
added web socket example
2013-08-08 16:06:00 +02:00
Axel Uhl
69cb13b03a
quickly copy relevant wind fixes in WindJsonGetServlet to hold lock only shortly; started a test case which currently still fails
2013-06-21 22:02:39 +02:00
fmittag
f333a33f75
extended the test for limitation of competitors in the leaderboard json export
2013-06-18 17:02:31 +02:00
fmittag
5c0dab2a94
added a maxCompetitorsCount parameter to the leaderboard json export to limit the number of exported competitors
2013-06-17 17:35:41 +02:00
Axel Uhl
f0d7c550e2
Changed "final" semantics for leaderboard JSON export such that it never exports a started but not yet finished race;
...
other fixes include creation of regattas which need to be created with no RaceColumns attached to the Series yet because
it otherwise breaks assumptions asserted by "assert" statements, hence breaking tests when executed with -ea.
2013-04-12 20:44:22 +02:00
Axel Uhl
34bab83ba2
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl
91af0a81ec
fixed serialization.test mockito dependencies; added logging for start of tracking
2013-04-11 13:57:15 +02:00
Armin Zamani
cc61f70b07
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/SettableScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/JsonExportTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-04-11 13:39:51 +08: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
49d078d64b
improved the JsonExport tests and added a test for bypassing the leaderboardCache if the url parameter useCache=false is used
2013-04-08 17:20:09 +02:00
fmittag
9f82edfb7b
Merge remote-tracking branch 'origin/master' into leaderboardCache
2013-04-02 09:16:56 +02:00
fmittag
dbc28be27b
fixed osgi dependency problems with JsonExportTest
2013-04-01 18:29:18 +02:00
fmittag
20d0f2abfb
replaced junit "require-bundle" with "import-package" in manifest.mf
2013-03-31 16:03:53 +02:00
fmittag
aea3060fde
refactoring of LeaderboardJsonGetServlet to support also "empty leaderboards" with no results. In this case the leaderboardCache is not used (as there is nothing to calculate and there is no "result" timestamp we could use for the caching)
2013-03-26 12:14:04 +01:00
fmittag
7db566ebae
added (failing) test case for smartfuturechache in leaderboard json export
2013-03-25 16:10:02 +01:00
fmittag
e3df4ea5dd
added a json servlet for exporting wind data (similar to the showWind action from the AdminApp but with more parameters)
...
some renaming of the json servlets
2013-03-22 17:22:24 +01:00
fmittag
8b8989dc3e
fixed missing method renaming
2013-03-22 10:58:30 +01:00
fmittag
9e0b09fab7
added test cases for json export of a leaderboard with "Live" and "Final" result state
2013-03-21 14:37:58 +01:00
fmittag
d48872b809
used a different id for regatta creation due to bug 1311
2013-03-20 17:35:37 +01:00
fmittag
f49cccea25
added basic json export tests for leaderboardGroups and a leaderboard
2013-03-20 15:33:32 +01:00
fmittag
36c60fb4b4
first test case for json exports
2013-03-20 12:08:58 +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
D049941
Axel Uhl
Jens Rommel
fmittag
Armin Zamani