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-BUG-FIX to HEAD

Browse Source 
22215: Fix compilation error
   22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions
   22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207
   22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix
      ALF-4395: recognize Kerberos machine accounts with lower case names
   22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo()
   22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure
         Error code constants and appropriate System.exit(code) invokations were added.
   22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache
      - removed the cache - didn't allow for dynamic model updates either
   22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
      22268: Merged V3.3-BUG-FIX to V3.3
         - Merged across all differences from V3.3-BUG-FIX
   22270: Incremented revision number
   22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741.
      V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
   22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable.
         Do not include unlock in the actions list when a node has a working copy.
   22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562)
   22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry"
   22718: Merge from V3.3 to V3.3-BUG-FIX
      r 22715 Merge from V3.2 to V3.3
         r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
   22722: Merged V3.3 to V3.3-BUG-FIX
      22271: ALF-3712: Merged HEAD to V3.3
         22249: Bin contents were not being packaged.
      22272: Merged DEV/TEMPORARY to V3.3
         22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation.
            - Do not unlock a working copy.
      22273: Merged DEV/TEMPORARY to V3.3
         21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition
            The temporary fix for unconfigurable valueSeparator property.
            https://jira.springframework.org/browse/SPR-7429
      22274: Merged DEV/TEMPORARY to V3.3
         21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response
            WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification.
      22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component
      22277: Merged DEV/TEMPORARY to V3.3
         22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc
            The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents:
            in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp.
      22285: Merged HEAD to V3.3
         22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour.
      22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant
         - this property is now used to control the merging of indexes as was intended
      22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy)
         21035: ALF-2588: RM: Export and import of file plan causes disposition errors
            When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears.
            To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier.
      22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
      22334: Merged HEAD to V3.3
         22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data.
      22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer.
         Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error.
      22356: Fix for ALF-4384 - missing JSP page directive
      22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
         - no abstain allowed
      22365: Merged DEV/TEMPORARY to V3.3
         21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder
            The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added.
            Also ALF-4008 compliant fix provided with this.
         21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.'
            Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined.
      22367: Merged DEV/TEMPORARY to V3.3
         21442: ALF-2587: WEBDAV error in Windows 7
            - variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected.
      22368: Merged DEV/TEMPORARY to V3.3
         20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace
            Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly.
      22369: Merged DEV/TEMPORARY to V3.3 (With simplifications)
         21470: ALF-3796: Locale is not always set/reset on every request thread
            - A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil
            - Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale
            - Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication
      22370: ALF-3868: Fix for compatibility with Sun Directory Server
      22371: Merged DEV/TEMPORARY to V3.3
         21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value.
         21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property.
      22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter
      22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy
      22386: ALF-3887: Two versions of geronimo-activation are shipped
         - Removed the older version
      22402: WCM - add more debug logging only
      22405: Change notification handler not enabled by the server configuration bean. ALF-4715.
      22407: Merged DEV/TEMPORARY to V3.3
         22231: ALF-4096: Share point module is causing file descriptor leaks.
            The following changes were added to VtiIfHeaderAction and GetDocumentMethod: 
            - code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy()
            - correct stream closing was added for all cases including exceptions while copying
      22411: Merged DEV/TEMPORARY to V3.3
         21864: ALF-4371: Error occurs if user try to find event from meeting place
            Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation.
      22412: Merged DEV/TEMPORARY to V3.3
         22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
         21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
      22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget
      22420: Fixed ALF-958: Target associations aren't copied
         - Added CopyBehaviourCallback. getAssociationCopyAction
         - Default behaviour:
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Copy the association using a new target if the target is copied in the same call
           - Copy the association to the original target if the target is not copied in the same call
         - Abstract behaviour (for those that have implemented a CopyBehaviourCallback):
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Only copy the association to a new target if the original target is copied 
      22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop
      22422: Merged DEV/TEMPORARY to V3.3
         21201: ALF-1804: Passthru server check gets confused when a server goes offline
      22423: Merged DEV/TEMPORARY to V3.3
         21891: ALF-3356: Error changing own user role from coordinator to consumer
            When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation.
            If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority.
      22424: Merged DEV/TEMPORARY to V3.3
         21182: ALF-1786: Remote Opensearch request mimetype missing
            SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers.
      22425: Merged DEV/TEMPORARY to V3.3
         22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there
            The selectedWorkflow variable was reseting every time on "Choose Workflow" step
      22426:Merged DEV/TEMPORARY to V3.3
         21323: ALF-687: Error when invoking webservices via SSL repository location url.
            Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end. 
            If this parameter value is true then SSLSocket is used and Socket otherwise. 
      22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist
         - Generalized ALF-4207 solution so that the error page instead displays a status 404 message
      22429: Merged DEV/TEMPORARY to V3.3
         21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean
            Detailed logging of the EvaluationException for ValueBinding was added.
      22430: Merged DEV/TEMPORARY to V3.3
         20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes
            Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to  “org.springframework.extensions.config.xml.XMLConfigService”
            Renamed mimetypes-extension-context.xml.sample file  to file  mimetypes-extension.xml.sample.  The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct.
      22431: Merged DEV/TEMPORARY to V3.3
         21099: ALF-3046: UI - Import feature not available to contributor user
            The fix also covers related bug ALF-2802.
            Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission.
      22432: Merged DEV/TEMPORARY to V3.3
         20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat
            The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application.
            Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml
      22433: Merged DEV/TEMPORARY to V3.3
         21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects
            Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder.
      22434: Merged DEV/TEMPORARY to V3.3
         21490: ALF-4099: Customer concern about String comparison operators == vs equals
            Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes. 
            DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case.
      22436: Merged DEV/TEMPORARY to V3.3
         22063: ALF-4494 : Share show error if versionable document has no version history.
            1. evaluator.lib.js was modified to prevent NPE if no version history exists for document.
            2. Result was manually tested.
      22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync
      22466: Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
      22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938.
         Removed (hopefully) last of the hardcoded buffer length limits.
      22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy
      22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs
         - Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly
         - Errors in the listeners are logged only
         - ContentStoreCleanerListener checks and warns if the URL is unsupported
      22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0
      22485: Fix for NFS losing contents during edit or copy. ALF-4737.
      22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays'
      22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore
      22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772.
      22520: ALF-4768: WCM (w/ virt svr) - submit  (no need to virtualize direct submit workflows)
      22526: Externalised setting of BINARIES, plus added bin with jars and dlls
      22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed)
      22611: Fixed ALF-1893: Windows 7 SSP Read-only.
         Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension.
      22612: Merged HEAD to BRANCHES/V3.3:
         22609: Resolve ALF4822, ALF4818
      22628: ALF-3239: Added encoding elements to mysql db url
      22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843.
      22673: ALF-4845: Person and Group member deletion performance fix
         - Don't batch load all a group's members when trying to delete one of them!
         - Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups
         - Switched off batch loading in NodeService.removeChild()
         - Avoided unnecessary use of removeAuthority in PersonService.deletePerson()
      22674: Merged DEV/TEMPORARY to V3.3
         22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM
            These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem.
               urls.alfresco.protocol
               urls.alfresco.host
               urls.alfresco.port
               urls.alfresco.context
               urls.share.protocol
               urls.share.host
               urls.share.port
               urls.share.context
            See bug for example usage
      22676: Merged HEAD to V3.3:
         20306: Google Doc integration fixes:
          - Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
          - Unit tests failures for excel sheets fixed
          - Able to now create and checkout docs, sheets and presentations successfullly
          - Docs, sheets and presentations downloadable and viewable
          - Fixed ALF-2700
         (See ALF-4827)
      22715: Merge from V3.2 to V3.3.
         r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-09-27 12:47:35 +00:00
parent 67a9bf6d4a
commit e0e04abccd
26 changed files with 461 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/messages/webclient.properties
View File

@@ -832,6 +832,7 @@ group_search_info=To find a group search for it using group name. Alternatively
user_change_homespace_info=Selecting a new home space for a user will not remove the existing permissions on the original home space. You may wish to use the Manage Space Users dialog to modify permissions if they are no longer required on the original home space.
quota_totalusage=Total Usage (for this search)
quota_totalquota=Total Quota (for this search)
caused_by=caused by:
# Content Wizard messages
add_content_dialog_title=Add Content Dialog
@@ -1975,6 +1976,10 @@ error_search_not_exist=Search does not exist with name: {0}
error_search_not_exist=Search does not exist with name: \"{0}\"
error_retrieving_search_results=Error getting results for search \"{0}\" - \"{1}\"
error_domain_mismatch=Domain mismatch: expected = {0}, actual = {1}
error_not_stored=No error currently stored
error_no_stack_trace=No stack trace available
error_permissions=You do not have sufficient permissions to view the requested item.
error_not_found=Sorry, the requested file does not exist at this location
# Confirmations
return_to_application=Return to application

2
config/alfresco/web-client-config-actions.xml
View File

@@ -722,7 +722,7 @@
<!-- Import into Space -->
<action id="import_space">
<permissions>
<permission allow="true">Write</permission>
<permission allow="true">CreateChildren</permission>
</permissions>
<label-id>import</label-id>
<image>/images/icons/import.gif</image>

16
source/java/org/alfresco/web/action/evaluator/UnlockDocEvaluator.java
View File

@@ -18,6 +18,10 @@
*/
package org.alfresco.web.action.evaluator;
import javax.faces.context.FacesContext;
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Node;
/**
@@ -34,6 +38,16 @@ public class UnlockDocEvaluator extends BaseActionEvaluator
*/
public boolean evaluate(Node node)
{
return (node.isLocked() == true);
if (node.isLocked())
{
FacesContext fc = FacesContext.getCurrentInstance();
CheckOutCheckInService checkOutCheckInService = (CheckOutCheckInService) FacesHelper.getManagedBean(fc, "CheckoutCheckinService");
if (checkOutCheckInService.getWorkingCopy(node.getNodeRef()) == null)
{
return true;
}
}
return false;
}
}

73
source/java/org/alfresco/web/app/Application.java
View File

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.alfresco.repo.SessionUser;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
@@ -194,6 +195,78 @@ public class Application
}
}
/**
* Handles error conditions detected by servlets.
*
* @param servletContext
* The servlet context
* @param request
* The HTTP request
* @param response
* The HTTP response
* @param messageKey
* the resource bundle key for the error mesage
* @param statusCode
* the status code to set on the response
* @param logger
* The logger
* @throws IOException
* Signals that an I/O exception has occurred.
* @throws ServletException
* the servlet exception
*/
public static void handleSystemError(ServletContext servletContext, HttpServletRequest request,
HttpServletResponse response, String messageKey, int statusCode, Log logger)
throws IOException, ServletException
{
// get the error bean from the session and set the error that occurred.
HttpSession session = request.getSession();
ErrorBean errorBean = (ErrorBean)session.getAttribute(ErrorBean.ERROR_BEAN_NAME);
if (errorBean == null)
{
errorBean = new ErrorBean();
session.setAttribute(ErrorBean.ERROR_BEAN_NAME, errorBean);
}
errorBean.setErrorMessageKey(messageKey);
errorBean.setReturnPage(null);
// try and find the configured error page
boolean errorShown = false;
String errorPage = getErrorPage(servletContext);
if (errorPage != null)
{
if (logger.isDebugEnabled())
logger.debug("An error has occurred, forwarding to error page: " + errorPage);
if (!response.isCommitted())
{
errorShown = true;
response.reset();
response.setStatus(statusCode);
response.setContentType(MimetypeMap.MIMETYPE_HTML);
response.setCharacterEncoding("utf-8");
servletContext.getRequestDispatcher(errorPage).include(request, response);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Response is already committed, re-throwing error");
}
}
else
{
if (logger.isDebugEnabled())
logger.debug("No error page defined, re-throwing error");
}
// if we could not show the error page for whatever reason, re-throw the error
if (!errorShown)
{
throw new ServletException(getMessage(session, messageKey));
}
}
/**
* Retrieves the DialogManager managed bean
*

2
source/java/org/alfresco/web/app/servlet/AuthenticationFilter.java
View File

@@ -112,8 +112,6 @@ public class AuthenticationFilter extends AbstractLifecycleBean implements Depen
}
else
{
BaseServlet.setLanguageFromRequestHeader(httpReq, context);
// continue filter chaining
chain.doFilter(req, res);
}

5
source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
View File

@@ -114,11 +114,6 @@ public final class AuthenticationHelper
{
I18NUtil.setLocale(Application.getLanguage(req.getSession()));
}
else
{
// Set the current thread locale (also for JSF context)
fc.getViewRoot().setLocale(BaseServlet.setLanguageFromRequestHeader(req, sc));
}
// Programatically retrieve the UserPreferencesBean from JSF
UserPreferencesBean userPreferencesBean = (UserPreferencesBean) fc.getApplication().createValueBinding(

72
source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
View File

@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletResponse;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
@@ -47,11 +46,9 @@ import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.LoginBean;
import org.apache.commons.logging.Log;
import org.springframework.extensions.surf.util.URLDecoder;
import org.springframework.extensions.surf.util.URLEncoder;
@@ -97,6 +94,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
protected static final String MIMETYPE_OCTET_STREAM = "application/octet-stream";
protected static final String MSG_ERROR_CONTENT_MISSING = "error_content_missing";
protected static final String MSG_ERROR_NOT_FOUND = "error_not_found";
protected static final String URL_DIRECT = "d";
protected static final String URL_DIRECT_LONG = "direct";
@@ -116,17 +114,19 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
protected abstract Log getLogger();
/**
* Processes the download request using the current context i.e. no
* authentication checks are made, it is presumed they have already
* been done.
* Processes the download request using the current context i.e. no authentication checks are made, it is presumed
* they have already been done.
*
* @param req The HTTP request
* @param res The HTTP response
* @param redirectToLogin Flag to determine whether to redirect to the login
* page if the user does not have the correct permissions
* @param req
* The HTTP request
* @param res
* The HTTP response
* @param allowLogIn
* Indicates whether guest users without access to the content should be redirected to the log in page. If
* <code>false</code>, a status 403 forbidden page is displayed instead.
*/
protected void processDownloadRequest(HttpServletRequest req, HttpServletResponse res,
boolean redirectToLogin, boolean transmitContent)
boolean allowLogIn, boolean transmitContent)
throws ServletException, IOException
{
Log logger = getLogger();
@@ -160,11 +160,19 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
if (path != null && path.length() != 0)
{
// process the name based path to resolve the NodeRef and the Filename element
try
{
PathRefInfo pathInfo = resolveNamePath(getServletContext(), path);
nodeRef = pathInfo.NodeRef;
filename = pathInfo.Filename;
}
catch (IllegalArgumentException e)
{
Application.handleSystemError(getServletContext(), req, res, MSG_ERROR_NOT_FOUND,
HttpServletResponse.SC_NOT_FOUND, logger);
return;
}
}
else
{
// a NodeRef must have been specified if no path has been found
@@ -200,7 +208,9 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
}
catch (FileNotFoundException e)
{
throw new AlfrescoRuntimeException("Unable to find node reference by relative path:" + uri);
Application.handleSystemError(getServletContext(), req, res, MSG_ERROR_NOT_FOUND,
HttpServletResponse.SC_NOT_FOUND, logger);
return;
}
}
else
@@ -229,35 +239,20 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
// get the services we need to retrieve the content
NodeService nodeService = serviceRegistry.getNodeService();
ContentService contentService = serviceRegistry.getContentService();
PermissionService permissionService = serviceRegistry.getPermissionService();
// Check that the node still exists
if (!nodeService.exists(nodeRef))
{
Application.handleSystemError(getServletContext(), req, res, MSG_ERROR_NOT_FOUND,
HttpServletResponse.SC_NOT_FOUND, logger);
return;
}
try
{
// check that the user has at least READ_CONTENT access - else redirect to the login page
if (permissionService.hasPermission(nodeRef, PermissionService.READ_CONTENT) == AccessStatus.DENIED)
// check that the user has at least READ_CONTENT access - else redirect to an error or login page
if (!checkAccess(req, res, nodeRef, PermissionService.READ_CONTENT, allowLogIn))
{
if (logger.isDebugEnabled())
logger.debug("User does not have permissions to read content for NodeRef: " + nodeRef.toString());
if (redirectToLogin)
{
if (logger.isDebugEnabled())
logger.debug("Redirecting to login page...");
// TODO: replace with serviceRegistry.getAuthorityService().hasGuestAuthority() from 3.1E
if (!AuthenticationUtil.getFullyAuthenticatedUser().equals(AuthenticationUtil.getGuestUserName()))
{
req.getSession().setAttribute(LoginBean.LOGIN_NOPERMISSIONS, Boolean.TRUE);
}
redirectToLoginPage(req, res, getServletContext());
}
else
{
if (logger.isDebugEnabled())
logger.debug("Returning 403 Forbidden error...");
res.sendError(HttpServletResponse.SC_FORBIDDEN);
}
return;
}
@@ -512,7 +507,6 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
throws IOException
{
final Log logger = getLogger();
final boolean trace = logger.isTraceEnabled();
// return the sets of bytes as requested in the content-range header
// the response will be formatted as multipart/byteranges media type message

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

@@ -23,17 +23,16 @@ import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.StringTokenizer;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantService;
@@ -44,14 +43,15 @@ import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.NamespaceService;
import org.springframework.extensions.surf.util.URLDecoder;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.LoginBean;
import org.alfresco.web.bean.LoginOutcomeBean;
import org.alfresco.web.bean.repository.Repository;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.URLDecoder;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.jsf.FacesContextUtils;
@@ -72,6 +72,8 @@ public abstract class BaseServlet extends HttpServlet
/** forcing guess access is available on most servlets */
private static final String ARG_GUEST = "guest";
private static final String MSG_ERROR_PERMISSIONS = "error_permissions";
/** list of valid JSPs for redirect after a clean login */
// TODO: make this list configurable
private static Set<String> validRedirectJSPs = new HashSet<String>();
@@ -160,6 +162,56 @@ public abstract class BaseServlet extends HttpServlet
return status;
}
/**
* Check the user has the given permission on the given node. If they do not either force a log on if this is a guest
* user or forward to an error page.
*
* @param req
* the request
* @param res
* the response
* @param nodeRef
* the node in question
* @param allowLogIn
* Indicates whether guest users without access to the node should be redirected to the log in page. If
* <code>false</code>, a status 403 forbidden page is displayed instead.
* @return <code>true</code>, if the user has access
* @throws IOException
* Signals that an I/O exception has occurred.
* @throws ServletException
* On other errors
*/
public boolean checkAccess(HttpServletRequest req, HttpServletResponse res, NodeRef nodeRef, String permission,
boolean allowLogIn) throws IOException, ServletException
{
ServletContext sc = getServletContext();
ServiceRegistry serviceRegistry = getServiceRegistry(sc);
PermissionService permissionService = serviceRegistry.getPermissionService();
// check that the user has the permission
if (permissionService.hasPermission(nodeRef, permission) == AccessStatus.DENIED)
{
if (logger.isDebugEnabled())
logger.debug("User does not have " + permission + " permission for NodeRef: " + nodeRef.toString());
if (allowLogIn && serviceRegistry.getAuthorityService().hasGuestAuthority())
{
if (logger.isDebugEnabled())
logger.debug("Redirecting to login page...");
redirectToLoginPage(req, res, sc);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Forwarding to error page...");
Application
.handleSystemError(sc, req, res, MSG_ERROR_PERMISSIONS, HttpServletResponse.SC_FORBIDDEN, logger);
}
return false;
}
return true;
}
/**
* Redirect to the Login page - saving the current URL which can be redirected back later
* once the user has successfully completed the authentication process.
@@ -192,45 +244,25 @@ public abstract class BaseServlet extends HttpServlet
redirectURL.append(LoginOutcomeBean.PARAM_REDIRECT_URL);
redirectURL.append('=');
String url = uri;
if (req.getQueryString() != null && req.getQueryString().length() != 0)
// Append the query string if necessary
String queryString = req.getQueryString();
if (queryString != null)
{
url += "?" + req.getQueryString();
// Strip out leading ticket arguments
queryString = queryString.replaceAll("(?<=^|&)" + ARG_TICKET + "(=[^&=]*)?&", "");
// Strip out trailing ticket arguments
queryString = queryString.replaceAll("(^|&)" + ARG_TICKET + "(=[^&=]*)?(?=&|$)", "");
if (queryString.length() != 0)
{
url += "?" + queryString;
}
}
redirectURL.append(URLEncoder.encode(url, "UTF-8"));
}
res.sendRedirect(redirectURL.toString());
}
/**
* Apply Client and Repository language locale based on the 'Accept-Language' request header
*/
public static Locale setLanguageFromRequestHeader(HttpServletRequest req, ServletContext sc)
{
Locale locale = null;
// Set the current locale and language
if (Application.getClientConfig(sc).isLanguageSelect())
{
locale = Application.getLanguage(req.getSession());
}
else
{
// set language locale from browser header
String acceptLang = req.getHeader("Accept-Language");
if (acceptLang != null && acceptLang.length() != 0)
{
StringTokenizer t = new StringTokenizer(acceptLang, ",; ");
// get language and convert to java locale format
String language = t.nextToken().replace('-', '_');
Application.setLanguage(req.getSession(), language);
locale = I18NUtil.parseLocale(language);
I18NUtil.setLocale(locale);
}
}
return locale;
}
/**
* Apply the headers required to disallow caching of the response in the browser
*/

21
source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
View File

@@ -155,12 +155,9 @@ public class ExternalAccessServlet extends BaseServlet
if (nodeRef != null)
{
// check that the user has at least READ access - else redirect to the login page
if (permissionService.hasPermission(nodeRef, PermissionService.READ) == AccessStatus.DENIED)
// check that the user has at least READ access - else redirect to an error or login page
if (!checkAccess(req, res, nodeRef, PermissionService.READ_CONTENT, true))
{
if (logger.isDebugEnabled())
logger.debug("User does not have permissions to READ NodeRef: " + nodeRef.toString());
redirectToLoginPage(req, res, getServletContext());
return;
}
@@ -189,12 +186,9 @@ public class ExternalAccessServlet extends BaseServlet
if (nodeRef != null)
{
// check that the user has at least READ access - else redirect to the login page
if (permissionService.hasPermission(nodeRef, PermissionService.READ) == AccessStatus.DENIED)
// check that the user has at least READ access - else redirect to an error or login page
if (!checkAccess(req, res, nodeRef, PermissionService.READ_CONTENT, true))
{
if (logger.isDebugEnabled())
logger.debug("User does not have permissions to READ NodeRef: " + nodeRef.toString());
redirectToLoginPage(req, res, getServletContext());
return;
}
@@ -225,12 +219,9 @@ public class ExternalAccessServlet extends BaseServlet
if (nodeRef != null)
{
// check that the user has at least READ access - else redirect to the login page
if (permissionService.hasPermission(nodeRef, PermissionService.READ) == AccessStatus.DENIED)
// check that the user has at least READ access - else redirect to an error or login page
if (!checkAccess(req, res, nodeRef, PermissionService.READ_CONTENT, true))
{
if (logger.isDebugEnabled())
logger.debug("User does not have permissions to READ NodeRef: " + nodeRef.toString());
redirectToLoginPage(req, res, getServletContext());
return;
}

2
source/java/org/alfresco/web/app/servlet/FacesHelper.java
View File

@@ -166,7 +166,7 @@ public final class FacesHelper
// catch exception to resolve ADB-158/ACT-7343
// not much we can do here, just make sure return is null
if (logger.isDebugEnabled())
logger.debug("Failed to resolve managed bean: " + name);
logger.debug("Failed to resolve managed bean: " + name, ee);
obj = null;
}

95
source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java Normal file
View File

@@ -0,0 +1,95 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.web.app.servlet;
import java.io.IOException;
import java.util.Locale;
import java.util.StringTokenizer;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* @author Stas Sokolovsky
*
* Servlet filter responsible for setting a fallback default locale for ALL requests.
*/
public class GlobalLocalizationFilter implements Filter
{
/**
* Run the filter
*
* @param request ServletRequest
* @param response ServletResponse
* @param chain FilterChain
* @exception IOException
* @exception ServletException
*/
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
{
HttpServletRequest httpRequest = (HttpServletRequest) request;
setLanguageFromRequestHeader(httpRequest);
// continue filter chaining
chain.doFilter(request, response);
}
/**
* Apply Client and Repository language locale based on the 'Accept-Language' request header
*
* @param request HttpServletRequest
*/
public void setLanguageFromRequestHeader(HttpServletRequest req)
{
Locale locale = null;
String acceptLang = req.getHeader("Accept-Language");
if (acceptLang != null && acceptLang.length() > 0)
{
StringTokenizer tokenizer = new StringTokenizer(acceptLang, ",; ");
// get language and convert to java locale format
String language = tokenizer.nextToken().replace('-', '_');
locale = I18NUtil.parseLocale(language);
I18NUtil.setLocale(locale);
}
else
{
I18NUtil.setLocale(Locale.getDefault());
}
}
public void init(FilterConfig filterConfig) throws ServletException
{
// Nothing to do
}
public void destroy()
{
// Nothing to do
}
}

68
source/java/org/alfresco/web/bean/ErrorBean.java
View File

@@ -18,9 +18,7 @@
*/
package org.alfresco.web.bean;
import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
import javax.servlet.ServletException;
@@ -37,6 +35,7 @@ public class ErrorBean implements Serializable
private String returnPage;
private Throwable lastError;
private String errorMessageKey;
/**
* @return Returns the page to go back to after the error has been displayed
@@ -79,68 +78,29 @@ public class ErrorBean implements Serializable
{
this.lastError = error;
}
this.errorMessageKey = null;
}
/**
* @return Returns the last error to occur in string form
* Gets the error message key.
*
* @return the error message key
*/
public String getLastErrorMessage()
public String getErrorMessageKey()
{
String message = "No error currently stored";
if (this.lastError != null)
{
StringBuilder builder = new StringBuilder(this.lastError.toString());;
Throwable cause = this.lastError.getCause();
// build up stack trace of all causes
while (cause != null)
{
builder.append("\ncaused by:\n");
builder.append(cause.toString());
if (cause instanceof ServletException &&
((ServletException)cause).getRootCause() != null)
{
cause = ((ServletException)cause).getRootCause();
}
else
{
cause = cause.getCause();
}
}
message = builder.toString();
// format the message for HTML display
message = message.replaceAll("<", "&lt;");
message = message.replaceAll(">", "&gt;");
message = message.replaceAll("\n", "<br>");
}
return message;
return errorMessageKey;
}
/**
* @return Returns the stack trace for the last error
* Sets the error message key.
*
* @param errorMessageKey
* the new error message key
*/
public String getStackTrace()
public void setErrorMessageKey(String errorMessageKey)
{
String trace = "No stack trace available";
if (this.lastError != null)
{
StringWriter stringWriter = new StringWriter();
PrintWriter writer = new PrintWriter(stringWriter);
this.lastError.printStackTrace(writer);
// format the message for HTML display
trace = stringWriter.toString();
trace = trace.replaceAll("<", "&lt;");
trace = trace.replaceAll(">", "&gt;");
trace = trace.replaceAll("\n", "<br>");
this.errorMessageKey = errorMessageKey;
this.lastError = null;
}
return trace;
}
}

11
source/java/org/alfresco/web/bean/content/InviteContentUsersWizard.java
View File

@@ -35,18 +35,11 @@ public class InviteContentUsersWizard extends BaseInviteUsersWizard
{
private static final long serialVersionUID = 9198783146031469545L;
/** Cache of available content permissions */
Set<String> contentPermissions = null;
@Override
protected Set<String> getPermissionsForType()
{
if (this.contentPermissions == null)
{
this.contentPermissions = this.getPermissionService().getSettablePermissions(getNode().getType());
}
return this.contentPermissions;
// Let the permission service do the caching to allow for dynamic model updates, etc.
return this.permissionService.getSettablePermissions(getNode().getType());
}
@Override

17
source/java/org/alfresco/web/bean/users/UserMembersBean.java
View File

@@ -37,6 +37,7 @@ import javax.faces.model.ListDataModel;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -814,16 +815,26 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext
// clear the currently set permissions for this user
// and add each of the new permissions in turn
NodeRef nodeRef = getNode().getNodeRef();
this.getPermissionService().clearPermission(nodeRef, getPersonAuthority());
final NodeRef nodeRef = getNode().getNodeRef();
if (this.getPermissionService().hasPermission(nodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
{
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() {
public Object doWork() throws Exception
{
getPermissionService().clearPermission(nodeRef, getPersonAuthority());
for (PermissionWrapper wrapper : personRoles)
{
this.getPermissionService().setPermission(
getPermissionService().setPermission(
nodeRef,
getPersonAuthority(),
wrapper.getPermission(),
true);
}
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
tx.commit();
}

2
source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
View File

@@ -615,7 +615,7 @@ public class StartWorkflowWizard extends BaseWizardBean
sorter.sort();
// select the first workflow in the list
if (this.availableWorkflows.size() > 0)
if (this.availableWorkflows.size() > 0 && previouslySelectedWorkflow == null)
{
this.selectedWorkflow = (String)this.availableWorkflows.get(0).getValue();
}

4
source/java/org/alfresco/web/forms/FormsService.java
View File

@@ -378,9 +378,13 @@ public final class FormsService
LOGGER.debug("removing configuration for " + formName +
" from web project " + this.nodeService.getProperty(parentRef, ContentModel.PROP_NAME));
}
// ALF-3751: Validate this is the real form folder rather than a copy
if (childRef.getParentRef().equals(parentRef))
{
this.nodeService.removeChild(parentRef, ref);
}
}
}
/**
* Return the list of web project nodes that reference a form name in their model

21
source/java/org/alfresco/web/ui/common/SortableSelectItem.java
View File

@@ -35,10 +35,23 @@ public final class SortableSelectItem extends SelectItem implements Comparable
public int compareTo(Object obj2)
{
if (this.sort == null && obj2 == null) return 0;
if (this.sort == null) return -1;
if (obj2 == null) return 1;
return this.sort.compareToIgnoreCase( ((SortableSelectItem)obj2).sort );
SortableSelectItem s2 = ((SortableSelectItem)obj2);
if (this.sort == null)
{
if (s2 == null || s2.sort == null)
{
return 0;
}
return -1;
}
else
{
if (s2 == null || s2.sort == null)
{
return 1;
}
return this.sort.compareToIgnoreCase( s2.sort );
}
}
private String sort;

5
source/java/org/alfresco/web/ui/common/Utils.java
View File

@@ -1059,13 +1059,14 @@ public final class Utils extends StringUtils
for (StringTokenizer t = new StringTokenizer(term.trim(), " "); t.hasMoreTokens(); /**/)
{
String token = LuceneQueryParser.escape(t.nextToken());
query.append("@").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:firstName:\"*");
query.append("+TYPE:\"").append(ContentModel.TYPE_PERSON).append("\" ");
query.append("+(@").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:firstName:\"*");
query.append(token);
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:lastName:\"*");
query.append(token);
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:");
query.append(token);
query.append("* ");
query.append("*) ");
}
}
}

2
source/java/org/alfresco/web/ui/repo/component/UIAjaxTagPicker.java
View File

@@ -218,7 +218,7 @@ public class UIAjaxTagPicker extends BaseAjaxItemPicker
out.write(" <span class='pickerActionButton'><a href='javascript:" + objId + ".showSelector();'>");
if (selectedNames == null)
{
if (getLabel() == "")
if ("".equals(getLabel()))
{
setLabel(msg.getString(MSG_CLICK_TO_SELECT_TAG));
}

82
source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
View File

@@ -19,10 +19,13 @@
package org.alfresco.web.ui.repo.tag;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.util.Collections;
import java.util.ResourceBundle;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
@@ -31,6 +34,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.app.portlet.AlfrescoFacesPortlet;
import org.alfresco.web.app.servlet.ExternalAccessServlet;
import org.alfresco.web.bean.ErrorBean;
import org.alfresco.web.ui.common.Utils;
/**
* A non-JSF tag library that displays the currently stored system error
@@ -46,6 +50,9 @@ public class SystemErrorTag extends TagSupport
private static final String MSG_HIDE_DETAILS = "hide_details";
private static final String MSG_SHOW_DETAILS = "show_details";
private static final String MSG_LOGOUT = "logout";
private static final String MSG_ERROR_NOT_STORED = "error_not_stored";
private static final String MSG_ERROR_NO_STACK_TRACE = "error_no_stack_trace";
private static final String MSG_CAUSED_BY = "caused_by";
private String styleClass;
private String detailsStyleClass;
@@ -105,9 +112,6 @@ public class SystemErrorTag extends TagSupport
*/
public int doStartTag() throws JspException
{
String errorMessage = "No error currently stored";
String errorDetails = "No details";
// get the error details from the bean, this may be in a portlet
// session or a normal servlet session.
ErrorBean errorBean = null;
@@ -121,12 +125,7 @@ public class SystemErrorTag extends TagSupport
getAttribute(ErrorBean.ERROR_BEAN_NAME);
}
if (errorBean != null)
{
errorMessage = errorBean.getLastErrorMessage();
errorDetails = errorBean.getStackTrace();
}
else
if (errorBean == null)
{
// if we reach here the error was caught by the declaration in web.xml so
// pull all the information from the request and create the error bean
@@ -138,9 +137,8 @@ public class SystemErrorTag extends TagSupport
pageContext.getSession().setAttribute(ErrorBean.ERROR_BEAN_NAME, errorBean);
errorBean.setLastError(error);
errorBean.setReturnPage(uri);
errorMessage = errorBean.getLastErrorMessage();
errorDetails = errorBean.getStackTrace();
}
Throwable lastError = errorBean.getLastError();
try
{
@@ -148,6 +146,20 @@ public class SystemErrorTag extends TagSupport
ResourceBundle bundle = Application.getBundle(pageContext.getSession());
String errorMessage;
String errorDetails;
if (lastError == null)
{
String messageKey = errorBean.getErrorMessageKey();
errorMessage = bundle.getString(messageKey == null ? MSG_ERROR_NOT_STORED : messageKey);
errorDetails = bundle.getString(MSG_ERROR_NO_STACK_TRACE);
}
else
{
errorMessage = getLastErrorMessage(lastError, bundle);
errorDetails = getStackTrace(lastError);
}
out.write("<div");
if (this.styleClass != null)
@@ -289,4 +301,52 @@ public class SystemErrorTag extends TagSupport
super.release();
}
/**
* @return Returns the last error to occur in string form
*/
private String getLastErrorMessage(Throwable lastError, ResourceBundle bundle)
{
StringBuilder builder = new StringBuilder(lastError.toString());;
Throwable cause = lastError.getCause();
// build up stack trace of all causes
while (cause != null)
{
builder.append("\n").append(bundle.getString(MSG_CAUSED_BY)).append("\n");
builder.append(cause.toString());
if (cause instanceof ServletException &&
((ServletException)cause).getRootCause() != null)
{
cause = ((ServletException)cause).getRootCause();
}
else
{
cause = cause.getCause();
}
}
String message = Utils.encode(builder.toString());
// format the message for HTML display
message = message.replaceAll("\n", "<br>");
return message;
}
/**
* @return Returns the stack trace for the last error
*/
private String getStackTrace(Throwable lastError)
{
StringWriter stringWriter = new StringWriter();
PrintWriter writer = new PrintWriter(stringWriter);
lastError.printStackTrace(writer);
// format the message for HTML display
String trace = Utils.encode(stringWriter.toString());
trace = trace.replaceAll("\n", "<br>");
return trace;
}
}

BIN
source/test-resources/xforms/examples/getting-started-sample/alfresco-sample-website.war
View File

Binary file not shown.

11
source/web/WEB-INF/web.xml
View File

@@ -146,6 +146,17 @@
</init-param>
</filter>
<filter>
<filter-name>Global Localization Filter</filter-name>
<description>Sets fallback default locale for ALL requests</description>
<filter-class>org.alfresco.web.app.servlet.GlobalLocalizationFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>Global Localization Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>Global Authentication Filter</filter-name>
<url-pattern>/navigate/*</url-pattern>

1
source/web/jsp/content/edit-html-inline.jsp
View File

@@ -22,6 +22,7 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<%@ page isELIgnored="false" %>
<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
<f:verbatim>

4
source/web/jsp/content/filelink-details.jsp
View File

@@ -61,7 +61,7 @@
<h:panelGroup id="props-panel-facets">
<f:facet name="title">
<r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
<a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editLinkProperties" actionListener="#{DialogManager.setupParameters}" >
<a:actionLink id="titleLink10" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editLinkProperties" actionListener="#{DialogManager.setupParameters}" >
<f:param name="nodeRef" value="#{DialogManager.bean.document.nodeRefAsString}" />
</a:actionLink>
</r:permissionEvaluator>
@@ -98,7 +98,7 @@
<%-- Document Actions --%>
<a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" style="text-align:center" progressive="true"
expanded='#{DialogManager.bean.panels["actions-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
<r:actions id="actions_doc" value="filelink_details_actions" context="#{DialogManager.bean.document}" verticalSpacing="3" style="white-space:nowrap" />
<r:actions id="actions_link_doc" value="filelink_details_actions" context="#{DialogManager.bean.document}" verticalSpacing="3" style="white-space:nowrap" />
</a:panel><f:verbatim></td>
</tr>
</table>

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

@@ -28,6 +28,7 @@
<%@ page import="org.alfresco.web.ui.common.Utils" %>
<%@ page import="org.alfresco.web.app.Application" %>
<%@ page import="org.alfresco.web.bean.LoginBean" %>
<%@ page import="org.springframework.extensions.surf.util.I18NUtil" %>
<%@ page import="javax.faces.context.FacesContext" %>
<%@ page import="javax.servlet.http.Cookie" %>
<%@ page import="java.util.Locale" %>
@@ -57,8 +58,6 @@
}
}
// setup system locale from the Accept-Language header value
Locale locale = BaseServlet.setLanguageFromRequestHeader(request, application);
%>
<body bgcolor="#ffffff" style="background-image: url(<%=request.getContextPath()%>/images/logo/AlfrescoFadedBG.png); background-repeat: no-repeat; background-attachment: fixed">
@@ -69,8 +68,8 @@
<%
FacesContext fc = FacesContext.getCurrentInstance();
// set locale for JSF framework usage
fc.getViewRoot().setLocale(locale);
// set locale for JSF framework usage (passed on by Localization Filter)
fc.getViewRoot().setLocale(I18NUtil.getLocale());
// set permissions error if applicable
if (session.getAttribute(LoginBean.LOGIN_NOPERMISSIONS) != null)

4
source/web/jsp/spaces/spacelink-details.jsp
View File

@@ -56,7 +56,7 @@
<h:panelGroup id="props-panel-facets">
<f:facet name="title">
<r:permissionEvaluator value="#{DialogManager.bean.space}" allow="Write">
<a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editLinkProperties" actionListener="#{DialogManager.setupParameters}" >
<a:actionLink id="titleLink10" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editLinkProperties" actionListener="#{DialogManager.setupParameters}" >
<f:param name="nodeRef" value="#{DialogManager.bean.space.nodeRefAsString}" />
</a:actionLink>
</r:permissionEvaluator>
@@ -97,7 +97,7 @@
<%-- Space Actions --%>
<a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" style="text-align:center" progressive="true"
expanded='#{DialogManager.bean.panels["actions-panel"]}' expandedActionListener="#{DialogManager.bean.expandPanel}">
<r:actions id="actions_space" value="spacelink_details_actions" context="#{DialogManager.bean.space}" verticalSpacing="3" style="white-space:nowrap" />
<r:actions id="actions_link_space" value="spacelink_details_actions" context="#{DialogManager.bean.space}" verticalSpacing="3" style="white-space:nowrap" />
</a:panel><f:verbatim></td>
</tr>
</table>