 Simon Pamies
|
632d695f41
|
Merged master into dev
|
2013-07-15 17:41:54 +02:00 |
|
|
Simon Pamies
|
90d10e9514
|
Make sure that after a first start the version is updated again
|
2013-07-15 17:40:10 +02:00 |
|
|
Simon Pamies
|
1116f066ba
|
Removing unneeded message
|
2013-07-15 17:32:10 +02:00 |
|
|
Simon Pamies
|
ffd7014537
|
Moving away from using config.ini in a server environment. The configuration found in env.sh is canonical and now also enforced upon startup
|
2013-07-15 17:25:43 +02:00 |
|
|
Simon Pamies
|
ae7ebabe45
|
Added MONGO_HOST and REPLICA_HOST to environment
|
2013-07-12 17:46:31 +02:00 |
|
 Axel Uhl
|
5021294fb6
|
Merge branch 'master' into dev
Conflicts:
java/target/configuration/logging.properties
|
2013-07-05 17:15:03 +02:00 |
|
 STG (Server)
|
8f5881a1e2
|
Merge remote branch 'origin/dev' into dev
|
2013-07-02 10:42:45 +02:00 |
|
|
STG (Server)
|
a76b910d72
|
Merge branch 'master' into dev
|
2013-07-02 10:42:26 +02:00 |
|
|
Simon Pamies
|
0f96f0a698
|
Fixed logging path
|
2013-06-30 12:56:14 +02:00 |
|
|
Simon Pamies
|
5fd82e236e
|
Make it possible to include additional parameters for the Java VM
|
2013-06-28 14:08:51 +02:00 |
|
|
Axel Uhl
|
6ea7312d8b
|
fixed logging and monitoring properties for dev
|
2013-06-27 14:50:16 +02:00 |
|
|
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 |
|