Merge branch 'master' into newhome

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
This commit is contained in:
Axel Uhl committed 2014-05-28 18:12:22 +02:00
commit fecc3db588
7 files changed
+227 -99

No files matched your search

+2 -27
View File
@@ -82,35 +82,10 @@
</web-resource-collection>
<auth-constraint>
<role-name>administrator</role-name>
<role-name>eventmanager</role-name>
</auth-constraint>
</security-constraint>
<!-- Preparation of security constraints for the leaderboard and raceboard pages
<security-constraint>
<web-resource-collection>
<web-resource-name>Raceboard pages</web-resource-name>
<url-pattern>/RaceBoard.html</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>administrator</role-name>
<role-name>spectator</role-name>
<role-name>moderator</role-name>
</auth-constraint>
</security-constraint>
<security-constraint>
<web-resource-collection>
<web-resource-name>Leaderboard pages</web-resource-name>
<url-pattern>/Leaderboard.html</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>administrator</role-name>
<role-name>spectator</role-name>
<role-name>moderator</role-name>
</auth-constraint>
</security-constraint>
-->
<security-constraint>
<web-resource-collection>
<web-resource-name>Leaderboard editing pages</web-resource-name>
@@ -118,7 +93,7 @@
</web-resource-collection>
<auth-constraint>
<role-name>administrator</role-name>
<role-name>moderator</role-name>
<role-name>eventmanager</role-name>
</auth-constraint>
</security-constraint>