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
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
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
Fredrik Teschke
5c714e5a31
restructured race log tracking: moved to racelogtrackingadapter bundles, renamed packages, moved some interfaces
2014-02-10 16:42:36 +01:00
Fredrik Teschke
0879ca7600
added DeviceTypeIdentifier and related files from cmd-android-tracking branch
2014-01-28 18:12:21 +01:00
Axel Uhl
c7e9d11a6e
on the dataMining branch we of course do want the datamining tests to be executed
2014-01-23 09:30:29 +01:00
Axel Uhl
f9c6df05da
un-commented the test bundles again
2014-01-22 17:57:23 +01:00
Axel Uhl
77a18aa93b
fixed pom.xml regarding remote debugging properties (need to be in one line)
2014-01-22 17:50:00 +01:00
Axel Uhl
3d32e32aff
suppress all tests but server.replication.test
2014-01-22 17:33:15 +01:00
Axel Uhl
78172c929a
commented out the datamining.test tests in pom.xml until Lennart has fixed those
2014-01-22 16:44:34 +01:00
Simon Pamies
ee03de1574
Renamed com.sap.sse.gwt.shared to com.sap.sse.gwt
2014-01-16 14:11:11 +01:00
Lennart Hensler
e3e81c553b
Added the datamining.shared bundle to java/pom.xml
2014-01-15 16:52:03 +01:00
Lennart Hensler
2ea2816a80
Merge remote-tracking branch 'extern/master' into dataMining
...
Conflicts:
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/pom.xml
2014-01-08 11:16:05 +01:00
Simon Pamies
c37d361b2a
Making sure that xmlexport bundle is included
2014-01-02 19:06:02 +02:00
Simon Pamies
4e094f0b95
Using properties from master branch
2014-01-02 19:04:37 +02:00
Simon Pamies
6d56eeb43d
Renamed project to xmlexport as this matches the purpose better
2014-01-02 12:43:34 +02:00
Axel Uhl
f2d5196e46
re-added Igtimi tests as the server's tokens supposedly have been restored
2013-12-23 00:28:50 +01:00
Lennart Hensler
dcfb249e01
Merge branch 'master' into dataMining
...
Conflicts:
java/pom.xml
2013-12-21 17:10:11 +01:00
Axel Uhl
08b61b0bb3
skip Igtimi tests for now because Igtimi server is down; this should make our Hudson tests green again for now
2013-12-20 16:16:02 +01:00
Lennart Hensler
adbeb04b24
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
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.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
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/pom.xml
2013-12-19 17:25:47 +01:00
Lukas Niemeier
e8835a26e6
# moved utf-8 compliance up to workspace
2013-12-02 22:30:52 +01:00
Lukas Niemeier
1ab0468739
# mavenized the mobile folder
2013-11-30 14:21:02 +01:00
Lukas Niemeier
04e8671a11
Merge branch 'racecommittee_app' into racecommittee_app_startphases
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Axel Uhl
70e7d3ea5d
added igtimiadapter.test bundle to pom.xml hierarchy
2013-11-20 15:06:55 +01:00
Lukas Niemeier
953eaaa668
Merge branch 'racecommittee_app' into racecommittee_app_startphases
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
2013-11-20 12:25:57 +01:00
Lennart Hensler
79db9b61a4
Merge branch '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/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 (Proxy).launch
2013-11-19 18:01:25 +01:00
Lukas Niemeier
f468b71024
# added surefire test reporting
...
# added option "-r" to build script for enabling reporting
2013-11-18 14:31:18 +01:00
Axel Uhl
80da9fa4c7
added Igtimi bundles to feature, launch configs and pom.xml
2013-11-15 15:49:45 +01:00
Lennart Hensler
32b94fcd19
Merge branch 'master' into dataMining
2013-11-14 16:27:12 +01:00
Jens Rommel
fc6a63c1d6
Changed mongo host and tractract tunnel host from hard-wired IP adress of local hudson server to "localhost".
...
This change became necessary after local hudson server could no longer be used for tunneling.
2013-11-14 13:31:42 +01:00
Lennart Hensler
7dad61c471
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
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
2013-10-23 14:10:07 +02:00
fmittag
b13d0f6d23
changed the order of maven repositories in main pom.xml to let maven first resolve our own maven repository under sapsailing.com (/home/trac/maven-repositories)
2013-10-21 18:27:03 +02:00
Lennart Hensler
0ccdb93814
Merge remote-tracking branch 'extern/master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
2013-10-02 13:48:48 +02:00
fmittag
51f07555ed
upgraded maven-surefire-plugin maven plugin (2.11 -> 2.16)
2013-09-02 11:45:11 +02:00