Commit Graph
100 Commits
Author SHA1 Message Date
Fredrik Teschke 4f799bf7f6 add resources folder to maven build 2015-11-10 11:07:37 +01:00
Fredrik Teschke c088df3ff8 Merge branch 'master' of sapsailing.com:/home/trac/git 2015-11-09 19:07:59 +01:00
Fredrik Teschke 9fcf600326 add fix for failing RaceLogStartTimeEvent deserialization 2015-11-09 19:07:18 +01:00
Fredrik Teschke 43db0476eb add failing testcase for RaceLogStartTimeEvent deserialization 2015-11-09 19:06:31 +01:00
Fredrik Teschke bdd3113e14 Merge branch 'ftes-remove-racelogeventfactory' 2015-11-04 08:23:09 +01:00
Fredrik Teschke b00fd99cf9 fixed NPEs due to missing nextStatus in RaceStateEvents 2015-11-03 16:20:18 +01:00
Fredrik Teschke 697a7947d7 missed one file in previous commit 2015-11-02 23:10:54 +01:00
Fredrik Teschke 817bb285c7 more housekeeping on RaceLog*Events 2015-11-02 23:09:42 +01:00
Fredrik Teschke f8fbbb35dc remove RaceLogEvent[Restore]Factory and RaceLogEvent* housekeeping
- the factories were not used for any factory purposes, and only resulted in maintenance effort
- unified order of constructor parameters for LogEvent-classes
- standard values for an event-id and createdAt-timestamp are now set once in base classes, instead
  of all over the place
2015-11-02 22:06:42 +01:00
Fredrik Teschke 970d6720ee update release notes: RaceLog-tracking related (bug 2851#comment1, bug 3307) 2015-10-22 11:17:47 +02:00
Fredrik Teschke e42ba2443a added res folder that the android compiler was missing 2015-10-22 11:02:06 +02:00
Fredrik Teschke eceabfa81b removed duplicate constructors (probably from cherry-pick & merge) 2015-02-14 13:40:51 +01:00
Fredrik Teschke 901d4b208f add initial implementation of get-marks-for-race endpoint 2015-02-14 13:18:45 +01:00
Fredrik Teschke 5597d0ce81 clarify documentation of ping-mark endpoint 2015-02-14 12:57:46 +01:00
Fredrik Teschke 54739ed42f add endpoint for pinging marks via regattalog 2015-02-14 12:53:33 +01:00
Fredrik Teschke 763d9fccf4 enable rest api servlets to find any OSGi service 2015-02-14 12:52:36 +01:00
Fredrik Teschke 387013eafa add functionality for pinging marks via RegattaLog to RaceLogTrackingAdapter 2015-02-14 12:50:47 +01:00
Fredrik Teschke 04f3002a59 clean up rest api description 2015-02-14 12:50:15 +01:00
Fredrik Teschke d858f6c904 Merge branch 'master' of sapsailing.com:/home/trac/git 2015-02-14 08:30:15 +01:00
Fredrik Teschke 4b8b667f57 add REST API doc for smartphone tracking related endpoints 2015-02-14 08:28:45 +01:00
Fredrik Teschke 114bddfdde Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-14 06:54:36 +01:00
Fredrik Teschke aedbfbeac4 remove unused import 2015-02-14 06:54:15 +01:00
Fredrik Teschke f60733698e Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java
	java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java
2015-02-14 06:53:07 +01:00
Fredrik Teschke 6b6c657452 fix test failures due to previous refactoring of abstract replication test classes 2015-02-14 06:51:39 +01:00
Fredrik Teschke ebb47e2900 fix typo in pom 2015-02-13 21:00:33 +01:00
Fredrik Teschke 1d99e6ba75 also add mail replication test that tests outside of SecurityService context 2015-02-13 20:59:11 +01:00
Fredrik Teschke 42e1411bb6 add replication test for mail service (could only test applying changes to master) 2015-02-13 20:30:32 +01:00
Fredrik Teschke de39d6a40a refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future 2015-02-13 20:28:45 +01:00
Fredrik Teschke b4b646be1f refactor AbstractServerReplicationTest to enable tests with multiple replicable services in future 2015-02-13 20:27:23 +01:00
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 4cb7b535c8 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Fredrik Teschke df3b798bda Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
2015-02-13 08:26:24 +01:00
Fredrik Teschke 3b97cb9fed re-add mail bundle to launch configs after merge 2015-02-12 18:31:26 +01:00
Fredrik Teschke fa887140c8 Merge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/pom.xml
2015-02-12 18:14:21 +01:00
Fredrik Teschke 5619438b22 Merge branch 'ftes-fix-noclassdeffounderrors' 2015-02-12 18:00:21 +01:00
Fredrik Teschke acfbe4de49 update launch configs to include jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:15:27 +01:00
Fredrik Teschke f637d50c41 add old jackson bundle as dependency to MANIFESTS to avoid NoClassDefFoundErrors 2015-02-12 13:14:47 +01:00
Fredrik Teschke 7bf597f4a4 add transitive dependencies for old jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:13:50 +01:00
Fredrik Teschke cf91286842 add old jackson-jaxrs and jettison bundle to target platform (fix NoClassDefFoundErrors) 2015-02-12 12:50:31 +01:00
Fredrik Teschke 0c8879b643 use lazy autostart for mail bundle in selenium test config and raceanalysis.product 2015-02-12 12:35:44 +01:00
Fredrik Teschke b9c6fea20e adapt selenium test to match new behaviour of RegattaLeaderboard#getAllCompetitors()
- test expected leaderboard to contain no competitors before linking tracked races
- however, the Regatta underlying the leaderboard already new the competitors
- with the new implementation, a RegattaLeaderboard also uses the competitors known to the regatta
2015-02-11 14:31:54 +01:00
Fredrik Teschke 3875409363 remove unused class that was added for email invites 2015-02-11 13:44:42 +01:00
Fredrik Teschke 8bfc064c5d Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-11 13:17:51 +01:00
Fredrik Teschke a5507a16b3 remove unnecessary mockito dependency that let build fail 2015-02-11 13:16:47 +01:00
Fredrik Teschke c8d28b9cf0 remove calls to deprecated mongodb threading/concurrency methods
- excerpt from the API doc: "The main use case for this method is to ensure that applications can read their own unacknowledged writes, but this is no longer so prevalent since the driver started defaulting to acknowledged writes. The other main use case is to ensure that related read operations are all routed to the same server when using a non-primary read preference. But this is dangerous because mongos does not provide this guarantee. For these reasons, this method is now deprecated and will be removed in the next major release."
2015-02-11 13:05:41 +01:00
Fredrik Teschke af0856653e removed calls to deprecated mongo-API methods (result of mongo-api upgrade) 2015-02-11 12:58:48 +01:00
Fredrik Teschke 9f13d9e56e fixed deprecation warnings resulting from MongoDB driver upgrade
Conflicts:
	java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java

Conflicts:
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
2015-02-11 12:57:11 +01:00
Fredrik Teschke 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +01:00
Fredrik Teschke 0c284eed0b Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' 2015-02-11 11:55:39 +01:00
Fredrik Teschke 9bc83057c6 update to mongo driver 2.13 2015-02-11 11:52:05 +01:00
Fredrik Teschke 0ca216eda6 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-10 16:03:40 +01:00
Fredrik Teschke 6ea9a7f06f Merge remote-tracking branch 'origin/master' into ftes-mail-move-to-sse 2015-02-10 16:02:01 +01:00
Fredrik Teschke 52fa52efce choose complicated approach for encoding URLs, as tycho doesn't allow com.google.gwt references in common bundles 2015-02-10 03:36:05 +01:00
Fredrik Teschke 523ad4cc3e Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation 2015-02-10 03:10:29 +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 4da7cfa6eb reflection in URLEncode to avoid tycho compilation error 2015-02-10 03:06:32 +01:00
Fredrik Teschke 4490d6a35d fix buggy behaviour with multipart image as email attachment 2015-02-10 02:50:13 +01:00
Fredrik Teschke 561c6470d4 make invitation mail prettier 2015-02-10 02:49:16 +01:00
Fredrik Teschke aade5bbb02 pass exception during mail sending along 2015-02-10 02:17:21 +01:00
Fredrik Teschke a762d97872 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-10 01:30:45 +01:00
Fredrik Teschke 0e8480d908 add MailService activator in manifest 2015-02-10 01:29:59 +01:00
Fredrik Teschke fe5bf1efcb moved TrackingStringMessages to correct folder 2015-02-10 01:27:00 +01:00
Fredrik Teschke b4142edf14 use competitors registered in RegattaLog to compute getAllCompetitors() in HasRegattaLike implementations 2015-02-10 01:21:42 +01:00
Fredrik Teschke 51f06e8695 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation 2015-02-10 00:55:04 +01:00
Fredrik Teschke e563efe9ea Merge branch 'master' into ftes-mail-move-to-sse 2015-02-10 00:52:59 +01:00
Fredrik Teschke 04608c2ae7 add email to constructor of CompetitorImpl and fix bug (competitor email not loading on startup) 2015-02-10 00:49:53 +01:00
Fredrik Teschke 639eba5226 improve competitor invitation UI 2015-02-10 00:49:24 +01:00
Fredrik Teschke 767652381b add GWT-context-sensitive URLEncoder 2015-02-10 00:48:19 +01:00
Fredrik Teschke 26b8c59382 removed obsolete code dealing with mail properties from SailingService 2015-02-09 23:03:51 +01:00
Fredrik Teschke 2f1b4390b4 add i18n to tracking invitation emails 2015-02-09 22:59:28 +01:00
Fredrik Teschke 7c3ec1983f explain how to get Locale from GWT in JavaDoc 2015-02-09 22:59:07 +01:00
Fredrik Teschke ee6759f42c Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sse.common/META-INF/MANIFEST.MF
2015-02-09 22:43:04 +01:00
Fredrik Teschke c6b68ee17b move MailException to common bundle (needed by GWT) 2015-02-09 22:36:55 +01:00
Fredrik Teschke e58f2931ea move email invite functionality into racelog tracking adapter 2015-02-09 22:28:13 +01:00
Fredrik Teschke 597163b5e0 Merge branch 'jbross-email-invitation' of sapsailing.com:/home/trac/git into jbross-email-invitation
Conflicts:
	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/server/SailingServiceImpl.java
2015-02-09 21:59:01 +01:00
Fredrik Teschke b43c2230bd Merge branch 'jbross-email-invitation' of sapsailing.com:/home/trac/git into jbross-email-invitation
Conflicts:
	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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
2015-02-09 21:56:20 +01:00
Fredrik Teschke 3dee3fe986 Merge branch 'jbross-email-invitation' of sapsailing.com:/home/trac/git into jbross-email-invitation
Conflicts:
	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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
2015-02-09 21:44:08 +01:00
Fredrik Teschke 0204185639 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-02-09 21:40:47 +01:00
Fredrik Teschke 0f22ef64df Revert "make MailService known in SailingService"
This reverts commit a841542419.
2015-02-09 21:39:36 +01:00
Fredrik Teschke 182dbd2571 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-09 21:39:14 +01:00
Fredrik Teschke 70151b06cf Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2015-02-09 21:36:24 +01:00
Fredrik Teschke f4db3f7a30 Merge branch 'ftes-file-storage-i18n' 2015-02-09 21:23:44 +01:00
Fredrik Teschke 354d284b03 add Mail bundle to launch configs 2015-02-09 21:09:58 +01:00
Fredrik Teschke 1cacd1e12f start MailService during selenium test 2015-02-09 21:09:26 +01:00
Fredrik Teschke a841542419 make MailService known in SailingService 2015-02-09 21:09:04 +01:00
Fredrik Teschke e004c433cc pull out mail functionality into own service and bundle
- needs to live outside com.sap.sse due to dependency on replication
- use mail.properties instead of security.properties
- introduced ServiceTrackerFactory, which led to refactorings in SailingServiceImpl and ~Mock
2015-02-09 21:03:50 +01:00
Fredrik Teschke 27939b6200 add QRCode to email, and start restructuring device-mapping-url-gen code 2015-02-09 18:08:14 +01:00
Fredrik Teschke 54b0071b75 add zxing library in newer version (including launch configs) 2015-02-09 16:40:18 +01:00
Fredrik Teschke dd9b4468d7 add zxing library to target definition 2015-02-09 15:58:29 +01:00
Fredrik Teschke 955c1237d7 Merge remote-tracking branch 'origin/master' into jbross-email-invitation
Conflicts:
	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/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/StringMessages_ru.properties
2015-02-09 15:49:40 +01:00
Fredrik Teschke fc1be06108 Merge branch 'ftes-pull-out-datamining-server-side-i18n' into dataMining
Conflicts:
	java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java
	java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java
	java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/ProcessorFactory.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/QueryFactory.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningActivator.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelByDimensionGroupingProcessor.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/ConcatenatingCompoundFunction.java
	java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java
2015-02-09 15:29:09 +01:00
Fredrik Teschke ee51b397d1 Merge branch 'ftes-pull-out-datamining-server-side-i18n' into ftes-file-storage-i18n 2015-02-08 23:48:47 +01:00
Fredrik Teschke 166c93f363 rename to more technically accurate ResourceBundleStringMessages and add javadoc 2015-02-08 23:46:37 +01:00
Fredrik Teschke 63dc00da31 rename to more technically accurate ResourceBundleStringMessages and add javadoc 2015-02-08 23:44:04 +01:00
Fredrik Teschke a3b65176d1 add i18n for server-managed file storage entities 2015-02-05 13:01:09 +01:00
Fredrik Teschke 2e292d97a1 Merge branch 'master' into ftes-pull-out-datamining-server-side-i18n 2015-02-05 12:26:00 +01:00
Fredrik Teschke b9ceb386a6 move file storage dto utils to com.sap.sse.gwt 2015-02-05 12:25:47 +01:00
Fredrik Teschke e10cb52762 move server-side string messages to com.sap.sse 2015-02-05 12:20:34 +01:00
Fredrik Teschke f414003f8b Merge branch 'master' of sapsailing.com:/home/trac/git 2015-02-05 12:05:16 +01:00
Fredrik Teschke 5c15b93e87 add explanation for commented src lines dealing with device type 2015-02-05 11:47:24 +01:00