diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 6184cae3e4..3cc770f437 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -1,273 +1,278 @@
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
- ${authentication.chain}
-
-
+
+
+
+ ${authentication.chain}
+
+
-
-
-
-
- org.alfresco.repo.security.authentication.MutableAuthenticationDao
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ org.alfresco.repo.security.authentication.MutableAuthenticationDao
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- org.alfresco.jlan.server.SessionListener
-
-
-
-
-
-
-
+
+
+
+
+ org.alfresco.jlan.server.SessionListener
+
+
+
+
+
+
+
-
-
-
- org.alfresco.jlan.server.auth.ICifsAuthenticator
- org.alfresco.repo.management.subsystems.ActivateableBean
-
-
-
+
+
+
+ org.alfresco.jlan.server.auth.ICifsAuthenticator
+ org.alfresco.repo.management.subsystems.ActivateableBean
+
+
+
-
-
-
- org.alfresco.jlan.ftp.FTPAuthenticator
- org.alfresco.repo.management.subsystems.ActivateableBean
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ org.alfresco.jlan.ftp.FTPAuthenticator
+ org.alfresco.repo.management.subsystems.ActivateableBean
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
- org.alfresco.repo.security.sync.UserRegistrySynchronizer
-
-
-
+
+
+
+
+ org.alfresco.repo.security.sync.UserRegistrySynchronizer
+
+
+
-
-
-
+ org.alfresco.repo.security.person.HomeFolderManager
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %firstName%_%lastName%
+
+
+
+ 10
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- %firstName%_%lastName%
-
-
-
- 10
-
-
-
-
-
-
-
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index 1a24475249..6da6cd4f01 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -132,6 +132,9 @@
+
+
+
@@ -847,6 +850,10 @@
assoc.is_primary as is_primary,
assoc.assoc_index as assoc_index
+
+
+ ,childNode.transaction_id as childNodeTxnId
+
from
alf_child_assoc assoc
@@ -1070,8 +1077,8 @@
)
-
-
-
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 03482b98e8..7ac609d102 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -364,6 +364,11 @@ alfresco_user_store.adminpassword=209c6174da490caeb422f3fa5a7ae634
# note: default guest username - should not be changed after installation
alfresco_user_store.guestusername=guest
+# Used to move home folders to a new location
+home_folder_provider_synchronizer.enabled=false
+home_folder_provider_synchronizer.override_provider=
+home_folder_provider_synchronizer.keep_empty_parents=false
+
# Spaces Archive Configuration
spaces.archive.store=archive://SpacesStore
diff --git a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
index 93090f8718..3a3d359145 100644
--- a/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
+++ b/config/alfresco/subsystems/Search/lucene/index-recovery-context.xml
@@ -32,7 +32,7 @@
-
{
@@ -157,7 +176,6 @@ public abstract class AbstractLuceneIndexerImpl extends AbstractLuceneBase
/**
* Logger
*/
- @SuppressWarnings("unused")
private static Log s_logger = LogFactory.getLog(AbstractLuceneIndexerImpl.class);
protected static Set deletePrimary(Collection nodeRefs, IndexReader reader, boolean delete)
@@ -611,9 +629,41 @@ public abstract class AbstractLuceneIndexerImpl extends AbstractLuceneBase
protected abstract void doSetRollbackOnly() throws IOException;
- protected abstract List createDocuments(String stringNodeRef, boolean isNew, boolean indexAllProperties,
+ protected abstract List createDocuments(String stringNodeRef, FTSStatus ftsStatus, boolean indexAllProperties,
boolean includeDirectoryDocuments);
+ protected List readDocuments(final String stringNodeRef, final FTSStatus ftsStatus,
+ final boolean indexAllProperties, final boolean includeDirectoryDocuments)
+ {
+ if (isReadThrough)
+ {
+ return transactionService.getRetryingTransactionHelper().doInTransaction(
+ new RetryingTransactionCallback>()
+ {
+ @Override
+ public List execute() throws Throwable
+ {
+ try
+ {
+ return createDocuments(stringNodeRef, ftsStatus, indexAllProperties,
+ includeDirectoryDocuments);
+ }
+ catch (InvalidNodeRefException e)
+ {
+ // Turn InvalidNodeRefExceptions into retryable exceptions.
+ throw new ConcurrencyFailureException(
+ "Possible cache integrity issue during reindexing", e);
+ }
+
+ }
+ }, true, true);
+ }
+ else
+ {
+ return createDocuments(stringNodeRef, ftsStatus, indexAllProperties, includeDirectoryDocuments);
+ }
+ }
+
protected Set deleteImpl(String nodeRef, IndexDeleteMode mode, boolean cascade, IndexReader mainReader)
throws LuceneIndexException, IOException
@@ -741,7 +791,7 @@ public abstract class AbstractLuceneIndexerImpl extends AbstractLuceneBase
try
{
- List docs = createDocuments(nodeRef, isNew, false, true);
+ List docs = readDocuments(nodeRef, isNew ? FTSStatus.New : FTSStatus.Dirty, false, true);
for (Document doc : docs)
{
try
@@ -867,11 +917,18 @@ public abstract class AbstractLuceneIndexerImpl extends AbstractLuceneBase
*/
public void flushPending() throws LuceneIndexException
{
- // Make sure the in flush deletion list is clear at the start
- deletionsSinceFlush.clear();
IndexReader mainReader = null;
try
{
+ saveDelta();
+
+ // Make sure the in flush deletion list is clear at the start
+ deletionsSinceFlush.clear();
+ if (commandList.isEmpty())
+ {
+ return;
+ }
+
mainReader = getReader();
Set forIndex = new LinkedHashSet();
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java b/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
index 118b648e4a..d92a5d93b6 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
@@ -19,8 +19,9 @@
package org.alfresco.repo.search.impl.lucene;
import java.io.IOException;
-import java.util.BitSet;
import java.util.Set;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.error.AlfrescoRuntimeException;
import org.apache.commons.logging.Log;
@@ -49,9 +50,12 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
{
private static Log s_logger = LogFactory.getLog(FilterIndexReaderByStringId.class);
- OpenBitSet deletedDocuments;
+ private OpenBitSet deletedDocuments;
+ private final Set deletions;
+ private final boolean deleteNodesOnly;
+ private final ReadWriteLock lock = new ReentrantReadWriteLock();
- private String id;
+ private final String id;
/**
* Apply the filter
@@ -66,21 +70,44 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
super(reader);
reader.incRef();
this.id = id;
+ this.deletions = deletions;
+ this.deleteNodesOnly = deleteNodesOnly;
- deletedDocuments = new OpenBitSet(reader.maxDoc());
-
if (s_logger.isDebugEnabled())
{
s_logger.debug("Applying deletions FOR "+id +" (the index ito which these are applied is the previous one ...)");
}
+ }
+
+ public OpenBitSet getDeletedDocuments()
+ {
+ lock.readLock().lock();
try
{
+ if (deletedDocuments != null)
+ {
+ return deletedDocuments;
+ }
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
+ lock.writeLock().lock();
+ try
+ {
+ if (deletedDocuments != null)
+ {
+ return deletedDocuments;
+ }
+ deletedDocuments = new OpenBitSet(in.maxDoc());
+
if (!deleteNodesOnly)
{
for (String stringRef : deletions)
{
- TermDocs td = reader.termDocs(new Term("ID", stringRef));
+ TermDocs td = in.termDocs(new Term("ID", stringRef));
while (td.next())
{
deletedDocuments.set(td.doc());
@@ -91,7 +118,7 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
else
{
- Searcher searcher = new IndexSearcher(reader);
+ Searcher searcher = new IndexSearcher(in);
for (String stringRef : deletions)
{
TermQuery query = new TermQuery(new Term("ID", stringRef));
@@ -112,12 +139,18 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
}
// searcher does not need to be closed, the reader is live
}
+ return deletedDocuments;
}
catch (IOException e)
{
- s_logger.error("Error initialising "+id);
- throw new AlfrescoRuntimeException("Failed to construct filtering index reader", e);
+ s_logger.error("Error initialising "+id, e);
+ throw new AlfrescoRuntimeException("Failed to find deleted documents to filter", e);
}
+ finally
+ {
+ lock.writeLock().unlock();
+ }
+
}
// Prevent from actually setting the closed flag
@@ -133,10 +166,8 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
* @author andyh
*
*/
- public static class FilterTermDocs implements TermDocs
+ public class FilterTermDocs implements TermDocs
{
- OpenBitSet deletedDocuments;
-
protected TermDocs in;
String id;
@@ -146,10 +177,9 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
* @param in
* @param deletedDocuments
*/
- public FilterTermDocs(String id, TermDocs in, OpenBitSet deletedDocuments)
+ public FilterTermDocs(String id, TermDocs in)
{
this.in = in;
- this.deletedDocuments = deletedDocuments;
}
public void seek(Term term) throws IOException
@@ -180,15 +210,20 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
{
try
{
- while (in.next())
- {
- if (!deletedDocuments.get(in.doc()))
+ if (!in.next())
+ {
+ return false;
+ }
+ OpenBitSet deletedDocuments = getDeletedDocuments();
+ while (deletedDocuments.get(in.doc()))
+ {
+ if (!in.next())
{
- // Not masked
- return true;
- }
- }
- return false;
+ return false;
+ }
+ }
+ // Not masked
+ return true;
}
catch(IOException ioe)
{
@@ -209,10 +244,17 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
return 0;
}
- if (allDeleted(innerDocs, count))
+ OpenBitSet deletedDocuments = getDeletedDocuments();
+ while (allDeleted(innerDocs, count, deletedDocuments))
{
- // Did not find anything - try again
- return read(docs, freqs);
+
+ count = in.read(innerDocs, innerFreq);
+
+ // Is the stream exhausted
+ if (count == 0)
+ {
+ return 0;
+ }
}
// Add non deleted
@@ -231,7 +273,7 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
return insertPosition;
}
- private boolean allDeleted(int[] docs, int fillSize)
+ private boolean allDeleted(int[] docs, int fillSize, OpenBitSet deletedDocuments)
{
for (int i = 0; i < fillSize; i++)
{
@@ -250,6 +292,7 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
return false;
}
+ OpenBitSet deletedDocuments = getDeletedDocuments();
while (deletedDocuments.get(in.doc()))
{
if (!in.next())
@@ -268,7 +311,7 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
}
/** Base class for filtering {@link TermPositions} implementations. */
- public static class FilterTermPositions extends FilterTermDocs implements TermPositions
+ public class FilterTermPositions extends FilterTermDocs implements TermPositions
{
TermPositions tp;
@@ -278,9 +321,9 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
* @param in
* @param deletedDocuements
*/
- public FilterTermPositions(String id, TermPositions in, OpenBitSet deletedDocuements)
+ public FilterTermPositions(String id, TermPositions in)
{
- super(id, in, deletedDocuements);
+ super(id, in);
tp = in;
}
@@ -308,18 +351,18 @@ public class FilterIndexReaderByStringId extends FilterIndexReader
@Override
public int numDocs()
{
- return super.numDocs() - (int)deletedDocuments.cardinality();
+ return super.numDocs() - (int)getDeletedDocuments().cardinality();
}
@Override
public TermDocs termDocs() throws IOException
{
- return new FilterTermDocs(id, super.termDocs(), deletedDocuments);
+ return new FilterTermDocs(id, super.termDocs());
}
@Override
public TermPositions termPositions() throws IOException
{
- return new FilterTermPositions(id, super.termPositions(), deletedDocuments);
+ return new FilterTermPositions(id, super.termPositions());
}
}
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
index 8c5bdcf257..9759c2ce0d 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
+import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.node.NodeBulkLoader;
import org.alfresco.repo.search.AbstractResultSet;
import org.alfresco.repo.search.ResultSetRowIterator;
@@ -196,8 +197,15 @@ public class LuceneResultSet extends AbstractResultSet
prefetch.set(next);
Document doc = hits.doc(next);
String nodeRefStr = doc.get("ID");
- NodeRef nodeRef = tenantService.getBaseName(new NodeRef(nodeRefStr));
- fetchList.add(nodeRef);
+ try
+ {
+ NodeRef nodeRef = tenantService.getBaseName(new NodeRef(nodeRefStr));
+ fetchList.add(nodeRef);
+ }
+ catch (AlfrescoRuntimeException e)
+ {
+ // Ignore IDs that don't parse as NodeRefs, e.g. FTSREF docs
+ }
}
// Now bulk fetch
if (fetchList.size() > 1)
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/fts/FullTextSearchIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/fts/FullTextSearchIndexerImpl.java
index 4b9f055b08..192fd2a71a 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/fts/FullTextSearchIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/fts/FullTextSearchIndexerImpl.java
@@ -26,8 +26,9 @@ import org.alfresco.repo.search.BackgroundIndexerAware;
import org.alfresco.repo.search.Indexer;
import org.alfresco.repo.search.IndexerAndSearcher;
import org.alfresco.repo.search.SupportsBackgroundIndexing;
-import org.alfresco.repo.search.impl.lucene.index.IndexInfo;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
@@ -51,6 +52,8 @@ public class FullTextSearchIndexerImpl implements FTSIndexerAware, FullTextSearc
private static Set indexing = new HashSet();
private IndexerAndSearcher indexerAndSearcherFactory;
+
+ private TransactionService transactionService;
private int pauseCount = 0;
@@ -201,30 +204,42 @@ public class FullTextSearchIndexerImpl implements FTSIndexerAware, FullTextSearc
int done = 0;
while (done == 0)
{
- StoreRef toIndex = getNextRef();
+ final StoreRef toIndex = getNextRef();
if (toIndex != null)
{
if(s_logger.isDebugEnabled())
{
s_logger.debug("FTS Indexing "+toIndex+" at "+(new java.util.Date()));
}
- Indexer indexer = indexerAndSearcherFactory.getIndexer(toIndex);
- if(indexer instanceof BackgroundIndexerAware)
+ try
{
- BackgroundIndexerAware backgroundIndexerAware = (BackgroundIndexerAware)indexer;
- backgroundIndexerAware.registerCallBack(this);
- try
- {
- done += backgroundIndexerAware.updateFullTextSearch(batchSize);
- }
- catch (Exception ex)
- {
- if(s_logger.isWarnEnabled())
- {
- s_logger.warn("FTS Job threw exception", ex);
- }
- done = 1; // better luck next time
- }
+ done += transactionService.getRetryingTransactionHelper().doInTransaction(
+ new RetryingTransactionCallback()
+ {
+ @Override
+ public Integer execute() throws Throwable
+ {
+ Indexer indexer = indexerAndSearcherFactory.getIndexer(toIndex);
+ // Activate database 'read through' behaviour so that we don't end up with stale
+ // caches during this potentially long running transaction
+ indexer.setReadThrough(true);
+ if (indexer instanceof BackgroundIndexerAware)
+ {
+ BackgroundIndexerAware backgroundIndexerAware = (BackgroundIndexerAware) indexer;
+ backgroundIndexerAware.registerCallBack(FullTextSearchIndexerImpl.this);
+ return backgroundIndexerAware.updateFullTextSearch(batchSize);
+ }
+ return 0;
+ }
+ });
+ }
+ catch (Exception ex)
+ {
+ if (s_logger.isWarnEnabled())
+ {
+ s_logger.warn("FTS Job threw exception", ex);
+ }
+ done = 1; // better luck next time
}
}
else
@@ -277,6 +292,14 @@ public class FullTextSearchIndexerImpl implements FTSIndexerAware, FullTextSearc
{
this.indexerAndSearcherFactory = indexerAndSearcherFactory;
}
+
+ /**
+ * @param transactionService
+ */
+ public void setTransactionService(TransactionService transactionService)
+ {
+ this.transactionService = transactionService;
+ }
/**
* @param args
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
index 0f01b93b9a..be4c6b18f9 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -348,6 +348,7 @@ public class IndexInfo implements IndexMonitor
* Main index reader
*/
private IndexReader mainIndexReader;
+ private Map mainIndexReaders = new HashMap();
/**
* Index writers for deltas
@@ -505,6 +506,7 @@ public class IndexInfo implements IndexMonitor
}
}
// Delete entries that are not required
+ invalidateMainReadersFromFirst(deletable);
for (String id : deletable)
{
indexEntries.remove(id);
@@ -845,7 +847,6 @@ public class IndexInfo implements IndexMonitor
}
entry.setStatus(TransactionStatus.COMMITTED);
registerReferenceCountingIndexReader(entry.getName(), buildReferenceCountingIndexReader(entry.getName(), entry.getDocumentCount()));
- mainIndexReader = null;
break;
// States that require no action
case COMMITTED:
@@ -857,6 +858,7 @@ public class IndexInfo implements IndexMonitor
}
}
// Delete entries that are not required
+ invalidateMainReadersFromFirst(deletable);
for (String id : deletable)
{
indexEntries.remove(id);
@@ -1281,6 +1283,36 @@ public class IndexInfo implements IndexMonitor
}
}
+ private void invalidateMainReadersFromFirst(Set ids) throws IOException
+ {
+ boolean found = false;
+ for (String id : indexEntries.keySet())
+ {
+ if (!found && ids.contains(id))
+ {
+ found = true;
+ }
+ if (found)
+ {
+ IndexReader main = mainIndexReaders.remove(id);
+ if (main != null)
+ {
+ ((ReferenceCounting) main).setInvalidForReuse();
+ }
+ }
+ }
+
+ if (found)
+ {
+ if(mainIndexReader != null)
+ {
+ ((ReferenceCounting) mainIndexReader).setInvalidForReuse();
+ mainIndexReader = null;
+ }
+ }
+
+ }
+
/**
* Get the main reader for committed index data
*
@@ -1300,6 +1332,10 @@ public class IndexInfo implements IndexMonitor
getWriteLock();
try
{
+ if (mainIndexReader != null)
+ {
+ ((ReferenceCounting)mainIndexReader).setInvalidForReuse();
+ }
mainIndexReader = null;
}
finally
@@ -1397,6 +1433,10 @@ public class IndexInfo implements IndexMonitor
getWriteLock();
try
{
+ if (mainIndexReader != null)
+ {
+ ((ReferenceCounting)mainIndexReader).setInvalidForReuse();
+ }
mainIndexReader = null;
}
finally
@@ -1738,6 +1778,7 @@ public class IndexInfo implements IndexMonitor
reordered.put(entry.getName(), entry);
reordered.put(current.getName(), current);
addedPreparedEntry = true;
+ invalidateMainReadersFromFirst(Collections.singleton(current.getName()));
}
else if (current.getName().equals(entry.getName()))
{
@@ -1843,6 +1884,7 @@ public class IndexInfo implements IndexMonitor
if (TransactionStatus.COMMITTED.follows(entry.getStatus()))
{
// Do the deletions
+ invalidateMainReadersFromFirst(Collections.singleton(id));
if ((entry.getDocumentCount() + entry.getDeletions()) == 0)
{
registerReferenceCountingIndexReader(id, tl.get());
@@ -2004,6 +2046,7 @@ public class IndexInfo implements IndexMonitor
if (TransactionStatus.DELETABLE.follows(entry.getStatus()))
{
+ invalidateMainReadersFromFirst(Collections.singleton(id));
indexEntries.remove(id);
writeStatus();
clearOldReaders();
@@ -2147,7 +2190,7 @@ public class IndexInfo implements IndexMonitor
clearInvalid(inValid);
}
- private void clearInvalid(HashSet inValid) throws IOException
+ private void clearInvalid(Set inValid) throws IOException
{
boolean hasInvalid = false;
for (String id : inValid)
@@ -2157,13 +2200,24 @@ public class IndexInfo implements IndexMonitor
{
s_logger.debug("... invalidating sub reader " + id);
}
- ReferenceCounting referenceCounting = (ReferenceCounting) reader;
- referenceCounting.setInvalidForReuse();
- deletableReaders.add(reader);
- hasInvalid = true;
+ if (reader != null)
+ {
+ ReferenceCounting referenceCounting = (ReferenceCounting) reader;
+ referenceCounting.setInvalidForReuse();
+ deletableReaders.add(reader);
+ hasInvalid = true;
+ }
}
if (hasInvalid)
{
+ for (String id : inValid)
+ {
+ IndexReader main = mainIndexReaders.remove(id);
+ if (main != null)
+ {
+ ((ReferenceCounting) main).setInvalidForReuse();
+ }
+ }
if (mainIndexReader != null)
{
if (s_logger.isDebugEnabled())
@@ -2179,6 +2233,7 @@ public class IndexInfo implements IndexMonitor
private IndexReader createMainIndexReader() throws IOException
{
IndexReader reader = null;
+ IndexReader oldReader = null;
for (String id : indexEntries.keySet())
{
IndexEntry entry = indexEntries.get(id);
@@ -2188,33 +2243,35 @@ public class IndexInfo implements IndexMonitor
if (reader == null)
{
reader = subReader;
- reader.incRef();
}
else
{
- if (entry.getType() == IndexType.INDEX)
+ boolean oldReaderIsSubReader = oldReader == null;
+ oldReader = reader;
+ reader = mainIndexReaders.get(id);
+ if (reader == null)
{
- IndexReader oldReader = reader;
- reader = new MultiReader(new IndexReader[] { oldReader, subReader }, false);
- // Cancel out the incRef on the old reader
- oldReader.decRef();
- }
- else if (entry.getType() == IndexType.DELTA)
- {
- try
+ if (entry.getType() == IndexType.INDEX)
{
- IndexReader oldReader = reader;
- IndexReader filterReader = new FilterIndexReaderByStringId(id, oldReader, getDeletions(entry.getName()), entry.isDeletOnlyNodes());
- reader = new MultiReader(new IndexReader[] { filterReader, subReader }, false);
- // Cancel out the incRef on the old readers
- oldReader.decRef();
- filterReader.decRef();
+ reader = new MultiReader(new IndexReader[] { oldReader, subReader }, false);
}
- catch (IOException ioe)
+ else if (entry.getType() == IndexType.DELTA)
{
- s_logger.error("Failed building filter reader beneath " + entry.getName(), ioe);
- throw ioe;
+ try
+ {
+ IndexReader filterReader = new FilterIndexReaderByStringId(id, oldReader, getDeletions(entry.getName()), entry.isDeletOnlyNodes());
+ reader = new MultiReader(new IndexReader[] { filterReader, subReader }, false);
+ // Cancel out the incRef on the filter reader
+ filterReader.decRef();
+ }
+ catch (IOException ioe)
+ {
+ s_logger.error("Failed building filter reader beneath " + entry.getName(), ioe);
+ throw ioe;
+ }
}
+ reader = ReferenceCountingReadOnlyIndexReaderFactory.createReader(id+"multi", reader, true, config);
+ mainIndexReaders.put(id, reader);
}
}
}
@@ -2223,6 +2280,12 @@ public class IndexInfo implements IndexMonitor
{
reader = IndexReader.open(emptyIndex);
}
+ else
+ {
+ // Keep this reader open whilst it is referenced by mainIndexReaders / referenceCountingReadOnlyIndexReaders
+ reader.incRef();
+ }
+
reader = ReferenceCountingReadOnlyIndexReaderFactory.createReader(MAIN_READER, reader, false, config);
return reader;
}
@@ -2237,8 +2300,9 @@ public class IndexInfo implements IndexMonitor
return reader;
}
- private void registerReferenceCountingIndexReader(String id, IndexReader reader)
+ private void registerReferenceCountingIndexReader(String id, IndexReader reader) throws IOException
{
+ clearInvalid(Collections.singleton(id));
ReferenceCounting referenceCounting = (ReferenceCounting) reader;
if (!referenceCounting.getId().equals(id))
{
@@ -3160,6 +3224,14 @@ public class IndexInfo implements IndexMonitor
deleteQueue.add(refCounting.getId());
i.remove();
}
+ else if (s_logger.isTraceEnabled() && refCounting.getCreationTime() < System.currentTimeMillis() - 120000)
+ {
+ for (Throwable t : refCounting.getReferences())
+ {
+ s_logger.trace(t.getMessage(), t);
+ }
+ }
+
}
Iterator j = deleteQueue.iterator();
@@ -3641,6 +3713,7 @@ public class IndexInfo implements IndexMonitor
}
// Delete entries that are not required
+ invalidateMainReadersFromFirst(deletable);
for (String id : deletable)
{
indexEntries.remove(id);
@@ -3767,96 +3840,100 @@ public class IndexInfo implements IndexMonitor
}
// Build readers
- final HashSet invalidIndexes = new HashSet();
+ int size = 2 * (toDelete.size() + indexes.size());
+ final HashSet invalidIndexes = new HashSet(size);
- final HashMap newIndexCounts = new HashMap();
-
- LinkedHashMap readers = new LinkedHashMap();
- for (IndexEntry entry : indexes.values())
- {
- File location = new File(indexDirectory, entry.getName()).getCanonicalFile();
- IndexReader reader;
- if (IndexReader.indexExists(location))
- {
- reader = IndexReader.open(location);
- }
- else
- {
- reader = IndexReader.open(emptyIndex);
- }
- readers.put(entry.getName(), reader);
- }
+ final HashMap newIndexCounts = new HashMap(size);
+ LinkedHashMap readers = new LinkedHashMap(size);
for (IndexEntry currentDelete : toDelete.values())
{
Set deletions = getDeletions(currentDelete.getName());
- for (String key : readers.keySet())
+ if (!deletions.isEmpty())
{
- IndexReader reader = readers.get(key);
- for (String stringRef : deletions)
+ for (String key : indexes.keySet())
{
- if (currentDelete.isDeletOnlyNodes())
+ IndexReader reader = getReferenceCountingIndexReader(key);
+ Searcher searcher = new IndexSearcher(reader);
+ try
{
- Searcher searcher = new IndexSearcher(reader);
-
- TermQuery query = new TermQuery(new Term("ID", stringRef));
- Hits hits = searcher.search(query);
- if (hits.length() > 0)
+ for (String stringRef : deletions)
{
- for (int i = 0; i < hits.length(); i++)
+ TermQuery query = new TermQuery(new Term("ID", stringRef));
+ Hits hits = searcher.search(query);
+ if (hits.length() > 0)
{
- Document doc = hits.doc(i);
- if (doc.getField("ISCONTAINER") == null)
+ IndexReader writeableReader = readers.get(key);
+ if (writeableReader == null)
{
- reader.deleteDocument(hits.id(i));
- invalidIndexes.add(key);
- // There should only be one thing to
- // delete
- // break;
+ File location = new File(indexDirectory, key).getCanonicalFile();
+ if (IndexReader.indexExists(location))
+ {
+ writeableReader = IndexReader.open(location);
+ }
+ else
+ {
+ continue;
+ }
+ readers.put(key, writeableReader);
+ }
+
+ if (currentDelete.isDeletOnlyNodes())
+ {
+ Searcher writeableSearcher = new IndexSearcher(writeableReader);
+ hits = writeableSearcher.search(query);
+ if (hits.length() > 0)
+ {
+ for (int i = 0; i < hits.length(); i++)
+ {
+ Document doc = hits.doc(i);
+ if (doc.getField("ISCONTAINER") == null)
+ {
+ writeableReader.deleteDocument(hits.id(i));
+ invalidIndexes.add(key);
+ // There should only be one thing to
+ // delete
+ // break;
+ }
+ }
+ }
+ writeableSearcher.close();
+ }
+ else
+ {
+ int deletedCount = 0;
+ try
+ {
+ deletedCount = writeableReader.deleteDocuments(new Term("ID", stringRef));
+ }
+ catch (IOException ioe)
+ {
+ if (s_logger.isDebugEnabled())
+ {
+ s_logger.debug("IO Error for " + key);
+ throw ioe;
+ }
+ }
+ if (deletedCount > 0)
+ {
+ if (s_logger.isDebugEnabled())
+ {
+ s_logger.debug("Deleted " + deletedCount + " from " + key + " for id " + stringRef + " remaining docs " + writeableReader.numDocs());
+ }
+ invalidIndexes.add(key);
+ }
}
}
}
- searcher.close();
-
}
- else
+ finally
{
- int deletedCount = 0;
- try
- {
- deletedCount = reader.deleteDocuments(new Term("ID", stringRef));
- }
- catch (IOException ioe)
- {
- if (s_logger.isDebugEnabled())
- {
- s_logger.debug("IO Error for " + key);
- throw ioe;
- }
- }
- if (deletedCount > 0)
- {
- if (s_logger.isDebugEnabled())
- {
- s_logger.debug("Deleted " + deletedCount + " from " + key + " for id " + stringRef + " remaining docs " + reader.numDocs());
- }
- invalidIndexes.add(key);
- }
- }
+ searcher.close();
+ }
}
-
}
- File location = new File(indexDirectory, currentDelete.getName()).getCanonicalFile();
- IndexReader reader;
- if (IndexReader.indexExists(location))
- {
- reader = IndexReader.open(location);
- }
- else
- {
- reader = IndexReader.open(emptyIndex);
- }
- readers.put(currentDelete.getName(), reader);
+ // The delta we have just processed now must be included when we process the deletions of its successor
+ indexes.put(currentDelete.getName(), currentDelete);
}
// Close all readers holding the write lock - so no one tries to
@@ -3929,25 +4006,10 @@ public class IndexInfo implements IndexMonitor
IndexReader newReader = newReaders.get(id);
registerReferenceCountingIndexReader(id, newReader);
}
- if (invalidIndexes.size() > 0)
- {
- if (mainIndexReader != null)
- {
- if (s_logger.isDebugEnabled())
- {
- s_logger.debug("... invalidating main index reader after applying deletions");
- }
- ((ReferenceCounting) mainIndexReader).setInvalidForReuse();
- }
- else
- {
- if (s_logger.isDebugEnabled())
- {
- s_logger.debug("... no main index reader to invalidate after applying deletions");
- }
- }
- mainIndexReader = null;
- }
+
+ // Invalidate all main index readers from the first invalid index onwards
+ invalidateMainReadersFromFirst(invalidIndexes);
+
if (s_logger.isDebugEnabled())
{
@@ -4047,6 +4109,7 @@ public class IndexInfo implements IndexMonitor
set.put(guid, target);
// rebuild merged index elements
LinkedHashMap reordered = new LinkedHashMap();
+ invalidateMainReadersFromFirst(Collections.singleton(firstMergeId));
for (IndexEntry current : indexEntries.values())
{
if (current.getName().equals(firstMergeId))
@@ -4215,6 +4278,7 @@ public class IndexInfo implements IndexMonitor
}
}
+ invalidateMainReadersFromFirst(toDelete);
for (String id : toDelete)
{
indexEntries.remove(id);
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
index 963a09c7fb..4f50a81033 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCounting.java
@@ -19,6 +19,7 @@
package org.alfresco.repo.search.impl.lucene.index;
import java.io.IOException;
+import java.util.List;
/**
* Reference counting and caching for read only index access.
@@ -31,6 +32,10 @@ import java.io.IOException;
*/
public interface ReferenceCounting
{
+ public long getCreationTime();
+
+ public List getReferences();
+
/**
* Get the number of references
* @return
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
index b55289480c..5200c98c45 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/index/ReferenceCountingReadOnlyIndexReaderFactory.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Timer;
import java.util.WeakHashMap;
@@ -124,6 +125,9 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
private LuceneConfig config;
+ private final long creationTime;
+ private final List references;
+
static
{
Class c = IndexReader.class;
@@ -146,6 +150,9 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
ReferenceCountingReadOnlyIndexReader(String id, IndexReader indexReader, boolean enableCaching, LuceneConfig config)
{
super(indexReader);
+ this.creationTime = System.currentTimeMillis();
+ this.references = new LinkedList();
+ references.add(new Exception(this.refCount + ": " + indexReader.toString()));
this.id = id;
if (enableCaching && (config != null))
{
@@ -154,6 +161,18 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
this.config = config;
}
+ @Override
+ public synchronized long getCreationTime()
+ {
+ return this.creationTime;
+ }
+
+ @Override
+ public synchronized List getReferences()
+ {
+ return this.references;
+ }
+
@Override
public synchronized void incRef()
{
@@ -184,6 +203,7 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
throw new AlfrescoRuntimeException("Failed to mark index as open ..", e);
}
}
+ references.add(new Exception(this.refCount + ": " + in.toString()));
}
private synchronized void decrementReferenceCount() throws IOException
@@ -198,6 +218,7 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
{
s_logger.error("Invalid reference count for Reader " + id + " is " + refCount + " ... " + super.toString());
}
+ references.add(new Exception(this.refCount + ": " + in.toString()));
}
private void closeIfRequired() throws IOException
@@ -274,6 +295,15 @@ public class ReferenceCountingReadOnlyIndexReaderFactory
super.decRef();
}
}
+
+ /**
+ * We want to avoid setting the closed flag on our wrapped stream, passing on all decrefs.
+ **/
+ @Override
+ protected void doClose() throws IOException
+ {
+ in.decRef();
+ }
@Override
protected void doDelete(int n) throws IOException
diff --git a/source/java/org/alfresco/repo/security/SecurityTestSuite.java b/source/java/org/alfresco/repo/security/SecurityTestSuite.java
index 55474eee8b..f1b2c1f155 100644
--- a/source/java/org/alfresco/repo/security/SecurityTestSuite.java
+++ b/source/java/org/alfresco/repo/security/SecurityTestSuite.java
@@ -22,7 +22,6 @@ import junit.framework.JUnit4TestAdapter;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.alfresco.repo.audit.access.AccessAuditorTest;
import org.alfresco.repo.ownable.impl.OwnableServiceTest;
import org.alfresco.repo.security.authentication.AuthenticationBootstrapTest;
import org.alfresco.repo.security.authentication.AuthenticationTest;
diff --git a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
index d4793860e2..100913d3b5 100644
--- a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
+++ b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider.java
@@ -48,7 +48,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
/**
* The home folder manager
*/
- private HomeFolderManager homeFolderManager;
+ private PortableHomeFolderManager homeFolderManager;
/**
* The store ref in which to conduct searches
@@ -97,7 +97,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
/**
* Get the home folder manager.
*/
- protected HomeFolderManager getHomeFolderManager()
+ protected PortableHomeFolderManager getHomeFolderManager()
{
return homeFolderManager;
}
@@ -106,7 +106,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
* Set the home folder manager.
* @param homeFolderManager
*/
- public void setHomeFolderManager(HomeFolderManager homeFolderManager)
+ public void setHomeFolderManager(PortableHomeFolderManager homeFolderManager)
{
this.homeFolderManager = homeFolderManager;
}
diff --git a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
index 09c458c7a8..e78cccc1c1 100644
--- a/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
+++ b/source/java/org/alfresco/repo/security/person/AbstractHomeFolderProvider2.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.InitializingBean;
/**
* Abstract class that implements {@link HomeFolderProvider2} which
- * works with the {@link HomeFolderManager} (which performs most of
+ * works with the {@link PortableHomeFolderManager} (which performs most of
* the work) to create home folders in custom locations.
*
* @author Alan Davis
@@ -43,7 +43,7 @@ public abstract class AbstractHomeFolderProvider2 implements
/**
* The home folder manager
*/
- private HomeFolderManager homeFolderManager;
+ private PortableHomeFolderManager homeFolderManager;
/**
* The store URL.
@@ -83,7 +83,7 @@ public abstract class AbstractHomeFolderProvider2 implements
/**
* Get the home folder manager.
*/
- protected HomeFolderManager getHomeFolderManager()
+ protected PortableHomeFolderManager getHomeFolderManager()
{
return homeFolderManager;
}
@@ -92,7 +92,7 @@ public abstract class AbstractHomeFolderProvider2 implements
* Set the home folder manager.
* @param homeFolderManager
*/
- public void setHomeFolderManager(HomeFolderManager homeFolderManager)
+ public void setHomeFolderManager(PortableHomeFolderManager homeFolderManager)
{
this.homeFolderManager = homeFolderManager;
}
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderManager.java b/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
index 1dc7da544f..eef5c2632c 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderManager.java
@@ -18,480 +18,19 @@
*/
package org.alfresco.repo.security.person;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.node.NodeServicePolicies;
-import org.alfresco.repo.policy.JavaBehaviour;
-import org.alfresco.repo.policy.PolicyComponent;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.tenant.TenantService;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.model.FileFolderService;
-import org.alfresco.service.cmr.model.FileFolderUtil;
-import org.alfresco.service.cmr.model.FileInfo;
-import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
-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.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
/**
- * Manage home folder creation by binding to events from the cm:person type.
- *
- * @author Andy Hind,
- * Alan Davis (support v1 and v2 HomeFolderProviders - code from
- * v1 HomeFolderProviders moved into HomeFolderManager).
+ * An object responsible for creating / validating the home folder for a given person node child association reference.
*/
-public class HomeFolderManager implements NodeServicePolicies.OnCreateNodePolicy
+public interface HomeFolderManager
{
- private PolicyComponent policyComponent;
-
- private NodeService nodeService;
-
- private boolean enableHomeFolderCreationAsPeopleAreCreated = false;
-
- private ServiceRegistry serviceRegistry;
-
- private TenantService tenantService;
-
/**
- * A default provider
- */
- private HomeFolderProvider2 defaultProvider;
-
- /**
- * Original Providers (now depreciated) that have registered and are looked up by bean name.
- */
- @SuppressWarnings("deprecation")
- private Map v1Providers = new HashMap();
-
- /**
- * Providers that have registered and are looked up by bean name.
- */
- private Map v2Providers = new HashMap();
-
- /**
- * Cache the result of the path look up.
- */
- private Map> rootPathNodeRefMaps =
- new ConcurrentHashMap>();
-
- /**
- * Bind the class behaviour to this implementation
- */
- public void init() throws Exception
- {
- if (enableHomeFolderCreationAsPeopleAreCreated)
- {
- policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateNode"), ContentModel.TYPE_PERSON, new JavaBehaviour(this, "onCreateNode"));
- }
- }
-
- public void setEnableHomeFolderCreationAsPeopleAreCreated(boolean enableHomeFolderCreationAsPeopleAreCreated)
- {
- this.enableHomeFolderCreationAsPeopleAreCreated = enableHomeFolderCreationAsPeopleAreCreated;
- }
-
- /**
- * Set the policy component.
+ * Create / move the home folder if required.
*
- * @param policyComponent
+ * @param childAssocRef
+ * the primary child association pointing to the person node.
*/
- public void setPolicyComponent(PolicyComponent policyComponent)
- {
- this.policyComponent = policyComponent;
- }
+ public void makeHomeFolder(ChildAssociationRef childAssocRef);
- /**
- * Set the node service.
- * @param nodeService
- */
- public void setNodeService(NodeService nodeService)
- {
- this.nodeService = nodeService;
- }
-
- /**
- * Set the service registry.
- */
- public void setServiceRegistry(ServiceRegistry serviceRegistry)
- {
- this.serviceRegistry = serviceRegistry;
- }
-
- /**
- * Set the tenant service
- */
- public void setTenantService(TenantService tenantService)
- {
- this.tenantService = tenantService;
- }
-
- /**
- * Register a home folder provider.
- *
- * @param provider
- */
- @SuppressWarnings("deprecation")
- public void addProvider(HomeFolderProvider provider)
- {
- v1Providers.put(provider.getName(), provider);
- }
-
- /**
- * Register a home folder provider.
- *
- * @param provider
- */
- public void addProvider(HomeFolderProvider2 provider)
- {
- v2Providers.put(provider.getName(), provider);
- }
-
- /**
- * Returns the version 1 HomeFolderProvider with the given name.
- */
- @SuppressWarnings("deprecation")
- public HomeFolderProvider getHomeFolderProvider1(String providerName)
- {
- return v1Providers.get(providerName);
- }
-
- /**
- * Returns the version 2 HomeFolderProvider2 with the given name.
- */
- public HomeFolderProvider2 getHomeFolderProvider2(String providerName)
- {
- return v2Providers.get(providerName);
- }
-
- /**
- * Set the default home folder provider (user which none is specified or when one is not found)
- * @param defaultProvider
- */
- public void setDefaultProvider(HomeFolderProvider2 defaultProvider)
- {
- this.defaultProvider = defaultProvider;
- }
-
- /**
- * Find the provider and call if eager home folder creation is enabled.
- */
- public void onCreateNode(ChildAssociationRef childAssocRef)
- {
- if (enableHomeFolderCreationAsPeopleAreCreated)
- {
- makeHomeFolder(childAssocRef);
- }
- }
-
- /**
- * Find the provider and call.
- */
- @SuppressWarnings("deprecation")
- public void makeHomeFolder(ChildAssociationRef childAssocRef)
- {
- HomeFolderProvider2 v2Provider = defaultProvider;
- HomeFolderProvider v1Provider = null;
- String providerName = DefaultTypeConverter.INSTANCE.convert(
- String.class, nodeService.getProperty(childAssocRef
- .getChildRef(), ContentModel.PROP_HOME_FOLDER_PROVIDER));
- if (providerName != null)
- {
- v2Provider = getHomeFolderProvider2(providerName);
- if (v2Provider == null)
- {
- v1Provider = getHomeFolderProvider1(providerName);
- if (v1Provider == null)
- {
- v2Provider = defaultProvider;
- }
- }
- }
- else
- {
- providerName = defaultProvider.getName();
- nodeService.setProperty(childAssocRef.getChildRef(),
- ContentModel.PROP_HOME_FOLDER_PROVIDER, providerName);
- }
- if (v2Provider != null)
- {
- // If a V2Adaptor we still must call onCreateNode just like a
- // v1 HomeFolderProvider in case it has been overridden
- if (v2Provider instanceof AbstractHomeFolderProvider.V2Adaptor)
- {
- ((AbstractHomeFolderProvider.V2Adaptor)v2Provider).onCreateNode(childAssocRef);
- }
- else
- {
- homeFolderCreateAndSetPermissions(v2Provider, childAssocRef.getChildRef());
- }
- }
- else if (v1Provider != null)
- {
- v1Provider.onCreateNode(childAssocRef);
- }
- }
-
- void homeFolderCreateAndSetPermissions(HomeFolderProvider2 provider, NodeRef personNodeRef)
- {
- AuthenticationUtil.RunAsWork action =
- new RunAsCreateAndSetPermissions(provider, personNodeRef);
- AuthenticationUtil.runAs(action, AuthenticationUtil.getSystemUserName());
- }
-
- /**
- * Helper class to encapsulate the creation and setting permissions etc
- */
- private class RunAsCreateAndSetPermissions implements AuthenticationUtil.RunAsWork
- {
- NodeRef personNodeRef;
- HomeFolderProvider2 provider;
-
- RunAsCreateAndSetPermissions(HomeFolderProvider2 provider, NodeRef personNodeRef)
- {
- this.personNodeRef = personNodeRef;
- this.provider = provider;
- }
-
- public NodeRef doWork() throws Exception
- {
- // Get home folder
- HomeSpaceNodeRef homeFolder = provider.getHomeFolder(personNodeRef);
-
- // If it exists
- if (homeFolder.getNodeRef() != null)
- {
- // Get uid and keep
- String uid = DefaultTypeConverter.INSTANCE.convert(String.class,
- serviceRegistry.getNodeService().getProperty(
- personNodeRef, ContentModel.PROP_USERNAME));
-
- // If created or found then set (other wise it was already set correctly)
- if (homeFolder.getStatus() != HomeSpaceNodeRef.Status.VALID)
- {
- serviceRegistry.getNodeService().setProperty(
- personNodeRef, ContentModel.PROP_HOMEFOLDER, homeFolder.getNodeRef());
- }
-
- final String providerSuppliedOwner = provider.getOwner();
- String owner = (providerSuppliedOwner == null) ? uid : providerSuppliedOwner;
- // If created..
- if (homeFolder.getStatus() == HomeSpaceNodeRef.Status.CREATED)
- {
- PermissionsManager onCreatePermissionsManager =
- provider.getOnCreatePermissionsManager();
- if (onCreatePermissionsManager != null)
- {
- onCreatePermissionsManager.setPermissions(
- homeFolder.getNodeRef(), owner, uid);
- }
- }
- else
- {
- PermissionsManager onReferencePermissionsManager =
- provider.getOnReferencePermissionsManager();
- if (onReferencePermissionsManager != null)
- {
- onReferencePermissionsManager.setPermissions(
- homeFolder.getNodeRef(), owner, uid);
- }
- }
- }
- return homeFolder.getNodeRef();
- }
- }
-
- private StoreRef getStoreRef(HomeFolderProvider2 provider)
- {
- // Could check to see if provider is a V2Adaptor to avoid
- // object creation, but there is little point.
- return new StoreRef(provider.getStoreUrl());
- }
-
- /**
- * Helper method for {@link HomeFolderProvider2.getHomeFolder} (so that it
- * does not need its own NodeService) that returns a person property value.
- */
- public String getPersonProperty(NodeRef person, QName name)
- {
- String value = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(person, name));
-
- if(value == null || value.length() == 0)
- {
- throw new PersonException("Can not create a home folder when the "+name+" property is null or empty");
- }
- return value;
- }
-
- void clearCaches(HomeFolderProvider2 provider)
- {
- getRootPathNodeRefMap(provider).clear();
- }
-
- NodeRef getRootPathNodeRef(HomeFolderProvider2 provider)
- {
- String rootPath = provider.getRootPath();
- String tenantDomain = (tenantService != null ? tenantService.getCurrentUserDomain() : TenantService.DEFAULT_DOMAIN);
- Map rootPathNodeRefMap = getRootPathNodeRefMap(provider);
- NodeRef rootPathNodeRef = rootPathNodeRefMap.get(tenantDomain);
- if (rootPathNodeRef == null)
- {
- // ok with race condition for initial construction
- rootPathNodeRef = resolvePath(provider, rootPath);
- rootPathNodeRefMap.put(tenantDomain, rootPathNodeRef);
- }
- return rootPathNodeRef;
- }
-
- private Map getRootPathNodeRefMap(HomeFolderProvider2 provider)
- {
- String name = provider.getName();
- Map rootPathNodeRefMap = rootPathNodeRefMaps.get(name);
- if (rootPathNodeRefMap == null)
- {
- // ok with race condition for initial construction
- rootPathNodeRefMap = new ConcurrentHashMap();
- rootPathNodeRefMaps.put(name, rootPathNodeRefMap);
- }
- return rootPathNodeRefMap;
- }
-
- /**
- * Utility method to resolve paths to nodes.
- */
- NodeRef resolvePath(HomeFolderProvider2 provider, String pathToResolve)
- {
- List refs = serviceRegistry.getSearchService().selectNodes(
- serviceRegistry.getNodeService().getRootNode(getStoreRef(provider)),
- pathToResolve, null,
- serviceRegistry.getNamespaceService(), false);
- if (refs.size() != 1)
- {
- throw new IllegalStateException("Non-unique path: found : " +
- pathToResolve + " " + refs.size());
- }
- return refs.get(0);
- }
-
- /**
- * Helper method for {@link HomeFolderProvider2.getHomeFolder(NodeRef)}
- * implementations to return a {@link HomeSpaceNodeRef}
- * @param referenceRootNode indicates that a reference to the root node
- * should be returned if the home folder property on the person
- * has not yet been set.
- */
- public HomeSpaceNodeRef getHomeFolder(HomeFolderProvider2 provider, NodeRef person, boolean referenceRootNode)
- {
- HomeSpaceNodeRef homeSpaceNodeRef = null;
- NodeRef existingHomeFolder = DefaultTypeConverter.INSTANCE.convert(
- NodeRef.class, serviceRegistry.getNodeService().getProperty(
- person, ContentModel.PROP_HOMEFOLDER));
- if (existingHomeFolder != null)
- {
- homeSpaceNodeRef = new HomeSpaceNodeRef(existingHomeFolder,
- HomeSpaceNodeRef.Status.VALID);
- }
- else if (referenceRootNode)
- {
- homeSpaceNodeRef = new HomeSpaceNodeRef(getRootPathNodeRef(provider),
- HomeSpaceNodeRef.Status.REFERENCED);
- }
- else
- {
- FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
- List homeFolderPath = provider.getHomeFolderPath(person);
-
- FileInfo fileInfo;
-
- // Test if it already exists
- NodeRef existing = getExisting(provider, fileFolderService, homeFolderPath);
- if (existing != null)
- {
- fileInfo = fileFolderService.getFileInfo(existing);
- }
- else
- {
- fileInfo = createTree(provider, getRootPathNodeRef(provider), homeFolderPath,
- provider.getTemplateNodeRef(), fileFolderService);
- }
- NodeRef homeFolderNodeRef = fileInfo.getNodeRef();
- return new HomeSpaceNodeRef(homeFolderNodeRef, HomeSpaceNodeRef.Status.CREATED);
- }
- return homeSpaceNodeRef;
- }
-
- private NodeRef getExisting(HomeFolderProvider2 provider, FileFolderService fileFolderService,
- List homeFolderPath)
- {
- NodeRef existing;
- try
- {
- FileInfo existingFileInfo = fileFolderService.resolveNamePath(getRootPathNodeRef(provider), homeFolderPath);
- existing = existingFileInfo.getNodeRef();
- }
- catch (FileNotFoundException fnfe)
- {
- existing = null;// home folder noderef doesn't exist yet
- }
- return existing;
- }
-
- /**
- * creates a tree of folder nodes based on the path elements provided.
- */
- private FileInfo createTree(HomeFolderProvider2 provider, NodeRef root,
- List homeFolderPath, NodeRef templateNodeRef,
- FileFolderService fileFolderService)
- {
- NodeRef newParent = createNewParentIfRequired(root, homeFolderPath, fileFolderService);
- String homeFolderName = homeFolderPath.get(homeFolderPath.size()-1);
- FileInfo fileInfo;
- if (templateNodeRef == null)
- {
- fileInfo = fileFolderService.create(
- newParent,
- homeFolderName,
- ContentModel.TYPE_FOLDER);
- }
- else
- {
- try
- {
- fileInfo = fileFolderService.copy(
- templateNodeRef,
- newParent,
- homeFolderName);
- }
- catch (FileNotFoundException e)
- {
- throw new PersonException("Invalid template to create home space");
- }
- }
- return fileInfo;
- }
-
- private NodeRef createNewParentIfRequired(NodeRef root,
- List homeFolderPath, FileFolderService fileFolderService)
- {
- if (homeFolderPath.size() > 1)
- {
- List parentPath = new ArrayList(homeFolderPath);
- parentPath.remove(parentPath.size()-1);
- return FileFolderUtil.makeFolders(fileFolderService, root,
- parentPath, ContentModel.TYPE_FOLDER).getNodeRef();
- }
- else
- {
- return root;
- }
- }
-}
+}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderProvider2.java b/source/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
index 36900ccf3d..d31981ca48 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderProvider2.java
@@ -24,7 +24,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
/**
* Interface for home folder providers. Instances work with the
- * {@link HomeFolderManager} (which performs most of the work)
+ * {@link PortableHomeFolderManager} (which performs most of the work)
* to allow it to create home folders in custom locations.
*
* The home folder may be a simple structure where all users share a root folder (See
@@ -94,8 +94,8 @@ public interface HomeFolderProvider2
PermissionsManager getOnReferencePermissionsManager();
/**
- * Callback from {@link HomeFolderManager} to locate or create a home folder.
- * Implementations normally call {@link HomeFolderManager.getHomeFolder}.
+ * Callback from {@link PortableHomeFolderManager} to locate or create a home folder.
+ * Implementations normally call {@link PortableHomeFolderManager.getHomeFolder}.
*/
HomeSpaceNodeRef getHomeFolder(NodeRef person);
}
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
index 9d7dfd6e07..c5cff08223 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import org.alfresco.model.ContentModel;
@@ -102,30 +101,28 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
{
private static final Log logger = LogFactory.getLog(HomeFolderProviderSynchronizer.class);
- private static final String ENABLED_PROPERTY_NAME = "home_folder_provider_synchronizer.enabled";
- private static final String OVERRIDE_PROPERTY_NAME = "home_folder_provider_synchronizer.override_provider";
- private static final String KEEP_EMPTY_PARENTS_PROPERTY_NAME = "home_folder_provider_synchronizer.keep_empty_parents";
-
private static final String GUEST_HOME_FOLDER_PROVIDER = "guestHomeFolderProvider";
private static final String BOOTSTRAP_HOME_FOLDER_PROVIDER = "bootstrapHomeFolderProvider";
- private final Properties properties;
private final TransactionService transactionService;
private final AuthorityService authorityService;
private final PersonService personService;
private final FileFolderService fileFolderService;
private final NodeService nodeService;
- private final HomeFolderManager homeFolderManager;
+ private final PortableHomeFolderManager homeFolderManager;
private final TenantAdminService tenantAdminService;
+
+ private boolean enabled;
+ private String overrideHomeFolderProviderName;
+ private boolean keepEmptyParents;
- public HomeFolderProviderSynchronizer(Properties properties,
+ public HomeFolderProviderSynchronizer(
TransactionService transactionService,
AuthorityService authorityService, PersonService personService,
FileFolderService fileFolderService, NodeService nodeService,
- HomeFolderManager homeFolderManager,
+ PortableHomeFolderManager homeFolderManager,
TenantAdminService tenantAdminService)
{
- this.properties = properties;
this.transactionService = transactionService;
this.authorityService = authorityService;
this.personService = personService;
@@ -135,19 +132,34 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
this.tenantAdminService = tenantAdminService;
}
+ public void setEnabled(String enabled)
+ {
+ this.enabled = "true".equalsIgnoreCase(enabled);
+ }
+
private boolean enabled()
{
- return "true".equalsIgnoreCase(properties.getProperty(ENABLED_PROPERTY_NAME));
+ return enabled;
+ }
+
+ public void setOverrideHomeFolderProviderName(String overrideHomeFolderProviderName)
+ {
+ this.overrideHomeFolderProviderName = overrideHomeFolderProviderName;
}
private String getOverrideHomeFolderProviderName()
{
- return properties.getProperty(OVERRIDE_PROPERTY_NAME);
+ return overrideHomeFolderProviderName;
+ }
+
+ public void setKeepEmptyParents(String keepEmptyParents)
+ {
+ this.keepEmptyParents = "true".equalsIgnoreCase(keepEmptyParents);
}
private boolean keepEmptyParents()
{
- return "true".equalsIgnoreCase(properties.getProperty(KEEP_EMPTY_PARENTS_PROPERTY_NAME));
+ return keepEmptyParents;
}
@Override
@@ -865,7 +877,10 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
public HomeFolderHandler(NodeRef person, String overrideProviderName)
{
this.person = person;
- this.overrideProviderName = overrideProviderName;
+ this.overrideProviderName =
+ (overrideProviderName == null || overrideProviderName.trim().isEmpty())
+ ? null
+ : overrideProviderName;
}
public void doWork()
diff --git a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
index 5d54406543..498295271d 100644
--- a/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
+++ b/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizerTest.java
@@ -77,14 +77,13 @@ public class HomeFolderProviderSynchronizerTest
private static ServiceRegistry serviceRegistry;
private static TransactionService transactionService;
private static FileFolderService fileFolderService;
- private static PersonService personService;
+ private static PersonServiceImpl personService;
private static NodeService nodeService;
private static ContentService contentService;
private static AuthorityService authorityService;
private static TenantAdminService tenantAdminService;
private static TenantService tenantService;
- private static HomeFolderManager homeFolderManager;
- private static Properties properties;
+ private static PortableHomeFolderManager homeFolderManager;
private static RegexHomeFolderProvider largeHomeFolderProvider;
private static String largeHomeFolderProviderName;
private static RegexHomeFolderProvider testHomeFolderProvider;
@@ -104,18 +103,17 @@ public class HomeFolderProviderSynchronizerTest
serviceRegistry = (ServiceRegistry) applicationContext.getBean("ServiceRegistry");
transactionService = (TransactionService) applicationContext.getBean("transactionService");
fileFolderService = (FileFolderService) applicationContext.getBean("fileFolderService");
- personService = (PersonService) applicationContext.getBean("personService");
+ personService = (PersonServiceImpl) applicationContext.getBean("personService");
nodeService = (NodeService) applicationContext.getBean("nodeService");
contentService = (ContentService) applicationContext.getBean("contentService");
authorityService = (AuthorityService) applicationContext.getBean("authorityService");
tenantAdminService = (TenantAdminService) applicationContext.getBean("tenantAdminService");
tenantService = (TenantService) applicationContext.getBean("tenantService");
- homeFolderManager = (HomeFolderManager) applicationContext.getBean("homeFolderManager");
+ homeFolderManager = (PortableHomeFolderManager) applicationContext.getBean("homeFolderManager");
largeHomeFolderProvider = (RegexHomeFolderProvider) applicationContext.getBean("largeHomeFolderProvider");
largeHomeFolderProviderName = largeHomeFolderProvider.getName();
storeUrl = largeHomeFolderProvider.getStoreUrl();
origRootPath = largeHomeFolderProvider.getRootPath();
- properties = (Properties) applicationContext.getBean("global-properties");
personService.setCreateMissingPeople(true);
@@ -144,7 +142,7 @@ public class HomeFolderProviderSynchronizerTest
homeFolderManager.addProvider(testHomeFolderProvider);
homeFolderProviderSynchronizer = new HomeFolderProviderSynchronizer(
- properties, transactionService, authorityService,
+ transactionService, authorityService,
personService, fileFolderService, nodeService,
homeFolderManager, tenantAdminService);
}
@@ -152,9 +150,9 @@ public class HomeFolderProviderSynchronizerTest
@Before
public void setUp() throws Exception
{
- properties.setProperty("home_folder_provider_synchronizer.enabled", "true");
- properties.remove("home_folder_provider_synchronizer.override_provider");
- properties.remove("home_folder_provider_synchronizer.keep_empty_parents");
+ homeFolderProviderSynchronizer.setEnabled("true");
+ homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(null);
+ homeFolderProviderSynchronizer.setKeepEmptyParents("false");
largeHomeFolderProvider.setPattern("^(..)");
testHomeFolderProvider.setRootPath(origRootPath);
@@ -323,7 +321,7 @@ public class HomeFolderProviderSynchronizerTest
properties.put(ContentModel.PROP_EMAIL, emailAddress);
properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, testHomeFolderProviderName);
properties.put(PROP_PARENT_PATH, parentPath);
- homeFolderManager.setEnableHomeFolderCreationAsPeopleAreCreated(createHomeDirectory);
+ personService.setHomeFolderCreationEager(createHomeDirectory);
NodeRef person = personService.createPerson(properties);
assertNotNull("The person nodeRef for "+domainUsername+" should have been created", person);
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(
@@ -598,7 +596,7 @@ public class HomeFolderProviderSynchronizerTest
public void testNotEnabled() throws Exception
{
createUser("", "fred");
- properties.remove("home_folder_provider_synchronizer.enabled");
+ homeFolderProviderSynchronizer.setEnabled("false");
moveUserHomeFolders();
@@ -670,7 +668,7 @@ public class HomeFolderProviderSynchronizerTest
public void testKeepEmptyParents() throws Exception
{
createUser("a/bb/ccc", "peter");
- properties.put("home_folder_provider_synchronizer.keep_empty_parents", "true");
+ homeFolderProviderSynchronizer.setKeepEmptyParents("true");
moveUserHomeFolders();
@@ -746,7 +744,7 @@ public class HomeFolderProviderSynchronizerTest
createFolder("Temporary3");
// Don't delete the temporary folder
- properties.put("home_folder_provider_synchronizer.keep_empty_parents", "true");
+ homeFolderProviderSynchronizer.setKeepEmptyParents("true");
moveUserHomeFolders();
@@ -837,7 +835,7 @@ public class HomeFolderProviderSynchronizerTest
moveUserHomeFolders();
assertHomeFolderLocation("fred", "fr/fred");
- properties.put("home_folder_provider_synchronizer.override_provider",
+ homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(
testHomeFolderProviderName);
moveUserHomeFolders();
@@ -851,7 +849,7 @@ public class HomeFolderProviderSynchronizerTest
public void testNoOriginalProvider() throws Exception
{
createUser("a/b/c", "fred", null, true);
- properties.put("home_folder_provider_synchronizer.override_provider",
+ homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(
largeHomeFolderProviderName);
moveUserHomeFolders();
@@ -885,7 +883,7 @@ public class HomeFolderProviderSynchronizerTest
createUser("a/b/c", "fred");
- properties.put("home_folder_provider_synchronizer.override_provider", name);
+ homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(name);
moveUserHomeFolders();
assertHomeFolderLocation("fred", "a/b/c/fred");
@@ -911,7 +909,7 @@ public class HomeFolderProviderSynchronizerTest
createUser("a/b/c", "fred");
- properties.put("home_folder_provider_synchronizer.override_provider", name);
+ homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(name);
moveUserHomeFolders();
assertHomeFolderLocation("fred", "fred");
diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
index 105681900f..21989ac568 100644
--- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
@@ -49,7 +49,6 @@ import org.alfresco.repo.node.getchildren.FilterPropString;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory;
import org.alfresco.repo.node.getchildren.FilterPropString.FilterTypeString;
-import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.search.SearcherException;
@@ -135,7 +134,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
private NamespacePrefixResolver namespacePrefixResolver;
private HomeFolderManager homeFolderManager;
private PolicyComponent policyComponent;
- private BehaviourFilter policyBehaviourFilter;
private AclDAO aclDao;
private PermissionsManager permissionsManager;
private RepoAdminService repoAdminService;
@@ -161,7 +159,9 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
private JavaBehaviour beforeCreateNodeValidationBehaviour;
private JavaBehaviour beforeDeleteNodeValidationBehaviour;
-
+
+ private boolean homeFolderCreationEager;
+
static
{
Set props = new HashSet();
@@ -305,11 +305,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
this.policyComponent = policyComponent;
}
- public void setPolicyBehaviourFilter(BehaviourFilter policyBehaviourFilter)
- {
- this.policyBehaviourFilter = policyBehaviourFilter;
- }
-
public void setStoreUrl(String storeUrl)
{
this.storeRef = new StoreRef(storeUrl);
@@ -350,6 +345,15 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
this.homeFolderManager = homeFolderManager;
}
+ /**
+ * Indicates if home folders should be created when the person
+ * is created or delayed until first accessed.
+ */
+ public void setHomeFolderCreationEager(boolean homeFolderCreationEager)
+ {
+ this.homeFolderCreationEager = homeFolderCreationEager;
+ }
+
public void setAclDAO(AclDAO aclDao)
{
this.aclDao = aclDao;
@@ -809,16 +813,27 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
{
public Object execute() throws Throwable
{
- homeFolderManager.makeHomeFolder(ref);
+ makeHomeFolderAsSystem(ref);
return null;
}
}, transactionService.isReadOnly(), transactionService.isReadOnly() ? false : AlfrescoTransactionSupport.getTransactionReadState() == TxnReadState.TXN_READ_ONLY);
- //homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class, nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
- //assert(homeFolder != null);
}
}
}
+ private void makeHomeFolderAsSystem(final ChildAssociationRef childAssocRef)
+ {
+ AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork