Axel Uhl
6ee562797e
removed mongo driver from pom.xml as it doesn't need to be built
2015-02-12 16:07:05 +01:00
Axel Uhl
7ac80d71e3
Merge branch 'master' into ribdashboard; introduced gwt.workers property in maven build
...
Conflicts:
configuration/buildAndUpdateProduct.sh
2015-02-10 15:27:01 +01:00
Axel Uhl
cc4d9e320e
re-formatted java/pom.xml
2015-02-10 14:14:08 +01:00
Axel Uhl
012ed3b242
added filestorage bundle to feature.xml (probably resolving an ill-resolved merge conflict)
2015-02-10 13:50:45 +01:00
Axel Uhl
1ed846859c
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
java/com.sap.sse.security.ui/Security UI sdm.launch
2015-02-10 13:00:48 +01:00
Axel Uhl
5ba401dbb1
exclude the currently defective com.sap.sse.gwt.test fragment from the build; we first need to fit it into the Maven environment properly
2015-02-10 12:38:40 +01:00
Simon Pamies
d1b80538aa
Moved tests at the end to be able to see compilation issues earlier
2015-02-09 19:19:11 +08:00
Simon Pamies
50f2b4e5c4
Added test bundle for sse.gwt
2015-02-09 19:17:02 +08:00
Simon Pamies
3e7588b74c
Merged master
2015-02-07 12:05:38 +08:00
Fredrik Teschke
4508934766
remove com.sap.sse.{gateway, osgi} by moving the few classes into com.sap.sse
2015-02-05 09:28:38 +01:00
Simon Pamies
c0948fab65
Merged master
2015-02-05 12:05:16 +08:00
Axel Uhl
baf7bcbe73
Merge branch 'master' into ftes-file-storage
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/pom.xml
2015-02-02 10:47:01 +01:00
Axel Uhl
9819bbf04e
Merge branch 'gwt-27-second-try'
...
Conflicts:
java/pom.xml
2015-01-30 13:29:51 +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
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
5bbb80891e
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-01-29 10:43:22 +01:00
Simon Pamies
1e96800919
Merge remote-tracking branch 'origin/master'
2015-01-28 13:13:50 +01:00
Simon Pamies
832e26ea16
Added very simple test for xml export - needs to be extended but at least there is one test for it now
2015-01-28 13:13:25 +01:00
Axel Uhl
5a5cb2b9d6
explicit gwt-maven-plugin declaration in top-level pom.xml doesn't seem to be required; Frank's fix in 937bcd1153 already cuts it
2015-01-28 12:48:29 +01:00
Axel Uhl
91c78c5852
added plugin declaration for gwt-maven-plugin in version ${gwt.version}
2015-01-28 11:36:02 +01:00
Steffen Schaefer
49e0ff9bcc
Merge branch 'master' into gwt-27-second-try
...
Conflicts:
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/SailingGWT.launch
java/pom.xml
2015-01-26 09:00:40 +01:00
Axel Uhl
39f19e0095
Merge branch 'master' into ribdashboard
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
2015-01-24 14:41:42 +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
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
11e1127699
add filestorage ui bundle
2015-01-23 16:31:37 +01:00
Fredrik Teschke
c9e1a39373
added projects and launch configuration for filestorage
2015-01-22 17:31:26 +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
Axel Uhl
33de6273ac
added pom.xml for com.sap.sse.shared.android
2015-01-22 11:31:52 +01:00
Papick Garcia Taboada
5843a42f2a
Updated project metadata to gwt 2.7.0 version
2015-01-16 09:18:33 +01:00
Axel Uhl
ee2424957d
Merge branch 'master' into bug1562
2015-01-15 17:51:41 +01:00
Axel Uhl
485cba10fb
added pom.xml for com.sap.sailing.server.gateway.serialization.shared.android
2015-01-14 13:37:48 +01:00
Axel Uhl
9247e84b1d
removed old replication.brokerURL parameter which probably dates back to ActiveMQ times...
2015-01-05 14:07:16 +01:00
Axel Uhl
09e9f3f1c0
added com.sap.sailing.polars.test to java/pom.xml
2015-01-02 11:34:52 +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
EC2 Server
34e8502b9c
added structureimportCopy artifact
2014-12-08 20:29:24 +00:00
Axel Uhl
9787abcdc6
added xrr.schema to pom.xml
2014-12-08 19:13:10 +01:00
Alexander Ries
0c9033a141
changed position of dashboards module in java/pom.xml
2014-12-08 03:09:09 +01:00
Alexander Ries
197f63d55b
moved ribdashboards module to bottom in java/pom.xml to solve maven build failure
2014-12-04 15:01:13 +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
Alexander Ries
85a295fcfc
added com.sap.sailing.dashboards.gwt to java/pom.xml
2014-12-01 15:09:49 +01:00
Alexander Ries
71ef824c7a
Merge remote-tracking branch 'origin/master' into ribdashboard
2014-12-01 14:55:55 +01:00
Axel Uhl
4c231f3844
Merge branch 'ftes-maven-p2-local' into bug2465
2014-11-30 11:54:15 +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
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
Simon Pamies
Fredrik Teschke
Alexander Ries
Steffen Schaefer
Papick Garcia Taboada
Frederik Petersen