Commit Graph
76 Commits
Author SHA1 Message Date
Fredrik Teschke 9c375a3ae4 Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
Conflicts:
	.gitignore
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +01:00
Fredrik Teschke c861fcbd74 upgrade poms of shared and common bundles to 1.7 compiler level 2015-02-10 03:09:27 +01:00
Fredrik Teschke b5be775f95 add javadoc to file-storage related classes 2015-02-05 09:45:21 +01:00
Axel Uhl baf7bcbe73 Merge branch 'master' into ftes-file-storage
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/pom.xml
2015-02-02 10:47:01 +01:00
Axel Uhl 3a9ddd9884 Merge branch 'master' into android_apps_no_rcapp_changes
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-01-30 20:32:42 +01:00
Fredrik Teschke 2989b4a335 add replication test for file storage mgmt service 2015-01-29 19:50:17 +01:00
Peter Siegmund b86411c441 Merge branch 'master' into android_apps 2015-01-26 09:37:54 +01:00
Steffen Schaefer 49e0ff9bcc Merge branch 'master' into gwt-27-second-try
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode
only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/pom.xml
2015-01-26 09:00:40 +01:00
Fredrik Teschke ab0c06c8e7 Merge remote-tracking branch 'origin/master' into ftes-file-storage
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
2015-01-25 18:09:22 +01:00
Axel Uhl 31bdf1ecf4 UTF-8 settings for CountryCodeFactory 2015-01-24 15:14:42 +01:00
Fredrik Teschke 7134f051a9 deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui 2015-01-23 19:33:39 +01:00
Fredrik Teschke 944614c1ac add file storage management service 2015-01-23 17:52:21 +01:00
Fredrik Teschke 3edbbb04bb move type based service finder to sse bundles (create new com.sap.sse.osgi bundle) 2015-01-23 16:56:49 +01:00
Peter Siegmund 353e83f270 Merge branch 'master' into android_apps 2015-01-23 10:08:08 +01:00
Axel Uhl 620058524a moved ArrayListNavigableSet from com.sap.sse.common to com.sap.sse.shared.android because NavigableSet is not available in GWT's JRE emulation 2015-01-22 17:10:27 +01:00
Axel Uhl 6c2d8238cf avoid warning by declaring Util.getFirstNonNull with @SafeVarargs; this was necessary after the upgrade from using JDK 1.6 --> 1.7 2015-01-22 11:29:50 +01:00
Axel Uhl a42d2085f1 updated the *.common projects to JavaSE-1.7 as their execution environment now that we use the Android build tools that are 1.7-capable 2015-01-22 11:10:58 +01:00
Axel Uhl 0c43f2b64b moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common 2015-01-22 11:05:24 +01:00
Axel Uhl ba4d5b0f6c moved CountryCode stuff to SSE 2015-01-22 11:01:01 +01:00
Axel Uhl 9fb859a8b3 major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android 2015-01-22 10:57:00 +01:00
Axel Uhl dd60863858 moved scalablevalue stuff and KMeansClusterer to SSE; added better maneuver-based wind estimation reporting features 2015-01-22 00:49:34 +01:00
Steffen Schaefer c789d85117 Updated to GWT 2.7 DOCTYPE 2015-01-16 09:18:34 +01:00
Axel Uhl ee2424957d Merge branch 'master' into bug1562 2015-01-15 17:51:41 +01:00
Peter Siegmund c580c10f89 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Axel Uhl 89e83a6955 Merge branch 'master' into bug1562 2015-01-14 14:56:30 +01:00
Axel Uhl 7f7eb10256 move ObjectInputStreamResolvingAgainstCache to com.sap.sse and let com.sap.sse depend on com.sap.sse.common which has the IsManaagedByCache interface 2015-01-14 13:54:45 +01:00
Axel Uhl 8ee256a4b7 split com.sap.sailing.gateway.serialization in two bundles, creating com.sap.sailing.gateway.serialization.shared.android, see bug 2572 2015-01-14 13:22:22 +01:00
Axel Uhl 24bba04589 moved ObjectInputStreamResolvingAgainstCache to com.sap.sse.common so that com.sap.sailing.domain does not require a dependency on com.sap.sse.replication anymore 2015-01-14 10:59:05 +01:00
Axel Uhl 07e7bad5e6 added Util.getFirstNonNull(...) 2015-01-13 08:52:07 +01:00
Fredrik Teschke d693090d81 Merge branch 'master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java
2014-12-24 12:45:22 +01:00
Fredrik Teschke a8e8d22857 move TimeRange to SSE 2014-12-24 12:27:58 +01:00
Fredrik Teschke a6c17ad1ec Merge remote-tracking branch 'origin/master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingAdapter.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2014-12-19 14:31:41 +01:00
Axel Uhl 9cb674dddb fixing bug 2512 by sorting by time range difference, simplifying algorithm for stage selection 2014-12-14 21:49:02 +01:00
Fredrik Teschke 741756a2ad moved beginning/end of time to TimePoint 2014-12-11 18:00:11 +01:00
Axel Uhl 249b276f19 fixed toString on MillisecondsDusationImpl regarding unit display 2014-11-26 00:42:51 +01:00
Axel Uhl 911f2160d9 set lazy activation for new SSE bundles 2014-11-09 20:07:48 +01:00
Axel Uhl 353342ecbf moving IsManagedByCache to com.sap.sse.common solves the "inconsistent hierarchy" issue in android.shared 2014-11-09 00:52:47 +01:00
Axel Uhl cd28a65394 major refactoring, using only Operation<T> instead of OperationWithTransformationSupport which is currently not applicable the way we use the operation return type 2014-11-07 23:45:05 +01:00
Axel Uhl bbc2796d59 renamed com.sap.sailing.server.replication bundle to com.sap.sse.replication 2014-11-07 21:47:57 +01:00
Axel Uhl b62d566953 broken interims commit; has some parts of the refactoring of the AdminConsolePanel already 2014-11-06 15:03:56 +01:00
Axel Uhl f9bfddfd72 introduced AnyOfRolesFilter as OR-variant of roles[...] shiro filter 2014-10-21 23:52:36 +02:00
Axel Uhl aba53e9747 working towards a solution for bug 2420: computing the email validation base URL on the client, passing it to the server 2014-10-20 18:20:32 +02:00
Axel Uhl bf55ab23cc Merge branch 'master' into axel-usermanagement 2014-10-17 22:12:07 +02:00
Jens Rommel 111486410d Fiddlig with Java 8 compiler settings... 2014-10-17 11:40:54 +02:00
Axel Uhl 819ca7b182 interims state after merge; doesn't compileMerge branch 'master' into usermanagement
Conflicts:
	home.md
	java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/AbstractTestWithIgtimiConnection.java
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
	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/client/GlobalNavigationPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.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/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/usermanagement/UserManagementPage.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-10-01 17:19:36 +02:00
Lennart Hensler 66efc11e16 Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
2014-09-17 15:07:42 +02:00
Axel Uhl ddaa8abf6d fixing bug 2303: newhome search now also considers remote servers 2014-09-15 22:53:22 +02:00
Axel Uhl a4af7c1128 making locally GWT-compilable again; addressed part of bug 2223 by making AddWaypoint/RemoveWaypoint idempotent, including a test that asserts this 2014-08-29 18:08:52 +02:00
Lennart Hensler 88b4f498b6 Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	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/datamining/client/DataMiningEntryPoint.java
2014-08-22 12:36:26 +02:00
Axel Uhl 47821a1141 a first working implementation of a competitor search box shown above the leaderboard 2014-07-31 17:44:43 +02:00