fmittag
8beb344d5c
changed generic news service to an event specific newsServce
2015-06-11 15:00:49 +02:00
Steffen Schaefer
89fd4e4471
Merge remote-tracking branch 'origin/master' into design2015
...
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.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/server/SailingServiceImpl.java
2015-04-29 17:00:53 +02:00
Frederik Petersen
f8f2ada89c
PolarDataService now uses OSGi service registry
...
preparation for being able to use polar data service in domain classes
2015-04-23 10:58:54 +02:00
Steffen Schaefer
5cb81d2c12
Added media pages and logic to decide if media tab is available
2015-03-09 16:27:27 +01:00
Axel Uhl
021b4a96ac
replaced UserRoles.adminitsrator by DefaultRoles.ADMIN
2015-02-13 15:59:24 +01:00
Axel Uhl
98d5235b47
upgraded all Mongo-using bundles to 2.13.0 driver
2015-02-12 16:00:15 +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
Fredrik Teschke
5471a6b8fc
update manifests and pom to new mongodb driver version
2015-02-11 12:55:32 +01:00
Simon Pamies
c0948fab65
Merged master
2015-02-05 12:05:16 +08:00
Axel Uhl
3d7137fa03
removed redundant version specidications in bundle dependencies
2015-02-02 15:59:44 +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
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
Alexander Ries
7dc1e72414
solved merge problems in LeaderboardEditing.gwt.xml, launch configs, feature.xml and TrackedRaceImpl.java
2015-01-22 13:15:23 +01:00
Simon Pamies
9411636740
Merge remote-tracking branch 'origin/master' into ribdashboard
2014-12-12 09:53:41 +11: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
Simon Pamies
6f3f15d07b
Merged master
2014-12-10 15:39:11 +11:00
EC2 Server
c1b85ee020
renamed structureimportCopy bundle to structureimport
2014-12-08 21:34:57 +00:00
Alexander Ries
35f8bbbad9
VerticalWindChart now uses SailingSerive
2014-12-07 19:20:42 +01:00
Axel Uhl
928cf87ea2
Merge remote-tracking branch 'server/polar-api' into polar-api
2014-12-03 13:42:37 +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
Axel Uhl
656118dae0
Merge branch 'master' into structureImport; pretty broken; in particular ListEditorComposite and SailingService will need close review for phony changes
...
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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/adminconsole/AdminConsoleFeatures.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetListEditorComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsListEditor.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/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_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java
java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/XRRParserUtil.java
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/ListEditorComposite.java
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/StringListEditorComposite.java
2014-12-03 10:54:12 +01:00
Frederik Petersen
734a29298b
Added x-y-diagram to polar sheets panel
...
for now only for upwind starboard speed
2014-12-03 10:39:31 +01:00
Alexander Ries
ba2dad23df
added initSailingService to RibDashboardEntryPoint and exported com.sap.sailing.gwt.ui.client in gwt.uis MANIFEST
2014-12-01 17:40:06 +01:00
Alexander Ries
c12af36227
added SailingServiceImpl in dashboads web.xml and exported com.sap.sailing.gwt.ui.server package in sailing.gwt.ui s MANIFEST
2014-12-01 17:19:34 +01:00
Alexander Ries
e0f5c546ed
Solved merge conflicts in TrackedRaceImpl
2014-11-27 11:22:33 +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
772d5477bc
added com.sap.sse.security.common which bundles security-related stuff that is shared by Java7 GWT projects as well as Java8 backend projects
2014-11-21 17:59:00 +01:00
Alexander Ries
144047ad07
Merge remote-tracking branch 'origin/master' into ribdashboard
2014-11-08 13:37:49 +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
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
5bcb19e5d9
exported packages from com.sap.sailing.gwt.ui required by RIB dashboard; added NoUI module to gwt.ui; added updateThreshold to Highcharts Series class
2014-11-06 16:12:49 +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
Frederik Petersen
861359071f
Merge branch 'master' into polar-api
...
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, No Tests).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.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 17:52:10 +01:00
Axel Uhl
15f0ea0489
renamed com.sap.sailing.mongodb to com.sap.sse.mongodb and removed unnecessary dependency to com.sap.sailing.domain.common; fixes bug 2435
2014-11-05 13:08:09 +01:00
Frederik Petersen
db968e5937
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.server/SailingServer (No Proxy).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, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2014-11-05 12:06:54 +01:00
Axel Uhl
3536628129
added ehcache runtime dependency for security-enabled bundles
2014-11-04 18:20:49 +01:00
Axel Uhl
71845c258d
Adjusted target platform definitions and launch configurations; added shiro.web bundle dependency to security-enabled web bundles
2014-11-04 18:09:14 +01:00
Frederik Petersen
4cad148934
Merge branch 'master' into polar-api
...
Conflicts:
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
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.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, Jetty on 8889, Cached MTB).launch
java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).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
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalGroupingProcessor.java
2014-10-16 09:33:58 +02:00
Nils
4366f4de77
merge master with problems
2014-10-08 14:05:17 +02:00
Axel Uhl
adbae3e412
Merge branch 'master' into usermanagement
2014-10-06 01:28:47 +02:00
Axel Uhl
20649299a4
require servlet 3.1.0 in gwt.ui so the getVirtualServerName() method is always available on ServletContext
2014-10-06 01:20:41 +02:00
Axel Uhl
62f8afa103
Merge branch 'master' into usermanagement
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-10-04 23:51:19 +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
Axel Uhl
69de0f2d76
upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly
2014-10-01 15:00:44 +02:00
Axel Uhl
7ece44052d
upgraded manifests from JavaSE-1.7 to JavaSE-1.8 as runtime environment
2014-10-01 14:08:19 +02:00
Simon Pamies
1857e77ee6
Added com.sap.sailing.autoload package that activates the feature of automatically loading races into a server
2014-09-05 10:54:12 +02:00
U-GLOBAL\D060338
136a81cf09
Regatta Import
2014-08-26 11:30:02 +02:00
U-GLOBAL\D060338
0b07926ca1
regattaimpi
2014-08-26 10:52:31 +02:00