|
|
@ -35,7 +35,6 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void contextInitialized(ServletContextEvent servletContextEvent) {
|
|
|
|
public void contextInitialized(ServletContextEvent servletContextEvent) {
|
|
|
|
|
|
|
|
|
|
|
|
UserStoreManager userStoreManager = getUserStoreManager();
|
|
|
|
UserStoreManager userStoreManager = getUserStoreManager();
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if (userStoreManager != null) {
|
|
|
|
if (userStoreManager != null) {
|
|
|
@ -47,7 +46,8 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
|
|
|
|
getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME,
|
|
|
|
getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME,
|
|
|
|
VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
|
|
|
|
VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} } catch (UserStoreException e) {
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (UserStoreException e) {
|
|
|
|
log.error("Error while creating a role and adding a user for Raspberry PI.", e);
|
|
|
|
log.error("Error while creating a role and adding a user for Raspberry PI.", e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -101,13 +101,11 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Permission[] getPermissions() {
|
|
|
|
private Permission[] getPermissions() {
|
|
|
|
|
|
|
|
Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM,
|
|
|
|
Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM,
|
|
|
|
CarbonConstants.UI_PERMISSION_ACTION);
|
|
|
|
CarbonConstants.UI_PERMISSION_ACTION);
|
|
|
|
Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
|
|
|
|
Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
|
|
|
|
.UI_PERMISSION_ACTION);
|
|
|
|
.UI_PERMISSION_ACTION);
|
|
|
|
return new Permission[]{androidSense, view};
|
|
|
|
|
|
|
|
|
|
|
|
return new Permission[]{androidSense, view};
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|