Commit Graph
68 Commits
Author SHA1 Message Date
Jens Rommel 3f6700210c Merge branch 'master' into jens--media-synch
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.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/client/media/popup/AbstractPopupWindow.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubePopupWindow.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/DialogBoxExt.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.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/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:15:35 +02:00
Axel Uhl dfbd669358 moved shared client UI gwt stuff from *.ui.shared.* (where we have the stuff shared between client and server) to *.ui.client.shared.* 2013-04-17 12:27:34 +02:00
fmittag 8a8657fd9b Merge remote-tracking branch 'origin/master' into winregatta_resultimport
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.freg.resultimport.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
	java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorEntryImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorRowImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/RegattaScoreCorrectionsImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForRaceImpl.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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/ResultImportUrlsManagementPanel.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
	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/server/SailingServiceImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).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 (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/pom.xml
2013-04-08 14:20:52 +02:00
Lukas Niemeier a229765845 # moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android
# updated com.sap.sailing.domain to Java 1.7 again
# split of Event (see EventData) and Course (see CourseData) to minimize shared code with android
# to avoid sharing RaceColumn and Leaderboard (and its dependencies) Android projects work with RaceGroups (consisting of SeriesWithRows -> consisting of RaceRows -> consisting of RaceCells -> consisting of RaceLogs). A RaceGroup is basically a data-only view on transposed RaceColumns. See RaceGroupFactory for conversion from Leaderboard to RaceGroup. Future work: use Regatta instead of Leaderboard to convert to RaceGroup
2013-02-18 13:26:32 +01:00
Frederik Petersen 18d562445b Initial highcharts upgrade
new gwt version: 1.5.0
new js lib version: 2.3.5

Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
2013-01-28 08:39:04 +01:00
Fredrik Teschke 1488cfa547 Added JDOM lib from eclipse orbit, updated launch configs, removed gateway dependency from gwt.ui 2013-01-22 18:53:56 +01:00
Jens Rommel 08429d5a92 Turn test bundles to fragments.
- Builds with maven, except know local issue with selenium tests on my machine (due to Selenium/Firefox version mismatch)
- domain.test not suitable for a test fragment, since it contains larger parts of integration-tests using many different down-stream bundles.
2013-01-21 15:58:13 +01:00
Jens Rommel 560d9ac045 Running version with browser windows-based video player.
Still issue with Chrome not muting video playbacks.
2013-01-09 18:47:25 +01:00
Jens Rommel f9170db047 Merge remote-tracking branch 'origin/master' into media
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/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.server/SailingServer (Proxy).launch
2013-01-06 12:28:27 +01:00
Jens Rommel b0d518d11c Merge remote-tracking branch 'origin/master' into media
+ Further progress with media support:
  - added audio awareness, which works already
  - still under construction, e.g. whole live cycle/play/pause still not fully wired
2012-12-11 15:10:18 +01:00
Jens Rommel c8e7f2772f Work commit: SwissTiminig panel on Admin Conosole loads races from JSON.
- introduced new bundle for SwissTiming specific stuff, plus respective test bundle
- added new panel to Admin Console featuring replay of SwissTiminig races
- Actual import of race data just started, not functioning yet.
2012-11-26 17:22:05 +01:00
Jens Rommel f4b72a4873 Merge remote-tracking branch 'origin/master' into media 2012-11-16 11:47:32 +01:00
fmittag af63356e52 Moved all servlet- and import/export specific functions in com.sap.sailing.server to com.sap.sailing.server.gateway to create a clear separation between the sailing server and it's remote access functions 2012-10-08 18:42:51 +02:00
Jens Rommel b4e5a33e98 Implemented database access of media management in Admin Console. Add/create, query and delete already work, update missing, yet. 2012-09-28 12:21:22 +02:00
unknown cc74876603 renaming of CompetitorResult to CompetitorRow 2012-07-31 06:46:53 +02:00
unknown 7f4f19a8a4 added new bundle com.sap.sailing.resultimport to share common interfaces across multiple providers
Adapted UI to these changes
2012-07-30 19:31:21 +02:00
unknown 82894d18ba replaced specific UI for FREG provider url management with a more generic version supporting several result import providers.
Added winregatta bundles to feature, product, start config, etc.
2012-07-29 18:27:48 +02:00
Axel Uhl b673823684 first preliminiary possibility to maintain FREG URLs in AdminConsole 2012-07-17 15:15:46 +02:00
fmittag 726aec41fa added an admin console panel to show the current race course 2012-07-11 11:36:25 +02:00
fmittag 1fd23701f4 second commit of adding a bundle tracker (missed some files before) 2012-06-19 11:00:29 +02:00
Axel Uhl 42bba01f90 compilable interims-version of replication 2012-04-24 18:26:37 +02:00
Axel Uhl 5b69aec2de made more objects serializable; changed to ReplicationService and obtain it in SailingServiceImpl 2012-04-23 18:08:05 +02:00
Lennart Hensler abcd5ac3f3 Moved calculation of the start and finish for a tracked race to the sailing service 2012-03-30 08:48:56 +02:00
fmittag e091ef8ecf removed gflot usage and java libraries 2012-03-27 14:36:03 +02:00
Axel Uhl ee8a81536d adjusted ADMIN documentation; adjusted gwt.ui build to source version of Highcharts 2012-02-28 14:06:48 +01:00
fmittag eeb4006929 removed com.sap.ui5/Phoenix stuff from target platform, manifest files and gwt modules 2012-02-06 11:22:28 +01:00
Axel Uhl 4af9ba9533 first Highcharts chart sample in WindPanel 2012-02-03 14:54:50 +01:00
Axel Uhl 3a8d6616fb removed server.api bundle after having moved the identifier stuff to the domain bundle 2012-01-24 10:26:15 +01:00
Axel Uhl 95aff2608e remove Eclipse-BuddyClassloader setting from gwt.ui's manifest 2012-01-16 17:17:21 +01:00
fmittag e07939819a refactoring of package com.sap.sailing.gwt.ui.client into 4 different packages -> one for each GWT Module 2012-01-05 17:53:40 +01:00
Axel Uhl 7490795e0a use newer Jetty in classpath for SailingGWT; probably not necessary 2012-01-03 16:00:10 +01:00
Axel Uhl fbeaa1d9d9 moved static resources to project root and include in build through build.properties 2012-01-03 14:26:44 +01:00
Axel Uhl dc4552c48c moved war/ contents back to war/ and exposed it through build.properties 2012-01-03 13:27:45 +01:00
Axel Uhl f0a09649d2 moved war/ folder of gwt.ui to src/main/resources; adjusted launch configurations to gwt/ subfolder 2012-01-03 11:43:10 +01:00
fmittag 4bab2f436b - move context path of application gwt.ui from / to /gwt and adjust resource loader
- added logging settings to AdminConsole app
2012-01-02 15:40:33 +01:00
Axel Uhl 5c8e8a9637 Merge branch 'gwt' into osgi_mvn_refactoring
Conflicts:
	java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
2011-12-29 14:56:10 +01:00
Axel Uhl 4398a0e3e2 introduced com.sap.sailing.domain.common project which lets us share between domain and gwt.ui 2011-12-29 10:57:25 +01:00
Axel Uhl c972c9e3d1 Merge branch 'gwt' into osgi_mvn_refactoring
Conflicts:
	java/com.sap.sailing.gwt.ui.test/.gitignore
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.api/.project
	java/com.sap.sailing.server.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, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
2011-12-28 15:37:10 +01:00
Axel Uhl 2e82fce625 introduced maven dependency for gflot; had to rename to 1.0.1 to avoid clash with gwt-1.5.3 2011-12-12 17:14:47 +01:00
Benjamin Ebling ed66ab1a10 Merge branch 'gwt' into gflot
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/ChartsPanel.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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2011-12-12 15:05:35 +01:00
Benjamin Ebling a73ea01ca6 First working version of gflot-charts. 2011-12-08 17:13:13 +01:00
fmittag 6ef85a92ef moved org.json.simple from bundle project to target-base 2011-12-08 15:42:43 +01:00
Axel Uhl 910941cce9 builds sources jar for server.api bundle which may be prerequisite for GWT source inclusion 2011-12-07 14:53:16 +01:00
fmittag 956532b362 first version... the PDE build works against a target platform referencing local p2 repositories generated by a script file... 2011-12-06 16:42:25 +01:00
Axel Uhl a916565233 cleaned up gwt.ui pom and switched to GWT 2.4 2011-12-01 15:18:21 +01:00
Axel Uhl a9d099e83a (re-?)added gwt OSGi bundle to dependency list of gwt.ui bundle 2011-11-25 23:54:01 +01:00
Axel Uhl 581e0f90a5 fixed visibilities, avoid warnings 2011-11-25 16:45:34 +01:00
fmittag 0fd38bb5b2 Merge remote-tracking branch 'origin/gwt' into gwt-5
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
2011-11-25 14:24:32 +01:00
fmittag e1c2918e27 refactoring of the MongoDBService to be configurable (TEST, PROD, etc.)
apply the new service to all tests
2011-11-25 13:59:41 +01:00
Fabian Schwarz-Fritz a109ca2132 Corrected pom.xml files 2011-11-25 11:03:30 +01:00