bug 4816: move permission CAN_IMPORT_MASTERDATA to SERVER_ACTIONS

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SecuredDomainType.java

@@ -137,11 +137,6 @@ public class SecuredDomainType extends HasPermissionsImpl {
     /**
      * type-relative identifier is the device configuration name
      */
-    public static final HasPermissions RACE_MANAGER_APP_DEVICE_CONFIGURATION = new SecuredDomainType("RACE_MANAGER_APP_DEVICE_CONFIGURATION", IdentifierStrategy.TO_SPECIFY);
+    public static final HasPermissions RACE_MANAGER_APP_DEVICE_CONFIGURATION = new SecuredDomainType("RACE_MANAGER_APP_DEVICE_CONFIGURATION", IdentifierStrategy.NAMED);
 
-    /**
-     * Create required to do MasterDataImport, type-relative identifier is the servername
-     */
-    public static final HasPermissions CAN_IMPORT_MASTERDATA = new SecuredDomainType(
-            "CAN_REPLAY_DURING_LIVE_RACES", IdentifierStrategy.TO_SPECIFY);
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

@@ -5458,8 +5458,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
             final boolean compress, final boolean exportWind, final boolean exportDeviceConfigurations,
             String targetServerUsername, String targetServerPassword) {
         // FIXME should the targetserver also check this?
-        SecurityUtils.getSubject().isPermitted(SecuredDomainType.CAN_IMPORT_MASTERDATA
-                .getStringPermissionForObjects(DefaultActions.CREATE, ServerInfo.getName()));
+        SecurityUtils.getSubject().isPermitted(SecuredSecurityTypes.SERVER
+                .getStringPermissionForObjects(ServerActions.CAN_IMPORT_MASTERDATA, ServerInfo.getName()));
 
         String token = getTokenForServer(urlAsString, targetServerUsername, targetServerPassword);
 

java/com.sap.sse.security.common/src/com/sap/sse/security/shared/impl/SecuredSecurityTypes.java

@@ -54,7 +54,8 @@ public class SecuredSecurityTypes extends HasPermissionsImpl {
         CONFIGURE_LOCAL_SERVER,
         CONFIGURE_REMOTE_INSTANCES,
         IMPORT_MASTER_DATA,
-        CREATE_OBJECT
+        CREATE_OBJECT,
+        CAN_IMPORT_MASTERDATA
     }
 
     /**