mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.3-BUG-FIX to HEAD
21242: ALF-2879: XAM Connector changes
- Fixed setting of store name
- Added properties:
- xam.archive.retentionPeriodDays=0
- xam.archive.addLock=true
21244: ALF-2879: Updated readme.txt
21262: ALF-3611 - tweak AVM orphan reaper test (PurgeTestP)
21277: Fix ALF-889 - WCM/AVM folder disappears when cut-and-paste into itself
- fixed cycle check before rename/move
- added -ve unit test
- externalized existing cycle error messages
21284: ALF-2879: XAM Connector changes
- Listen to store selector policies (incl. workaround for policy listening)
- Set XAM retention (code is setting the value, but not successfully tested against test servers)
21285: StoreSelectorPolicies.OnContentMovedPolicy is deprecated. Use StoreSelectorPolicies.AfterMoveContentPolicy.
- Deprecated so old policy still exists and works
- Will remove for 3.4 (maybe)
21293: Fix ALF-3245: stream not closed in DictionaryBootstrap.onDictionaryInit()
21303: ALF-2879: XAM Connector changes
- Throw ContentIOException if setBaseRetention fails
21313: ALF-2879: XAM Connector changes
- Round ms to nearest second
- Log actual ms value being set for retention
21322: Fix AVMNodeService.createNode to close output stream and avoid "Too many open files" (also add example AVMFileFolderPerformanceTester)
21331: ALF-2879: XAM Connector changes
- Removed duplicate setting of base retention
- Left code hooks for setting of other metadata
21368: Merged V3.3 to V3.3-BUG-FIX
21213: Merged DEV/TEMPORARY to V3.3
21200: ALF-2978: IMAP cannot bind to all the interfaces (0.0.0.0)
“imap.server.host” property can be used for setting IP address / network adapter to listen on for IMAP protocol.
21219: Merged PATCHES/V3.2.1 to V3.3
21216: ALF-3779: A few bug fixes to --FOREACH handling in SchemaBootstrap
- New system.upgrade.default.batchsize property to control overall default batch size
- Added in a few more missed --FOREACH markers
21211: ALF-3779: Remaining scripts converted to use --FOREACH (as logs finally provided by test prove that they need it too!)
21210: (RECORD ONLY) Incremented version label
21209: ALF-3779: Solution to allow batching of mass updates in upgrade scripts into smaller transactions
- A special preceding comment in this format specifies a numeric table column to control the batching and a global property specifying the batch size
--FOREACH table.column batch.size.property
- If the property isn't specified in alfresco-global.properties, the default batch size is 10,000
- INSERT / UPDATE / DELETE statements can then tack on extra conditions on ${LOWERBOUND} and ${UPPERBOUND} variables. E.g.
WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
- The statements are substituted and executed for each batch range up to the maximum value of the column
- 2.1 and 2.2 MySQL upgrades reimplemented this way
21207: Extra debug logging to track index triggering activity
21295: Merged HEAD to V3.3
21255: Parameter encoding
21298: Merged V3.2 to V3.3
21297: ALF-3889: JBPMDeployProcessServlet is now disabled by default and enabled with this in alfresco-global.properties
system.workflow.deployservlet.enabled=true
21317: dod5015: Parameter encoding
21363: Merged PATCHES/V3.2.1 to V3.3
21338: (RECORD ONLY) Incremented version label
21335: ALF-3779: Correction to error in --FOREACH range restriction for UPDATE statement
21290: ALF-3960: ArrayIndexOutOfBoundsException when we set mergerMergeFactor > mergerTargetOverlays
21278: (RECORD ONLY) Merged PATCHES/V3.1.2 to PATCHES/V3.2.1
21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
- Should only be enabled in development environment
21364: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
- Should only be enabled in development environment
21365: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
21276: Merged PATCHES/V3.1.2 to PATCHES/V3.2.0
21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
- Should only be enabled in development environment
21366: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
21279: Merged PATCHES/V3.1.2 to PATCHES/V3.2.r
21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
- Should only be enabled in development environment
21367: Merged PATCHES/V3.3.1 to V3.3 (RECORD ONLY)
21343: Incremented version label
21342: ALF-3997: Merged V3.3-BUG-FIX to PATCHES/V3.3.1
20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
21282: Merged PATCHES/V3.1.2 to PATCHES/V3.3.1
21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
- Should only be enabled in development environment
21239: Created hotfix branch off ENTERPRISE/V3.3.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -34,6 +34,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.aopalliance.intercept.MethodInterceptor;
|
||||
import org.aopalliance.intercept.MethodInvocation;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* Method interceptor for atomic indexing of AVM entries The properties can defined how stores are indexed based on type
|
||||
@@ -44,6 +46,8 @@ import org.aopalliance.intercept.MethodInvocation;
|
||||
*/
|
||||
public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInterceptor
|
||||
{
|
||||
private static Log logger = LogFactory.getLog(AVMSnapShotTriggeredIndexingMethodInterceptor.class);
|
||||
|
||||
// Copy of store properties used to tag avm stores (a store propertry)
|
||||
|
||||
public final static QName PROP_SANDBOX_STAGING_MAIN = QName.createQName(null, ".sandbox.staging.main");
|
||||
@@ -106,6 +110,10 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
|
||||
AVMLuceneIndexer avmIndexer = getIndexer(store);
|
||||
if (avmIndexer != null)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("purgeStore " + store, new Exception("Stack Trace"));
|
||||
}
|
||||
avmIndexer.deleteIndex(store, IndexMode.SYNCHRONOUS);
|
||||
}
|
||||
}
|
||||
@@ -133,6 +141,10 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
|
||||
AVMLuceneIndexer avmIndexer = getIndexer(from);
|
||||
if (avmIndexer != null)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("renameStore deleteIndex " + from, new Exception("Stack Trace"));
|
||||
}
|
||||
avmIndexer.deleteIndex(from, IndexMode.SYNCHRONOUS);
|
||||
}
|
||||
}
|
||||
@@ -142,6 +154,10 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
|
||||
AVMLuceneIndexer avmIndexer = getIndexer(to);
|
||||
if (avmIndexer != null)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("renameStore createIndex " + to, new Exception("Stack Trace"));
|
||||
}
|
||||
avmIndexer.createIndex(to, IndexMode.SYNCHRONOUS);
|
||||
avmIndexer.index(to, 0, after, getIndexMode(to));
|
||||
}
|
||||
@@ -258,6 +274,10 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
|
||||
}
|
||||
|
||||
int from = before != -1 ? before : last;
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("indexSnapshotImpl " + store, new Exception("Stack Trace"));
|
||||
}
|
||||
avmIndexer.index(store, from, after, getIndexMode(store));
|
||||
}
|
||||
}
|
||||
@@ -503,6 +523,10 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
|
||||
AVMLuceneIndexer avmIndexer = getIndexer(store);
|
||||
if (avmIndexer != null)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("createIndex " + store, new Exception("Stack Trace"));
|
||||
}
|
||||
avmIndexer.createIndex(store, IndexMode.SYNCHRONOUS);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user