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

Browse Source 
40605: ALF-15273: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX
      40132: ALF-15376:  Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. 
         - Corrected schema case to uppercase when database is Oracle.
      40235: ALF-15367: Reverse merged the following revisions because the fix is deemed not robust enough.
         40132: ALF-15376:  Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. 
            - Corrected schema case to uppercase when database is Oracle.
         40041: ALF-15376: Merged V4.1-BUG-FIX to PATCHES/V4.0.1
            39969: Merged DEV/BELARUS-V4.1-BUG-FIX-2012_07_09 to V4.1-BUG-FIX:
               ALF-15273 : Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. The Activiti database is now correctly initialized with the correct "hibernate.default_schema"
      40470: ALF-15376: how to debug the creation of Activiti tables (ACT_) when upgrading to 4.X
         - added more logging to Activiti schema creation
      40471: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942
         - Ignore hibernate.default_schema and determine default schema from the Connection DatabaseMetaData
         - Provided the Activiti schema initializer with the default schema information
         - Provided countAppliedPatches() with default schema information
      40501: ALF-15376: Improved webapp logging.properties to use a console handler so that it doesn't suppress absolutely everything and we can selectively turn on logging!
   40608: Fix for ALF-4274 - JSF - Paste action does not work when browse.jsp is overrided
   40611: GERMAN: Translation updates based on EN r40604
   40612: SPANISH: Translation updates based on EN r40604
   40613: FRENCH: Translation updates based on EN r40604
   40614: ITALIAN: Translation updates based on EN r40604
   40615: JAPANESE: Translation updates based on EN r40604
   40616: DUTCH: Translation updates based on EN r40604
   40617: CHINESE: Translation updates based on EN r40604
   40629: ALF-15321: upgrade Activiti to fix logging
   40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
   Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
   40655: Fix for ALF-14752 - Collapse Links part at the WCM details page lead to error.
   40662: Eclipse classpath fixes
   40663: Merged DEV to V4.1-BUG-FIX
      40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env)
         The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user.
   40665: ALF-15448: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      40664: ALF-15578 CLONE 3.4.11: LibreOffice 3.6 startup on Mac fails 
   40685: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      39274: Merged DEV to V4.0.2 (4.0.2.4)
         << Unable to merge code as supplied as it introduced a change to a public API, which would break alfresco.log
            if the RM AMP was installed See RM-452 >>
         39166: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin
            'VersionableAspectTest' has been modified in accordance with concept: several modifications of node in
      	  a single transaction are interpreted as a single version. Each operation in the test which should provide
      	  a new version have been made atomic
         39089: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin
            Check of lock has been corrected since 'cm:lockable' aspect doesn't indicate lock state:
            - 'LockService' service has been extended with 'isLocked(NodRef)' method which returns 'true' if document
              is locked and current user is not an owner of the lock;
            - new 'VersionableAspectTest' has been added to test the use-case described in the issue and to test
              whether 'VersionableAspect' changes version label of a locked document
      39369: ALF-15583 / ALF-14584 autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin
         - Test failures: A READ_ONLY lock was being set because we are adding a versionable aspect. This resulted in an
           Exception when attempting to update the version. Change made to the isLocked method (now called isLockedOrReadOnly)
           to reflect that a node is locked even for the owner and the lock type is not a WRITE lock.
      39939: ALF-15584 / ALF-15001: Gracefully handle stale NodeRefs in query results in DMDiscoveryServicePort
      - SOLR makes this more likely to occur
      40455: ALF-15585 / ALF-15383: Long-running Feed Cleaner
       - Part 1: Limit problems caused by missing indexes
         - Remove all count calls
         - Remove logic requiring calls to SiteService to list all sites
         - Added in an ID range limit to act as a hard-stop to entry growth (set to 1M)
       - TODO: use JobLockService
      40461: ALF-15585 / ALF-15383: Long running Feed Cleaner 
       - Part 2: Added JobLockService usage to ensure only one instance runs at a time
      40463: ALF-15585 / ALF-15383: Long running Feed Cleaner
       - A bit more trace and debug
      40526: ALF-15586: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
      40574: ALF-15585 / ALF-15383: Long running Feed Cleaner
      - Fix MySQL variant of activities-common-SqlMap
      40579: ALF-15585: Fix fallout from rev 40455: ALF-15383: Long-running Feed Cleaner
       - MySQL dialect was duplicating ALL SQL statements
       - Split 'large' SQL selects into activities-select-SqlMap.xml containing 7 statements that are all overridden for MySQL
       - Fixed split in common file between different types of statements
      40588: ALF-15587 / ALF-15385: Merged V3.4-BUG-FIX to PATCHES/V4.0.2 (Lost revision)
         28830: ALF-7622 Refactored JScriptWorkflowTask. Now when setProperties() is called it properly updates the WorkflowTask properties via the WorflowService.updateTask() method.
   40687: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40599: ALF-15567: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         40511: ALF-12008: Merged DEV to PATCHES/V3.4.10
            Due to Windows Explorer's URL concatenation behaviour, we must present links as shortcuts to the real URL, rather than direct hrefs.
            This is at least consistent with the way the CIFS server handles links. See org.alfresco.filesys.repo.ContentDiskDriver.openFile().
         40518: ALF-12008: Fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40691 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-21 16:31:48 +00:00
parent b67559229c
commit 5a4a040e6c
10 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/web/app/servlet/KerberosAuthenticationFilter.java
View File

@@ -110,18 +110,6 @@ public class KerberosAuthenticationFilter extends BaseKerberosAuthenticationFilt
AuthenticationHelper.setupThread(sc, req, res, !req.getServletPath().equals("/wcs") && !req.getServletPath().equals("/wcservice"));
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
*/
@Override
protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session)
throws IOException
{
// Redirect to the login page if user validation fails
redirectToLoginPage(req, res);
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#onLoginComplete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/

11
source/java/org/alfresco/web/app/servlet/NTLMAuthenticationFilter.java
View File

@@ -104,17 +104,6 @@ public class NTLMAuthenticationFilter extends BaseNTLMAuthenticationFilter
AuthenticationHelper.setupThread(sc, req, res, !req.getServletPath().equals("/wcs") && !req.getServletPath().equals("/wcservice"));
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
*/
@Override
protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session)
throws IOException
{
// Redirect to the login page if user validation fails
redirectToLoginPage(req, res);
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseNTLMAuthenticationFilter#onLoginComplete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/

9
source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
View File

@@ -18,6 +18,7 @@
*/
package org.alfresco.web.bean.clipboard;
import java.util.List;
import java.util.Map;
import javax.faces.context.FacesContext;
@@ -55,9 +56,9 @@ public class AVMClipboardItem extends AbstractClipboardItem
* @param ref
* @param mode
*/
public AVMClipboardItem(NodeRef ref, ClipboardStatus mode)
public AVMClipboardItem(NodeRef ref, ClipboardStatus mode, List<String> customPasteViewIds)
{
super(ref, mode);
super(ref, mode, customPasteViewIds);
}
/**
@@ -73,7 +74,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
*/
public boolean canCopyToViewId(String viewId)
{
if (AVM_PASTE_VIEW_ID.equals(viewId))
if (super.canCopyToViewId(viewId) || AVM_PASTE_VIEW_ID.equals(viewId))
{
AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), AVMBrowseBean.BEAN_NAME);
String destPath = avmBrowseBean.getCurrentPath();
@@ -87,7 +88,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
}
else
{
return WORKSPACE_PASTE_VIEW_ID.equals(viewId);
return (super.canCopyToViewId(viewId) || WORKSPACE_PASTE_VIEW_ID.equals(viewId));
}
}

76
source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
View File

@@ -65,6 +65,37 @@ abstract class AbstractClipboardItem implements ClipboardItem
transient protected AVMService avmService;
private List<String> customPasteViewIds;
/**
* Constructor
*
* @param ref The ref of the item on the clipboard
* @param mode The ClipboardStatus enum value
*/
public AbstractClipboardItem(NodeRef ref, ClipboardStatus mode, List<String> customPasteViewIds)
{
this.ref = ref;
this.mode = mode;
this.customPasteViewIds = customPasteViewIds;
}
/**
* Constructor
*
* @param ref The ref of the item on the clipboard
* @param parent The parent of the item on the clipboard
* @param mode The ClipboardStatus enum value
*/
public AbstractClipboardItem(NodeRef ref, NodeRef parent, ClipboardStatus mode, List<String> customPasteViewIds)
{
this.ref = ref;
this.mode = mode;
this.parent = parent;
this.customPasteViewIds = customPasteViewIds;
}
public void setAvmService(AVMService avmService)
{
this.avmService = avmService;
@@ -79,33 +110,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
return avmService;
}
/**
* Constructor
*
* @param ref The ref of the item on the clipboard
* @param mode The ClipboardStatus enum value
*/
public AbstractClipboardItem(NodeRef ref, ClipboardStatus mode)
{
this.ref = ref;
this.mode = mode;
}
/**
* Constructor
*
* @param ref The ref of the item on the clipboard
* @param parent The parent of the item on the clipboard
* @param mode The ClipboardStatus enum value
*/
public AbstractClipboardItem(NodeRef ref, NodeRef parent, ClipboardStatus mode)
{
this.ref = ref;
this.mode = mode;
this.parent = parent;
}
public ClipboardStatus getMode()
{
return this.mode;
@@ -186,6 +190,24 @@ abstract class AbstractClipboardItem implements ClipboardItem
return services;
}
public boolean canCopyToViewId(String viewId)
{
if (this.customPasteViewIds != null)
{
return this.customPasteViewIds.contains(viewId);
}
return false;
}
public boolean canMoveToViewId(String viewId)
{
if (this.customPasteViewIds != null)
{
return this.customPasteViewIds.contains(viewId);
}
return false;
}
protected boolean checkExists(String name, NodeRef parent)
{
QueryParameterDefinition[] params = new QueryParameterDefinition[1];

15
source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
View File

@@ -63,6 +63,7 @@ public class ClipboardBean implements Serializable
transient private NodeService nodeService;
private List<String> customPasteViewIds;
// ------------------------------------------------------------------------------
// Bean property getters and setters
@@ -98,6 +99,16 @@ public class ClipboardBean implements Serializable
return nodeService;
}
public void setCustomPasteViewIds(List<String> customPasteViewIds)
{
this.customPasteViewIds = customPasteViewIds;
}
public List<String> getCustomPasteViewIds()
{
return customPasteViewIds;
}
// ------------------------------------------------------------------------------
// Navigation action event handlers
@@ -317,11 +328,11 @@ public class ClipboardBean implements Serializable
ClipboardItem item = null;
if (StoreRef.PROTOCOL_WORKSPACE.equals(ref.getStoreRef().getProtocol()))
{
item = new WorkspaceClipboardItem(ref, parent, mode);
item = new WorkspaceClipboardItem(ref, parent, mode, customPasteViewIds);
}
else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
{
item = new AVMClipboardItem(ref, mode);
item = new AVMClipboardItem(ref, mode, customPasteViewIds);
}
else
{

17
source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
View File

@@ -75,18 +75,18 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
* @param ref
* @param mode
*/
public WorkspaceClipboardItem(NodeRef ref, ClipboardStatus mode)
public WorkspaceClipboardItem(NodeRef ref, ClipboardStatus mode, List<String> customPasteViewIds)
{
super(ref, mode);
super(ref, mode, customPasteViewIds);
}
/**
* @param ref
* @param mode
*/
public WorkspaceClipboardItem(NodeRef ref, NodeRef parent, ClipboardStatus mode)
public WorkspaceClipboardItem(NodeRef ref, NodeRef parent, ClipboardStatus mode, List<String> customPasteViewIds)
{
super(ref, parent, mode);
super(ref, parent, mode, customPasteViewIds);
}
/**
@@ -116,9 +116,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
}
else
{
return (WORKSPACE_PASTE_VIEW_ID.equals(viewId) ||
FORUMS_PASTE_VIEW_ID.equals(viewId) ||
FORUM_PASTE_VIEW_ID.equals(viewId));
return super.canCopyToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || AVM_PASTE_VIEW_ID.equals(viewId) ||
FORUMS_PASTE_VIEW_ID.equals(viewId) || FORUM_PASTE_VIEW_ID.equals(viewId));
}
}
@@ -127,7 +126,7 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
*/
public boolean canMoveToViewId(String viewId)
{
return (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
return super.canMoveToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
FORUM_PASTE_VIEW_ID.equals(viewId));
}
@@ -138,7 +137,7 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
{
final ServiceRegistry serviceRegistry = getServiceRegistry();
final RetryingTransactionHelper retryingTransactionHelper = serviceRegistry.getRetryingTransactionHelper();
if (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
if (super.canCopyToViewId(viewId) || WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
FORUM_PASTE_VIEW_ID.equals(viewId))
{
NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);

12
source/java/org/alfresco/web/sharepoint/auth/kerberos/KerberosAuthenticationHandler.java
View File

@@ -50,18 +50,6 @@ public class KerberosAuthenticationHandler extends BaseKerberosAuthenticationFil
setUserAttributeName(SharepointConstants.USER_SESSION_ATTRIBUTE);
super.init();
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
*/
@Override
protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session)
throws IOException
{
// Restart the login challenge process if validation fails
restartLoginChallenge(sc, req, res);
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseAuthenticationFilter#createUserObject(java.lang.String, java.lang.String, org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)

12
source/java/org/alfresco/web/sharepoint/auth/ntlm/NtlmAuthenticationHandler.java
View File

@@ -50,18 +50,6 @@ public class NtlmAuthenticationHandler extends BaseNTLMAuthenticationFilter
setUserAttributeName(SharepointConstants.USER_SESSION_ATTRIBUTE);
super.init();
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseSSOAuthenticationFilter#onValidateFailed(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpSession)
*/
@Override
protected void onValidateFailed(ServletContext sc, HttpServletRequest req, HttpServletResponse res, HttpSession session)
throws IOException
{
// Restart the login challenge process if validation fails
restartLoginChallenge(sc, req, res);
}
/* (non-Javadoc)
* @see org.alfresco.repo.webdav.auth.BaseAuthenticationFilter#createUserObject(java.lang.String, java.lang.String, org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)

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

@@ -544,6 +544,17 @@
<property-name>nodeService</property-name>
<value>#{NodeService}</value>
</managed-property>
<!-- When using custom pages, uncomment this block and add each custom page in the 'list-entries' as it shown in example below.
This will ensure those pages can receive copy/paste events from the user. -->
<!--
<managed-property>
<property-name>customPasteViewIds</property-name>
<list-entries>
<value>/jsp/browse/customBrowse.jsp</value>
</list-entries>
</managed-property>
-->
</managed-bean>
<managed-bean>

2
source/web/jsp/wcm/folder-details.jsp
View File

@@ -39,7 +39,7 @@
<h:panelGroup id="props-panel-facets">
<f:facet name="title">
<r:permissionEvaluator value="#{FolderDetailsBean.folder}" allow="Write">
<r:permissionEvaluator id="eval1" value="#{FolderDetailsBean.folder}" allow="Write">
<a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/Change_details.gif" action="dialog:editAvmFolderProperties" />
</r:permissionEvaluator>
</f:facet>