Commit Graph
266 Commits
Author SHA1 Message Date
Axel Uhl 4c231f3844 Merge branch 'ftes-maven-p2-local' into bug2465 2014-11-30 11:54:15 +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
Fredrik Teschke 91fef8fc84 build p2 repo with maven plugin instead of manually invoking launcher jar 2014-11-21 15:18:14 +01:00
Axel Uhl b36b2e146f added missing pom.xml stuff for replication.testsupport 2014-11-21 12:28:03 +01:00
Axel Uhl 6fc64beb42 introduced replication test support bundle, factoring commonalities for abstract replication tests; started simple security replication test frame 2014-11-21 11:02:54 +01:00
Fredrik Teschke 56c25c50d7 keep only one target definition
- target definitions for ide and maven (local and p2admin) were all very similar
  - only differences between ide and maven: bundle versions, attributes in <location> tags and order of tags
  - only differences between local and p2admin: once one uses the file:// url for local, then they are exactly the same but for the specific URL
- retain only one base target definition (use for normal ide and maven scenario)
- introduce a script that can generate the target definition for the local p2 repo
2014-11-19 17:55:39 +01:00
Fredrik Teschke 141618d540 use locally built p2 repo in maven build
- ``-v`` flag in buildAndUpdateProduct.sh triggers building p2 repo and then uses it instead of p2.sapsailing.com
2014-11-19 16:49:17 +01:00
Fredrik Teschke 063f83ad2e removed duplicate gwt.version 2014-11-19 11:22:03 +01:00
Fredrik Teschke 6586a2c070 Merge branch 'master' of sapsailing.com:/home/trac/git 2014-11-19 11:18:20 +01:00
Fredrik Teschke e0e23b9cab moved gwt.version into existing <properties> tag (duplicate tag warning otherwise) 2014-11-19 11:18:06 +01:00
Axel Uhl 3b8b942865 fixed top-level pom.xml in java/ directory (moving the gwt.version property duplicated the properties tag) 2014-11-19 11:17:26 +01:00
Axel Uhl cffee9e046 Merge branch 'master' into bug2409 2014-11-19 10:17:25 +01:00
Axel Uhl 068f397f3f fixing bug 2472 by moving gwt.version specification from com.sap.sailing.gwt.ui/pom.xml to parent pom.xml in java/ 2014-11-19 10:03:51 +01:00
Axel Uhl 4e7fac15db Merge branch 'master' into bug2409
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/TvView.gwt.xml
2014-11-14 10:36:46 +01:00
Axel Uhl 301d682205 activate -ea for test execution to see failing assertions during Maven test runs; adjusted GC settings for tests to those used in production 2014-11-14 09:47:12 +01:00
Axel Uhl b21ea15902 fixed pom.xml files for new com.sap.sse.gateway bundle 2014-11-09 02:52:48 +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
Axel Uhl 030129629a renamed com.sap.sailing.operationaltransformation to com.sap.sse.operationaltransformation 2014-11-07 09:21:22 +01:00
Axel Uhl 93988dcf64 added adminconsole module to top-level pom.xml 2014-11-06 21:29:46 +01:00
Axel Uhl 01d5f3ea6c renamed com.sap.sse.mongodb also in pom.xml files 2014-11-05 14:07:44 +01:00
Axel Uhl bf55ab23cc Merge branch 'master' into axel-usermanagement 2014-10-17 22:12:07 +02:00
Jens Rommel 921febb3cd Tycho config 2014-10-17 11:18:52 +02:00
Axel Uhl 9143d55e7f removed the com.sap.sse.security.userstore bundle and consolidated it in com.sap.sse.security 2014-10-16 17:14:02 +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 e477d2ba7a downgrade Tycho to 0.20.0; see http://dev.eclipse.org/mhonarc/lists/tycho-user/msg05812.html 2014-10-02 14:18:58 +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
EC2 Server 8d5bf943c0 upgraded Tycho to version 0.21.0 so as to enable JavaSE-1.8 to be recognized as execution environment 2014-10-01 13:42:48 +00:00
Simon Pamies df0e5ba767 Forgot to add autoload to main pom 2014-09-05 10:54:21 +02:00
Axel Uhl d1d94b7c3f added -DspatialWind=true to the parameters.common section in pom.xml so it is used for the Maven / Tycho tests as well 2014-06-22 21:07:49 +02:00
Benjamin Ebling d46376eb40 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	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/shared/panels/UserStatusPanel.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/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-06-04 15:49:02 +02:00
Axel Uhl 1a3853b6ff Merge branch 'master' into tracapi 2014-05-30 15:07:12 +02:00
Axel Uhl be0cf924ba added deckmanadapter to main java/pom.xml, to feature.xml and raceanalysis.product 2014-05-30 15:02:28 +02:00
Benjamin Ebling ad1d63effd Initial simple user management 2014-05-16 11:06:59 +02:00
Axel Uhl 5c2fc3b888 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
Fredrik Teschke bf31f4c1ea Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).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, 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-04-07 23:35:57 +02:00
Axel Uhl acf88b282c Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling.launch
2014-04-07 23:05:36 +02:00
Axel Uhl 45925fb8ad removed de.csenk.gwt.ws project for now as we're not using web sockets from GWT projects, and the project requires stuff from gwt-dev.jar which we're not including anymore in gwt.osgi 2014-04-07 21:23:21 +02:00
Fredrik Teschke 821f1307bf Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	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/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/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceCourseManagementPanel.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.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
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	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).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).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/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-03-28 18:34:58 +01:00
Axel Uhl e959d76417 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/pom.xml
2014-03-27 14:37:41 +01:00
Axel Uhl e978666d6d Merge branch 'master' into swisstiming-2.0
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 (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).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-03-22 15:46:26 +01:00
fmittag 61b5bbe2be added new bundle com.sap.sailing.manage2sail to have a place for common manage2sail related code 2014-03-19 17:43:36 +01:00
fmittag c902ddeea3 Merge remote-tracking branch 'origin/dataMining' into sse_gwt_refactoring
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/AbstractEntryPoint.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/datamining/DataMiningEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
2014-03-18 14:29:55 +01:00
fmittag f19fc449f2 added a com.sap.sse.common.test bundle 2014-03-17 13:21:08 +01:00
fmittag 9a9055ab63 added com.sap.sse.common bundle to have a place for common code for all sse subprojects 2014-03-13 11:51:35 +01:00
Lennart Hensler 15ffa269c2 Merge remote-tracking branch 'extern/master' into dataMining
Conflicts:
	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
2014-02-21 16:20:01 +01:00
Axel Uhl b6e19b6536 Merge branch 'master' into tracapi
Conflicts:
	java/pom.xml
2014-02-20 10:32:47 +01:00
Axel Uhl 18e0abb4a7 starting to work on the test cases; remove ClientParamsPHP tests because they don't seem required anymore 2014-02-13 21:09:22 +01:00
Lennart Hensler b74d2227e5 Added new data mining core bundles to the overall pom.xml 2014-02-11 17:01:21 +01:00
D049941 081d19395e Module com.sap.sailing.server.gateway.test.support added which was
missing.
2014-02-11 13:35:39 +01:00