Fredrik Teschke
2a3351338e
Merge remote-tracking branch 'origin-d/master'
2013-07-03 17:23:18 +02:00
Fredrik Teschke
3620f90474
added new routeconverter version that doesn't include duplicated internal sun class
2013-07-03 16:59:54 +02:00
Frederik Petersen
6685f97758
Fixed bug in master data import with override
...
and added test for it
2013-07-03 13:26:26 +02:00
Frederik Petersen
9b995adb4f
Merge branch 'master' into import_dbdata
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-07-03 10:58:56 +02:00
Frederik Petersen
f9c8ad3760
Fixed null pointer in regatta export/import due to null course area
2013-07-03 10:56:14 +02:00
Frederik Petersen
54a7c12646
Fixed course area null pointer for regatta
2013-07-03 10:49:56 +02:00
Frederik Petersen
b2f8dbbada
Merge branch 'master' into import_dbdata
2013-07-03 10:37:23 +02:00
Frederik Petersen
b8093660ee
Fixed NPE for master data import if default course area == null
2013-07-03 10:36:19 +02:00
Frederik Petersen
62734243a0
Added override flag for master data import
...
if set, all existing data with clashing names and ids will be overwritten
2013-07-03 10:31:37 +02:00
Frederik Petersen
0457feed82
Added test case for persistentreggatasforraceIDs export/import
2013-07-03 09:42:26 +02:00
Frederik Petersen
a0e85006b5
Added serialization for PersistentRegattaForRaceIDs map to master data
...
import
2013-07-03 09:30:34 +02:00
Frederik Petersen
5b510f985b
Added test for master data import without override
...
also fixed logging for course area (use id instead of new name)
2013-07-03 09:03:11 +02:00
Frederik Petersen
0a85d22d53
Introduced some logging to master data import operation
...
logs at info level, when some object with a sepcific name or id already
exists
2013-07-03 08:23:20 +02:00
Axel Uhl
edb9bb0103
harmonized race column export/import so that also for regatta series the RaceIdentifiers are transmitted
2013-07-03 00:01:36 +02:00
Axel Uhl
dc9ac6acc6
added missing new file RaceColumnMasterData
2013-07-02 22:37:04 +02:00
Axel Uhl
b39a496572
added race identifiers to race column export/import so that they are preserved across export/import
2013-07-02 22:35:25 +02:00
Axel Uhl
4b6a6975b3
preserve order of leaderboards in leaderboard group during import
2013-07-02 21:51:50 +02:00
Axel Uhl
1ce4b1596a
fixed another NPE in deserializer for nationality
2013-07-02 17:58:32 +02:00
Axel Uhl
6f3f96f697
Merge branch 'import_dbdata'
2013-07-02 17:54:33 +02:00
Frederik Petersen
b9f0da6b1c
Nationality serializer and deserializer now check for null value
2013-07-02 17:53:00 +02:00
Axel Uhl
7ec1a7906f
enhanced logging for tests to better understand where it blocks if it blocks
2013-07-02 17:11:47 +02:00
Axel Uhl
6e09cb3c7f
moved BoatClassMasterdata back to where it belongs
2013-07-02 15:31:52 +02:00
Axel Uhl
8a95d4f49c
Merge branch 'master' into import_dbdata
2013-07-02 15:24:59 +02:00
Frederik Petersen
a3dcd7c9d6
Creation of events and course areas now possible without replication
...
this is important for the Master Data Importer not to replicate things
twice
2013-07-02 14:37:04 +02:00
Frederik Petersen
29ce40b930
Regattas can now be created without replication
...
important for master data import as it itself is a replication operation
2013-07-02 14:21:06 +02:00
Frederik Petersen
31760a3902
Added source folder of master data import to gwt.xmls
2013-07-02 13:30:55 +02:00
Frederik Petersen
40fa1ea6b9
Merge branch 'master' into import_dbdata
2013-07-02 13:09:47 +02:00
Frederik Petersen
570dfef4be
Removed master data import post servlet
...
replaced with sailingservice implementation
2013-07-02 13:08:15 +02:00
fmittag
72f4fc57b7
Fixed NPE in RegattaLeaderboardDialog in case a regatta defines it's own discarding rules
2013-07-02 11:19:27 +02:00
fmittag
5933d0fae7
reverted the usage if the SAPJVM in the no proxy launch configuration
2013-07-02 10:49:15 +02:00
Frederik Petersen
3f068e0917
Renamed MasterDataSerializerForNames
2013-07-02 09:49:12 +02:00
Fredrik Teschke
e30b59f7f0
moved RouteConverter bundles into one, because of duplicate package name problems
2013-07-01 22:58:31 +02:00
Fredrik Teschke
a4e2f1753a
used jars with generate .class files
2013-07-01 22:19:00 +02:00
Fredrik Teschke
4da3b9cc3f
added routeconverter to targetplatform
2013-07-01 16:00:58 +02:00
Simon Pamies
0f96f0a698
Fixed logging path
2013-06-30 12:56:14 +02:00
Marcus Kammer
e07e2661b9
Add fix height to sapLogo.
2013-06-30 12:20:16 +02:00
Simon Pamies
d19e1c4bbd
Added visible confirmation that scores have been updated
2013-06-30 11:58:52 +02:00
Axel Uhl
5db11407ad
added even more logging to test's tearDown()
2013-06-30 11:58:37 +02:00
Axel Uhl
9fb5bfc3ae
added logging to test's tearDown() because we suspect something may be taking long there
2013-06-30 11:57:17 +02:00
Axel Uhl
67fbc17b31
added locking for leaderboardCache map in LeaderboardDTOCache; we assume this will fix a non-working eviction;
...
The supposed problem could have been that in the presence of high load and a lot of concurrency, two removeEldestEntry calls
could have tried to remove the same entry. This will lead to one fewer entry being removed than put. Eventually, this leads to
a leak in the LeaderboardCacheDTO's internal map which should have been restricted to 10 entries. In the memory analyzer,
we saw 8296 entries in the 29er leaderboard.
2013-06-30 11:40:42 +02:00
Frederik Petersen
9e1b3df73d
Fixed merge problems after merge of master into import_dbdata
2013-06-29 10:54:13 +02:00
Frederik Petersen
5963984323
Merge branch 'master' into import_dbdata
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2013-06-29 10:46:20 +02:00
Frederik Petersen
18d5ca2fca
Added race log import to master data import service
...
also tested that feature
2013-06-29 10:34:22 +02:00
Simon Pamies
e1a9bdb6bd
Fixed spacing for startpage
2013-06-28 20:40:48 +02:00
Simon Pamies
504cbcaf94
Better indication of live status
2013-06-28 20:38:22 +02:00
Axel Uhl
365a0622f2
fixed NPE and fixed compilation error
2013-06-28 19:27:12 +02:00
Axel Uhl
ccfb5ee18f
Merge commit '5fd82e236e798834219d4d0052ef76f55c5c5ac2'
2013-06-28 19:06:19 +02:00
Axel Uhl
ac6d420f74
don't use synchronization for isSuppresssed; use a reentrant read write lock instead to increase read concurrency
2013-06-28 18:45:59 +02:00
Axel Uhl
7cc79d54c8
fixed bug in competitor sorting
2013-06-28 18:39:51 +02:00
Axel Uhl
6d343bf311
avoid unnecessary calculation of number of competitors in race if they are not needed; cache net points for sort
2013-06-28 18:36:39 +02:00
Fredrik Teschke
Frederik Petersen
Axel Uhl
fmittag
Simon Pamies
Marcus Kammer