inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.3 to HEAD

Browse Source 
20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API
   20232: Fix problem opening AVM web project folders via FTP. ALF-2738.
   20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain
   20235: Fix for unable to create folders in web project via CIFS. ALF-2736.
   20258: Reverse-merged rev 20254: 'When dropping the mysql database ...'
   20262: Merged V3.3-BUG-FIX to V3.3
      20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations.
              - Browser history filter object in incorrect state after page refresh.
   20264: Updated Oracle build support (to fix grants)
   20282: Merged PATCHES/V3.2.0 to V3.3
      20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
      20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
   20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20194: AVMTestSuite - scale down unit tests (slightly)
      20247: AVMServiceTest.testVersionByDate - build (add delay)
   20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7"
      - Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted
      - Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found.
   20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY)
      20249: Merged V3.1 to PATCHES/V3.1.0
         14565: Updated version to include revision number (x.y.z)
      20246: Merged V3.1 to PATCHES/V3.1.0
         13841: Build fix
      20245: Merged V3.1 to PATCHES/V3.1.0
         16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction
      20241: Merged V3.1 to PATCHES/V3.1.0
         14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person.
         16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work
         16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import
            - Problem due to ETHREEOH-2023, fixed in 3.1.1
            - Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider
            - Also requires fix to ETHREEOH-2475 to fix up duplicate users
      20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
         20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
            19793: Merged HEAD to V3.2.0
               19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
               19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
                  Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
                  Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
                  I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
               19707: Return value from isTransformationBlocked was inverted. Fixed now.
               19705: Refinement of previous check-in re OOo transformations.
                  I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
               19702: Fix for HEAD builds running on panda build server.
                  OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
                  It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
      20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0
   20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
      20268: Increment version number
      20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2
         17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
            17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
      20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
         19793: Merged HEAD to V3.2.0
            19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
            19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
               Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
               Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
               I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
            19707: Return value from isTransformationBlocked was inverted. Fixed now.
            19705: Refinement of previous check-in re OOo transformations.
               I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
            19702: Fix for HEAD builds running on panda build server.
               OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
               It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
      20204: Moved version label to '.6'
   20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
      20281: Incremented version number to '10'
      20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
         Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
            18490: Added cache for alf_content_data
         Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
            20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
   20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
      20279: Incremented version label
      20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719)
      20210: Incremented version label to '.3'
      20206: Bumped version label to '.2'
      20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner
      20149: Incremented version label
      20101: Created hotfix branch off ENTERPRISE/V3.2.1
   20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3:
      20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK)
   20301: Merged PATCHES/V3.2.1 to V3.3
      20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office
         - A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login
   20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E
      - Auto-unbox NPE on Long->long: Just used the Long directly for reporting
   20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO
   20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
      - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
      - Fixed queries to check for dereferencing AND use the indexed orphan_time column
      - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
      - Added optimistic lock checks on updates and deletes of alf_content_url
   20335: Merged DEV/V3.3-BUG-FIX to V3.3
      20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3
         - Removed previous SafeEventPublisher workaround for startup errors and associated changes
         - Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started
         - Now all subsystems shut down cleanly
         - Fixes problem with FileContentStore visibility in JMX too!
   20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder.
   20346: ALF-2839: Node pre-loading generates needless resultset rows
      - Added missing Criteria.list() call
   20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
   20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections)
      19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured
         1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system.
         2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode.
   20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec
      20354: Update test to reflect changes to CMIS version mapping.
   20363: Merge from V3.2 to V3.2 (all record-only)
      c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled.
      c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown
      c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken
   20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/
   20395: set google docs off
   20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
      - Setting ContentData that was derived outside of the current transaction opened up a window
        for the post-rollback code to delete the underlying binary. The binaries are only registered
        for writers fetched via the ContentService now; the low-level DAO no longer does management
        because it can't assume that a new content URL indicates a new underlying binary.
      - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
        live content when retrying collisions took place. The cleanup is no longer on the stack
        for the patch.
      - Removes the ALF-558 changes around ContentData.reference()
   20399: Remove googledocs aspect option
   20400: PurgeTestP (AVM) - increase wait cycles
   20422: Added ooo converter properties
   20425: Merge V3.3-BUG-FIX to V3.3
      20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English
      20365 : Merge DEV to V3.3-BUG_FIX     
         18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name
      20332 : Build fix - rework to the ImapServiceUnit tests.
      20325 : build fix
      20318 : MERGE DEV TO V3.3-BUG-FIX    
         20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client.
      20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English   This change reworks the received date metadata extraction.
      20316 : ALF-1912 : Problem with IMAP Sites visibility   Now only IMAP favouries are shown.   Also major rework to the way that this service uses the FileFolderService.
      20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service    - add listDeepFolders    - remove "makeFolders" which moves to its own Utility class.    - update to JavaDoc
   20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20171: 3.3SP1 bug fix branch
      20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project
      20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task.
   20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor.
      20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529.
   20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY)
      20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
         r20176 Merge from V3.2 to V3.3.
             r20175. JMX configuration of enterprise logging broken (fix).
      20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
         r20178 JodConverter loggers are now exposed in JMX.
      20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20195: Form fields for numbers are now rendered much smaller that ...
      20248: (RECORD ONLY) Merging HEAD into V3.3
      20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20177: Add 'MaxPermSize' setting for DOD JUnit tests
      20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml
         20264: Updated Oracle build support (to fix grants)
   20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck
      20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck
      20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX
         20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted.
      20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail.
      20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error.
      20263: Fix for ALF-2500: query with a ! in contains search make it strange
      20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash.
   20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20292: (RECORD ONLY) Latest SpringSurf libs:
      20308: (RECORD ONLY) Latest SpringSurf libs:
      20366: (RECORD ONLY) Latest SpringSurf libs:
      20415: Latest SpringSurf libs:
   20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20270: Build times: SearchTestSuite
      20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks
      20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console).
      20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked
      20291: Reduce build time: Added security test suite to cover 17 security tests 
   20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
      20302: Fixed ALF-727:  Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE
      20307: VersionStore - minor fixes if running deprecated V1 
      20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly.
      20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters
      20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX
         20313: ALF-2507: Not able to email space users even if the user owns the space 
      20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share"
      20327: Fix Quickr project to compile in Eclipse
      20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
      20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
      20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
      20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
      20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
      20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item
      20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-06-09 14:01:07 +00:00
parent b2e7793c54
commit ca3ea75ab0
9 changed files with 186 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/web/app/servlet/BaseServlet.java
View File

@@ -19,6 +19,7 @@
package org.alfresco.web.app.servlet; package org.alfresco.web.app.servlet;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -47,6 +48,7 @@ import org.alfresco.service.namespace.NamespaceService;
import org.springframework.extensions.surf.util.URLDecoder; import org.springframework.extensions.surf.util.URLDecoder;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.bean.LoginBean; import org.alfresco.web.bean.LoginBean;
import org.alfresco.web.bean.LoginOutcomeBean;
import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.repository.Repository;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -163,32 +165,40 @@ public abstract class BaseServlet extends HttpServlet
* once the user has successfully completed the authentication process. * once the user has successfully completed the authentication process.
*/ */
public static void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res, ServletContext sc) public static void redirectToLoginPage(HttpServletRequest req, HttpServletResponse res, ServletContext sc)
throws IOException throws IOException
{ {
// authentication failed - so end servlet execution and redirect to login page // authentication failed - so end servlet execution and redirect to login page
res.sendRedirect(req.getContextPath() + FACES_SERVLET + Application.getLoginPage(sc)); StringBuilder redirectURL = new StringBuilder(1024).append(req.getContextPath()).append(FACES_SERVLET).append(
Application.getLoginPage(sc));
// save the full requested URL so the login page knows where to redirect too later
// Pass the full requested URL as a parameter so the login page knows where to redirect to later
String uri = req.getRequestURI(); String uri = req.getRequestURI();
String url = uri;
if (req.getQueryString() != null && req.getQueryString().length() != 0) // if we find a JSF servlet reference in the URI then we need to check if the rest of the
// JSP specified is valid for a redirect operation after Login has occured.
int jspIndex;
if (uri.indexOf(req.getContextPath() + FACES_SERVLET) == -1
|| uri.length() > (jspIndex = uri.indexOf(BaseServlet.FACES_SERVLET) + BaseServlet.FACES_SERVLET.length())
&& BaseServlet.validRedirectJSP(uri.substring(jspIndex)))
{ {
url += "?" + req.getQueryString(); if (redirectURL.indexOf("?") == -1)
}
if (uri.indexOf(req.getContextPath() + FACES_SERVLET) != -1)
{
// if we find a JSF servlet reference in the URI then we need to check if the rest of the
// JSP specified is valid for a redirect operation after Login has occured.
int jspIndex = uri.indexOf(BaseServlet.FACES_SERVLET) + BaseServlet.FACES_SERVLET.length();
if (uri.length() > jspIndex && BaseServlet.validRedirectJSP(uri.substring(jspIndex)))
{ {
req.getSession().setAttribute(LoginBean.LOGIN_REDIRECT_KEY, url); redirectURL.append('?');
} }
else
{
redirectURL.append('&');
}
redirectURL.append(LoginOutcomeBean.PARAM_REDIRECT_URL);
redirectURL.append('=');
String url = uri;
if (req.getQueryString() != null && req.getQueryString().length() != 0)
{
url += "?" + req.getQueryString();
}
redirectURL.append(URLEncoder.encode(url, "UTF-8"));
} }
else res.sendRedirect(redirectURL.toString());
{
req.getSession().setAttribute(LoginBean.LOGIN_REDIRECT_KEY, url);
}
} }
/** /**

14
source/java/org/alfresco/web/bean/LoginBean.java
View File

@@ -323,17 +323,18 @@ public class LoginBean implements Serializable
// the app to continue without redirecting to the login page // the app to continue without redirecting to the login page
Application.setCurrentUser(fc, user); Application.setCurrentUser(fc, user);
// Programatically retrieve the LoginOutcomeBean from JSF
LoginOutcomeBean loginOutcomeBean = (LoginOutcomeBean) fc.getApplication().createValueBinding(
"#{LoginOutcomeBean}").getValue(fc);
// if a redirect URL has been provided then use that // if a redirect URL has been provided then use that
// this allows servlets etc. to provide a URL to return too after a successful login // this allows servlets etc. to provide a URL to return too after a successful login
String redirectURL = (String)session.get(LOGIN_REDIRECT_KEY); String redirectURL = loginOutcomeBean.getRedirectURL();
if (redirectURL != null) if (redirectURL != null && redirectURL.length() > 0)
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Redirect URL found: " + redirectURL); logger.debug("Redirect URL found: " + redirectURL);
// remove redirect URL from session
session.remove(LOGIN_REDIRECT_KEY);
try try
{ {
fc.getExternalContext().redirect(redirectURL); fc.getExternalContext().redirect(redirectURL);
@@ -472,7 +473,6 @@ public class LoginBean implements Serializable
public static final String MSG_PASSWORD_LENGTH = "login_err_password_length"; public static final String MSG_PASSWORD_LENGTH = "login_err_password_length";
public static final String MSG_USER_ERR = "user_err_user_name"; public static final String MSG_USER_ERR = "user_err_user_name";
public static final String LOGIN_REDIRECT_KEY = "_alfRedirect";
public static final String LOGIN_EXTERNAL_AUTH = "_alfExternalAuth"; public static final String LOGIN_EXTERNAL_AUTH = "_alfExternalAuth";
public static final String LOGIN_NOPERMISSIONS = "_alfNoPermissions"; public static final String LOGIN_NOPERMISSIONS = "_alfNoPermissions";

67
source/java/org/alfresco/web/bean/LoginOutcomeBean.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.web.bean;
import java.io.Serializable;
/**
* A request-scoped bean that is used to propagate the URL to redirect to after successful login. This is now done with
* request parameters rather than session-scoped beans so that tools such as MS Office, which do not propagate cookies
* to hyperlinks, can be used to open hyperlinks to protected documents (ALF-206).
*
* @author dward
*/
public class LoginOutcomeBean implements Serializable
{
/** The name of the request parameter that provides the initial value of the {@link #redirectURL} property. */
public static final String PARAM_REDIRECT_URL = "_alfRedirect";
private static final long serialVersionUID = -2575348340143674698L;
/** The URL to redirect to after successful login. */
private String redirectURL;
/**
* Gets the URL to redirect to after successful login.
*
* @return the URL to redirect to after successful login
*/
public String getRedirectURL()
{
return redirectURL;
}
/**
* Sets the URL to redirect to after successful login.
*
* @param redirectURL
* the URL to redirect to after successful login
*/
public void setRedirectURL(String redirectURL)
{
this.redirectURL = redirectURL;
}
}

73
source/java/org/alfresco/web/bean/users/EmailSpaceUsersDialog.java
View File

@@ -33,6 +33,8 @@ import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction; import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessPermission;
@@ -313,46 +315,53 @@ public class EmailSpaceUsersDialog extends BaseDialogBean implements IContextLis
// Return all the permissions set against the current node for any authentication // Return all the permissions set against the current node for any authentication
// instance (user/group), walking the parent space inheritance chain. // instance (user/group), walking the parent space inheritance chain.
// Then combine them into a single list for each authentication found. // Then combine them into a single list for each authentication found.
String currentAuthority = Application.getCurrentUser(context).getUserName(); final String currentAuthority = Application.getCurrentUser(context).getUserName();
Map<String, List<String>> permissionMap = new HashMap<String, List<String>>(8, 1.0f); Map<String, List<String>> permissionMap = AuthenticationUtil.runAs(new RunAsWork<Map<String, List<String>>>()
NodeRef spaceRef = getSpace().getNodeRef();
while (spaceRef != null)
{ {
Set<AccessPermission> permissions = getPermissionService().getAllSetPermissions(spaceRef); public Map<String, List<String>> doWork() throws Exception
for (AccessPermission permission : permissions)
{ {
// we are only interested in Allow and not Guest/Everyone/owner NodeRef spaceRef = getSpace().getNodeRef();
if (permission.getAccessStatus() == AccessStatus.ALLOWED && Map<String, List<String>> permissionMap = new HashMap<String, List<String>>(8, 1.0f);
(permission.getAuthorityType() == AuthorityType.USER || while (spaceRef != null)
permission.getAuthorityType() == AuthorityType.GROUP))
{ {
String authority = permission.getAuthority(); Set<AccessPermission> permissions = getPermissionService().getAllSetPermissions(spaceRef);
for (AccessPermission permission : permissions)
if (currentAuthority.equals(authority) == false)
{ {
List<String> userPermissions = permissionMap.get(authority); // we are only interested in Allow and not Guest/Everyone/owner
if (userPermissions == null) if (permission.getAccessStatus() == AccessStatus.ALLOWED &&
(permission.getAuthorityType() == AuthorityType.USER ||
permission.getAuthorityType() == AuthorityType.GROUP))
{ {
// create for first time String authority = permission.getAuthority();
userPermissions = new ArrayList<String>(4);
permissionMap.put(authority, userPermissions); if (currentAuthority.equals(authority) == false)
{
List<String> userPermissions = permissionMap.get(authority);
if (userPermissions == null)
{
// create for first time
userPermissions = new ArrayList<String>(4);
permissionMap.put(authority, userPermissions);
}
// add the permission name for this authority
userPermissions.add(permission.getPermission());
}
} }
// add the permission name for this authority }
userPermissions.add(permission.getPermission());
// walk parent inheritance chain until root or no longer inherits
if (getPermissionService().getInheritParentPermissions(spaceRef))
{
spaceRef = getNodeService().getPrimaryParent(spaceRef).getParentRef();
}
else
{
spaceRef = null;
} }
} }
} return permissionMap;
}
// walk parent inheritance chain until root or no longer inherits }, AuthenticationUtil.SYSTEM_USER_NAME);
if (getPermissionService().getInheritParentPermissions(spaceRef))
{
spaceRef = getNodeService().getPrimaryParent(spaceRef).getParentRef();
}
else
{
spaceRef = null;
}
}
// create the structure as a linked list for fast insert/removal of items // create the structure as a linked list for fast insert/removal of items
this.usersGroups = new LinkedList<Map>(); this.usersGroups = new LinkedList<Map>();

17
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -366,6 +366,23 @@ public class CreateWebContentWizard extends CreateContentWizard
} }
} }
// remove any locks created as a result of uploading files
final NodeRef[] uploadedFiles = this.filePickerBean.getUploadedFiles();
if (uploadedFiles != null && uploadedFiles.length > 0)
{
for (NodeRef uploadedFile : uploadedFiles)
{
String path = AVMNodeConverter.ToAVMVersionPath(uploadedFile).getSecond();
String storeId = AVMUtil.getStoreId(path);
String storePath = AVMUtil.getStoreRelativePath(path);
if (logger.isDebugEnabled())
logger.debug("Removing lock for uploaded file: " + path);
this.getAvmLockingService().removeLock(storeId, storePath);
}
}
return super.cancel(); return super.cancel();
} }

26
source/java/org/alfresco/web/bean/wcm/FilePickerBean.java
View File

@@ -112,10 +112,6 @@ public class FilePickerBean implements Serializable
// cached reference to the public saved searches folder // cached reference to the public saved searches folder
private NodeRef publicSearchesRef = null; private NodeRef publicSearchesRef = null;
// initial current folder - the current folder path which the
// the file picker opens at when first selected in the form
private String initialCurrentPath = null;
public FilePickerBean() public FilePickerBean()
{ {
} }
@@ -383,32 +379,20 @@ public class FilePickerBean implements Serializable
AVMUtil.PathRelation.WEBAPP_RELATIVE); AVMUtil.PathRelation.WEBAPP_RELATIVE);
} }
// if initial current path not set then set it to the current path
if (initialCurrentPath == null)
{
initialCurrentPath = currentPath;
// insert '/' at end of initial current path if there isn't one
if (initialCurrentPath.charAt(initialCurrentPath.length() - 1) != '/')
{
initialCurrentPath = initialCurrentPath + "/";
}
}
// if folder path restriction (relative path) is set, // if folder path restriction (relative path) is set,
// then calculate the absolute restriction path (in context of file // then calculate the absolute restriction path from the root
// picker's // of the webapp and set the current path to that
// initial current path - the path at which it was opened the first time)
// and set file picker current path to that
if ((folderPathRestriction != null) if ((folderPathRestriction != null)
&& (folderPathRestriction.length() != 0)) && (folderPathRestriction.length() != 0))
{ {
currentPath = initialCurrentPath + folderPathRestriction; currentPath = AVMUtil.getWebappPath(currentPath) + "/" + folderPathRestriction;
} }
if (LOGGER.isDebugEnabled()) if (LOGGER.isDebugEnabled())
{ {
LOGGER.debug(this + ".getFilePickerData(path = " + currentPath LOGGER.debug(this + ".getFilePickerData(path = " + currentPath
+ ", folderRestriction = "
+ folderPathRestriction
+ ", selectableTypes = [" + ", selectableTypes = ["
+ StringUtils.join(selectableTypes, ",") + StringUtils.join(selectableTypes, ",")
+ "], filterMimetypes = [" + "], filterMimetypes = ["

9
source/java/org/alfresco/web/ui/repo/component/UIContentSelector.java
View File

@@ -43,7 +43,6 @@ import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.lucene.queryParser.QueryParser;
/** /**
* Component for selecting content from the repository * Component for selecting content from the repository
@@ -54,7 +53,7 @@ public class UIContentSelector extends UIInput
{ {
private final static Log logger = LogFactory.getLog(UIContentSelector.class); private final static Log logger = LogFactory.getLog(UIContentSelector.class);
private final static String ACTION_SEPARATOR = ";"; // private final static String ACTION_SEPARATOR = ";";
private final static String ACTION_SEARCH = "0"; private final static String ACTION_SEARCH = "0";
private final static String FIELD_CONTAINS = "_contains"; private final static String FIELD_CONTAINS = "_contains";
@@ -123,8 +122,8 @@ public class UIContentSelector extends UIInput
*/ */
public void decode(FacesContext context) public void decode(FacesContext context)
{ {
Map requestMap = context.getExternalContext().getRequestParameterMap(); Map<?, ?> requestMap = context.getExternalContext().getRequestParameterMap();
Map valuesMap = context.getExternalContext().getRequestParameterValuesMap(); Map<?, ?> valuesMap = context.getExternalContext().getRequestParameterValuesMap();
String fieldId = getHiddenFieldName(); String fieldId = getHiddenFieldName();
String value = (String)requestMap.get(fieldId); String value = (String)requestMap.get(fieldId);
@@ -356,7 +355,7 @@ public class UIContentSelector extends UIInput
NamespaceService.CONTENT_MODEL_1_0_URI, "name")); NamespaceService.CONTENT_MODEL_1_0_URI, "name"));
query.append(nameAttr); query.append(nameAttr);
query.append(":*" + safeContains + "*"); query.append(":\"*" + safeContains + "\"*");
} }
int maxResults = Application.getClientConfig(context).getSelectorsSearchMaxResults(); int maxResults = Application.getClientConfig(context).getSelectorsSearchMaxResults();

13
source/web/WEB-INF/faces-config-beans.xml
View File

@@ -260,6 +260,19 @@
</managed-property> </managed-property>
</managed-bean> </managed-bean>
<managed-bean>
<description>
A request scoped bean that backs up the Login screen
</description>
<managed-bean-name>LoginOutcomeBean</managed-bean-name>
<managed-bean-class>org.alfresco.web.bean.LoginOutcomeBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>redirectURL</property-name>
<value>#{param._alfRedirect}</value>
</managed-property>
</managed-bean>
<managed-bean> <managed-bean>
<description> <description>
The bean that holds navigation state. The bean that holds navigation state.

3
source/web/jsp/login.jsp
View File

@@ -87,6 +87,9 @@
<h:form acceptcharset="UTF-8" id="loginForm" > <h:form acceptcharset="UTF-8" id="loginForm" >
<%-- Propagate the redirect URL parameter --%>
<h:inputHidden value="#{LoginOutcomeBean.redirectURL}" id="redirectURL"/>
<table width=100% height=98% align=center> <table width=100% height=98% align=center>
<tr width=100% align=center> <tr width=100% align=center>
<td valign=middle align=center width=100%> <td valign=middle align=center width=100%>