Changeset 29310 for main/trunk
- Timestamp:
- 2014-09-18T12:47:48+12:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java
r29164 r29310 303 303 } 304 304 305 String disabled = securityBlock.getAttribute(GSXML.DISABLED_ATT); 306 if (!disabled.equals("")) { 307 // security block has been disabled. 308 logger.warn("Security block has been disabled. Not implementing any security for collection "+this.cluster_name); 309 return; 310 } 305 311 String scope = securityBlock.getAttribute(GSXML.SCOPE_ATT); 306 312 String defaultAccess = securityBlock.getAttribute(GSXML.DEFAULT_ACCESS_ATT); … … 374 380 exceptionSets.add(docSetName); 375 381 } 376 382 if (_securityScopeCollection) { 383 // we don't add in any exceptions that have document sets 384 if (!exceptionSets.isEmpty()) { 385 continue; 386 } 387 } 377 388 securityException.put("groups", exceptionGroups); 378 389 securityException.put("sets", exceptionSets);
Note:
See TracChangeset
for help on using the changeset viewer.