Axel Uhl
c46ea1c351
reset wind UDP listening port to 2010; needs to be adjusted again in all branches into which master is merged
2013-06-26 16:11:15 +02:00
Axel Uhl
6e1a49d59f
set UDP expedition port for racecommittee_app to 2014 to make sure it doesn't conflict with dev branch
2013-06-24 13:01:06 +02:00
Simon Pamies
355515f989
Fixed logging path
2013-06-18 13:51:47 +02:00
Simon Pamies
6905cebf4a
Merge branch 'master' into dev
2013-06-18 13:51:14 +02:00
Simon Pamies
f0dc9d5292
Added status script to check if server is running (now with script)
2013-06-18 13:37:48 +02:00
Axel Uhl (Server)
cf682503de
Merge branch 'master' into dev
2013-06-18 10:54:50 +02:00
Simon Pamies
b7b2af46a0
More detection for startup
2013-06-18 10:05:45 +02:00
Simon Pamies
ee9039a7aa
Added java detection and startup detection to start script
2013-06-18 09:56:33 +02:00
Simon Pamies
eb58713bc1
Added explicit check for java home directory
2013-06-18 09:36:28 +02:00
Axel Uhl (Server)
39cab55521
Merge branch 'master' into dev
2013-06-16 17:23:35 +02:00
Simon Pamies
7ab9e34922
Always overwrite java path the hard way
2013-06-14 13:38:08 +02:00
Axel Uhl (Server)
168baa5856
Merge branch 'master' into dev
2013-06-13 16:28:36 +02:00
Simon Pamies
0299953420
Revert "Fixed output"
...
This reverts commit 6b77bb9fab
2013-06-12 16:29:49 +02:00
Simon Pamies
c8c6b9c9aa
Merged master
2013-06-12 15:52:12 +02:00
Simon Pamies
6b77bb9fab
Fixed output
2013-06-12 15:34:56 +02:00
Simon Pamies
37b5af0d17
Fixed newlines
2013-06-12 14:05:07 +02:00
Axel Uhl
6384e9fdad
Merge branch 'master' into dev
...
Conflicts:
java/target/env.sh
2013-06-10 11:46:21 +02:00
Axel Uhl
ad7b12a0d3
Merge remote-tracking branch 'server/master'
2013-06-10 11:44:21 +02:00
Axel Uhl
b8d0bd6153
Merge branch 'master' into dev
...
Conflicts:
java/target/start
2013-06-10 11:41:58 +02:00
Axel Uhl
2c2fb4ba62
fixed MEMORY parameter again in start script
2013-06-10 11:32:43 +02:00
Axel Uhl
ae90148d71
Merge branch 'master' into bug1407-new
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/target/start
2013-06-10 11:23:47 +02:00
Simon Pamies
3553e5428f
Fixed ports for master branch
2013-06-09 10:56:05 +02:00
Simon Pamies
e51ee22a45
Fixed configuration for DEV
2013-06-07 16:27:03 +02:00
Simon Pamies
e37c60b34e
Merged master with new configuration style
2013-06-07 16:24:15 +02:00
Simon Pamies
498c409b89
Updated build script to ensure correct ports upon install
2013-06-07 16:15:50 +02:00
Simon Pamies
e47b52798f
Added more variables that could be useful - watch out for memory setting
2013-06-07 16:02:56 +02:00
Simon Pamies
7bb82f4ea8
Moved server variables to extra script
2013-06-07 15:59:03 +02:00
Axel Uhl
1dd90fbfe3
redirect Java server output and error to /dev/null to avoid a leaking nohup.out
2013-05-27 17:45:43 +02:00
Axel Uhl
2584955b43
Merge branch 'master' into dev
2013-05-03 20:09:24 +02:00
Axel Uhl
98b6217c66
fixed newlines in udpmirror script which didn't execute anymore after some CRs had been inserted
2013-05-03 20:08:36 +02:00
Axel Uhl (Server)
78be086380
Merge branch 'master' into dev
...
Conflicts:
java/target/start
2013-04-14 05:32:05 +02:00
Axel Uhl (Server)
98001cd1be
Fixed start script again - slow ssh makes things hard
2013-04-14 05:30:10 +02:00
Axel Uhl (Server)
acf6659bd1
Added indicator and tmpdir
2013-04-14 04:24:24 +02:00
Axel Uhl (Server)
1f178d32c7
Merge branch 'master' into dev
2013-04-14 04:20:07 +02:00
Axel Uhl (Server)
4b1157d58b
Hopefully fixed scripts for good
2013-04-14 04:19:58 +02:00
Axel Uhl (Server)
77571b91fc
Merged master
2013-04-14 04:19:11 +02:00
Axel Uhl (Server)
45ef00d883
Fixed indicator of server and added tmpdir
2013-04-14 04:15:54 +02:00
Axel Uhl (Server)
c14990b2e4
Fixed indicator
2013-04-14 04:12:42 +02:00
Axel Uhl (Server)
4bd85a4d2e
Adapted DEV scripts
2013-04-13 19:42:46 +02:00
Axel Uhl (Server)
4a1380cd41
Merge branch 'master' into dev
2013-04-13 18:49:14 +02:00
Simon Pamies
3969120fdd
Added stop script and updated build script to also copy start and stop script
2013-04-14 00:10:46 +08:00
Axel Uhl
d4d0c95505
Merge branch 'master' into dev
2013-04-12 13:06:15 +02:00
Axel Uhl
8088f1c9fe
adjusted start script to use telnet port and nohup
2013-04-12 13:05:18 +02:00
Axel Uhl (Server)
eb03a7a269
Merged master
2013-04-11 07:58:08 +02:00
Armin Zamani
b501d1ca6f
Merge branch 'racecommittee_integrated' of
...
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Axel Uhl (Server)
efdd5d064e
Removed some blather from configuration files by setting level to OFF
2013-03-10 16:10:16 +01:00
Axel Uhl (Server)
8189e93c9d
Merge branch 'master' into dev
2013-03-03 20:22:04 +01:00
Armin Zamani
4816dd2428
added new item in realm.properties
2013-03-02 00:23:03 +01:00
Axel Uhl (Server)
87289dfcdd
Mailing should be enabled on DEV
2013-02-18 19:18:01 +01:00
Axel Uhl (Server)
b44e59f228
Merge branch 'master' into dev
2013-02-18 19:16:59 +01:00
Axel Uhl
Simon Pamies
Armin Zamani