ate 2005/02/02 18:54:09 Modified: components/security/src/java/org/apache/jetspeed/security/spi/impl SecurityAccessImpl.java Log: Enable name filtering on user, group and role collection finders Revision Changes Path 1.4 +3 -3 jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java Index: SecurityAccessImpl.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SecurityAccessImpl.java 22 Dec 2004 17:54:08 -0000 1.3 +++ SecurityAccessImpl.java 3 Feb 2005 02:54:09 -0000 1.4 @@ -127,7 +127,7 @@ { Criteria queryCriteria = new Criteria(); queryCriteria.addEqualTo("isMappingOnly", new Boolean(false)); - queryCriteria.addLike("fullPath", UserPrincipal.PREFS_USER_ROOT + "%"); + queryCriteria.addLike("fullPath", UserPrincipal.PREFS_USER_ROOT + filter + "%"); Query query = QueryFactory.newQuery(InternalUserPrincipalImpl.class, queryCriteria); Iterator result = getPersistenceBrokerTemplate().getIteratorByQuery(query); return result; @@ -341,7 +341,7 @@ { Criteria queryCriteria = new Criteria(); queryCriteria.addEqualTo("isMappingOnly", new Boolean(false)); - queryCriteria.addLike("fullPath", UserPrincipal.PREFS_ROLE_ROOT + "%"); + queryCriteria.addLike("fullPath", UserPrincipal.PREFS_ROLE_ROOT + filter + "%"); Query query = QueryFactory.newQuery(InternalRolePrincipalImpl.class, queryCriteria); Collection c = getPersistenceBrokerTemplate().getCollectionByQuery(query); return c.iterator(); @@ -352,7 +352,7 @@ Criteria queryCriteria = new Criteria(); queryCriteria.addEqualTo("isMappingOnly", new Boolean(false)); - queryCriteria.addLike("fullPath", UserPrincipal.PREFS_GROUP_ROOT + "%"); + queryCriteria.addLike("fullPath", UserPrincipal.PREFS_GROUP_ROOT + filter + "%"); Query query = QueryFactory.newQuery(InternalGroupPrincipalImpl.class, queryCriteria); Collection c = getPersistenceBrokerTemplate().getCollectionByQuery(query); return c.iterator();
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]