Axel Uhl f57aed7de6 Merge branch 'master' into bug3420 ...

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java

Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0

2016-01-22 15:39:16 +01:00

..

.settings

upgraded project settings to Java8, fixed gwt.ui to JavaSE-1.7 explicitly

2014-10-01 15:00:44 +02:00

META-INF

Merge branch 'master' into bug2700

2015-04-24 18:41:37 +02:00

src/com/sap/sailing/server

Merge branch 'master' into bug3420

2016-01-22 15:39:16 +01:00

.classpath

upgraded classpaths to JavaSE-1.8

2014-10-01 14:16:18 +02:00

.gitignore

…

.project

…

build.properties

…

pom.xml

…

SailingServer (No Proxy OSX).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Cached MTB).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, Jetty on 8890).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

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

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy, winddbTest).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (No Proxy).launch

in Igtimi WebSocketConnectionManager.reconnect() wait for the connection for 5s; if not connected, try again with failover URL

2015-12-21 10:21:26 +01:00

SailingServer (Proxy, Jetty on 8889).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (Proxy, winddbTest).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00

SailingServer (Proxy).launch

adjusted launch configurations to the use of the asl instead of the lgpl versions of the jackson bundles

2015-11-18 13:11:44 +01:00