Peter Siegmund
197b4e039e
Merge branch 'master' into feature/procedure_wizard
2015-02-16 12:56:03 +01:00
Axel Uhl
39b1c55a88
made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
...
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, Jetty on 8890).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.sse.security.test/META-INF/MANIFEST.MF
java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +01:00
Peter Siegmund
b7de2dff53
Merge branch 'master' into feature/procedure_wizard
2015-02-13 16:30:07 +01:00
Simon Pamies
348fcd64b0
Added parameter to only execute a single testcase
2015-02-13 11:35:05 +01:00
Fredrik Teschke
fa887140c8
Merge branch 'master' into ftes-mail-move-to-sse
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sse.security.ui/Security UI sdm.launch
java/pom.xml
2015-02-12 18:14:21 +01:00
Axel Uhl
d91257c8d6
Merge branch 'master' into ftes-mail-move-to-sse
2015-02-11 10:04:01 +01:00
Axel Uhl
b9e3daf224
fixed -x option for gwt worker number setting
2015-02-10 22:31:11 +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
6f1d2229a5
preparing for configurable number of GWT workers
2015-02-10 15:03:02 +01:00
Axel Uhl
4e55e61c51
fixed merge problems in launch configs, adding file storage bundle everywhere
2015-02-10 14:37:41 +01:00
Fredrik Teschke
e004c433cc
pull out mail functionality into own service and bundle
...
- needs to live outside com.sap.sse due to dependency on replication
- use mail.properties instead of security.properties
- introduced ServiceTrackerFactory, which led to refactorings in SailingServiceImpl and ~Mock
2015-02-09 21:03:50 +01:00
Peter Siegmund
7c7995a411
Revert "Gradle: don't stop executing the script, if gradle connectedCheck failed"
...
This reverts commit 36466b2128
2015-01-28 15:09:56 +01:00
Peter Siegmund
36466b2128
Gradle: don't stop executing the script, if gradle connectedCheck failed
2015-01-28 14:05:07 +01:00
Peter Siegmund
fd09135e89
Gradle: change emulator to ARM for testing
2015-01-28 12:08:12 +01:00
Peter Siegmund
401cb6b404
Gradle: emulator start within the script and also termination
2015-01-26 13:00:24 +01:00
Peter Siegmund
dce66e3d6e
Gradle: disabled Android unit tests within buildAndUpdateProduct
2015-01-26 11:03:37 +01:00
Peter Siegmund
0d35dfa40b
Gradle: activate Android test framework
2015-01-26 10:35:32 +01:00
Peter Siegmund
621378ca36
Merge branch 'master' into android_apps
2015-01-26 09:37:54 +01:00
Axel Uhl
34082fef8d
fixed tab/space issues in buildAndUpdateProduct.sh
2015-01-24 23:53:12 +01:00
Peter Siegmund
383b7e6048
APK signing - needs testing with Java 1.6, 1.7 and 1.8 - jarsigner has changed and can produce errors
2015-01-21 16:02:58 +01:00
Peter Siegmund
80a3eb5547
Merge branch 'master' into android_apps
2015-01-21 15:20:56 +01:00
Peter Siegmund
491ed8ceef
Removed Google Volley project
2015-01-21 14:39:04 +01:00
Peter Siegmund
3b00f11df1
Gradle: insert Android SDK update before mobile app build
2015-01-19 11:03:51 +01:00
Peter Siegmund
a085639c2e
Gradle: "./gradlew clean build" and "./gradlew clean" included into main build script (buildAndUpdateProduct.sh)
2015-01-19 10:58:29 +01:00
Peter Siegmund
015c4f2d82
Merge branch 'bug2572' into android_apps
2015-01-14 17:02:18 +01:00
Fredrik Teschke
d43a223e8f
introduce copy-to-www-project behaviour for tracking app
2014-12-24 09:56:12 +01:00
Axel Uhl
caba006186
when compiling only one GWT permutation, apply this to all .gwt.xml files in com.sap.*.gwt.ui, including the newhome ones
2014-12-09 10:44:30 +01:00
Axel Uhl
b5a697b388
fixed issue with StringListEditorCompositr regarding row count after clearing the structure
2014-12-02 11:31:53 +01:00
Fredrik Teschke
bb9293c668
remove ECLIPSE_HOME information from script (not needed to build local p2 repo)
2014-11-26 17:17:04 +01:00
Fredrik Teschke
d25757fd3f
bind generating local p2 repo to mvn compile goal
2014-11-22 18:57:58 +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
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
76121eb782
Merge remote-tracking branch 'origin/master' into ftes-maven-p2admin
2014-11-19 16:50:36 +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
EC2 Server
8099bbe380
in the sailing boot script, append a default MEMORY value to env.sh
2014-11-19 12:28:22 +00:00
Axel Uhl
c41e6ebeac
Merge remote-tracking branch 'server/master'
2014-11-19 11:05:19 +01:00
Simon Pamies
e1ef013265
Fixed generated file once more - typo
2014-11-19 10:52:52 +01:00
Simon Pamies
96eb5d58f5
Fixed replicate on start
2014-11-19 10:17:15 +01:00
Simon Pamies
1d59df0219
Updated generated amazon launch configs
2014-11-19 10:09:38 +01:00
EC2 Server
310090916d
adjusted sailing script to changed semantics of the REPLICATE_ON_START environment variable
2014-11-17 09:57:01 +00:00
Axel Uhl
771067ebd0
evaluate the combined env.sh in /etc/init.d/sailing before deciding and launching the httpd server
2014-11-16 10:52:49 +01:00
Axel Uhl
c7ffdcb2d2
added check to start httpd server when REPLICATION_ON_START=True, adding "Use Event" line to 001-events.conf
2014-11-14 23:22:49 +01:00
EC2 Server
b3ea1ca574
Merge branch 'master' into bug2409
2014-11-14 21:35:40 +00:00
Axel Uhl
835a7e56a3
added check to start httpd server when REPLICATION_ON_START=True, adding "Use Event" line to 001-events.conf
2014-11-14 21:10:59 +00:00
Axel Uhl
f8c0370271
also clean com.sap.sse.security.ui from GWT artifacts when "clean" option is used in buildAndUpdateProduct.sh
2014-11-14 17:50:08 +01:00
Simon Pamies
11a18d4caa
Fixed bug 2448
2014-11-04 16:40:57 +01:00
Simon Pamies
2dde236ebc
Added clean action
2014-10-31 15:44:09 +02:00
Axel Uhl
53848ed5dd
added security.properties to the build/install/release process
2014-10-21 17:27:44 +02:00
Axel Uhl
8b4f4fa7e4
replaced #!/bin/sh by #!/bin/bash to ensure compatibility on Debian-like Linux systems such as Ubuntu
2014-07-16 11:31:14 +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
Peter Siegmund
Axel Uhl
Simon Pamies
Fredrik Teschke