diff --git a/dspace-api/src/main/java/org/dspace/embargo/DefaultEmbargoSetter.java b/dspace-api/src/main/java/org/dspace/embargo/DefaultEmbargoSetter.java index 773b6425d1..45b2d407ac 100644 --- a/dspace-api/src/main/java/org/dspace/embargo/DefaultEmbargoSetter.java +++ b/dspace-api/src/main/java/org/dspace/embargo/DefaultEmbargoSetter.java @@ -168,20 +168,24 @@ public class DefaultEmbargoSetter implements EmbargoSetter { // check for ANY read policies and report them: for (ResourcePolicy rp : getAuthorizeService() .getPoliciesActionFilter(context, bn, Constants.READ)) { - System.out.println("CHECK WARNING: Item " + item.getHandle() + ", Bundle " + bn - .getName() + " allows READ by " + - ((rp.getEPerson() != null) ? "Group " + rp.getGroup().getName() : - "EPerson " + rp.getEPerson().getFullName())); + if (rp.getStartDate() == null) { + System.out.println("CHECK WARNING: Item " + item.getHandle() + ", Bundle " + bn + .getName() + " allows READ by " + + ((rp.getEPerson() != null) ? "Group " + rp.getGroup().getName() : + "EPerson " + rp.getEPerson().getFullName())); + } } } for (Bitstream bs : bn.getBitstreams()) { for (ResourcePolicy rp : getAuthorizeService() .getPoliciesActionFilter(context, bs, Constants.READ)) { - System.out.println("CHECK WARNING: Item " + item.getHandle() + ", Bitstream " + bs - .getName() + " (in Bundle " + bn.getName() + ") allows READ by " + - ((rp.getEPerson() != null) ? "Group " + rp.getGroup().getName() : - "EPerson " + rp.getEPerson().getFullName())); + if (rp.getStartDate() == null) { + System.out.println("CHECK WARNING: Item " + item.getHandle() + ", Bitstream " + bs + .getName() + " (in Bundle " + bn.getName() + ") allows READ by " + + ((rp.getEPerson() != null) ? "Group " + rp.getGroup().getName() : + "EPerson " + rp.getEPerson().getFullName())); + } } } } diff --git a/dspace-api/src/main/java/org/dspace/embargo/EmbargoServiceImpl.java b/dspace-api/src/main/java/org/dspace/embargo/EmbargoServiceImpl.java index 541f891924..68efce46e1 100644 --- a/dspace-api/src/main/java/org/dspace/embargo/EmbargoServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/embargo/EmbargoServiceImpl.java @@ -147,8 +147,9 @@ public class EmbargoServiceImpl implements EmbargoService { @Override public void liftEmbargo(Context context, Item item) throws SQLException, AuthorizeException, IOException { - // new version of Embargo policies remain in place. - //lifter.liftEmbargo(context, item); + // Since 3.0 the lift process for all embargoes is performed through the dates + // on the authorization process (see DS-2588) + // lifter.liftEmbargo(context, item); itemService.clearMetadata(context, item, lift_schema, lift_element, lift_qualifier, Item.ANY); // set the dc.date.available value to right now