Axel Uhl 6169f54e25 Merge branch 'master' into bug2589 ...

Conflicts:
	java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/RestServletContainer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java

Change-Id: I8cbb797ba64d221ea401b90b22d21a813204a6f2

2016-01-04 11:34:01 +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 bug2589

2016-01-04 11:34:01 +01:00

src/com/sap/sailing/domain/igtimiadapter

Merge branch 'master' into bug2589

2016-01-04 11:34:01 +01:00

WEB-INF

disable directory listing for further web bundles

2014-07-21 23:58:37 +02:00

.classpath

upgraded classpaths to JavaSE-1.8

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

.gitignore

Included bin directory into ignores

2014-01-19 18:39:29 +01:00

.project

added structure for Igtimi connector

2013-11-14 13:43:35 +01:00

build.properties

added missing WEB-INF directory of Igtimi bundle to build.properties

2013-12-16 13:53:53 +01:00

pom.xml

added Igtimi bundles to feature, launch configs and pom.xml

2013-11-15 15:49:45 +01:00