Author: ate Date: Mon Oct 9 06:29:18 2006 New Revision: 454376 URL: http://svn.apache.org/viewvc?view=rev&rev=454376 Log: JS2-491 patch breaks Jetspeed trunk as it cannot compile/run anymore on Java 1.4. Fixing Java 5 dependencies by (temporarily) commenting out the related code. THIS BREAKS THE CURRENT LDAP support!!!
See: https://issues.apache.org/jira/browse/JS2-491 Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java?view=diff&rev=454376&r1=454375&r2=454376 ============================================================================== --- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java (original) +++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/AbstractLdapDao.java Mon Oct 9 06:29:18 2006 @@ -261,7 +261,10 @@ while ((null != searchResults) && searchResults.hasMore()) { SearchResult searchResult = (SearchResult) searchResults.next(); + +/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again userDn = searchResult.getNameInNamespace(); +*/ // if (searchResult.getObject() instanceof DirContext) // { // DirContext userEntry = (DirContext) searchResult.getObject(); Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java?view=diff&rev=454376&r1=454375&r2=454376 ============================================================================== --- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (original) +++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java Mon Oct 9 06:29:18 2006 @@ -16,7 +16,9 @@ import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again import javax.naming.ldap.LdapName; +*/ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,10 +50,13 @@ { logger.debug("query[" + query + "]"); } - Name name = new LdapName(getGroupFilterBase()); + +/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again + Name name = new LdapName(getGroupFilterBase()); NamingEnumeration searchResults = ((DirContext) ctx).search(name,query , cons); - +*/ List groupPrincipalUids = new ArrayList(); +/* while (searchResults.hasMore()) { SearchResult result = (SearchResult) searchResults.next(); @@ -59,6 +64,7 @@ groupPrincipalUids.addAll(getAttributes(getAttribute(getGroupIdAttribute(), answer))); } +*/ return (String[]) groupPrincipalUids.toArray(new String[groupPrincipalUids.size()]); } @@ -90,11 +96,13 @@ { logger.debug("query[" + query + "]"); } - + +/* TODO: Java 5 dependency, needs to be resolved for Java 1.4 first before this can be enabled again Name name = new LdapName(getRoleFilterBase()) ; NamingEnumeration searchResults = ((DirContext) ctx).search(name,query , cons); - +*/ List rolePrincipalUids = new ArrayList(); +/* while (searchResults.hasMore()) { @@ -103,6 +111,7 @@ rolePrincipalUids.addAll(getAttributes(getAttribute(getRoleIdAttribute(), answer))); } +*/ return (String[]) rolePrincipalUids.toArray(new String[rolePrincipalUids.size()]); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
