Commit Graph
204 Commits
Author SHA1 Message Date
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Frederik Petersen 3fd2bfd8a2 Fixes auto stat for polars 2015-05-01 10:54:19 +02:00
Axel Uhl 75b04d8048 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-30 22:09:02 +02:00
Alexander Ries a1ad8df545 added dashboard and mgwt bundle to server launch configs 2015-03-20 10:14:48 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Frederik Petersen 5206c79548 Fixed some stuff after new datamining -> polar mining merge 2015-03-02 16:18:44 +01:00
Frederik Petersen ff36a8c758 Added commons math to launch configs 2015-02-18 10:52:01 +01:00
fmittag 2c7f3c4174 added gwt.theme project to all launch configs 2015-02-17 17:13:12 +01:00
Axel Uhl da608903b8 fixed launch configs; fixed mail service which needs to implement ClearStateTestSupport 2015-02-16 16:36:12 +01:00
Axel Uhl b037a465a9 Merge branch 'master' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2015-02-15 09:03:34 +01:00
Axel Uhl 39b1c55a88 made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +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
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 3b97cb9fed re-add mail bundle to launch configs after merge 2015-02-12 18:31:26 +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 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
Axel Uhl 4e55e61c51 fixed merge problems in launch configs, adding file storage bundle everywhere 2015-02-10 14:37:41 +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
Simon Pamies c0948fab65 Merged master 2015-02-05 12:05:16 +08: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 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 d7920ef0df added com.sap.sse.osgi to launch configs 2015-01-23 19:32:07 +01:00
Axel Uhl a3af0faae3 measure time it takes to compute wind based on maneuvers; re-enabled two more tests of this kind 2015-01-23 17:46:33 +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
Fredrik Teschke 3170d94fd4 added mimepull bundle to launch configs 2015-01-23 16:32:47 +01:00
Fredrik Teschke 11e1127699 add filestorage ui bundle 2015-01-23 16:31:37 +01:00
Fredrik Teschke 16f35c1b24 added implementation of file storage service 2015-01-23 11:15:28 +01:00
Peter Siegmund 353e83f270 Merge branch 'master' into android_apps 2015-01-23 10:08:08 +01:00
Axel Uhl 9e58885c0d added com.sap.sse.shared.android to feature and added it to all launch configurations 2015-01-22 15:34:36 +01:00
Peter Siegmund d72da977cb Merge branch 'master' into android_apps 2015-01-15 15:34:10 +01:00
Axel Uhl 79fb30def8 added serialization.hsared.android bundle to launch configurations 2015-01-15 13:55: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 c757548fae Merge branch 'master' into structureImport
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/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-12-11 18:15:44 +01:00
Frederik Petersen f03cacd7cf Rechecked polar bundle in launch configs
these were overridden in previous merges
2014-12-10 13:01:16 +01:00
Axel Uhl 13474b7137 fixed initialization of discard threshold field in series edit/create dialogs; added structureimport to launch configs 2014-12-09 15:52:13 +01:00
Axel Uhl c979f8f214 added xrr bundles to launch configs; added StructureImportPanel to AdminConsole's Connector panel; added missing string properties and fixed table selection model 2014-12-04 15:25:46 +01:00
Axel Uhl 4550f975dc Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
	java/pom.xml
2014-12-03 13:10:20 +01:00
Frederik Petersen 84221e52a3 Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.domain/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/PolarSheetGenerationTest.java
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/aggregation/PolarFixAggregationWorker.java
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/data/impl/PolarFixImpl.java
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/generation/PolarSheetGenerator.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-11-25 14:58:39 +01:00
Axel Uhl fcfde37fad adjusted launch configurations and more pom.xml files for new security.common bundle 2014-11-21 18:21:17 +01:00
Axel Uhl 80aff1561b renamed packages in com.sap.sse.replication according to bundle name; fixed launch configurations 2014-11-09 20:30:31 +01:00
Frederik Petersen 58811787a2 Merge branch 'master' into polar-api
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-11-07 19:16:13 +01:00
Axel Uhl 182445b6c5 added module declaration for reusable adminconsole component 2014-11-06 21:00:35 +01:00