mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V4.0-BUG-FIX to HEAD
37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
- part 1
37810: Merge V3.4-BUG-FIX (3.4.11) to V4.0-BUG-FIX
37809: Merge V3.4 (3.4.10) to V3.4-BUG-FIX (3.4.11)
37808: ALF-14603: Merge V4.0 (4.0.2) to V3.4 (3.4.10)
<< The original 001-Cover_Cover.pdf file from ALF-9417 also now previews in 3.4.10 >>
37800: ALF-14145 Flash preview quality is poor
- Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
being changed back to:
swf.encoder.params=-s poly2bitmap,subpixels=72
The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
37796: Fix for ALF-12609 - refactored Site Finder to no longer an async call to retrieve memberships before the search operation
37788: Second part of fix from Alex Mukha for ALF-11714
37811: Merged V4.0 (4.0.2) to V4.0-BUG-FIX
37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
- fixed admin and JMX console generation to match SOLR SUMMARY report changes
37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
37884: First full commit of Chinese (zh_CN) translation bundles
37885: Spanish and French translation updates (based on EN r37081) - fixes a minor bug related to German strings in the wrong files.
37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
- reject model changes that will break query support
37899: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
37889: Added additional debugging output for JavaScript Search helper
37897: Fix from Alex Malinovsky for ALF-13529 - Performing a 'Copy to' from document details results in error. [applied to doclib v2 also for 4.0.X]
37901: Added support for xpath root node resolution to Repository search - previously only NodeRef based root node was working correctly.
37904: Fix to ensure the root node is only applied to a search for a Repository search (ALF-13778)
37913: Set version to 4.1.1
37917: ALF-14652: Installation: Friendly message about busy Tomcat SSL port should be more exact
- Updated installer strings for SSL port and JMX port
- Needs localizing
37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
- FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
37969: Fixes for:
ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb
ALF-14527 Share - Error to display documents if user has no access to the parent folder
- Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node.
37972: Fix for ALF-13343 - Unfriendly popup error messages displayed in Share when a user clicks on a direct folder-details or document-details URL that they don't have the permissions to access. Fixed due to changes in rev 37969 plus an improved error message.
37992: Fix for ALF-14211 - Topics isn't found if search by content (full text)
38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
38027: Update version to 4.0.3 - although this version should never exist - to differenciate it from 4.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -34,6 +34,7 @@ import org.alfresco.query.EmptyCannedQueryResults;
|
||||
import org.alfresco.query.EmptyPagingResults;
|
||||
import org.alfresco.query.PagingRequest;
|
||||
import org.alfresco.query.PagingResults;
|
||||
import org.alfresco.repo.content.MimetypeMap;
|
||||
import org.alfresco.repo.discussion.cannedqueries.GetDiscussionTopcisWithPostsCannedQuery;
|
||||
import org.alfresco.repo.discussion.cannedqueries.GetDiscussionTopcisWithPostsCannedQueryFactory;
|
||||
import org.alfresco.repo.discussion.cannedqueries.NodeWithChildrenEntity;
|
||||
@@ -389,8 +390,9 @@ public class DiscussionServiceImpl implements DiscussionService
|
||||
// Store the content
|
||||
ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
|
||||
writer.setEncoding("UTF-8");
|
||||
writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
|
||||
writer.putContent(contents);
|
||||
|
||||
|
||||
// Generate the wrapping object for it
|
||||
// Build it that way, so creator and created date come through
|
||||
return buildPost(nodeRef, topic, name, contents);
|
||||
|
||||
@@ -51,7 +51,8 @@ import org.alfresco.repo.action.executer.TransformActionExecuter;
|
||||
import org.alfresco.repo.content.transform.magick.ImageTransformationOptions;
|
||||
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl.InvalidTypeException;
|
||||
import org.alfresco.repo.search.QueryParameterDefImpl;
|
||||
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||
import org.alfresco.repo.tagging.script.TagScope;
|
||||
import org.alfresco.repo.thumbnail.ThumbnailDefinition;
|
||||
import org.alfresco.repo.thumbnail.ThumbnailHelper;
|
||||
@@ -484,21 +485,37 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
|
||||
// The current node is a folder e.g. Company Home and standard child folders.
|
||||
// optimized code path for cm:folder and sub-types supporting getChildrenByName() method
|
||||
NodeRef result = null;
|
||||
StringTokenizer t = new StringTokenizer(path, "/");
|
||||
final StringTokenizer t = new StringTokenizer(path, "/");
|
||||
if (t.hasMoreTokens())
|
||||
{
|
||||
result = this.nodeRef;
|
||||
while (t.hasMoreTokens() && result != null)
|
||||
{
|
||||
String name = t.nextToken();
|
||||
try
|
||||
final String name = t.nextToken();
|
||||
final NodeRef lastName = result;
|
||||
result = AuthenticationUtil.runAsSystem(new RunAsWork<NodeRef>()
|
||||
{
|
||||
result = this.nodeService.getChildByName(result, ContentModel.ASSOC_CONTAINS, name);
|
||||
}
|
||||
catch (AccessDeniedException ade)
|
||||
{
|
||||
result = null;
|
||||
}
|
||||
@Override
|
||||
public NodeRef doWork() throws Exception
|
||||
{
|
||||
NodeRef child = null;
|
||||
if (t.hasMoreTokens())
|
||||
{
|
||||
// allow traversal of a cm:name based path even if user cannot retrieve the node directly
|
||||
child = nodeService.getChildByName(lastName, ContentModel.ASSOC_CONTAINS, name);
|
||||
}
|
||||
else
|
||||
{
|
||||
// final node must be accessible to the user via the usual ACL permission checks
|
||||
child = nodeService.getChildByName(lastName, ContentModel.ASSOC_CONTAINS, name);
|
||||
if (child != null && AccessStatus.ALLOWED != services.getPermissionService().hasPermission(child, PermissionService.READ_PROPERTIES))
|
||||
{
|
||||
child = null;
|
||||
}
|
||||
}
|
||||
return child;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -793,6 +793,9 @@ public class Search extends BaseScopableProcessorExtension
|
||||
{
|
||||
Collection<ScriptNode> set = null;
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("query=" + sp.getQuery() + " limit=" + sp.getLimit());
|
||||
|
||||
// perform the search against the repo
|
||||
ResultSet results = null;
|
||||
try
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -104,21 +104,21 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
Date now = new Date();
|
||||
|
||||
JSONObject alfresco = summary.getJSONObject("alfresco");
|
||||
String alfrescoLag = alfresco.getString("Lag");
|
||||
String alfrescoLag = alfresco.getString("TX Lag");
|
||||
String alfrescoActive = alfresco.getString("Active");
|
||||
String alfrescoDuration = alfresco.getString("Duration");
|
||||
String alfrescoDuration = alfresco.getString("TX Duration");
|
||||
String alfrescoLastIndexedTxn = alfresco.getString("Id for last TX in index");
|
||||
String alfrescoApproxTxnsReminaing = alfresco.getString("Approx transactions remaining");
|
||||
String alfrescoApproxIndexingTimeReminaing = alfresco.getString("Approx indexing time remaining");
|
||||
String alfrescoApproxIndexingTimeReminaing = alfresco.getString("Approx transaction indexing time remaining");
|
||||
|
||||
|
||||
JSONObject archive = summary.getJSONObject("archive");
|
||||
String archiveLag = archive.getString("Lag");
|
||||
String archiveLag = archive.getString("TX Lag");
|
||||
String archiveActive = archive.getString("Active");
|
||||
String archiveDuration = archive.getString("Duration");
|
||||
String archiveDuration = archive.getString("TX Duration");
|
||||
String archiveLastIndexedTxn = archive.getString("Id for last TX in index");
|
||||
String archiveApproxTxnsReminaing = archive.getString("Approx transactions remaining");
|
||||
String archiveApproxIndexingTimeReminaing = archive.getString("Approx indexing time remaining");
|
||||
String archiveApproxIndexingTimeReminaing = archive.getString("Approx transaction indexing time remaining");
|
||||
|
||||
if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user