Axel Uhl 1dfc055e34 Merge branch 'master' into bug1018 ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java

2015-05-08 18:27:39 +02: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

PolarDataService now uses OSGi service registry

2015-04-23 10:58:54 +02:00

resources

moved SailingPermissionsForRoleProvider to com.sap.sailing.domain.common so that gateway and gwt.ui can both use them in their shiro.ini

2015-02-26 16:23:10 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into bug1018

2015-05-08 18:27:39 +02:00

utils

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

WEB-INF

implement file upload using a plain servlet with Apache multipart suppot, skipping confusing Jersey with FormDataParams that don't work

2015-02-27 18:19:13 +01:00

webservices

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

2015-03-27 14:39:21 +02:00

.classpath

prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point

2015-02-25 18:26:27 +01:00

.gitignore

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.project

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

build.properties

prepared the com.sap.sailing.server.gateway bundle for REST security, showing a commented example in shiro.ini for the /events service end point

2015-02-25 18:26:27 +01:00

main.css

refactoring of Webservice API to use JAX-RS as implementation technique

2013-08-30 15:50:46 +02:00

pom.xml

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00