Commit Graph
1793 Commits
Author SHA1 Message Date
Axel Uhl a1a8166b08 fixed MongoDB bundle reference in launch configurations after target platform upgrade 2015-02-13 10:18:32 +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
Axel Uhl 89cf67a50a Merge branch 'master' into ftes-mongo-driver-2.13 2015-02-12 23:19:56 +01:00
Fredrik Teschke 3b97cb9fed re-add mail bundle to launch configs after merge 2015-02-12 18:31:26 +01:00
Axel Uhl 98d5235b47 upgraded all Mongo-using bundles to 2.13.0 driver 2015-02-12 16:00:15 +01:00
Fredrik Teschke acfbe4de49 update launch configs to include jackson bundles to avoid NoClassDefFoundErrors 2015-02-12 13:15:27 +01:00
Axel Uhl 39c3c789b5 Merge remote-tracking branch 'origin/master' into ftes-mongo-driver-2.13 2015-02-12 00:05:07 +01:00
Nicolas 7e3aab3a33 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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/client/StringMessages.java
2015-02-11 17:58:59 +01:00
Axel Uhl a211e5427a proposal for no e-mail validation but a placeholder attribute on the text box explaining what/why to enter 2015-02-11 17:49:45 +01:00
Axel Uhl 67d1444466 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	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
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/pom.xml
2015-02-11 14:55:30 +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 5471a6b8fc update manifests and pom to new mongodb driver version 2015-02-11 12:55:32 +01:00
Axel Uhl d91257c8d6 Merge branch 'master' into ftes-mail-move-to-sse 2015-02-11 10:04:01 +01:00
Axel Uhl 6cd449928b fixed winddbTest launch configs, re-enabling the accidentally disabled gateway.testsupport bundle as auto-start 2015-02-10 23:32:32 +01:00
Axel Uhl 8646840cec harmonized launch configurations 2015-02-10 23:17:35 +01:00
Axel Uhl 4e55e61c51 fixed merge problems in launch configs, adding file storage bundle everywhere 2015-02-10 14:37:41 +01:00
Axel Uhl 1ed846859c Merge branch 'master' into ribdashboard
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-10 13:00:48 +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 354d284b03 add Mail bundle to launch configs 2015-02-09 21:09:58 +01:00
Fredrik Teschke 54b0071b75 add zxing library in newer version (including launch configs) 2015-02-09 16:40:18 +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
Simon Pamies ecc77653f4 Do not use -XstartOnFirstThread as this crashes on MacOSX 2015-02-08 16:29:10 +08:00
Simon Pamies dab530bbb7 Introduced AbstractEntryPoint and registered services by using EntryPointHelper (cont.) 2015-02-07 12:07:05 +08:00
Simon Pamies 3e7588b74c Merged master 2015-02-07 12:05:38 +08:00
Axel Uhl 8fcda9fa7f Merge branch 'master' into mark-rounding-inference
Conflicts:
	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/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
2015-02-06 06:22:56 +01:00
Axel Uhl ba65988793 Merge remote-tracking branch 'server/master'
Conflicts:
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-06 05:58:55 +01:00
Simon Pamies a602d9d478 Added a parameter to reload connections to wind receivers 2015-02-06 12:14:17 +08:00
Axel Uhl a2b8813aab another launch config to start a transitive replica 2015-02-05 18:26:47 +01:00
Simon Pamies c97e7a4ca5 Made dashboards run with SDM, also changed group launch config to include the dashboards SDM 2015-02-05 16:59:00 +08:00
Fredrik Teschke 4508934766 remove com.sap.sse.{gateway, osgi} by moving the few classes into com.sap.sse 2015-02-05 09:28:38 +01:00
Simon Pamies c0948fab65 Merged master 2015-02-05 12:05:16 +08:00
Jan Broß 0e4775d51f Add email field to Competitor 2015-02-04 22:36:48 +01:00
Axel Uhl d20450a172 updated launch configurations with new filestorage and AWS bundles 2015-02-04 05:12:51 +01:00
Alexander Ries 14539148d1 changed db name in No Proxy, Jetty on 8889 launch conifg to replica 2015-02-03 22:09:39 +01:00
Axel Uhl 405001c948 consolidated imports 2015-02-02 16:38:45 +01:00
Axel Uhl 92c3a96ed0 removed redundant getActiveFileStorageService from RacingEventService 2015-02-02 16:38:07 +01:00
Axel Uhl 4972fdb93f removed redundant version specifiers from com.sap.sailing.server manifest 2015-02-02 16:34:36 +01:00
Fredrik Teschke 991aaf126b Revert "introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8"
This reverts commit 02972d1bea.

Conflicts:
	java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/ReplicableFileStorageManagementService.java
2015-01-29 17:00:02 +01:00
Fredrik Teschke 02972d1bea introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8 2015-01-29 16:50:40 +01:00
Alexander Ries ee9d6a9f7b added com.sap.sailing.dashboards and mgwt bundle to launch configs 2015-01-29 13:41:30 +01:00
Peter Siegmund b86411c441 Merge branch 'master' into android_apps 2015-01-26 09:37:54 +01:00
Fredrik Teschke 9050a7d58e lower start level of filestorage bundle to 3 due to test errors 2015-01-25 17:16:46 +01:00
Fredrik Teschke fdb38874bd avoid NPE when trying to find file storage mgmt service 2015-01-25 16:22:30 +01:00
Nicolas 6402631c8f Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-24 16:33:26 +01:00
Axel Uhl 103dc8b56d Merge branch 'master' into ribdashboard 2015-01-24 15:49:01 +01:00
Axel Uhl 39f19e0095 Merge branch 'master' into ribdashboard
Conflicts:
	java/com.sap.sailing.feature/feature.xml
2015-01-24 14:41:42 +01:00
Fredrik Teschke 9a5fd4ac36 removing discrepancies to master (old 1.6 android compiler settings somehow appeared) 2015-01-23 20:09:53 +01:00
Fredrik Teschke daad4c8c73 Merge branch 'master' into ftes-file-storage
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-01-23 19:40:26 +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