tdraier 2005/04/01 17:11:16 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
etc/ldap groups.ldap.properties
src/java/org/jahia/services/applications
ServletIncludeRequestWrapper.java
src/java/org/jahia/services/usermanager
JahiaGroupManagerLDAPProvider.java
JahiaUserManagerLDAPProvider.java
Log:
ldap optimizations, get org.portletapi.userlist on demand only
Revision Changes Path
1.3.4.4 +1 -1 jahia/etc/ldap/groups.ldap.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/ldap/groups.ldap.properties.diff?r1=1.3.4.3&r2=1.3.4.4&f=h
1.23.2.6 +5 -1
jahia/src/java/org/jahia/services/applications/ServletIncludeRequestWrapper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/applications/ServletIncludeRequestWrapper.java.diff?r1=1.23.2.5&r2=1.23.2.6&f=h
1.16.4.15 +13 -11
jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java.diff?r1=1.16.4.14&r2=1.16.4.15&f=h
1.32.4.19 +7 -5
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.32.4.18&r2=1.32.4.19&f=h
Index: groups.ldap.properties
===================================================================
RCS file: /home/cvs/repository/jahia/etc/ldap/Attic/groups.ldap.properties,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- groups.ldap.properties 8 Mar 2005 13:39:44 -0000 1.3.4.3
+++ groups.ldap.properties 1 Apr 2005 15:11:14 -0000 1.3.4.4
@@ -20,7 +20,7 @@
groups.ldap.dynamic.members.attribute = memberurl
# if set to false, group members will not be preloaded and members will not
appear in engines
-groups.ldap.preload = true
+groups.ldap.preload = false
# the following defines the attributes to use for wildcard search such as
*=*test*
groups.ldap.search.wildcards.attributes = cn,description,uniqueMember
Index: ServletIncludeRequestWrapper.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/applications/Attic/ServletIncludeRequestWrapper.java,v
retrieving revision 1.23.2.5
retrieving revision 1.23.2.6
diff -u -r1.23.2.5 -r1.23.2.6
--- ServletIncludeRequestWrapper.java 1 Mar 2005 09:31:07 -0000 1.23.2.5
+++ ServletIncludeRequestWrapper.java 1 Apr 2005 15:11:15 -0000 1.23.2.6
@@ -152,7 +152,6 @@
httpServletRequest.setAttribute("org.portletapi.portal", "true");
/** @todo Add a security check before enabling this attribute */
- httpServletRequest.setAttribute("org.portletapi.userlist",
applicationRequest.getAppContextUsers());
httpServletRequest.setAttribute("org.portletapi.contextid",
contextID);
if (fullScreenActivated) {
httpServletRequest.setAttribute("org.portletapi.fullscreen",
"true");
@@ -1189,6 +1188,11 @@
public Object getAttribute(String name) {
logger.debug( "getAttribute("+name+")");
+ if (super.getAttribute(name) == null) {
+ if ("org.portletapi.userlist".equals(name)) {
+ super.setAttribute("org.portletapi.userlist",
appRequest.getAppContextUsers());
+ }
+ }
return super.getAttribute(name);
}
Index: JahiaGroupManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaGroupManagerLDAPProvider.java,v
retrieving revision 1.16.4.14
retrieving revision 1.16.4.15
diff -u -r1.16.4.14 -r1.16.4.15
--- JahiaGroupManagerLDAPProvider.java 10 Mar 2005 10:52:56 -0000
1.16.4.14
+++ JahiaGroupManagerLDAPProvider.java 1 Apr 2005 15:11:15 -0000
1.16.4.15
@@ -302,7 +302,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty
(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (NamingException ne) {
logger.warn ("JNDI warning",ne);
invalidatePublicCtx ();
@@ -460,7 +460,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty
(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (NamingException ne) {
logger.warn ("JNDI warning",ne);
invalidatePublicCtx ();
@@ -697,7 +697,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty
(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (PartialResultException pre) {
logger.warn (pre);
} catch (NamingException ne) {
@@ -1192,7 +1192,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty
(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
group = null;
} catch (PartialResultException pre) {
@@ -1411,13 +1411,15 @@
public synchronized JahiaUserManagerLDAPProvider
getUserManagerProvider() {
- Vector v =
ServicesRegistry.getInstance().getJahiaUserManagerService().getProviderList();
- for (Iterator iterator = v.iterator(); iterator.hasNext();) {
- UserManagerProviderBean userManagerProviderBean =
(UserManagerProviderBean) iterator.next();
- if
(userManagerProviderBean.getClassName().equals(JahiaUserManagerLDAPProvider.class.getName()))
{
- JahiaUserManagerLDAPProvider jahiaUserManagerLDAPProvider =
(JahiaUserManagerLDAPProvider)userManagerProviderBean.getInstance();
- if
(jahiaUserManagerLDAPProvider.getUrl().equals(ldapProperties.get(LDAP_URL_PROP)))
{
- userProvider = jahiaUserManagerLDAPProvider;
+ if (userProvider == null) {
+ Vector v =
ServicesRegistry.getInstance().getJahiaUserManagerService().getProviderList();
+ for (Iterator iterator = v.iterator(); iterator.hasNext();) {
+ UserManagerProviderBean userManagerProviderBean =
(UserManagerProviderBean) iterator.next();
+ if
(userManagerProviderBean.getClassName().equals(JahiaUserManagerLDAPProvider.class.getName()))
{
+ JahiaUserManagerLDAPProvider
jahiaUserManagerLDAPProvider =
(JahiaUserManagerLDAPProvider)userManagerProviderBean.getInstance();
+ if
(jahiaUserManagerLDAPProvider.getUrl().equals(ldapProperties.get(LDAP_URL_PROP)))
{
+ userProvider = jahiaUserManagerLDAPProvider;
+ }
}
}
}
Index: JahiaUserManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerLDAPProvider.java,v
retrieving revision 1.32.4.18
retrieving revision 1.32.4.19
diff -u -r1.32.4.18 -r1.32.4.19
--- JahiaUserManagerLDAPProvider.java 31 Mar 2005 17:24:37 -0000
1.32.4.18
+++ JahiaUserManagerLDAPProvider.java 1 Apr 2005 15:11:15 -0000
1.32.4.19
@@ -533,7 +533,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty
(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (NamingException ne) {
logger.warn ("JNDI warning",ne);
invalidatePublicCtx ();
@@ -584,7 +584,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (NamingException ne) {
logger.warn ("JNDI warning",ne);
invalidatePublicCtx ();
@@ -650,7 +650,7 @@
DEFAULT_CONFIGURATION_FILE +
", limiting to " +
this.ldapProperties.getProperty(SEARCH_COUNT_LIMIT_PROP) +
- " first results...", slee);
+ " first results...");
} catch (NamingException ne) {
logger.warn ("JNDI warning",ne);
invalidatePublicCtx ();
@@ -892,7 +892,9 @@
protected JahiaLDAPUser lookupUserFromDN(String dn) {
logger.debug ("Lookup user from dn " + dn);
JahiaLDAPUser user = null;
-
+ if (mUserCache.containsKey("d"+dn)) {
+ return (JahiaLDAPUser) mUserCache.get("d"+dn);
+ }
try {
String baseName = dn.substring(dn.indexOf(',')+1);
// might check if base name match the search base defined in
properties
@@ -922,7 +924,7 @@
return null;
}
user = ldapToJahiaUser (sr);
-
+ mUserCache.put("d"+dn, user);
} catch (SizeLimitExceededException slee) {
logger.debug(
"Search generated more than configured maximum search limit
in " +
