Christopher Ronnewinkel (D036654) 906bd30dc9 Merge remote-tracking branch 'origin/master' into simulator_dev ...

Conflicts:
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/pom.xml

2013-03-25 14:45:06 +01:00

..

.settings

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

META-INF

Merge remote-tracking branch 'origin/master' into simulator_dev

2013-03-25 14:45:06 +01:00

src/com/sap/sailing/server

Merge remote-tracking branch 'origin/master' into simulator_dev

2013-03-25 14:45:06 +01:00

.classpath

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

.gitignore

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

.project

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

build.properties

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

pom.xml

Merge remote-tracking branch 'origin/master' into simulator

2012-04-22 16:27:21 +02:00

SailingServer (No Proxy, Jetty on 8889, Monitoring).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (No Proxy, No Tests).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (No Proxy, Remote Debug SAP VM).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (No Proxy).launch

use a single ThreadPool for all SmartFutureCache instances, 3*availableProcessors in size; shuffle multi-cache-invalidations;

2013-03-21 23:53:39 +01:00

SailingServer (Proxy, Jetty on 8889).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added XRR import bundle to launch configs; fixed mix-up of boat class name and event name in XRR result import

2013-03-19 21:11:44 +01:00

SailingServer (Proxy).launch

Fix further errors after merge.

2013-03-21 17:29:43 +01:00