From cd903c80dfa7d89c2d0df07df4e449c4546611d3 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 18 Jan 2010 19:47:40 +0000 Subject: [PATCH] Merged V3.2 to HEAD 18088: ETHREEOH-3787: Addition of liferay-display.xml to define category for demo portlet 18053: Build fix: Re-enable log ins to Alfresco web app when not running in a portlet container - Removed direct dependencies between FacesHelper and portlet API 18037: Merged DEV/DAVEW/SURFPORTLET to V3.2 17669: Changes to enable surf rendering from a portlet - New DispatcherPortlet forwards portlet requests to the DispatcherServlet as servlet requests. - A new filter 'lazily' creates users' dashboard pages to avoid the need to have to redirect from site-index.jsp - Build against JSR 286 portlet 2.0 API jar - Exclude portlet API jar from war to avoid ClassCastExceptions - Lazily init portlet authenticators to avoid ClassNotFoundExceptions when not running in a portlet container - Fix web.xml schema validation problems - UserFactory session keys given unique prefix to avoid class with Liferay shared session attributes - Liferay deployment descriptor to enable user principal name resolution - Fixed subsystem problem that prevented the override of a property with the empty string in alfresco-global.properties. Stopped 'unprotected' external auth from working. 18019: ETHREEOH-3770: LDAP sync now supports attribute range retrieval to get around limits imposed by Active Directory on multi-valued attributes - Meant that groups with more than 1000 members were getting truncated in Active Directory - Now switched on in ldap-ad and off in ldap subsystem - Also switched off result set paging in ldap subsystem by default for wider compatibility with non-AD systems 17759: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17755: ETHREEOH-3739: build 283: Upgrades from 3.1.1 and 3.1.2 fail on JBoss 5.1 - The getFile method was created for ImapFoldersPatch to retrieve acp file for ACPImportPackageHandler. - This method tries to load ACP file from file location and if it is unsuccessful then creates temporary file from resource input stream. - In other words we apply aproach from ImporterBootstrap. 17600: ETHREEOH-1002: Avoid using HTTP 1.1 chunked transfer encoding to send heartbeat data because some proxy servers can't cope with it! - Unit test can now parse chunked and un-chunked HTTP requests 17597: Further optimizations to authority caching - Don't invalidate entire user authority lookup cache when user added to or removed from an authority 17588: Fix up authority caching - Need to include tenant domain in cache key - Also reinstated cache of user recursive group memberships for performance purposes 17559: ETHREEOH-3440: Authority search performance improvements - AuthorityDAO now uses Lucene (again) to do wildcard style authority searches by name, type and zone - Retrieval by exact name, type and zone still performed by DB methods - DB methods now optimized to avoid having to load group child nodes to determine group membership - Authority cache now stores authority node refs by name to reduce authority resolution queries - ScriptGroup avoids hammering repository with multiple searches to determine group membership 17545: ETHREEOH-3371: Fixed group searches to search within the default zone and thus hide 'invisible' WCM and Share groups. 17527: ETHREEOH-3375: Use static inner class for cache key to avoid non serializable exceptions 17523: ETHREEOH-3337: Fix NPEs in RepoServerMgmt operations - Transactional cache can have entries with non-null keys and null values 17521: ETHREEOH-3158: Proper handling of user validation failures in Kerberos Authentication filters. 17490: Fix failing HeartBeatTest - Prevent possibility of both test and non-test public keys being used at the same time 17481: Fix build for Jan - Removed JDK 1.6 String.isEmpty() references 17472: Follow-on for ETHREEOH-2648 - tighten guest login, eg. if no guest configured (in auth chain) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/web-client-application-context.xml | 2 +- .../org/alfresco/web/app/servlet/FacesHelper.java | 11 ++++------- .../web/bean/users/MailInviteSpaceUsersWizard.java | 3 ++- .../alfresco/web/bean/wcm/SetPermissionsDialog.java | 2 +- .../web/bean/wizard/BaseInviteUsersWizard.java | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml index 93baa5784f..be9061cf12 100644 --- a/config/alfresco/web-client-application-context.xml +++ b/config/alfresco/web-client-application-context.xml @@ -164,7 +164,7 @@ - + diff --git a/source/java/org/alfresco/web/app/servlet/FacesHelper.java b/source/java/org/alfresco/web/app/servlet/FacesHelper.java index f15847afcd..f916f0e3f8 100644 --- a/source/java/org/alfresco/web/app/servlet/FacesHelper.java +++ b/source/java/org/alfresco/web/app/servlet/FacesHelper.java @@ -33,9 +33,6 @@ import javax.faces.el.EvaluationException; import javax.faces.el.ValueBinding; import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; -import javax.portlet.PortletContext; -import javax.portlet.PortletRequest; -import javax.portlet.PortletResponse; import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -105,13 +102,13 @@ public final class FacesHelper * Return a valid FacesContext for the specific context, request and response. * The FacesContext can be constructor for Servlet use. * - * @param context ServletContext - * @param request ServletRequest - * @param response ServletReponse + * @param context PortletContext + * @param request PortletRequest + * @param response PortletResponse * * @return FacesContext */ - public static FacesContext getFacesContext(PortletRequest request, PortletResponse response, PortletContext context) + public static FacesContext getFacesContext(Object request, Object response, Object context) { return getFacesContextImpl(request, response, context, null); } diff --git a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java index 3fd0e64b5a..851e058e53 100755 --- a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java +++ b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java @@ -26,6 +26,7 @@ package org.alfresco.web.bean.users; import java.util.Set; +import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.web.bean.spaces.InviteSpaceUsersWizard; @@ -42,7 +43,7 @@ public class MailInviteSpaceUsersWizard extends InviteSpaceUsersWizard // groups - text search match on supplied name String term = PermissionService.GROUP_PREFIX + "*" + search + "*"; Set groups; - groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term); + groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT); return groups; } } \ No newline at end of file diff --git a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java index 861a2cf5cc..a74b881b7c 100644 --- a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java @@ -279,7 +279,7 @@ public class SetPermissionsDialog extends UpdatePermissionsDialog // groups - text search match on supplied name String term = PermissionService.GROUP_PREFIX + "*" + contains.trim() + "*"; Set groups; - groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term); + groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT); groups.addAll(getAuthorityService().getAllAuthorities(AuthorityType.EVERYONE)); String groupDisplayName; diff --git a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java index 2a489802a1..2c36ce2359 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java @@ -571,7 +571,7 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean // groups - text search match on supplied name String term = PermissionService.GROUP_PREFIX + "*" + search + "*"; Set groups; - groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term); + groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT); groups.addAll(getAuthorityService().getAllAuthorities(AuthorityType.EVERYONE)); return groups; }