(){
+
+ private Long next = fetchNext();
+
+ private Long fetchNext()
+ {
+ Long next;
+ if (rs.next())
+ {
+ next = rs.getLong(0);
+ }
+ else
+ {
+ next = null;
+ rs.close();
+ }
+ return next;
+ }
+
+ public boolean hasNext()
+ {
+ return next != null;
+ }
+
+ public Long next()
+ {
+ if (!hasNext())
+ {
+ throw new IllegalStateException();
+ }
+ Long oldNext = next;
+ next = fetchNext();
+ return oldNext;
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }};
}
- // Compute qname crc
- Long dbQNameCrc = (Long) rs.get(4);
- Long namespaceId = (Long) rs.get(5);
- String namespace = qnameDAO.getNamespace(namespaceId).getSecond();
- String localName = (String) rs.get(6);
- QName qname = QName.createQName(namespace, localName);
- long utf8QNameCrc = ChildAssocImpl.getCrc(qname);
-
- // Check
- if (dbChildCrc != null && utf8ChildCrc == dbChildCrc.longValue() && dbQNameCrc != null && utf8QNameCrc == dbQNameCrc.longValue())
+ @Override
+ public int size()
{
- // It is a match, so ignore
- continue;
+ return sizeEstimate;
}
- childAssocIds.add(assocId);
- }
+
+ };
}
catch (Throwable e)
{
- logger.error("Failed to query for child name CRCs", e);
- writeLine("Failed to query for child name CRCs: " + e.getMessage());
- throw new PatchException("Failed to query for child name CRCs", e);
+ logger.error("Failed to query for child association IDs", e);
+ writeLine("Failed to query for child association IDs: " + e.getMessage());
+ throw new PatchException("Failed to query for child association IDs", e);
}
- finally
- {
- if (rs != null)
- {
- try { rs.close(); } catch (Throwable e) { writeLine("Failed to close resultset: " + e.getMessage()); }
- }
- }
- return childAssocIds;
}
/**
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
new file mode 100644
index 0000000000..fdbb162e1e
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.domain.mimetype.MimetypeDAO;
+import org.alfresco.repo.domain.patch.PatchDAO;
+import org.alfresco.repo.search.Indexer;
+import org.alfresco.repo.search.IndexerAndSearcher;
+import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * A patch to update the value of a Mimetype.
+ *
+ * This patch will only work fully if the content URL data has been fully normalized.
+ * It supports renaming to existing, currently-used mimetypes as well as to
+ * mimetypes that have not been used before.
+ *
+ * @author Derek Hulley
+ * @since 3.3 SP1
+ */
+public class GenericMimetypeRenamePatch extends AbstractPatch
+{
+ private static final String MSG_START = "patch.genericMimetypeUpdate.start";
+ private static final String MSG_UPDATED = "patch.genericMimetypeUpdate.updated";
+ private static final String MSG_INDEXED = "patch.genericMimetypeUpdate.indexed";
+ private static final String MSG_DONE = "patch.genericMimetypeUpdate.done";
+ private static final String MSG_DONE_REINDEX = "patch.genericMimetypeUpdate.doneReindex";
+
+ /* Helper DAOs */
+ private IndexerAndSearcher indexerAndSearcher;
+ private MimetypeDAO mimetypeDAO;
+ private PatchDAO patchDAO;
+
+ /** Mimetype mappings */
+ private Map mimetypeMappings;
+ private boolean reindex;
+
+ public void setIndexerAndSearcher(IndexerAndSearcher indexerAndSearcher)
+ {
+ this.indexerAndSearcher = indexerAndSearcher;
+ }
+
+ public void setMimetypeDAO(MimetypeDAO mimetypeDAO)
+ {
+ this.mimetypeDAO = mimetypeDAO;
+ }
+
+ public void setPatchDAO(PatchDAO patchDAO)
+ {
+ this.patchDAO = patchDAO;
+ }
+
+ public void setMimetypeMappings(Map mimetypeMappings)
+ {
+ this.mimetypeMappings = mimetypeMappings;
+ }
+
+ public void setReindex(boolean reindex)
+ {
+ this.reindex = reindex;
+ }
+
+ protected void checkProperties()
+ {
+ super.checkProperties();
+ checkPropertyNotNull(indexerAndSearcher, "indexerAndSearcher");
+ checkPropertyNotNull(mimetypeDAO, "mimetypeDAO");
+ checkPropertyNotNull(patchDAO, "patchDAO");
+ checkPropertyNotNull(mimetypeMappings, "mimetypeMappings");
+ }
+
+ @Override
+ protected String applyInternal() throws Exception
+ {
+ // First get all the available stores that we might want to reindex
+ List storeRefsList = nodeService.getStores();
+ Set storeRefs = new HashSet();
+ for (StoreRef storeRef : storeRefsList)
+ {
+ // We want workspace://SpacesStore or related MT stores
+ if (storeRef.getIdentifier().endsWith("SpacesStore"))
+ {
+ storeRefs.add(storeRef);
+ }
+ }
+
+ StringBuilder result = new StringBuilder(I18NUtil.getMessage(MSG_START));
+ for (Map.Entry element : mimetypeMappings.entrySet())
+ {
+ String oldMimetype = element.getKey();
+ String newMimetype = element.getValue();
+
+ // First check if the mimetype is used at all
+ Pair oldMimetypePair = mimetypeDAO.getMimetype(oldMimetype);
+ if (oldMimetypePair == null)
+ {
+ // Not used
+ continue;
+ }
+
+ // Check if the new mimetype exists
+ Pair newMimetypePair = mimetypeDAO.getMimetype(newMimetype);
+ int updateCount = 0;
+ if (newMimetypePair == null)
+ {
+ // Easy, just rename the old one
+ updateCount = mimetypeDAO.updateMimetype(oldMimetype, newMimetype);
+ }
+ else
+ {
+ // We need to move all the old references to the new ones
+ Long oldMimetypeId = oldMimetypePair.getFirst();
+ Long newMimetypeId = mimetypeDAO.getOrCreateMimetype(newMimetype).getFirst();
+ updateCount = patchDAO.updateContentMimetypeIds(oldMimetypeId, newMimetypeId);
+ }
+ result.append(I18NUtil.getMessage(MSG_UPDATED, updateCount, oldMimetype, newMimetype));
+ if (reindex)
+ {
+ // Update Lucene
+ int reindexCount = 0;
+ for (StoreRef storeRef : storeRefs)
+ {
+ reindexCount += reindex(oldMimetype, storeRef);
+ result.append(I18NUtil.getMessage(MSG_INDEXED, reindexCount, storeRef));
+ }
+ }
+ }
+ // Done
+ if (reindex)
+ {
+ result.append(I18NUtil.getMessage(MSG_DONE));
+ }
+ else
+ {
+ result.append(I18NUtil.getMessage(MSG_DONE_REINDEX));
+ }
+
+ return result.toString();
+ }
+
+ private int reindex(String oldMimetype, StoreRef store)
+ {
+ SearchParameters sp = new SearchParameters();
+ sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+ sp.setQuery("@" + LuceneQueryParser.escape(ContentModel.PROP_CONTENT.toString()) +
+ ".mimetype:\"" + oldMimetype + "\"");
+ sp.addStore(store);
+ Indexer indexer = indexerAndSearcher.getIndexer(store);
+ ResultSet rs = null;
+ int count = 0;
+ try
+ {
+ rs = searchService.query(sp);
+ count = rs.length();
+ for (ResultSetRow row : rs)
+ {
+ indexer.updateNode(row.getNodeRef());
+ }
+ }
+ finally
+ {
+ if (rs != null)
+ {
+ rs.close();
+ }
+ }
+ return count;
+ }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
index 8c9b1dcdc9..b581b7098f 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
@@ -19,7 +19,6 @@
package org.alfresco.repo.admin.patch.impl;
import org.alfresco.error.AlfrescoRuntimeException;
-import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -28,6 +27,7 @@ import org.alfresco.repo.version.VersionMigrator;
import org.alfresco.service.cmr.repository.StoreRef;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
/**
* Migrate version store from workspace://lightWeightVersionStore to workspace://version2Store
@@ -36,13 +36,16 @@ public class MigrateVersionStorePatch extends AbstractPatch
{
private static Log logger = LogFactory.getLog(MigrateVersionStorePatch.class);
- private static final String MSG_SUCCESS = "patch.migrateVersionStore.result";
+ private static final String MSG_DONE = "patch.migrateVersionStore.done";
+ private static final String MSG_INCOMPLETE = "patch.migrateVersionStore.incomplete";
private VersionMigrator versionMigrator;
private TenantService tenantService;
private ImporterBootstrap version2ImporterBootstrap;
private int batchSize = 1;
+ private int threadCount = 2;
+
private boolean deleteImmediately = false;
public void setVersionMigrator(VersionMigrator versionMigrator)
@@ -65,6 +68,11 @@ public class MigrateVersionStorePatch extends AbstractPatch
this.batchSize = batchSize;
}
+ public void setThreadCount(int threadCount)
+ {
+ this.threadCount = threadCount;
+ }
+
public void setDeleteImmediately(boolean deleteImmediately)
{
this.deleteImmediately = deleteImmediately;
@@ -79,28 +87,45 @@ public class MigrateVersionStorePatch extends AbstractPatch
throw new AlfrescoRuntimeException(errorMessage);
}
+ if (threadCount < 1)
+ {
+ String errorMessage = "threadCount ("+threadCount+") cannot be less than 1";
+ logger.error(errorMessage);
+ throw new AlfrescoRuntimeException(errorMessage);
+ }
+
super.init();
}
@Override
protected String applyInternal() throws Exception
{
- if (tenantService.isEnabled() && tenantService.isTenantUser())
- {
- // bootstrap new version store
+ if (tenantService.isEnabled() && tenantService.isTenantUser())
+ {
+ // bootstrap new version store
StoreRef bootstrapStoreRef = version2ImporterBootstrap.getStoreRef();
- bootstrapStoreRef = tenantService.getName(AuthenticationUtil.getRunAsUser(), bootstrapStoreRef);
+ bootstrapStoreRef = tenantService.getName(AuthenticationUtil.getRunAsUser(), bootstrapStoreRef);
version2ImporterBootstrap.setStoreUrl(bootstrapStoreRef.toString());
-
+
version2ImporterBootstrap.bootstrap();
- }
-
- int vhCount = versionMigrator.migrateVersions(batchSize, deleteImmediately);
-
- // build the result message
- String msg = I18NUtil.getMessage(MSG_SUCCESS, vhCount);
+ }
- // done
- return msg;
+ if (AuthenticationUtil.getRunAsUser() == null)
+ {
+ logger.info("Set system user");
+ AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
+ }
+
+ boolean completed = versionMigrator.migrateVersions(batchSize, threadCount, deleteImmediately);
+
+ // return the result message
+ if (completed)
+ {
+ return I18NUtil.getMessage(MSG_DONE);
+ }
+ else
+ {
+ return I18NUtil.getMessage(MSG_INCOMPLETE);
+ }
}
}
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
index 442f724ffb..95718e4d1e 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
@@ -34,18 +34,20 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
*/
public class AVMCrawlTestP extends AVMServiceTestBase
{
- public void testCrawlA()
+ /*
+ public void xtestCrawlA()
{
testCrawl(1,
"source/java/org/alfresco/repo/avm/actions", // relative from .../repository
1,
30000); // 30 secs
}
+ */
public void testCrawlB()
{
testCrawl(2,
- "source/java/org/alfresco/repo/avm", // relative from .../repository
+ "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
2,
30000); // 30 secs
}
diff --git a/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java b/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
index 2a7a4faeca..a483ce644b 100644
--- a/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
@@ -31,20 +31,22 @@ public class AVMDiffPerformanceTest extends AVMServiceTestBase
super.testSetup();
}
- public void xtest_1000() throws Exception
+ public void test_1000() throws Exception
{
runTest(1000);
}
- public void ytest_10000() throws Exception
- {
- runTest(10000);
- }
-
- public void test_2000() throws Exception
+ public void xtest_2000() throws Exception
{
runTest(2000);
}
+
+ /*
+ public void xtest_10000() throws Exception
+ {
+ runTest(10000);
+ }
+ */
private void runTest(final int cnt) throws Exception
{
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java b/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
index 5891375538..95cc2ec762 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
@@ -26,13 +26,42 @@ import org.alfresco.repo.search.impl.lucene.AVMLuceneIndexer;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.TriggerBean;
/**
* Test AVMService indexing
*/
public class AVMServiceIndexTest extends AVMServiceTestBase
{
- private final static long SLEEP = 180000;
+ /*
+ private final static long SLEEP = 180000; // 3 mins (default, where startDelay & repeatInterval are both 1 min)
+ private final static long START_DELAY_MSECS = 1000 * 60;
+ private final static long REPEAT_INTERVAL_MSECS = 1000 * 60;
+ */
+
+ private final static long SLEEP = 10000;
+ private final static long START_DELAY_MSECS = 2000;
+ private final static long REPEAT_INTERVAL_MSECS = 2000;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ //
+ // override default schedule to speed up this unit test (by reducing the sleep time)
+ //
+
+ TriggerBean ftsIndexerTrigger = (TriggerBean)fContext.getBean("ftsIndexerTrigger");
+
+ ftsIndexerTrigger.destroy(); // unschedule
+
+ ftsIndexerTrigger.setStartDelay(START_DELAY_MSECS);
+ ftsIndexerTrigger.setRepeatInterval(REPEAT_INTERVAL_MSECS);
+
+ ftsIndexerTrigger.afterPropertiesSet(); // re-schedule
+ }
+
/**
* Test async indexing.
*
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
index 2d65096610..710827b1ac 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
@@ -76,7 +76,7 @@ public class AVMServiceLocalTest extends TestCase
protected ApplicationContext fContext;
protected NameMatcher excluder;
-
+
protected void setUp() throws Exception
{
@@ -880,38 +880,56 @@ public class AVMServiceLocalTest extends TestCase
*/
public void testBulkUpdateLD() throws Exception
{
+ //String LOAD_DIR = "config/alfresco/bootstrap";
+ String LOAD_DIR = "source/java/org/alfresco/repo/avm/actions";
+
+ String[] split = LOAD_DIR.split("/");
+ String DIR = split[split.length-1];
+
try
{
RemoteBulkLoader loader = new RemoteBulkLoader();
loader.setAvmRemoteService(fService);
fService.createLayeredDirectory("main:/", "layer:/", "layer");
- loader.recursiveLoad("config/alfresco/bootstrap", "layer:/layer");
+
+ loader.recursiveLoad(LOAD_DIR, "layer:/layer");
+
+
+
List diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
assertEquals(1, diffs.size());
- assertEquals("[layer:/layer/bootstrap[-1] > main:/bootstrap[-1]]", diffs.toString());
+ assertEquals("[layer:/layer/"+DIR+"[-1] > main:/"+DIR+"[-1]]", diffs.toString());
+
fService.createSnapshot("layer", null, null);
fSyncService.update(diffs, null, false, false, false, false, null, null);
fService.createSnapshot("main", null, null);
+
diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
assertEquals(0, diffs.size());
+
fSyncService.flatten("layer:/layer", "main:/");
recursiveList("layer");
recursiveList("main");
fService.createStore("layer2");
fService.createLayeredDirectory("layer:/layer", "layer2:/", "layer");
- loader.recursiveLoad("config/alfresco/bootstrap", "layer2:/layer/bootstrap");
+
+ loader.recursiveLoad(LOAD_DIR, "layer2:/layer/"+DIR);
+
fService.createSnapshot("layer2", null, null);
diffs = fSyncService.compare(-1, "layer2:/layer", -1, "layer:/layer", null);
assertEquals(1, diffs.size());
- assertEquals("[layer2:/layer/bootstrap/bootstrap[-1] > layer:/layer/bootstrap/bootstrap[-1]]", diffs.toString());
+ assertEquals("[layer2:/layer/"+DIR+"/"+DIR+"[-1] > layer:/layer/"+DIR+"/"+DIR+"[-1]]", diffs.toString());
+
fSyncService.update(diffs, null, false, false, false, false, null, null);
diffs = fSyncService.compare(-1, "layer2:/layer", -1, "layer:/layer", null);
assertEquals(0, diffs.size());
+
fSyncService.flatten("layer2:/layer", "layer:/layer");
diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
assertEquals(1, diffs.size());
- assertEquals("[layer:/layer/bootstrap/bootstrap[-1] > main:/bootstrap/bootstrap[-1]]", diffs.toString());
+ assertEquals("[layer:/layer/"+DIR+"/"+DIR+"[-1] > main:/"+DIR+"/"+DIR+"[-1]]", diffs.toString());
+
recursiveList("layer2");
recursiveList("layer");
recursiveList("main");
@@ -923,7 +941,7 @@ public class AVMServiceLocalTest extends TestCase
}
finally
{
- fService.purgeStore("layer2");
+ if (fService.getStore("layer2") != null) { fService.purgeStore("layer2"); }
}
}
diff --git a/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java b/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
index 35e16b8f6b..9a59204ef4 100644
--- a/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
@@ -36,30 +36,32 @@ public class AVMServicePerfTest extends AVMServiceTestBase
add(100, 10);
}
- public void testAdd100x10b() throws Throwable
+ /*
+ public void xtestAdd100x10b() throws Throwable
{
add(100, 10);
}
- public void testAdd100x10c() throws Throwable
+ public void xtestAdd100x10c() throws Throwable
{
add(100, 10);
}
- public void testAdd100x10d() throws Throwable
+ public void xtestAdd100x10d() throws Throwable
{
add(100, 10);
}
- public void testAdd500x2e() throws Throwable
+ public void xtestAdd500x2e() throws Throwable
{
add(500, 2);
}
- public void testAdd500x4g() throws Throwable
+ public void xtestAdd500x4g() throws Throwable
{
add(500, 4);
}
+ */
/**
* Test adding 100 files to each of 10 directories.
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 343f8e6377..f4c81e96aa 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -51,8 +50,6 @@ import org.alfresco.repo.avm.actions.SimpleAVMSubmitAction;
import org.alfresco.repo.avm.util.BulkLoader;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager;
-import org.alfresco.repo.search.impl.lucene.ADMLuceneSearcherImpl;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -71,7 +68,6 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.remote.RepoRemote;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
@@ -767,15 +763,35 @@ public class AVMServiceTest extends AVMServiceTestBase
ArrayList times = new ArrayList();
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
- loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
- times.add(System.currentTimeMillis());
+
+ assertEquals(1, fService.getStoreVersions("main").size());
+
+ loader.recursiveLoad("source/java/org/alfresco/repo/avm/actions", "main:/");
+
+ long time = System.currentTimeMillis();
+ times.add(time);
+ while(! (System.currentTimeMillis() > time)) { }
+
assertEquals(1, fService.createSnapshot("main", null, null).get("main").intValue());
- loader.recursiveLoad("source/java/org/alfresco/repo/action", "main:/");
- times.add(System.currentTimeMillis());
+
+ loader.recursiveLoad("source/java/org/alfresco/repo/avm/ibatis", "main:/");
+
+ time = System.currentTimeMillis();
+ times.add(time);
+ while(! (System.currentTimeMillis() > time)) { }
+
assertEquals(2, fService.createSnapshot("main", null, null).get("main").intValue());
- loader.recursiveLoad("source/java/org/alfresco/repo/audit", "main:/");
- times.add(System.currentTimeMillis());
+
+ loader.recursiveLoad("source/java/org/alfresco/repo/avm/locking", "main:/");
+
+ time = System.currentTimeMillis();
+ times.add(time);
+ while(! (System.currentTimeMillis() > time)) { }
+
assertEquals(3, fService.createSnapshot("main", null, null).get("main").intValue());
+
+ assertEquals(4, fService.getStoreVersions("main").size());
+
assertEquals(1, fService.getStoreVersions("main", null, new Date(times.get(0))).size());
assertEquals(3, fService.getStoreVersions("main", new Date(times.get(0)), null).size());
assertEquals(2, fService.getStoreVersions("main", new Date(times.get(1)), new Date(System.currentTimeMillis())).size());
@@ -2919,26 +2935,40 @@ public class AVMServiceTest extends AVMServiceTestBase
*/
public void testVersionUpdate() throws Exception
{
+ //String LOAD_DIR1 = "config/alfresco/bootstrap";
+ //String LOAD_DIR2 = "config/alfresco/extension";
+
+ String LOAD_DIR1 = "source/java/org/alfresco/repo/avm/actions";
+ String LOAD_DIR2 = "source/java/org/alfresco/repo/avm/ibatis";
+
+ String[] split1 = LOAD_DIR1.split("/");
+ String DIR1 = split1[split1.length-1];
+
+ String[] split2 = LOAD_DIR2.split("/");
+ String DIR2 = split2[split2.length-1];
+
+
try
{
BulkLoader loader = new BulkLoader();
loader.setAvmService(fService);
fService.createStore("source");
fService.createStore("dest");
- loader.recursiveLoad("config/alfresco/bootstrap", "source:/");
+
+ loader.recursiveLoad(LOAD_DIR1, "source:/");
int version1 = fService.createSnapshot("source", null, null).get("source");
- loader.recursiveLoad("config/alfresco/extension", "source:/");
+ loader.recursiveLoad(LOAD_DIR2, "source:/");
int version2 = fService.createSnapshot("source", null, null).get("source");
List diffs = fSyncService.compare(version1, "source:/", -1, "dest:/", null);
fService.createSnapshot("dest", null, null);
assertEquals(1, diffs.size());
- assertEquals("[source:/bootstrap[1] > dest:/bootstrap[-1]]", diffs.toString());
+ assertEquals("[source:/"+DIR1+"[1] > dest:/"+DIR1+"[-1]]", diffs.toString());
fSyncService.update(diffs, null, false, false, false, false, null, null);
diffs = fSyncService.compare(version1, "source:/", -1, "dest:/", null);
assertEquals(0, diffs.size());
diffs = fSyncService.compare(version2, "source:/", -1, "dest:/", null);
assertEquals(1, diffs.size());
- assertEquals("[source:/extension[2] > dest:/extension[-1]]", diffs.toString());
+ assertEquals("[source:/"+DIR2+"[2] > dest:/"+DIR2+"[-1]]", diffs.toString());
fSyncService.update(diffs, null, false, false, false, false, null, null);
fService.createSnapshot("dest", null, null);
diffs = fSyncService.compare(version2, "source:/", -1, "dest:/", null);
diff --git a/source/java/org/alfresco/repo/avm/AVMStressTestP.java b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
index e944eeb11a..ae9004a151 100644
--- a/source/java/org/alfresco/repo/avm/AVMStressTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
@@ -29,7 +29,8 @@ import org.alfresco.repo.avm.util.BulkLoader;
*/
public class AVMStressTestP extends AVMServiceTestBase
{
- public void testStressA() throws Throwable
+ /*
+ public void xtestStressA() throws Throwable
{
testNThreads( 1, // nThreads
"source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
@@ -45,11 +46,12 @@ public class AVMStressTestP extends AVMServiceTestBase
0, // snapshot
100); // # ops (for each thread)
}
+ */
public void testStressB() throws Throwable
{
testNThreads( 2, // nThreads
- "source/java/org/alfresco/repo/avm", // relative dir to load from (.../repository)
+ "source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
1, // nCopies
10, // create file
2, // create dir
diff --git a/source/java/org/alfresco/repo/avm/AVMTestSuite.java b/source/java/org/alfresco/repo/avm/AVMTestSuite.java
index f65caee7bf..a4d8c3f0be 100644
--- a/source/java/org/alfresco/repo/avm/AVMTestSuite.java
+++ b/source/java/org/alfresco/repo/avm/AVMTestSuite.java
@@ -24,12 +24,24 @@ import junit.framework.TestSuite;
import org.alfresco.repo.avm.locking.AVMLockingServiceTest;
import org.alfresco.repo.avm.util.VersionPathTest;
import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
/**
* AVM test suite
+ *
+ * @author brittp, janv
*/
public class AVMTestSuite extends TestSuite
{
+ public static ApplicationContext getContext()
+ {
+ ApplicationContextHelper.setUseLazyLoading(false);
+ ApplicationContextHelper.setNoAutoStart(true);
+ return ApplicationContextHelper.getApplicationContext(
+ new String[] { "classpath:alfresco/minimal-context.xml" }
+ );
+ }
+
/**
* Creates the test suite
*
@@ -37,10 +49,11 @@ public class AVMTestSuite extends TestSuite
*/
public static Test suite()
{
+ // Setup the context
+ getContext();
+
TestSuite suite = new TestSuite();
- // Ensure that the default context is available
- ApplicationContextHelper.getApplicationContext();
// Add the tests to be run
@@ -68,7 +81,7 @@ public class AVMTestSuite extends TestSuite
suite.addTestSuite(VersionPathTest.class);
suite.addTestSuite(WCMInheritPermissionsTest.class);
-
+
// This should go last, as its uses a different
// context to the other tests
suite.addTestSuite(AVMServiceRemoteSystemTest.class);
diff --git a/source/java/org/alfresco/repo/avm/PurgeTestP.java b/source/java/org/alfresco/repo/avm/PurgeTestP.java
index be3fc9a202..15317440e4 100644
--- a/source/java/org/alfresco/repo/avm/PurgeTestP.java
+++ b/source/java/org/alfresco/repo/avm/PurgeTestP.java
@@ -142,7 +142,7 @@ public class PurgeTestP extends AVMServiceTestBase
{
fReaper.activate();
- final int maxCycles = 50;
+ final int maxCycles = 100;
int cycles = 0;
while (fReaper.isActive() && (cycles <= maxCycles))
diff --git a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
index 9f0514c1aa..663eb6753e 100644
--- a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
+++ b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
@@ -26,10 +26,12 @@ import org.alfresco.repo.avm.util.BulkLoader;
*/
public class SimultaneousLoadTest extends AVMServiceTestBase
{
- public void testSimulLoadA() throws Throwable
+ /*
+ public void xtestSimulLoadA() throws Throwable
{
testSimultaneousLoad(1,1);
}
+ */
public void testSimulLoadB() throws Throwable
{
@@ -53,7 +55,7 @@ public class SimultaneousLoadTest extends AVMServiceTestBase
for (int i = 0; i < n; i++)
{
//Loader loader = new Loader("/Users/britt/stuff/" + i, "main:/d" + i, m);
- Loader loader = new Loader("source/java/org/alfresco/repo/avm", "main:/d" + i, m);
+ Loader loader = new Loader("source/java/org/alfresco/repo/avm/actions", "main:/d" + i, m);
threads[i] = new Thread(loader);
threads[i].start();
diff --git a/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java b/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
index c9d4c2aade..cfd0a0e629 100644
--- a/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
@@ -35,7 +35,6 @@ import org.alfresco.util.ApplicationContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEventPublisher;
/**
* Abstract base class that provides a set of tests for implementations
@@ -53,7 +52,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
private static Log logger = LogFactory.getLog(AbstractReadOnlyContentStoreTest.class);
- protected ApplicationEventPublisher applicationEventPublisher;
protected TransactionService transactionService;
private UserTransaction txn;
@@ -68,7 +66,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
@Override
public void setUp() throws Exception
{
- applicationEventPublisher = (ApplicationEventPublisher) ctx.getBean("applicationEventPublisher");
transactionService = (TransactionService) ctx.getBean("TransactionService");
txn = transactionService.getUserTransaction();
txn.begin();
diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
index 0c43136de3..5885dc500b 100644
--- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
-import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy;
@@ -57,14 +56,16 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.service.cmr.usage.ContentQuotaException;
-import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.extensions.surf.util.I18NUtil;
/**
* Service implementation acting as a level of indirection between the client
@@ -77,7 +78,7 @@ import org.springframework.context.ApplicationEventPublisher;
* @author Derek Hulley
* @since 3.2
*/
-public class ContentServiceImpl implements ContentService
+public class ContentServiceImpl implements ContentService, ApplicationContextAware
{
private static Log logger = LogFactory.getLog(ContentServiceImpl.class);
@@ -85,7 +86,7 @@ public class ContentServiceImpl implements ContentService
private NodeService nodeService;
private AVMService avmService;
private RetryingTransactionHelper transactionHelper;
- private ApplicationEventPublisher applicationEventPublisher;
+ private ApplicationContext applicationContext;
/** a registry of all available content transformers */
private ContentTransformerRegistry transformerRegistry;
@@ -153,16 +154,14 @@ public class ContentServiceImpl implements ContentService
{
this.imageMagickContentTransformer = imageMagickContentTransformer;
}
-
- /**
- * Sets the application event publisher.
- *
- * @param applicationEventPublisher
- * the new application event publisher
+
+
+ /* (non-Javadoc)
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
- public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
- this.applicationEventPublisher = applicationEventPublisher;
+ this.applicationContext = applicationContext;
}
/**
@@ -171,8 +170,7 @@ public class ContentServiceImpl implements ContentService
public void init()
{
// Set up a temporary store
- this.tempStore = new FileContentStore(this.applicationEventPublisher, TempFileProvider.getTempDir()
- .getAbsolutePath());
+ this.tempStore = new FileContentStore(this.applicationContext, TempFileProvider.getTempDir().getAbsolutePath());
// Bind on update properties behaviour
this.policyComponent.bindClassBehaviour(
diff --git a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
index 52912dda65..f8ec7de94b 100644
--- a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
+++ b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
@@ -86,8 +86,8 @@ public class RoutingContentServiceTest extends TestCase
@Override
public void setUp() throws Exception
{
- transactionService = (TransactionService) ctx.getBean("transactionComponent");
- nodeService = (NodeService) ctx.getBean("dbNodeService");
+ transactionService = (TransactionService) ctx.getBean("TransactionService");
+ nodeService = (NodeService) ctx.getBean("NodeService");
contentService = (ContentService) ctx.getBean(ServiceRegistry.CONTENT_SERVICE.getLocalName());
this.policyComponent = (PolicyComponent) ctx.getBean("policyComponent");
this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
@@ -705,6 +705,7 @@ public class RoutingContentServiceTest extends TestCase
return isDone;
}
+ @SuppressWarnings("unused")
public Throwable getError()
{
return error;
@@ -827,4 +828,98 @@ public class RoutingContentServiceTest extends TestCase
txn.commit();
txn = null;
}
+
+ /**
+ * Ensure that content URLs outside of a transaction are not touched on rollback.
+ */
+ public void testRollbackCleanup_ALF2890() throws Exception
+ {
+ ContentWriter updatingWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
+ updatingWriter.putContent("STEP 1");
+
+ txn.commit();
+ txn = null;
+
+ ContentReader readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
+
+ ContentWriter simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
+ simpleWriter.putContent("STEP 2");
+ readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
+
+ // Update the content
+ nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriter.getContentData());
+ ContentReader readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+
+ simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
+ simpleWriter.putContent("STEP 3");
+ ContentReader readerStep3 = simpleWriter.getReader();
+ assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
+ readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+
+ // Now get a ex-transaction writer but set the content property in a failing transaction
+ // Notice that we have already written "STEP 3" to an underlying binary
+ final ContentData simpleWriterData = simpleWriter.getContentData();
+ RetryingTransactionCallback failToSetPropCallback = new RetryingTransactionCallback()
+ {
+ public Void execute() throws Throwable
+ {
+ nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriterData);
+ throw new RuntimeException("aaa");
+ }
+ };
+ try
+ {
+ transactionService.getRetryingTransactionHelper().doInTransaction(failToSetPropCallback);
+ }
+ catch (RuntimeException e)
+ {
+ if (!e.getMessage().equals("aaa"))
+ {
+ throw e;
+ }
+ // Expected
+ }
+ // The writer data should not have been cleaned up
+ readerStep3 = simpleWriter.getReader();
+ assertTrue("Content was cleaned up when it originated outside of the transaction", readerStep3.exists());
+ assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
+ // The node's content must be unchanged
+ readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+
+ // Test that rollback cleanup works for writers fetched in the same transaction
+ final ContentReader[] readers = new ContentReader[1];
+ RetryingTransactionCallback rollbackCallback = new RetryingTransactionCallback()
+ {
+ public Void execute() throws Throwable
+ {
+ ContentWriter writer = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
+ writer.putContent("UNLUCKY CONTENT");
+ ContentReader reader = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+ assertEquals("Incorrect content", "UNLUCKY CONTENT", reader.getContentString());
+ assertEquals("Incorrect content", "UNLUCKY CONTENT", writer.getReader().getContentString());
+ readers[0] = reader;
+
+ throw new RuntimeException("aaa");
+ }
+ };
+ try
+ {
+ transactionService.getRetryingTransactionHelper().doInTransaction(rollbackCallback);
+ }
+ catch (RuntimeException e)
+ {
+ if (!e.getMessage().equals("aaa"))
+ {
+ throw e;
+ }
+ // Expected
+ }
+ // Make sure that the content has been cleaned up
+ assertFalse("Content was not cleaned up after having been created in-transaction", readers[0].exists());
+ }
}
diff --git a/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java b/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
index b72e7cf183..d8fe7d5eb3 100644
--- a/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
@@ -59,13 +59,13 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
File tempDir = TempFileProvider.getTempDir();
// Create a subdirectory for A
File storeADir = new File(tempDir, "A");
- storeA = new FileContentStore(applicationEventPublisher, storeADir);
+ storeA = new FileContentStore(ctx, storeADir);
// Create a subdirectory for B
File storeBDir = new File(tempDir, "B");
- storeB = new FileContentStore(applicationEventPublisher, storeBDir);
+ storeB = new FileContentStore(ctx, storeBDir);
// Create a subdirectory for C
File storeCDir = new File(tempDir, "C");
- storeC = new DumbReadOnlyFileStore(new FileContentStore(applicationEventPublisher, storeCDir));
+ storeC = new DumbReadOnlyFileStore(new FileContentStore(ctx, storeCDir));
// No subdirectory for D
storeD = new SupportsNoUrlFormatStore();
// Create the routing store
diff --git a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java b/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
index 630e3931c5..2a591554e5 100644
--- a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
+++ b/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
@@ -30,21 +30,23 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.Tenant;
import org.alfresco.repo.tenant.TenantDeployer;
import org.alfresco.repo.tenant.TenantService;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
/**
* Content Store that supports tenant routing, if multi-tenancy is enabled.
*
* Note: Need to initialise before the dictionary service, in the case that models are dynamically loaded for the tenant.
*/
-public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer
+public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer, ApplicationContextAware
{
// cache of tenant file stores
Map tenantFileStores = new ConcurrentHashMap();
private String defaultRootDirectory;
private TenantService tenantService;
- private ApplicationEventPublisher applicationEventPublisher;
+ private ApplicationContext applicationContext;
public void setDefaultRootDir(String defaultRootDirectory)
@@ -56,18 +58,17 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
{
this.tenantService = tenantService;
}
-
- /**
- * Sets the application event publisher.
- *
- * @param applicationEventPublisher
- * the new application event publisher
- */
- public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
- {
- this.applicationEventPublisher = applicationEventPublisher;
- }
+ /*
+ * (non-Javadoc)
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
+ * ApplicationContext)
+ */
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+ {
+ this.applicationContext = applicationContext;
+ }
+
@Override
protected ContentStore selectWriteStore(ContentContext ctx)
{
@@ -130,7 +131,7 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
tenantDomain = tenant.getTenantDomain();
}
- putTenantFileStore(tenantDomain, new FileContentStore(this.applicationEventPublisher, new File(rootDir)));
+ putTenantFileStore(tenantDomain, new FileContentStore(this.applicationContext, new File(rootDir)));
}
public void destroy()
diff --git a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
index 6aa22d39de..9b93414481 100644
--- a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
+++ b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
@@ -19,7 +19,9 @@
package org.alfresco.repo.content.cleanup;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.domain.avm.AVMNodeDAO;
@@ -33,12 +35,12 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.Pair;
+import org.alfresco.util.PropertyCheck;
import org.alfresco.util.VmShutdownListener;
import org.alfresco.util.VmShutdownListener.VmShutdownException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.alfresco.util.Pair;
-import org.alfresco.util.PropertyCheck;
/**
* This component is responsible cleaning up orphaned content.
@@ -328,26 +330,35 @@ public class ContentStoreCleaner
private int cleanBatch(final int batchSize)
{
- final List idsToDelete = new ArrayList(batchSize);
+ // Get a bunch of cleanable URLs
+ final Map urlsById = new HashMap(batchSize * 2);
ContentUrlHandler contentUrlHandler = new ContentUrlHandler()
{
public void handle(Long id, String contentUrl, Long orphanTime)
{
- // Pass the content URL to the eager cleaner for post-commit handling
- eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrl, true);
- idsToDelete.add(id);
+ urlsById.put(id, contentUrl);
}
};
final long maxOrphanTime = System.currentTimeMillis() - (protectDays * 24 * 3600 * 1000);
contentDataDAO.getContentUrlsOrphaned(contentUrlHandler, maxOrphanTime, batchSize);
- // All the URLs have been passed off for eventual deletion.
- // Just delete the DB data
- int size = idsToDelete.size();
- if (size > 0)
+
+ // Shortcut, if necessary
+ if (urlsById.size() == 0)
{
- contentDataDAO.deleteContentUrls(idsToDelete);
+ return 0;
+ }
+ // We have the IDs of the URLs to delete. Let's do it!
+ List idsToDelete = new ArrayList(urlsById.keySet());
+ contentDataDAO.deleteContentUrls(idsToDelete);
+
+ // No problems, so far (ALF-1998: contentStoreCleanerJob leads to foreign key exception)
+ // Schedule the URLs for deletion in the post-commit phase
+ for (String contentUrlToDelete : urlsById.values())
+ {
+ // NOTE: We are forcing eager cleanup so ignore the return value.
+ eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrlToDelete, true);
}
// Done
- return size;
+ return urlsById.size();
}
}
diff --git a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
index 07e03394a0..45a93bd6cd 100644
--- a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
+++ b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
@@ -140,28 +140,47 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
/**
* Queues orphaned content for post-transaction removal
+ *
+ * NB: Any content registered will be deleted if the current transaction
+ * commits and if 'eager' cleanup is turned on.
+ *
+ * @return Returns true if the content was scheduled for post-transaction deletion.
+ * If the return value is true then the calling code must delete
+ * the row entry for the content URL provided BEFORE THE TRANSACTION COMMITS!
*/
- public void registerOrphanedContentUrl(String contentUrl)
+ public boolean registerOrphanedContentUrl(String contentUrl)
{
- registerOrphanedContentUrl(contentUrl, false);
+ return registerOrphanedContentUrl(contentUrl, false);
}
/**
* Queues orphaned content for post-transaction removal
+ *
+ * NB: Any content registered will be deleted if the current transaction
+ * commits and if 'eager' cleanup is turned on.
*
* @param force true for force the post-commit URL deletion
* regardless of the setting {@link #setEagerOrphanCleanup(boolean)}.
+ * @return Returns true if the content was scheduled for post-transaction deletion.
+ * If the return value is true then the calling code must delete
+ * the row entry for the content URL provided BEFORE THE TRANSACTION COMMITS!
*/
- public void registerOrphanedContentUrl(String contentUrl, boolean force)
+ public boolean registerOrphanedContentUrl(String contentUrl, boolean force)
{
if (!eagerOrphanCleanup && !force)
{
- return;
+ return false;
}
Set urlsToDelete = TransactionalResourceHelper.getSet(KEY_POST_COMMIT_DELETION_URLS);
urlsToDelete.add(contentUrl);
// Register to listen for transaction commit
AlfrescoTransactionSupport.bindListener(this);
+ // Done
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Scheduled content for post-commit eager cleanup: " + contentUrl);
+ }
+ return true;
}
/**
@@ -218,7 +237,7 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
{
logger.debug(" " + (urlsToDelete.size() - 10) + " more ...");
}
- else
+ else if (count < 10)
{
logger.debug(" Deleting content URL: " + contentUrl);
}
diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
index ce08fb9157..a639b59bb9 100644
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
@@ -38,8 +38,12 @@ import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
/**
* Provides a store of node content directly to the file system. The writers
@@ -50,7 +54,7 @@ import org.springframework.context.ConfigurableApplicationContext;
*
* @author Derek Hulley
*/
-public class FileContentStore extends AbstractContentStore
+public class FileContentStore extends AbstractContentStore implements ApplicationContextAware, ApplicationListener
{
/**
* store is the new prefix for file content URLs
@@ -64,7 +68,7 @@ public class FileContentStore extends AbstractContentStore
private String rootAbsolutePath;
private boolean allowRandomAccess;
private boolean readOnly;
- private ApplicationEventPublisher applicationEventPublisher;
+ private ApplicationContext applicationContext;
/**
* Private: for Spring-constructed instances only.
@@ -102,32 +106,32 @@ public class FileContentStore extends AbstractContentStore
/**
* Public constructor for programmatic use.
*
- * @param applicationEventPublisher
- * the application event publisher
+ * @param context
+ * application context through which events can be published
* @param rootDirectoryStr
* the root under which files will be stored. The directory will be created if it does not exist.
* @see FileContentStore#FileContentStore(File)
*/
- public FileContentStore(ApplicationEventPublisher applicationEventPublisher, String rootDirectoryStr)
+ public FileContentStore(ApplicationContext context, String rootDirectoryStr)
{
this(rootDirectoryStr);
- setApplicationEventPublisher(applicationEventPublisher);
- publishEvent();
+ setApplicationContext(context);
+ publishEvent(context);
}
/**
* Public constructor for programmatic use.
*
- * @param applicationEventPublisher
- * the application event publisher
+ * @param context
+ * application context through which events can be published
* @param rootDirectory
* the root under which files will be stored. The directory will be created if it does not exist.
*/
- public FileContentStore(ApplicationEventPublisher applicationEventPublisher, File rootDirectory)
+ public FileContentStore(ApplicationContext context, File rootDirectory)
{
this(rootDirectory);
- setApplicationEventPublisher(applicationEventPublisher);
- publishEvent();
+ setApplicationContext(context);
+ publishEvent(context);
}
@@ -142,16 +146,13 @@ public class FileContentStore extends AbstractContentStore
return sb.toString();
}
-
- /**
- * Sets the application event publisher.
- *
- * @param applicationEventPublisher
- * the new application event publisher
+
+ /* (non-Javadoc)
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
- public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
- this.applicationEventPublisher = applicationEventPublisher;
+ this.applicationContext = applicationContext;
}
/**
@@ -630,9 +631,22 @@ public class FileContentStore extends AbstractContentStore
/**
* Publishes an event to the application context that will notify any interested parties of the existence of this
* content store.
+ *
+ * @param context
+ * the application context
*/
- private void publishEvent()
+ private void publishEvent(ApplicationContext context)
{
- this.applicationEventPublisher.publishEvent(new ContentStoreCreatedEvent(this));
+ context.publishEvent(new ContentStoreCreatedEvent(this));
+ }
+
+ public void onApplicationEvent(ApplicationEvent event)
+ {
+ // Once the context has been refreshed, we tell other interested beans about the existence of this content store
+ // (e.g. for monitoring purposes)
+ if (event instanceof ContextRefreshedEvent && event.getSource() == this.applicationContext)
+ {
+ publishEvent(((ContextRefreshedEvent) event).getApplicationContext());
+ }
}
}
diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
index f9e417fa50..51751e1016 100644
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
@@ -46,8 +46,10 @@ public class FileContentStoreTest extends AbstractWritableContentStoreTest
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
- store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
- + getName());
+ store = new FileContentStore(ctx,
+ tempDir.getAbsolutePath() +
+ File.separatorChar +
+ getName());
}
@Override
diff --git a/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
index bc50461747..8bd1299021 100644
--- a/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
@@ -43,8 +43,10 @@ public class NoRandomAccessFileContentStoreTest extends AbstractWritableContentS
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
- store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
- + getName());
+ store = new FileContentStore(ctx,
+ tempDir.getAbsolutePath() +
+ File.separatorChar +
+ getName());
// disallow random access
store.setAllowRandomAccess(false);
}
diff --git a/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
index 52ba97414d..3fb41c95fd 100644
--- a/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
@@ -44,8 +44,10 @@ public class ReadOnlyFileContentStoreTest extends AbstractReadOnlyContentStoreTe
// create a store that uses a subdirectory of the temp directory
File tempDir = TempFileProvider.getTempDir();
- store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
- + getName());
+ store = new FileContentStore(ctx,
+ tempDir.getAbsolutePath() +
+ File.separatorChar +
+ getName());
// disallow random access
store.setReadOnly(true);
}
diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
index 5cc9d49982..e1bbb74e7e 100644
--- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
@@ -31,6 +31,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -105,7 +106,7 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
private Set supportedMimetypes;
private OverwritePolicy overwritePolicy;
private boolean failOnTypeConversion;
- private Set supportedDateFormats;
+ private Set supportedDateFormats = new HashSet(0);
private Map> mapping;
private boolean inheritDefaultMapping;
@@ -134,7 +135,6 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
// Set defaults
overwritePolicy = OverwritePolicy.PRAGMATIC;
failOnTypeConversion = true;
- supportedDateFormats = new HashSet(0);
mapping = null; // The default will be fetched
inheritDefaultMapping = false; // Any overrides are complete
initialized = false;
@@ -260,8 +260,22 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
{
try
{
+ /**
+ * Regional date format
+ */
DateFormat df = new SimpleDateFormat(dateFormatStr);
this.supportedDateFormats.add(df);
+
+ /**
+ * Date format can be locale specific - make sure English format always works
+ */
+ /*
+ * TODO MER 25 May 2010 - Added this as a quick fix for IMAP date parsing which is always
+ * English regardless of Locale. Some more thought and/or code is required to configure
+ * the relationship between properties, format and locale.
+ */
+ DateFormat englishFormat = new SimpleDateFormat(dateFormatStr, Locale.US);
+ this.supportedDateFormats.add(englishFormat);
}
catch (Throwable e)
{
diff --git a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
index 3253469767..00d07c8341 100644
--- a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.apache.poi.hsmf.MAPIMessage;
/**
- * Outlook format email meta-data extractor extracting the following values:
+ * Outlook MAPI format email meta-data extractor extracting the following values:
*
* sentDate: -- cm:sentdate
* originator: -- cm:originator, cm:author
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
index 499784359f..40041cde31 100644
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
+import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map;
@@ -40,20 +41,20 @@ import org.alfresco.service.namespace.QName;
/**
* Metadata extractor for RFC822 mime emails.
+ *
+ * Default configuration: (see RFC822MetadataExtractor.properties)
+ *
*
* messageFrom: -- imap:messageFrom, cm:originator
* messageTo: -- imap:messageTo
* messageCc: -- imap:messageCc
* messageSubject: -- imap:messageSubject, cm:title, cm:description, cm:subjectline
* messageSent: -- imap:dateSent, cm:sentdate
+ * messageReceived: -- imap:dateReceived
* All {@link Header#getName() header names}:
* Thread-Index: -- imap:threadIndex
* Message-ID: -- imap:messageId
- * date: -- imap:dateReceived
- *
- * TIKA Note - to and cc are missing, and date stuff isn't
- * great. Thread index is missing, and arbitrary headers
- * don't seem to be supported
+ *
*
* @author Derek Hulley
* @since 3.2
@@ -66,6 +67,7 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
protected static final String KEY_MESSAGE_CC = "messageCc";
protected static final String KEY_MESSAGE_SUBJECT = "messageSubject";
protected static final String KEY_MESSAGE_SENT = "messageSent";
+ protected static final String KEY_MESSAGE_RECEIVED = "messageReceived";
public static String[] SUPPORTED_MIMETYPES = new String[] { MimetypeMap.MIMETYPE_RFC822 };
@@ -87,12 +89,50 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
if (mimeMessage != null)
{
- //Extract values that doesn't match to headers and need to be encoded.
+ /**
+ * Extract RFC822 values that doesn't match to headers and need to be encoded.
+ * Or those special fields that require some code to extract data
+ */
putRawValue(KEY_MESSAGE_FROM, InternetAddress.toString(mimeMessage.getFrom()), rawProperties);
putRawValue(KEY_MESSAGE_TO, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.TO)), rawProperties);
putRawValue(KEY_MESSAGE_CC, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.CC)), rawProperties);
putRawValue(KEY_MESSAGE_SENT, mimeMessage.getSentDate(), rawProperties);
-
+
+ /**
+ * Received field from RFC 822
+ *
+ * "Received" ":" ; one per relay
+ * ["from" domain] ; sending host
+ * ["by" domain] ; receiving host
+ * ["via" atom] ; physical path
+ * ("with" atom) ; link/mail protocol
+ * ["id" msg-id] ; receiver msg id
+ * ["for" addr-spec] ; initial form
+ * ";" date-time ; time received
+ */
+ Date rxDate = mimeMessage.getReceivedDate();
+
+ if(rxDate != null)
+ {
+ // The email implementation extracted the received date for us.
+ putRawValue(KEY_MESSAGE_RECEIVED, rxDate, rawProperties);
+ }
+ else
+ {
+ // the email implementation did not parse the received date for us.
+ String[] rx = mimeMessage.getHeader("received");
+ if(rx != null && rx.length > 0)
+ {
+ String lastReceived = rx[0];
+ int x = lastReceived.indexOf(';');
+ if(x > 0)
+ {
+ String dateStr = lastReceived.substring(x + 1).trim();
+ putRawValue(KEY_MESSAGE_RECEIVED, dateStr, rawProperties);
+ }
+ }
+ }
+
String[] subj = mimeMessage.getHeader("Subject");
if (subj != null && subj.length > 0)
{
@@ -108,7 +148,9 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
putRawValue(KEY_MESSAGE_SUBJECT, decodedSubject, rawProperties);
}
- //Extract values from headers
+ /*
+ * Extract values from all header fields, including extension fields "X-"
+ */
Set keys = getMapping().keySet();
Enumeration headers = mimeMessage.getAllHeaders();
while (headers.hasMoreElements())
@@ -148,15 +190,4 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
{
return super.getMapping();
}
-
-// /**
-// * Back door for RM
-// * @return
-// */
-// public void setMapping(Map> mapping)
-// {
-// super.setMapping(mapping);
-// }
-
-
}
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
index 4291afc3e5..2981f49d42 100644
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
@@ -8,15 +8,15 @@ namespace.prefix.cm=http://www.alfresco.org/model/content/1.0
# Mappings
-#Default values that doesn't match to Header
+#Default values that doesn't match exactly to Header
messageFrom=imap:messageFrom, cm:originator
messageTo=imap:messageTo
messageCc=imap:messageCc
messageSubject=imap:messageSubject, cm:title, cm:description, cm:subjectline
messageSent=imap:dateSent, cm:sentdate
+messageReceived=imap:dateReceived
-
-#Add here any values you want to extract. Use Header name for key.
+#Add here any values you want to extract.
+# Use Header name for key. LHS is a list of the destination properties.
Thread-Index=imap:threadIndex
Message-ID=imap:messageId
-Date=imap:dateReceived
diff --git a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
index b972d2ecf5..05fef49628 100644
--- a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
@@ -64,7 +64,7 @@ public class ReplicatingContentStoreTest extends AbstractWritableContentStoreTes
File tempDir = TempFileProvider.getTempDir();
// create a primary file store
String storeDir = tempDir.getAbsolutePath() + File.separatorChar + GUID.generate();
- primaryStore = new FileContentStore(applicationEventPublisher, storeDir);
+ primaryStore = new FileContentStore(ctx, storeDir);
// create some secondary file stores
secondaryStores = new ArrayList(3);
for (int i = 0; i < 4; i++)
diff --git a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
index c913109ab2..c12448deed 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
@@ -19,6 +19,8 @@
package org.alfresco.repo.domain.contentdata;
import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -34,11 +36,11 @@ import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.dao.DataIntegrityViolationException;
-import org.alfresco.util.Pair;
/**
* Abstract implementation for ContentData DAO.
@@ -121,14 +123,6 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
contentDataCallbackDAO);
}
- /**
- * Register new content for post-rollback handling
- */
- protected void registerNewContentUrl(String contentUrl)
- {
- contentStoreCleaner.registerNewContentUrl(contentUrl);
- }
-
/**
* A content_url entity was dereferenced. This makes no assumptions about the
* current references - dereference deletion is handled in the commit phase.
@@ -300,7 +294,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
if (contentUrl != null)
{
// We must find or create the ContentUrlEntity
- contentUrlId = getOrCreateContentUrlEntity(contentUrl, size, contentData.isReferenced()).getId();
+ contentUrlId = getOrCreateContentUrlEntity(contentUrl, size).getId();
}
// Resolve the mimetype
Long mimetypeId = null;
@@ -347,7 +341,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
}
if (newContentUrl != null)
{
- Long contentUrlId = getOrCreateContentUrlEntity(newContentUrl, contentData.getSize(), contentData.isReferenced()).getId();
+ Long contentUrlId = getOrCreateContentUrlEntity(newContentUrl, contentData.getSize()).getId();
contentDataEntity.setContentUrlId(contentUrlId);
contentDataEntity.setContentUrl(newContentUrl);
}
@@ -391,7 +385,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
* whether it has been created or is being re-used.
* @param isReferenced if true we won't worry about eagerly deleting the content on transaction rollback
*/
- private ContentUrlEntity getOrCreateContentUrlEntity(String contentUrl, long size, boolean isReferenced)
+ private ContentUrlEntity getOrCreateContentUrlEntity(String contentUrl, long size)
{
// Create the content URL entity
ContentUrlEntity contentUrlEntity = getContentUrlEntity(contentUrl);
@@ -408,16 +402,21 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
" Existing: " + contentUrlEntity);
}
// Check orphan state
- if (contentUrlEntity.getOrphanTime() != null)
+ Long oldOrphanTime = contentUrlEntity.getOrphanTime();
+ if (oldOrphanTime != null)
{
Long id = contentUrlEntity.getId();
- updateContentUrlOrphanTime(id, null);
+ int updated = updateContentUrlOrphanTime(id, null, oldOrphanTime);
+ if (updated == 0)
+ {
+ throw new ConcurrencyFailureException("Failed to remove orphan time: " + contentUrlEntity);
+ }
}
}
else
{
// Create it
- contentUrlEntity = createContentUrlEntity(contentUrl, size, isReferenced);
+ contentUrlEntity = createContentUrlEntity(contentUrl, size);
}
// Done
return contentUrlEntity;
@@ -425,9 +424,8 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
/**
* @param contentUrl the content URL to create or search for
- * @param isReferenced if true we won't worry about eagerly deleting the content on transaction rollback
*/
- protected abstract ContentUrlEntity createContentUrlEntity(String contentUrl, long size, boolean isReferenced);
+ protected abstract ContentUrlEntity createContentUrlEntity(String contentUrl, long size);
/**
* @param id the ID of the content url entity
@@ -453,9 +451,10 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
*
* @param id the unique ID of the entity
* @param orphanTime the time (ms since epoch) that the entity was orphaned
+ * @param oldOrphanTime the orphan time we expect to update for optimistic locking (may be null)
* @return Returns the number of rows updated
*/
- protected abstract int updateContentUrlOrphanTime(Long id, Long orphanTime);
+ protected abstract int updateContentUrlOrphanTime(Long id, Long orphanTime, Long oldOrphanTime);
/**
* Create the row for the alf_content_data
@@ -512,11 +511,36 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
// It is still referenced, so ignore it
continue;
}
- // We mark the URL as orphaned.
- Long contentUrlId = contentUrlEntity.getId();
- updateContentUrlOrphanTime(contentUrlId, orphanTime);
// Pop this in the queue for deletion from the content store
- contentStoreCleaner.registerOrphanedContentUrl(contentUrl);
+ boolean isEagerCleanup = contentStoreCleaner.registerOrphanedContentUrl(contentUrl);
+ if (!isEagerCleanup)
+ {
+ // We mark the URL as orphaned.
+ // The content binary is not scheduled for immediate removal so just mark the
+ // row's orphan time. Concurrently, it is possible for multiple references
+ // to be made WHILE the orphan time is set, but we handle that separately.
+ Long contentUrlId = contentUrlEntity.getId();
+ Long oldOrphanTime = contentUrlEntity.getOrphanTime();
+ int updated = updateContentUrlOrphanTime(contentUrlId, orphanTime, oldOrphanTime);
+ if (updated != 1)
+ {
+ throw new ConcurrencyFailureException(
+ "Failed to update content URL orphan time: " + contentUrlEntity);
+ }
+ }
+ else
+ {
+ // ALERT!!!
+ // The content is scheduled for deletion once this transaction commits.
+ // We need to make sure that the URL is not re-referenced by another transaction.
+ List contentUrlId = Collections.singletonList(contentUrlEntity.getId());
+ int deleted = deleteContentUrls(contentUrlId);
+ if (deleted != 1)
+ {
+ throw new ConcurrencyFailureException(
+ "Failed to delete eagerly-reaped content URL: " + contentUrlEntity);
+ }
+ }
}
contentUrls.clear();
}
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
index c48102c4b2..bfe72c7391 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
@@ -37,7 +37,6 @@ import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
-import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.dao.DataIntegrityViolationException;
@@ -62,10 +61,9 @@ public class ContentDataDAOTest extends TestCase
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
transactionService = serviceRegistry.getTransactionService();
txnHelper = transactionService.getRetryingTransactionHelper();
- ApplicationEventPublisher applicationEventPublisher = (ApplicationEventPublisher) ctx.getBean("applicationEventPublisher");
contentDataDAO = (ContentDataDAO) ctx.getBean("contentDataDAO");
- contentStore = new FileContentStore(applicationEventPublisher, TempFileProvider.getTempDir());
+ contentStore = new FileContentStore(ctx, TempFileProvider.getTempDir());
}
private Pair create(final ContentData contentData)
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
new file mode 100644
index 0000000000..f7c6487c85
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.domain.contentdata;
+
+
+/**
+ * Entity bean for updating the alf_content_url table.
+ *
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class ContentUrlUpdateEntity
+{
+ private Long id;
+ private Long orphanTime;
+ private Long oldOrphanTime;
+
+ public ContentUrlUpdateEntity()
+ {
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(512);
+ sb.append("ContentUrlUpdateEntity")
+ .append("[ ID=").append(id)
+ .append(", orphanTime=").append(orphanTime)
+ .append(", oldOrphanTime=").append(oldOrphanTime)
+ .append("]");
+ return sb.toString();
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getOrphanTime()
+ {
+ return orphanTime;
+ }
+
+ public void setOrphanTime(Long orphanTime)
+ {
+ this.orphanTime = orphanTime;
+ }
+
+ public Long getOldOrphanTime()
+ {
+ return oldOrphanTime;
+ }
+
+ public void setOldOrphanTime(Long oldOrphanTime)
+ {
+ this.oldOrphanTime = oldOrphanTime;
+ }}
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
index 8686a772e2..9f1d54213a 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
@@ -29,10 +29,11 @@ import org.alfresco.ibatis.IdsEntity;
import org.alfresco.repo.domain.contentdata.AbstractContentDataDAOImpl;
import org.alfresco.repo.domain.contentdata.ContentDataEntity;
import org.alfresco.repo.domain.contentdata.ContentUrlEntity;
+import org.alfresco.repo.domain.contentdata.ContentUrlUpdateEntity;
import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.util.Pair;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.dao.DataIntegrityViolationException;
-import org.alfresco.util.Pair;
import org.springframework.orm.ibatis.SqlMapClientTemplate;
import com.ibatis.sqlmap.client.event.RowHandler;
@@ -48,7 +49,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
private static final String SELECT_CONTENT_URL_BY_ID = "alfresco.content.select_ContentUrlById";
private static final String SELECT_CONTENT_URL_BY_KEY = "alfresco.content.select_ContentUrlByKey";
private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "alfresco.content.select_ContentUrlByKeyUnreferenced";
- private static final String SELECT_CONTENT_URLS_BY_ORPHAN_TIME = "alfresco.content.select_ContentUrlByOrphanTime";
+ private static final String SELECT_CONTENT_URLS_ORPHANED = "alfresco.content.select_ContentUrlsOrphaned";
private static final String SELECT_CONTENT_DATA_BY_ID = "alfresco.content.select_ContentDataById";
private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "alfresco.content.select_ContentDataByNodeAndQName";
private static final String INSERT_CONTENT_URL = "alfresco.content.insert_ContentUrl";
@@ -77,7 +78,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
}
@Override
- protected ContentUrlEntity createContentUrlEntity(String contentUrl, long size, boolean isReferenced)
+ protected ContentUrlEntity createContentUrlEntity(String contentUrl, long size)
{
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setContentUrl(contentUrl);
@@ -86,13 +87,6 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
/* Long id = (Long) */ template.insert(INSERT_CONTENT_URL, contentUrlEntity);
/*contentUrlEntity.setId(id);*/
- // Don't register this URL for tidy up if it is still referenced by code outside of this transaction
- if (!isReferenced)
- {
- // Register the url as new
- registerNewContentUrl(contentUrl);
- }
-
// Done
return contentUrlEntity;
}
@@ -136,7 +130,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
};
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setOrphanTime(maxOrphanTime);
- template.queryWithRowHandler(SELECT_CONTENT_URLS_BY_ORPHAN_TIME, contentUrlEntity, rowHandler);
+ template.queryWithRowHandler(SELECT_CONTENT_URLS_ORPHANED, contentUrlEntity, rowHandler);
}
@SuppressWarnings("unchecked")
@@ -145,7 +139,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setOrphanTime(maxOrphanTime);
List results = template.queryForList(
- SELECT_CONTENT_URLS_BY_ORPHAN_TIME,
+ SELECT_CONTENT_URLS_ORPHANED,
contentUrlEntity, 0, maxResults);
// Pass the result to the callback
for (ContentUrlEntity result : results)
@@ -157,12 +151,13 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
}
}
- public int updateContentUrlOrphanTime(Long id, Long orphanTime)
+ public int updateContentUrlOrphanTime(Long id, Long orphanTime, Long oldOrphanTime)
{
- ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
- contentUrlEntity.setId(id);
- contentUrlEntity.setOrphanTime(orphanTime);
- return template.update(UPDATE_CONTENT_URL_ORPHAN_TIME, contentUrlEntity);
+ ContentUrlUpdateEntity contentUrlUpdateEntity = new ContentUrlUpdateEntity();
+ contentUrlUpdateEntity.setId(id);
+ contentUrlUpdateEntity.setOrphanTime(orphanTime);
+ contentUrlUpdateEntity.setOldOrphanTime(oldOrphanTime);
+ return template.update(UPDATE_CONTENT_URL_ORPHAN_TIME, contentUrlUpdateEntity);
}
/**
diff --git a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
index 4cf7039340..9e0294ea6e 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
@@ -56,6 +56,7 @@ import org.alfresco.repo.security.permissions.SimpleAccessControlList;
import org.alfresco.repo.security.permissions.SimpleAccessControlListProperties;
import org.alfresco.repo.security.permissions.impl.AclChange;
import org.alfresco.repo.security.permissions.impl.AclDaoComponent;
+import org.alfresco.repo.security.permissions.impl.PermissionsDaoComponent;
import org.alfresco.repo.security.permissions.impl.SimplePermissionReference;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.service.cmr.security.AccessStatus;
@@ -119,6 +120,8 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
/** a transactionally-safe cache to be injected */
private SimpleCache aclCache;
+ private boolean useOldPermissions;
+
private enum WriteMode
{
/**
@@ -2548,4 +2551,28 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
return createAccessControlListImpl(properties, aces, inherited);
}
+ /* (non-Javadoc)
+ * @see org.alfresco.repo.security.permissions.impl.AclDaoComponent#getDefaultProperties()
+ */
+ public SimpleAccessControlListProperties getDefaultProperties()
+ {
+ if(useOldPermissions)
+ {
+ return OldADMPermissionsDaoComponentImpl.getDefaultProperties();
+ }
+ else
+ {
+ return DMPermissionsDaoComponentImpl.getDefaultProperties();
+ }
+ }
+
+ /**
+ * @param permissionsDaoComponent the permissionsDaoComponent to set
+ */
+ public void setUseOldPermissions(boolean useOldPermissions)
+ {
+ this.useOldPermissions = useOldPermissions;
+ }
+
+
}
diff --git a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
index b28610e9f3..531fb57ad8 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
@@ -209,7 +209,7 @@ public class DMAccessControlListDAO implements AccessControlListDAO
if (existingAcl.getAclType() == ACLType.OLD)
{
result.increment(ACLType.DEFINING);
- SimpleAccessControlListProperties properties = DMPermissionsDaoComponentImpl.getDefaultProperties();
+ SimpleAccessControlListProperties properties = aclDaoComponent.getDefaultProperties();
properties.setInherits(existingAcl.getInherits());
AccessControlList existing = aclDaoComponent.getAccessControlList(existingAcl.getId());
Long actuallyInherited = null;
@@ -240,7 +240,7 @@ public class DMAccessControlListDAO implements AccessControlListDAO
if (isRoot)
{
result.increment(ACLType.DEFINING);
- SimpleAccessControlListProperties properties = DMPermissionsDaoComponentImpl.getDefaultProperties();
+ SimpleAccessControlListProperties properties = aclDaoComponent.getDefaultProperties();
Long id = aclDaoComponent.createAccessControlList(properties);
DbAccessControlList newAcl = aclDaoComponent.getDbAccessControlList(id);
diff --git a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
index 384ff1de9d..16fedacf71 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
@@ -119,7 +119,9 @@ public class NodeAccessControlListDAO extends HibernateDaoSupport implements Acc
Pair caPair = fNodeDAOService.getPrimaryParentAssoc(nodePair.getFirst());
if ((caPair != null) && (caPair.getSecond().getParentRef() != null))
{
- Long aclId = fNodeDAOService.getNodeAccessControlList(caPair.getFirst());
+ NodeRef parentRef = caPair.getSecond().getParentRef();
+ Long parentNodeId = fNodeDAOService.getNodePair(parentRef).getFirst();
+ Long aclId = fNodeDAOService.getNodeAccessControlList(parentNodeId);
return aclId;
}
else
@@ -150,6 +152,7 @@ public class NodeAccessControlListDAO extends HibernateDaoSupport implements Acc
public void setAccessControlList(NodeRef nodeRef, Long aclId)
{
- throw new UnsupportedOperationException();
+ Pair nodePair = getNodePairNotNull(nodeRef);
+ fNodeDAOService.setNodeAccessControlList(nodePair.getFirst(), aclId);
}
}
diff --git a/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
index 7efd2f9927..cfc751ba3c 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
@@ -91,4 +91,13 @@ public class OldADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCom
aclDaoComponent.deleteAccessControlList(acl.getId());
}
}
+
+ public static SimpleAccessControlListProperties getDefaultProperties()
+ {
+ SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties();
+ properties.setAclType(ACLType.OLD);
+ properties.setInherits(true);
+ properties.setVersioned(false);
+ return properties;
+ }
}
diff --git a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
index ba7aa7a740..b3339499ff 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.util.Pair;
+import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
@@ -125,6 +126,35 @@ public abstract class AbstractMimetypeDAOImpl implements MimetypeDAO
return result;
}
+ public int updateMimetype(String oldMimetype, String newMimetype)
+ {
+ ParameterCheck.mandatory("oldMimetype", oldMimetype);
+ ParameterCheck.mandatory("newMimetype", newMimetype);
+
+ Pair oldMimetypePair = getMimetype(oldMimetype);
+ if (oldMimetypePair == null)
+ {
+ // There is no mimetype currently, so there is nothing to update.
+ // Just do a create
+ getOrCreateMimetype(newMimetype);
+ return 0;
+ }
+ // The ID will remain the same
+ Long id = oldMimetypePair.getFirst();
+ // We have to update it
+ int count = updateMimetypeEntity(id, newMimetype);
+ if (count != 1)
+ {
+ throw new ConcurrencyFailureException("Concurrent update of mimetype: " + oldMimetype);
+ }
+ // Cache it
+ mimetypeEntityCache.remove(oldMimetype);
+ mimetypeEntityCache.put(id, newMimetype);
+ mimetypeEntityCache.put(newMimetype, id);
+ // Done
+ return count;
+ }
+
/**
* @param id the ID of the mimetype entity
* @return Return the entity or null if it doesn't exist
@@ -132,4 +162,5 @@ public abstract class AbstractMimetypeDAOImpl implements MimetypeDAO
protected abstract MimetypeEntity getMimetypeEntity(Long id);
protected abstract MimetypeEntity getMimetypeEntity(String mimetype);
protected abstract MimetypeEntity createMimetypeEntity(String mimetype);
+ protected abstract int updateMimetypeEntity(Long id, String newMimetype);
}
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
index 1f4ac7eef5..0d190e0b32 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
@@ -49,4 +49,15 @@ public interface MimetypeDAO
* @return the Mimetype pair (id, mimetype) (never null)
*/
Pair getOrCreateMimetype(String mimetype);
+
+ /**
+ * Update a mimetype if it exists. This method does not do any conflict resolution
+ * i.e. it will only succeed if the new mimetype does not exist already. Higher-level
+ * logic is required to handle updates to dependent rows, etc.
+ *
+ * @param oldMimetype the old Mimetype
+ * @param newMimetype the new Mimetype
+ * @return the number of rows modified
+ */
+ int updateMimetype(String oldMimetype, String newMimetype);
}
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
index 96abf55e5f..7b936a8aaa 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
@@ -136,4 +136,27 @@ public class MimetypeDAOTest extends TestCase
"Upper and lowercase mimetype instance IDs were not the same",
lowercasePair.getFirst(), uppercasePair.getFirst());
}
+
+ public void testUpdate() throws Exception
+ {
+ final String oldMimetype = GUID.generate();
+ final String newMimetype = GUID.generate();
+ Pair oldMimetypePair = get(oldMimetype, true, true);
+ // Update it
+ RetryingTransactionCallback> callback = new RetryingTransactionCallback>()
+ {
+ public Pair execute() throws Throwable
+ {
+ int count = mimetypeDAO.updateMimetype(oldMimetype, newMimetype);
+ assertEquals("Incorrect number updated", 1, count);
+ return mimetypeDAO.getMimetype(newMimetype);
+ }
+ };
+ Pair newMimetypePair = txnHelper.doInTransaction(callback, false, false);
+ // Check
+ assertEquals("ID should remain the same if the old mimetype existed",
+ oldMimetypePair.getFirst(), newMimetypePair.getFirst());
+ get(oldMimetype, false, false);
+ get(newMimetype, false, true);
+ }
}
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
index 1f75534acf..6a3946df03 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
@@ -72,6 +72,18 @@ public class MimetypeEntity
return sb.toString();
}
+ public void incrementVersion()
+ {
+ if (version >= Short.MAX_VALUE)
+ {
+ this.version = 0L;
+ }
+ else
+ {
+ this.version++;
+ }
+ }
+
public Long getId()
{
return id;
diff --git a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
index 4c76af6f89..3760003303 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.mimetype.ibatis;
import org.alfresco.repo.domain.mimetype.AbstractMimetypeDAOImpl;
import org.alfresco.repo.domain.mimetype.MimetypeEntity;
+import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.orm.ibatis.SqlMapClientTemplate;
/**
@@ -33,6 +34,7 @@ public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl
private static final String SELECT_MIMETYPE_BY_ID = "alfresco.content.select_MimetypeById";
private static final String SELECT_MIMETYPE_BY_KEY = "alfresco.content.select_MimetypeByKey";
private static final String INSERT_MIMETYPE = "alfresco.content.insert_Mimetype";
+ private static final String UPDATE_MIMETYPE = "alfresco.content.update_Mimetype";
private SqlMapClientTemplate template;
@@ -72,4 +74,18 @@ public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl
// Done
return mimetypeEntity;
}
+
+ @Override
+ protected int updateMimetypeEntity(Long id, String newMimetype)
+ {
+ MimetypeEntity mimetypeEntity = getMimetypeEntity(id);
+ if (mimetypeEntity == null)
+ {
+ throw new DataIntegrityViolationException(
+ "Cannot update mimetype as ID doesn't exist: " + id);
+ }
+ mimetypeEntity.incrementVersion();
+ mimetypeEntity.setMimetype(newMimetype);
+ return template.update(UPDATE_MIMETYPE, mimetypeEntity);
+ }
}
diff --git a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
index d9e8f86545..155538ae73 100644
--- a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
+++ b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
@@ -59,4 +59,13 @@ public interface PatchDAO
* @param maxNodeId the exclusive node ID to limit the updates to
*/
public void updateAdmV31ContentProperties(Long minNodeId, Long maxNodeId);
+
+ /**
+ * Update all alf_content_data mimetype references.
+ *
+ * @param oldMimetypeId the ID to search for
+ * @param newMimetypeId the ID to change to
+ * @return the number of rows affected
+ */
+ public int updateContentMimetypeIds(Long oldMimetypeId, Long newMimetypeId);
}
diff --git a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
index aa4d6d1c68..e575fa07fd 100644
--- a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
@@ -45,6 +45,7 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
private static final String SELECT_AVM_NODES_WITH_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_avmNodesWithOldContentProperties";
private static final String SELECT_ADM_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_admOldContentProperties";
private static final String UPDATE_ADM_OLD_CONTENT_PROPERTY = "alfresco.patch.update_admOldContentProperty";
+ private static final String UPDATE_CONTENT_MIMETYPE_ID = "alfresco.patch.update_contentMimetypeId";
private SqlMapClientTemplate template;
@@ -144,4 +145,12 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
params.put("longValue", longValue);
template.update(UPDATE_ADM_OLD_CONTENT_PROPERTY, params);
}
+
+ public int updateContentMimetypeIds(Long oldMimetypeId, Long newMimetypeId)
+ {
+ Map params = new HashMap(11);
+ params.put("newMimetypeId", newMimetypeId);
+ params.put("oldMimetypeId", oldMimetypeId);
+ return template.update(UPDATE_CONTENT_MIMETYPE_ID, params);
+ }
}
diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
index e9cb57d4f8..1ba93818ec 100644
--- a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
@@ -242,7 +242,7 @@ public class PropertyValueDAOTest extends TestCase
public void testPropertyDoubleValue() throws Exception
{
- final Double doubleValue = Double.valueOf(1.7976931348623E+308);
+ final Double doubleValue = Double.valueOf(1.7976931348623E+125);
RetryingTransactionCallback> createValueCallback = new RetryingTransactionCallback>()
{
public Pair execute() throws Throwable
diff --git a/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
index b63be6c027..16153634e4 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
@@ -256,7 +256,7 @@ public class TypeFormProcessor extends ContentModelFormProcessor fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled() && folderInfo != null)
{
logger.debug(folderInfo.getName() + " - Messages count:" + messages.size());
}
@@ -481,9 +481,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected long[] getMessageUidsInternal()
{
- if (messages == null || messages.size() == 0)
+ if (messages == null || messages.size() == 0 && folderInfo != null)
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
int len = messages.size();
@@ -505,7 +505,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected List getMessagesInternal()
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
return getMessages(fileInfos);
}
@@ -513,6 +513,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
{
if (fileInfos == null || fileInfos.size() == 0)
{
+ logger.debug("getMessages - fileInfos is empty or null");
return Collections.emptyList();
}
if (fileInfos.size() != messages.size())
@@ -569,7 +570,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
}
if (messages == null || messages.size() == 0)
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
List ret = new ArrayList();
@@ -628,9 +629,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
{
List result = new ArrayList();
- if (messages.size() == 0)
+ if (messages.size() == 0 && folderInfo != null)
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
@@ -643,7 +644,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
}
}
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled() && folderInfo != null)
{
logger.debug(folderInfo.getName() + " - Non deleted messages count:" + result.size());
}
@@ -672,9 +673,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected int getRecentCountInternal(boolean reset)
{
- if (messages.size() == 0)
+ if (messages.size() == 0 && folderInfo != null)
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
@@ -693,7 +694,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
}
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled() && folderInfo != null)
{
logger.debug(folderInfo.getName() + " - Recent count: " + count + " reset: " + reset);
}
@@ -731,9 +732,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected int getUnseenCountInternal()
{
- if (messages.size() == 0)
+ if (messages.size() == 0 && folderInfo != null)
{
- List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+ List fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
}
@@ -747,7 +748,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
}
}
- if (logger.isDebugEnabled())
+ if (logger.isDebugEnabled() && folderInfo != null)
{
logger.debug(folderInfo.getName() + " - Unseen count: " + count);
}
diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java
index 2a2a9b5452..4b2bee07ed 100644
--- a/source/java/org/alfresco/repo/imap/ImapService.java
+++ b/source/java/org/alfresco/repo/imap/ImapService.java
@@ -118,26 +118,26 @@ public interface ImapService
*/
public void unsubscribe(AlfrescoImapUser user, String mailbox);
- /**
- * Search for files in specified context
- *
- * @param contextNodeRef context folder for search
- * @param namePattern name pattern for search
- * @param includeSubFolders include SubFolders
- * @return list of files
- */
- public List searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders);
+// /**
+// * Search for files in specified context
+// *
+// * @param contextNodeRef context folder for search
+// * @param namePattern name pattern for search
+// * @param includeSubFolders include SubFolders
+// * @return list of files
+// */
+// public List searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders);
- /**
- * Search for mailboxes in specified context
- *
- * @param contextNodeRef context folder for search
- * @param namePattern name pattern for search
- * @param includeSubFolders include SubFolders
- * @param viewMode (ARCHIVE, MIXED or VIRTUAL)
- * @return list of mailboxes that are visible from specified view
- */
- public List searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode);
+// /**
+// * Search for mailboxes in specified context
+// *
+// * @param contextNodeRef context folder for search
+// * @param namePattern name pattern for search
+// * @param includeSubFolders include SubFolders
+// * @param viewMode (ARCHIVE, MIXED or VIRTUAL)
+// * @return list of mailboxes that are visible from specified view
+// */
+// public List searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode);
/**
* Search for emails in specified folder depend on view mode.
@@ -148,7 +148,7 @@ public interface ImapService
* @param includeSubFolders includeSubFolders
* @return list of emails that context folder contains.
*/
- public List searchMails(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode, boolean includeSubFolders);
+ public List searchMails(NodeRef contextNodeRef, ImapViewMode viewMode);
/**
* Return flags that belong to the specified imap folder.
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index aabf5ce84b..4f09581c65 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.imap;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,12 +40,15 @@ import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode;
import org.alfresco.repo.imap.config.ImapConfigMountPointsBean;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.site.SiteServiceException;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.SubFolderFilter;
import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -370,12 +374,13 @@ public class ImapServiceImpl implements ImapService
NodeRef parentNodeRef = root; // it is used for hierarhy deep search.
for (String folderName : getMailPathInRepo(mailboxName).split(String.valueOf(AlfrescoImapConst.HIERARCHY_DELIMITER)))
{
- List folders = searchFolders(parentNodeRef, folderName, false, ImapViewMode.MIXED);
+ NodeRef child = fileFolderService.searchSimple(parentNodeRef, folderName);
+
if (logger.isDebugEnabled())
{
logger.debug("Trying to create folder '" + folderName + "'");
}
- if (folders.size() == 0)
+ if (child == null)
{
// folder doesn't exist
AccessStatus status = permissionService.hasPermission(parentNodeRef, PermissionService.CREATE_CHILDREN);
@@ -402,7 +407,7 @@ public class ImapServiceImpl implements ImapService
logger.debug("Folder '" + folderName + "' already exists");
}
// next search from new parent
- parentNodeRef = folders.get(0).getNodeRef();
+ parentNodeRef = child;
}
}
throw new AlfrescoRuntimeException(ERROR_FOLDER_ALREADY_EXISTS);
@@ -410,19 +415,19 @@ public class ImapServiceImpl implements ImapService
public void deleteMailbox(AlfrescoImapUser user, String mailboxName)
{
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Delete mailbox: mailboxName=" + mailboxName);
+ }
if (mailboxName == null)
{
throw new IllegalArgumentException(I18NUtil.getMessage(ERROR_MAILBOX_NAME_IS_MANDATORY));
}
- if (logger.isDebugEnabled())
- {
- logger.debug("Deleting folder: mailboxName=" + mailboxName);
- }
AlfrescoImapFolder folder = getFolder(user, mailboxName);
NodeRef nodeRef = folder.getFolderInfo().getNodeRef();
-
- List childFolders = searchFolders(nodeRef, "*", false, folder.getViewMode());
+
+ List childFolders = fileFolderService.listFolders(nodeRef);
if (childFolders.isEmpty())
{
@@ -436,7 +441,7 @@ public class ImapServiceImpl implements ImapService
{
// Delete all messages for this folder
// Don't delete subfolders and their messages
- List messages = searchFiles(nodeRef, "*", false);
+ List messages = fileFolderService.listFiles(nodeRef);
for (FileInfo message : messages)
{
fileFolderService.delete(message.getNodeRef());
@@ -489,10 +494,11 @@ public class ImapServiceImpl implements ImapService
}
}
else
- // not last element than checks if it exists and creates if doesn't
{
- List folders = searchFolders(parentNodeRef, folderName, false, sourceNode.getViewMode());
- if (folders.size() == 0)
+ // not last element than checks if it exists and creates if doesn't
+ NodeRef child = fileFolderService.searchSimple(parentNodeRef, folderName);
+
+ if (child == null)
{
// check creation permission
AccessStatus status = permissionService.hasPermission(parentNodeRef, PermissionService.CREATE_CHILDREN);
@@ -509,7 +515,7 @@ public class ImapServiceImpl implements ImapService
}
else
{
- parentNodeRef = folders.get(0).getNodeRef();
+ parentNodeRef = child;
if (logger.isDebugEnabled())
{
logger.debug("Folder '" + folderName + "' already exists");
@@ -531,12 +537,17 @@ public class ImapServiceImpl implements ImapService
}
}
+ /**
+ * Get Folder
+ * @param user
+ * @param mailboxName
+ */
public AlfrescoImapFolder getFolder(AlfrescoImapUser user, String mailboxName)
{
mailboxName = Utf7.decode(mailboxName, Utf7.UTF7_MODIFIED);
if (logger.isDebugEnabled())
{
- logger.debug("Getting folder '" + mailboxName + "'");
+ logger.debug("Get folder '" + mailboxName + "'");
}
// If MailFolder object is used to obtain hierarchy delimiter by LIST command:
// Example:
@@ -552,36 +563,65 @@ public class ImapServiceImpl implements ImapService
return new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
}
- NodeRef root = getMailboxRootRef(mailboxName, user.getLogin());
- String mountPointName = getMountPointName(mailboxName);
- NodeRef nodeRef = root; // initial top folder
ImapViewMode viewMode = getViewMode(mailboxName);
-
+ String mountPointName = getMountPointName(mailboxName);
+
+ NodeRef root = getMailboxRootRef(mailboxName, user.getLogin());
+ NodeRef nodeRef = root; // initial top folder
+
String[] folderNames = getMailPathInRepo(mailboxName).split(String.valueOf(AlfrescoImapConst.HIERARCHY_DELIMITER));
-
+
+ if(folderNames.length == 1 && folderNames[0].length() == 0)
+ {
+ // This is the root of the mount point e.g "Alfresco IMAP" which has a path from root of ""
+ FileInfo folderFileInfo = fileFolderService.getFileInfo(root);
+
+ AlfrescoImapFolder folder = new AlfrescoImapFolder(
+ user.getQualifiedMailboxName(),
+ folderFileInfo,
+ mountPointName,
+ viewMode,
+ root,
+ mountPointName,
+ isExtractionEnabled(folderFileInfo.getNodeRef()),
+ serviceRegistry);
+
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Returning root folder '" + mailboxName + "'");
+ }
+ return folder;
+ }
+
for (int i = 0; i < folderNames.length; i++)
{
if (logger.isDebugEnabled())
{
logger.debug("Processing of " + folderNames[i]);
- }
- NodeRef targetNode = nodeService.getChildByName(nodeRef, ContentModel.ASSOC_CONTAINS, folderNames[i]);
+ }
+
+ NodeRef targetNode = fileFolderService.searchSimple(nodeRef, folderNames[i]);
+
if (targetNode == null)
{
- List folderList = searchFolders(nodeRef, folderNames[i], false, viewMode);
- if (folderList != null && !folderList.isEmpty() && folderList.get(0) != null)
+ AlfrescoImapFolder folder = new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
+ if (logger.isDebugEnabled())
{
- targetNode = folderList.get(0).getNodeRef();
+ logger.debug("Returning empty folder '" + folderNames[i]);
}
+ return folder;
}
- if (targetNode == null)
- {
- return new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
- }
+
if (i == (folderNames.length - 1)) // is last
{
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("found folder to list ");
+ }
+
FileInfo folderFileInfo = fileFolderService.getFileInfo(targetNode);
- return new AlfrescoImapFolder(
+
+ AlfrescoImapFolder folder = new AlfrescoImapFolder(
user.getQualifiedMailboxName(),
folderFileInfo,
folderFileInfo.getName(),
@@ -590,146 +630,245 @@ public class ImapServiceImpl implements ImapService
mountPointName,
isExtractionEnabled(folderFileInfo.getNodeRef()),
serviceRegistry);
+
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Returning folder '" + mailboxName + "'");
+ }
+ return folder;
}
- else
- {
- nodeRef = targetNode; // next parent
- }
+
+ /**
+ * End of loop - next element in path
+ */
+ nodeRef = targetNode;
+ }
+
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Cannot get a folder '" + mailboxName + "'");
}
-
throw new AlfrescoRuntimeException(ERROR_CANNOT_GET_A_FOLDER, new String[] { mailboxName });
}
+
+ /**
+ * Deep search for mailboxes/folders in the specified context
+ *
+ * Certain folders are excluded depending upon the view mode.
+ * - For ARCHIVE mode all Share Sites are excluded.
+ * - For MIXED and VIRTUAL non favourite sites are excluded.
+ *
+ * @param contextNodeRef context folder for search
+ * @param viewMode is folder in "Virtual" View
+ * @return list of mailboxes/folders
+ */
+ private List searchDeep(final NodeRef contextNodeRef, final ImapViewMode viewMode)
+ {
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("searchDeep start " + contextNodeRef + ", " + viewMode);
+ }
+
+ /**
+ * Exclude Share Sites of TYPE_SITE
+ */
+ final Collection typesToExclude = getServiceRegistry().getDictionaryService().getSubTypes(SiteModel.TYPE_SITE, true);
+
+ /**
+ * Share Site Exclusion Filter
+ */
+ SubFolderFilter filter = new SubFolderFilter()
+ {
+ List favs = null;
+ public boolean isEnterSubfolder(ChildAssociationRef subfolderRef)
+ {
+
+ NodeRef folder = subfolderRef.getChildRef();
+ QName typeOfFolder = nodeService.getType(folder);
+ if(typesToExclude.contains(typeOfFolder))
+ {
+ if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+ {
+ /**
+ * In VIRTUAL and MIXED MODE WE SHOULD ONLY DISPLAY FOLDERS FROM FAVOURITE SITES
+ */
+ if(favs == null)
+ {
+ favs = getFavouriteSites(getCurrentUser());
+ }
+
+ if(favs.contains(folder))
+ {
+ logger.debug("searchDeep (VIRTUAL) including fav site folder :" + subfolderRef.getQName());
+ return true;
+ }
+ else
+ {
+ logger.debug("searchDeep (VIRTUAL) excluding non fav site folder :" + subfolderRef.getQName());
+ return false;
+ }
+ }
+ else
+ {
+ /**
+ * IN ARCHIVE MODE we don't display folders for any SITES, regardless of whether they are favourites.
+ */
+ logger.debug("searchDeep (ARCHIVE) excluding site folder :" + subfolderRef.getQName());
+ return false;
+ }
+ }
+ return true;
+ }
+ };
+
+
+ List searchResult = fileFolderService.listDeepFolders(contextNodeRef, filter);
+
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("SearchDeep folders return at end");
+ }
+ return new ArrayList(searchResult);
+ }
+
/**
- * Search for mailboxes in specified context
+ * Shallow search for mailboxes in specified context
*
* @param contextNodeRef context folder for search
* @param namePattern name pattern for search
- * @param includeSubFolders include SubFolders
- * @param isVirtualView is folder in "Virtual" View
+ * @param viewMode is folder in "Virtual" View
* @return list of mailboxes
*/
- public List searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode)
+ private List searchFolders(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode)
{
if (logger.isDebugEnabled())
{
- logger.debug("Search folders namePattern" + namePattern);
+ logger.debug("Search folders, contextNodeRef" + contextNodeRef + " namePattern, " + namePattern);
}
-
- List searchResult = fileFolderService.search(contextNodeRef, namePattern, false, true, includeSubFolders);
- Set result = new HashSet(searchResult);
- if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+
+ List searchResult;
+
+ /**
+ * Shallow search for all folders below contextNodeRef
+ */
+ if("*".equals(namePattern))
{
- List nonFavSites = getNonFavouriteSites(getCurrentUser());
- for (SiteInfo siteInfo : nonFavSites)
- {
- FileInfo nonFavSite = fileFolderService.getFileInfo(siteInfo.getNodeRef());
- List siteChilds = fileFolderService.search(nonFavSite.getNodeRef(), namePattern, false, true, true);
- result.removeAll(siteChilds);
- result.remove(nonFavSite);
- }
-
+ /**
+ * This is a simple listing of all folders below contextNodeRef
+ */
+ searchResult = fileFolderService.listFolders(contextNodeRef);
}
else
{
- // Remove folders from Sites
- List sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback>()
- {
- public List execute() throws Exception
- {
- List res = new ArrayList();
- try
- {
-
- res = serviceRegistry.getSiteService().listSites(getCurrentUser());
- }
- catch (SiteServiceException e)
- {
- // Do nothing. Root sites folder was not created.
- if (logger.isWarnEnabled())
- {
- logger.warn("Root sites folder was not created.");
- }
- }
- catch (InvalidNodeRefException e)
- {
- // Do nothing. Root sites folder was deleted.
- if (logger.isWarnEnabled())
- {
- logger.warn("Root sites folder was deleted.");
- }
- }
-
- if (logger.isDebugEnabled())
- {
- logger.debug("Search folders return ");
- }
-
- return res;
- }
- }, false, true);
- for (SiteInfo siteInfo : sites)
- {
- List siteChilds = fileFolderService.search(siteInfo.getNodeRef(), namePattern, false, true, true);
- result.removeAll(siteChilds);
- // remove site
- result.remove(fileFolderService.getFileInfo(siteInfo.getNodeRef()));
- }
-
+ // MER TODO I'm not sure we ever get here in real use of IMAP. But if we do then the use of this
+ // deprecated method needs to be re-worked.
+ searchResult = fileFolderService.search(contextNodeRef, namePattern, false, true, false);
}
+
+// DO WE NEED TO WORRY ABOUT THE STUFF BELOW ?
+// WOULD ONLY BE RELEVANT if ContextNodeRef is site root.
+// IF contextNodeRef is the imap home or the contextNodeRef is in the depths of a non favourite site.
+//
+// Set result = new HashSet(searchResult);
+// if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+// {
+// /**
+// * In VIRTUAL and MIXED MODE WE SHOULD ONLY DISPLAY FAVOURITE SITES
+// */
+// List nonFavSites = getNonFavouriteSites(getCurrentUser());
+// for (SiteInfo siteInfo : nonFavSites)
+// {
+// FileInfo nonFavSite = fileFolderService.getFileInfo(siteInfo.getNodeRef());
+//
+// // search deep for all folders in the site
+// List siteChilds = fileFolderService.search(nonFavSite.getNodeRef(), namePattern, false, true, true);
+// result.removeAll(siteChilds);
+// result.remove(nonFavSite);
+// }
+//
+// }
+// else
+// {
+// /**
+// * IN ARCHIVE MODE we don't display folders any SITES
+// */
+// // Remove folders from Sites
+// List sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback>()
+// {
+// public List execute() throws Exception
+// {
+// List res = new ArrayList();
+// try
+// {
+//
+// res = serviceRegistry.getSiteService().listSites(getCurrentUser());
+// }
+// catch (SiteServiceException e)
+// {
+// // Do nothing. Root sites folder was not created.
+// if (logger.isWarnEnabled())
+// {
+// logger.warn("Root sites folder was not created.");
+// }
+// }
+// catch (InvalidNodeRefException e)
+// {
+// // Do nothing. Root sites folder was deleted.
+// if (logger.isWarnEnabled())
+// {
+// logger.warn("Root sites folder was deleted.");
+// }
+// }
+//
+// if (logger.isDebugEnabled())
+// {
+// logger.debug("Search folders return ");
+// }
+//
+// return res;
+// }
+// }, false, true);
+//
+// for (SiteInfo siteInfo : sites)
+// {
+// List siteChilds = fileFolderService.search(siteInfo.getNodeRef(), namePattern, false, true, true);
+// result.removeAll(siteChilds);
+// // remove site
+// result.remove(fileFolderService.getFileInfo(siteInfo.getNodeRef()));
+// }
+//
+// }
+
if (logger.isDebugEnabled())
{
- logger.debug("Search folders return at end");
+ logger.debug("Search folders return at end, namePattern:" + namePattern);
}
- return new ArrayList(result);
+
+ return searchResult;
}
/**
- * Search for files in specified context
+ * Search for emails in specified folder depending on view mode.
+ *
+ * Shallow list of files
*
* @param contextNodeRef context folder for search
- * @param namePattern name pattern for search
- * @param searchType type for search
- * @param includeSubFolders include SubFolders
- * @return list of files with specifed type
- */
- public List searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders)
- {
-
- if (logger.isDebugEnabled())
- {
- logger.debug("Search files namePattern," + contextNodeRef + ", " + namePattern + ", " + includeSubFolders);
- }
-
- List files = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
-
- if (logger.isDebugEnabled())
- {
- logger.debug("Search files return");
- }
-
- return files;
- }
-
- /**
- * Search for emails in specified folder depend on view mode.
- *
- * @param contextNodeRef context folder for search
- * @param namePattern name pattern for search
* @param viewMode context folder view mode
- * @param includeSubFolders includeSubFolders
* @return list of emails that context folder contains.
*/
- public List searchMails(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode, boolean includeSubFolders)
+ public List searchMails(NodeRef contextNodeRef, ImapViewMode viewMode)
{
if (logger.isDebugEnabled())
{
- logger.debug("Search mails namePattern," + contextNodeRef + ", " + namePattern + ", " + viewMode + ", " + includeSubFolders);
+ logger.debug("Search mails namePattern," + contextNodeRef + ", " + viewMode );
}
+ List searchResult = fileFolderService.listFiles(contextNodeRef);
+
List result = new LinkedList();
- List searchResult = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
+ //List searchResult = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
switch (viewMode)
{
case MIXED:
@@ -755,6 +894,7 @@ public class ImapServiceImpl implements ImapService
break;
}
+ logger.debug("found files:" + result.size());
return result;
}
@@ -762,7 +902,7 @@ public class ImapServiceImpl implements ImapService
{
if (logger.isDebugEnabled())
{
- logger.debug("Subscribing: " + mailbox);
+ logger.debug("Subscribing: " + user + ", " + mailbox);
}
AlfrescoImapFolder mailFolder = getFolder(user, mailbox);
nodeService.removeAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED);
@@ -772,10 +912,19 @@ public class ImapServiceImpl implements ImapService
{
if (logger.isDebugEnabled())
{
- logger.debug("Unsubscribing: " + mailbox);
+ logger.debug("Unsubscribing: " + user + ", " + mailbox);
}
AlfrescoImapFolder mailFolder = getFolder(user, mailbox);
- nodeService.addAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED, null);
+ if(mailFolder.getFolderInfo() != null)
+ {
+ logger.debug("unsubscribing by ASPECT_IMAP_FOLDER_NONSUBSCRIBED");
+ nodeService.addAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED, null);
+ }
+ else
+ {
+ // perhaps the folder has been deleted by another async process?
+ logger.debug("Unable to find folder to unsubscribe");
+ }
}
/**
@@ -811,6 +960,8 @@ public class ImapServiceImpl implements ImapService
public synchronized void setFlags(FileInfo messageInfo, Flags flags, boolean value)
{
checkForFlaggableAspect(messageInfo.getNodeRef());
+
+
for (Flags.Flag flag : flags.getSystemFlags())
{
setFlag(messageInfo, flag, value);
@@ -826,8 +977,18 @@ public class ImapServiceImpl implements ImapService
*/
public void setFlag(FileInfo messageInfo, Flag flag, boolean value)
{
- checkForFlaggableAspect(messageInfo.getNodeRef());
- nodeService.setProperty(messageInfo.getNodeRef(), flagToQname.get(flag), value);
+ NodeRef nodeRef = messageInfo.getNodeRef();
+ checkForFlaggableAspect(nodeRef);
+ AccessStatus status = permissionService.hasPermission(nodeRef, PermissionService.WRITE_PROPERTIES);
+ if (status == AccessStatus.DENIED)
+ {
+ logger.debug("checkForFlaggableAspect - no permissions to add FLAG " + nodeRef);
+ //TODO should we throw an exception here?
+ }
+ else
+ {
+ nodeService.setProperty(messageInfo.getNodeRef(), flagToQname.get(flag), value);
+ }
}
/**
@@ -835,6 +996,10 @@ public class ImapServiceImpl implements ImapService
*/
private List listMailboxes(AlfrescoImapUser user, String mailboxPattern, boolean listSubscribed)
{
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("listMailboxes" + user + ", mailboxPattern:" + mailboxPattern + ", listSubscribed:" + listSubscribed);
+ }
List result = new LinkedList();
Map mountPoints = getMountPoints();
@@ -900,7 +1065,8 @@ public class ImapServiceImpl implements ImapService
isExtractionEnabled(mountPointFileInfo.getNodeRef())));
}
}
-
+
+
}
// List mailboxes that are in user IMAP Home
@@ -917,11 +1083,24 @@ public class ImapServiceImpl implements ImapService
}
result.addAll(imapFolders);
}
+
+ logger.debug("listMailboxes returning size:" + result.size());
return result;
}
+ /**
+ * Get the list of folders
+ *
+ * @param mailboxRoot
+ * @param root
+ * @param user
+ * @param mailboxPattern
+ * @param listSubscribed
+ * @param viewMode
+ * @return
+ */
private List listFolder(
NodeRef mailboxRoot,
NodeRef root,
@@ -932,7 +1111,7 @@ public class ImapServiceImpl implements ImapService
{
if (logger.isDebugEnabled())
{
- logger.debug("Listing mailboxes: mailboxPattern=" + mailboxPattern);
+ logger.debug("List folder: mailboxPattern=" + mailboxPattern);
}
int index = mailboxPattern.indexOf(AlfrescoImapConst.HIERARCHY_DELIMITER);
@@ -957,9 +1136,12 @@ public class ImapServiceImpl implements ImapService
if (index < 0)
{
+ // This is the last level
+
if ("*".equals(name))
{
- Collection list = searchFolders(root, name, true, viewMode);
+ // Deep listing of all folders
+ Collection list = searchDeep(root, viewMode);
if (listSubscribed)
{
list = getSubscribed(list, user.getLogin());
@@ -973,8 +1155,9 @@ public class ImapServiceImpl implements ImapService
}
else if (name.endsWith("*"))
{
+ // Ends with wildcard
List fullList = new LinkedList();
- List list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+ List list = searchFolders(root, name.replace('%', '*'), viewMode);
Collection subscribedList = list;
if (listSubscribed)
{
@@ -986,7 +1169,7 @@ public class ImapServiceImpl implements ImapService
fullList.addAll(subscribedList);
for (FileInfo fileInfo : list)
{
- List childList = searchFolders(fileInfo.getNodeRef(), "*", true, viewMode);
+ List childList = searchDeep(fileInfo.getNodeRef(), viewMode);
if (listSubscribed)
{
fullList.addAll(getSubscribed(childList, user.getLogin()));
@@ -1002,7 +1185,8 @@ public class ImapServiceImpl implements ImapService
}
else if ("%".equals(name))
{
- List list = searchFolders(root, "*", false, viewMode);
+ // Non recursive listing
+ List list = searchFolders(root, "*", viewMode);
LinkedList subscribedList = new LinkedList();
if (listSubscribed)
@@ -1050,7 +1234,8 @@ public class ImapServiceImpl implements ImapService
}
else if (name.contains("%") || name.contains("*"))
{
- List list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+ // wild cards in the middle of the name
+ List list = searchFolders(root, name.replace('%', '*'), viewMode);
Collection subscribedList = list;
if (listSubscribed)
{
@@ -1065,7 +1250,8 @@ public class ImapServiceImpl implements ImapService
}
else
{
- List list = searchFolders(root, name, false, viewMode);
+ // No wild cards
+ List list = searchFolders(root, name, viewMode);
Collection subscribedList = list;
if (listSubscribed)
{
@@ -1083,7 +1269,7 @@ public class ImapServiceImpl implements ImapService
// If (index != -1) this is not the last level
List result = new LinkedList();
- List list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+ List list = searchFolders(root, name.replace('%', '*'), viewMode);
for (FileInfo folder : list)
{
Collection childFolders = listFolder(mailboxRoot, folder.getNodeRef(), user, remainName, listSubscribed, viewMode);
@@ -1104,35 +1290,51 @@ public class ImapServiceImpl implements ImapService
/**
* Convert mailpath from IMAP client representation to the alfresco representation view
- * (e.g. with default settings "getMailPathInRepo(Repository_virtual.Imap Home)" will return "Company Home.Imap Home")
+ * (e.g. with default settings
+ * "getMailPathInRepo(Repository_virtual/Imap Home)" will return "Company Home/Imap Home")
*
* @param mailPath mailbox path in IMAP client
* @return mailbox path in alfresco
*/
private String getMailPathInRepo(String mailPath)
{
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("getMailPathInRepo :" + mailPath);
+ }
String rootFolder;
String remain = "";
int index = mailPath.indexOf(AlfrescoImapConst.HIERARCHY_DELIMITER);
if (index > 0)
{
+ // mail path contains a /
rootFolder = mailPath.substring(0, index);
- remain = mailPath.substring(index);
+ remain = mailPath.substring(index + 1);
}
else
{
+ //mail path is a root folder
rootFolder = mailPath;
}
if (imapConfigMountPoints.keySet().contains(rootFolder))
{
Map mountPoints = getMountPoints();
NodeRef rootRef = mountPoints.get(rootFolder);
- String rootName = nodeService.getProperty(rootRef, ContentModel.PROP_NAME).toString();
+ String path = remain;
+
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("getMailPathInRepo mounted point returning :" + path);
+ }
- return rootName + remain;
+ return path;
}
else
{
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("getMailPathInRepo not mounted returning path as is:" + mailPath);
+ }
return mailPath;
}
}
@@ -1219,11 +1421,16 @@ public class ImapServiceImpl implements ImapService
{
Map mountPoints = getMountPoints();
NodeRef mountRef = mountPoints.get(rootFolder);
- return nodeService.getParentAssocs(mountRef).get(0).getParentRef();
+ logger.debug("getMailboxRootRef mounted, " + mountRef);
+ return mountRef;
+ // MER EXPERIMENT
+ //return nodeService.getParentAssocs(mountRef).get(0).getParentRef();
}
else
{
- return getUserImapHomeRef(userName);
+ NodeRef ret = getUserImapHomeRef(userName);
+ logger.debug("getMailboxRootRef using userImapHome, " + ret);
+ return ret;
}
}
@@ -1269,21 +1476,14 @@ public class ImapServiceImpl implements ImapService
private boolean isSubscribed(FileInfo fileInfo, String userName)
{
return !nodeService.hasAspect(fileInfo.getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED);
- // This is a multiuser support. Commented due new requirements
-
- // Map properties = fileInfo.getProperties();
- // String subscribedList = (String) properties.get(ImapModel.PROP_IMAP_FOLDER_SUBSCRIBED);
- // if (subscribedList == null)
- // {
- // return false;
- // }
- // else
- // {
- // return subscribedList.contains(imapHelper.formatUserEntry(userName));
- // }
-
}
+ /**
+ * getSubscribed filters out folders which are not subscribed.
+ * @param list
+ * @param userName
+ * @return collection of subscribed folders.
+ */
private Collection getSubscribed(Collection list, String userName)
{
Collection result = new LinkedList();
@@ -1301,7 +1501,7 @@ public class ImapServiceImpl implements ImapService
private boolean hasSubscribedChild(FileInfo parent, String userName, ImapViewMode viewMode)
{
- List list = searchFolders(parent.getNodeRef(), "*", true, viewMode);
+ List list = searchDeep(parent.getNodeRef(), viewMode);
for (FileInfo fileInfo : list)
{
@@ -1314,6 +1514,7 @@ public class ImapServiceImpl implements ImapService
return false;
}
+
private List createMailFolderList(AlfrescoImapUser user, Collection list, NodeRef imapUserHomeRef)
{
List result = new LinkedList();
@@ -1371,71 +1572,101 @@ public class ImapServiceImpl implements ImapService
}
/**
- * Return list of sites, that belong to the specified user and not marked as "Imap favourite"
+ * Return list of "favourite" sites, that belong to the specified user and are marked as "Imap favourite"
*
* @param userName name of user
- * @return List of nonFavourite sites.
+ * @return List of favourite sites.
*/
- private List getNonFavouriteSites(final String userName)
+ private List getFavouriteSites(final String userName)
{
- List nonFavSites = new LinkedList();
+ List favSites = new LinkedList();
- PreferenceService preferenceService = (PreferenceService) serviceRegistry.getService(ServiceRegistry.PREFERENCE_SERVICE);
- Map prefs = preferenceService.getPreferences(userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES);
+ PreferenceService preferenceService = (PreferenceService) serviceRegistry
+ .getService(ServiceRegistry.PREFERENCE_SERVICE);
+ Map prefs = preferenceService.getPreferences(
+ userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES);
- List sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback>()
- {
- public List execute() throws Exception
- {
- List res = new ArrayList();
- try
- {
+ /**
+ * List the user's sites
+ */
+ List sites = serviceRegistry.getTransactionService()
+ .getRetryingTransactionHelper().doInTransaction(
+ new RetryingTransactionCallback>()
+ {
+ public List execute() throws Exception
+ {
+ List res = new ArrayList();
+ try
+ {
- res = serviceRegistry.getSiteService().listSites(userName);
- }
- catch (SiteServiceException e)
- {
- //Do nothing. Root sites folder was not created.
- if (logger.isDebugEnabled())
- {
- logger.warn("Root sites folder was not created.");
- }
- }
- catch (InvalidNodeRefException e)
- {
- //Do nothing. Root sites folder was deleted.
- if (logger.isDebugEnabled())
- {
- logger.warn("Root sites folder was deleted.");
- }
- }
+ res = serviceRegistry.getSiteService()
+ .listSites(userName);
+ }
+ catch (SiteServiceException e)
+ {
+ // Do nothing. Root sites folder was not
+ // created.
+ if (logger.isDebugEnabled())
+ {
+ logger.warn("Root sites folder was not created.");
+ }
+ }
+ catch (InvalidNodeRefException e)
+ {
+ // Do nothing. Root sites folder was
+ // deleted.
+ if (logger.isDebugEnabled())
+ {
+ logger.warn("Root sites folder was deleted.");
+ }
+ }
- return res;
- }
- }, false, true);
+ return res;
+ }
+ }, false, true);
for (SiteInfo siteInfo : sites)
{
- String key = AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES + "." + siteInfo.getShortName();
+ String key = AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES + "."
+ + siteInfo.getShortName();
Boolean isImapFavourite = (Boolean) prefs.get(key);
- if (isImapFavourite == null || !isImapFavourite)
+ if (isImapFavourite != null && isImapFavourite)
{
- nonFavSites.add(siteInfo);
+ if(logger.isDebugEnabled())
+ {
+ logger.debug("favourite site user:" + userName + "site:" + siteInfo.getShortName());
+ }
+ favSites.add(siteInfo.getNodeRef());
}
}
+
+ logger.debug("at end of getFavouriteSites user:" + userName);
- return nonFavSites;
+ return favSites;
}
+ /**
+ * Checks for the existence of the flaggable aspect and adds it if it is not already present on the folder.
+ * @param nodeRef
+ */
private void checkForFlaggableAspect(NodeRef nodeRef)
{
if (!nodeService.hasAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE))
{
- Map aspectProperties = new HashMap();
- nodeService.addAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE, aspectProperties);
+ AccessStatus status = permissionService.hasPermission(nodeRef, PermissionService.WRITE_PROPERTIES);
+ if (status == AccessStatus.DENIED)
+ {
+ logger.debug("checkForFlaggableAspect - no permissions to add FLAGGABLE aspect" + nodeRef);
+ }
+ else
+ {
+ logger.debug("adding flaggable aspect nodeRef:" + nodeRef);
+ Map aspectProperties = new HashMap();
+ nodeService.addAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE, aspectProperties);
+ }
}
}
-
+
private boolean isExtractionEnabled(NodeRef nodeRef)
{
return extractAttachmentsEnabled && !ignoreExtractionFolders.contains(nodeRef);
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
index 4eceaea209..6f7d4b3eb3 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
@@ -59,6 +59,9 @@ import org.alfresco.util.config.RepositoryFolderConfigBean;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ClassPathResource;
+/**
+ * Unit test for ImapServiceImpl
+ */
public class ImapServiceImplTest extends TestCase
{
@@ -261,7 +264,38 @@ public class ImapServiceImplTest extends TestCase
imapService.createMailbox(user, MAILBOX_NAME_A);
imapService.createMailbox(user, MAILBOX_NAME_B);
List mf = imapService.listMailboxes(user, MAILBOX_PATTERN);
- assertEquals(mf.size(), 2);
+ assertEquals(2, mf.size());
+
+ boolean foundA = false;
+ boolean foundB = false;
+
+ for(AlfrescoImapFolder folder : mf)
+ {
+ if(MAILBOX_NAME_A.equals(folder.getName()))
+ {
+ foundA = true;
+ }
+ if(MAILBOX_NAME_B.equals(folder.getName()))
+ {
+ foundB = true;
+ }
+ }
+
+ assertTrue("folder A found", foundA);
+ assertTrue("folder B found", foundB);
+
+ /**
+ * The new mailboxes should be subscribed?
+ */
+ List aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
+ assertEquals(2, aif.size());
+
+ /**
+ * Unsubscribe to one of the mailboxes.
+ */
+ imapService.unsubscribe(user, MAILBOX_NAME_B);
+ List aif2 = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
+ assertEquals(1, aif2.size());
}
public void testListSubscribedMailbox() throws Exception
@@ -272,6 +306,9 @@ public class ImapServiceImplTest extends TestCase
imapService.subscribe(user, MAILBOX_NAME_B);
List aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
assertEquals(aif.size(), 2);
+
+ assertTrue("Can't subscribe mailbox A", checkSubscribedMailbox(user, MAILBOX_NAME_A));
+ assertTrue("Can't subscribe mailbox B", checkSubscribedMailbox(user, MAILBOX_NAME_B));
}
public void testCreateMailbox() throws Exception
@@ -325,52 +362,52 @@ public class ImapServiceImplTest extends TestCase
assertFalse("Can't delete mailbox", checkMailbox(user, MAILBOX_NAME_B));
}
- public void testSearchFoldersInArchive() throws Exception
- {
- List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.ARCHIVE);
- assertNotNull("Can't find folders in Archive Mode", fi);
- assertEquals("Can't find folders in Archive Mode", fi.size(), 2);
-
- fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.ARCHIVE);
- assertNotNull("Can't find folders in Archive Mode", fi);
- assertEquals("Can't find folders in Archive Mode", fi.size(), 1);
- }
+// public void testSearchFoldersInArchive() throws Exception
+// {
+// List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.ARCHIVE);
+// assertNotNull("Can't find folders in Archive Mode", fi);
+// assertEquals("Can't find folders in Archive Mode", fi.size(), 2);
+//
+// fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.ARCHIVE);
+// assertNotNull("Can't find folders in Archive Mode", fi);
+// assertEquals("Can't find folders in Archive Mode", fi.size(), 1);
+// }
+//
+// public void testSearchFoldersInVirtual() throws Exception
+// {
+// List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.VIRTUAL);
+// assertNotNull("Can't find folders in Virtual Mode", fi);
+// assertEquals("Can't find folders in Virtual Mode", fi.size(), 2);
+//
+// fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.VIRTUAL);
+// assertNotNull("Can't find folders in Virtual Mode", fi);
+// assertEquals("Can't find folders in Virtual Mode", fi.size(), 1);
+// }
+//
+// public void testSearchFoldersInMixed() throws Exception
+// {
+// List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.MIXED);
+// assertNotNull("Can't find folders in Mixed Mode", fi);
+// assertEquals("Can't find folders in Mixed Mode", fi.size(), 2);
+//
+// fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.MIXED);
+// assertNotNull("Can't find folders in Mixed Mode", fi);
+// assertEquals("Can't find folders in Mixed Mode", fi.size(), 1);
+// }
- public void testSearchFoldersInVirtual() throws Exception
- {
- List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.VIRTUAL);
- assertNotNull("Can't find folders in Virtual Mode", fi);
- assertEquals("Can't find folders in Virtual Mode", fi.size(), 2);
-
- fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.VIRTUAL);
- assertNotNull("Can't find folders in Virtual Mode", fi);
- assertEquals("Can't find folders in Virtual Mode", fi.size(), 1);
- }
-
- public void testSearchFoldersInMixed() throws Exception
- {
- List fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.MIXED);
- assertNotNull("Can't find folders in Mixed Mode", fi);
- assertEquals("Can't find folders in Mixed Mode", fi.size(), 2);
-
- fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.MIXED);
- assertNotNull("Can't find folders in Mixed Mode", fi);
- assertEquals("Can't find folders in Mixed Mode", fi.size(), 1);
- }
-
- public void testSearchFiles() throws Exception
- {
- List fi = imapService.searchFiles(testImapFolderNodeRef, FILE_PATTERN, true);
- assertNotNull(fi);
- assertTrue(fi.size() > 0);
- }
-
- public void testSearchMails() throws Exception
- {
- List fi = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.MIXED, true);
- assertNotNull(fi);
- assertTrue(fi.size() > 0);
- }
+// public void testSearchFiles() throws Exception
+// {
+// List fi = imapService.searchFiles(testImapFolderNodeRef, FILE_PATTERN, true);
+// assertNotNull(fi);
+// assertTrue(fi.size() > 0);
+// }
+//
+// public void testSearchMails() throws Exception
+// {
+// List fi = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.MIXED);
+// assertNotNull(fi);
+// assertTrue(fi.size() > 0);
+// }
public void testSubscribe() throws Exception
{
@@ -385,6 +422,7 @@ public class ImapServiceImplTest extends TestCase
imapService.createMailbox(user, MAILBOX_NAME_A);
imapService.subscribe(user, MAILBOX_NAME_A);
imapService.unsubscribe(user, MAILBOX_NAME_A);
+ // TODO MER 21/05/2010 : line below looks like a bug to me.
assertFalse("Can't unsubscribe mailbox", checkSubscribedMailbox(user, MAILBOX_NAME_A));
}
@@ -402,7 +440,7 @@ public class ImapServiceImplTest extends TestCase
public void testSetFlags() throws Exception
{
- List fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+ List fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
if (fis != null && fis.size() > 0)
{
FileInfo messageFileInfo = fis.get(0);
@@ -435,7 +473,7 @@ public class ImapServiceImplTest extends TestCase
public void testSetFlag() throws Exception
{
- List fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+ List fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
if (fis != null && fis.size() > 0)
{
FileInfo messageFileInfo = fis.get(0);
@@ -455,7 +493,7 @@ public class ImapServiceImplTest extends TestCase
public void testGetFlags() throws Exception
{
- List fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+ List fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
if (fis != null && fis.size() > 0)
{
FileInfo messageFileInfo = fis.get(0);
diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 4fecc020b2..12b2dff645 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -495,6 +495,8 @@ public final class People extends BaseScopableProcessorExtension implements Init
query.append(term);
query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:lastName:\"*");
query.append(term);
+ query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:\"*");
+ query.append(term);
query.append("*\" ");
}
diff --git a/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java b/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
new file mode 100644
index 0000000000..f30c455670
--- /dev/null
+++ b/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.management;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.SimpleApplicationEventMulticaster;
+
+/**
+ * A workaround for a Spring problem, where it tries to multicast to a parent application context that either hasn't
+ * finished refreshing yet or is in the process of shutting down.
+ *
+ * @author dward
+ */
+public class SafeApplicationEventMulticaster extends SimpleApplicationEventMulticaster implements
+ ApplicationContextAware
+{
+ /** The owning application context. */
+ private ApplicationContext context;
+
+ /** Has the application started? */
+ private boolean isApplicationStarted;
+
+ /** The queued events that can't be broadcast until the application is started. */
+ private List queuedEvents = new LinkedList();
+
+ /*
+ * (non-Javadoc)
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
+ * ApplicationContext)
+ */
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+ {
+ this.context = applicationContext;
+ setBeanFactory(applicationContext);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see
+ * org.springframework.context.event.SimpleApplicationEventMulticaster#multicastEvent(org.springframework.context
+ * .ApplicationEvent)
+ */
+ @Override
+ public void multicastEvent(ApplicationEvent event)
+ {
+ if (event instanceof ContextRefreshedEvent && event.getSource() == this.context)
+ {
+ this.isApplicationStarted = true;
+ for (ApplicationEvent queuedEvent : this.queuedEvents)
+ {
+ super.multicastEvent(queuedEvent);
+ }
+ this.queuedEvents.clear();
+ super.multicastEvent(event);
+ }
+ else if (event instanceof ContextClosedEvent && event.getSource() == this.context)
+ {
+ this.isApplicationStarted = false;
+ super.multicastEvent(event);
+ }
+ else if (this.isApplicationStarted)
+ {
+ super.multicastEvent(event);
+ }
+ else
+ {
+ this.queuedEvents.add(event);
+ }
+ }
+}
diff --git a/source/java/org/alfresco/repo/management/SafeEventPublisher.java b/source/java/org/alfresco/repo/management/SafeEventPublisher.java
deleted file mode 100644
index 5d333bf543..0000000000
--- a/source/java/org/alfresco/repo/management/SafeEventPublisher.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.repo.management;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationEventPublisher;
-
-/**
- * An event publisher that is safe to use while the context is in the process of refreshing. It queues up events until
- * the context has refreshed, after which point events are published in real time.
- *
- * @author dward
- */
-public class SafeEventPublisher extends AbstractLifecycleBean implements ApplicationEventPublisher
-{
-
- /** Has the application started? */
- private boolean isApplicationStarted;
-
- /** The queued events. */
- private List queuedEvents = new LinkedList();
-
- /*
- * (non-Javadoc)
- * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
- */
- @Override
- protected void onBootstrap(ApplicationEvent event)
- {
- this.isApplicationStarted = true;
- for (ApplicationEvent queuedEvent : this.queuedEvents)
- {
- publishEvent(queuedEvent);
- }
- this.queuedEvents.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
- */
- @Override
- protected void onShutdown(ApplicationEvent event)
- {
- this.isApplicationStarted = false;
- }
-
- /*
- * (non-Javadoc)
- * @see
- * org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent)
- */
- public void publishEvent(ApplicationEvent event)
- {
- ApplicationContext context = getApplicationContext();
- if (this.isApplicationStarted)
- {
- context.publishEvent(event);
- }
- else
- {
- this.queuedEvents.add(event);
- }
- }
-
-}
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
index fc377e3c62..6d2fb0295c 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.model.filefolder;
import java.io.File;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -29,6 +30,8 @@ import junit.framework.TestCase;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
+import org.alfresco.repo.dictionary.DictionaryDAO;
+import org.alfresco.repo.dictionary.M2Model;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -406,7 +409,7 @@ public class FileFolderPerformanceTester extends TestCase
}
}
- private static void run(ApplicationContext ctx, String ... args) throws Throwable
+ private static void run(final ApplicationContext ctx, String ... args) throws Throwable
{
ArgumentHelper argHelper = new ArgumentHelper(getUsage(), args);
final int fileCount = argHelper.getIntegerValue("files", true, 1, 10000);
@@ -418,6 +421,7 @@ public class FileFolderPerformanceTester extends TestCase
final MutableAuthenticationService authenticationService = serviceRegistry.getAuthenticationService();
final PermissionService permissionService = serviceRegistry.getPermissionService();
final NodeService nodeService = serviceRegistry.getNodeService();
+ final SearchService searchService = serviceRegistry.getSearchService();
final TransactionService transactionService = serviceRegistry.getTransactionService();
final FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
@@ -438,23 +442,42 @@ public class FileFolderPerformanceTester extends TestCase
public NodeRef execute() throws Throwable
{
AuthenticationUtil.pushAuthentication();
+
+ DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO");
+ M2Model model = M2Model.createModel("tempModel");
+ model.createNamespace("test", "t");
+ model.createNamespace("testx", "");
+ for (int m = 0; m < 30; m++)
+ {
+ model.createAspect("t:aspect_" + m);
+ }
+ dictionaryDao.putModel(model);
+
NodeRef folderNodeRef = null;
try
{
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
if (selectedFolderNodeRef == null)
{
- // Create a new store
- StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, GUID.generate());
- NodeRef rootNodeRef = nodeService.getRootNode(storeRef);
- // Create a folder
- folderNodeRef = nodeService.createNode(
- rootNodeRef,
- ContentModel.ASSOC_CHILDREN,
- ContentModel.ASSOC_CHILDREN,
- ContentModel.TYPE_FOLDER,
- Collections.singletonMap(ContentModel.PROP_NAME, "TOP FOLDER")
- ).getChildRef();
+ // find the guest folder
+ StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+ ResultSet rs = searchService.query(storeRef, SearchService.LANGUAGE_XPATH, "/app:company_home");
+ try
+ {
+ if (rs.length() == 0)
+ {
+ throw new AlfrescoRuntimeException("Didn't find Company Home");
+ }
+ NodeRef companyHomeNodeRef = rs.getNodeRef(0);
+ folderNodeRef = fileFolderService.create(
+ companyHomeNodeRef,
+ "TOP_FOLDER_" + System.currentTimeMillis(),
+ ContentModel.TYPE_FOLDER).getNodeRef();
+ }
+ finally
+ {
+ rs.close();
+ }
// Grant permissions
permissionService.setPermission(folderNodeRef, user, PermissionService.ALL_PERMISSIONS, true);
}
@@ -472,15 +495,33 @@ public class FileFolderPerformanceTester extends TestCase
}
if (selectedFolderNodeRef == null)
{
+ List largeCollection = new ArrayList(1000);
+ for (int i = 0; i < 50; i++)
+ {
+ largeCollection.add(String.format("Large-collection-value-%05d", i));
+ }
+
// Create the files
for (int i = 0; i < fileCount; i++)
{
- fileFolderService.create(
+ FileInfo fileInfo = fileFolderService.create(
folderNodeRef,
String.format("FILE-%4d", i),
ContentModel.TYPE_CONTENT);
+ NodeRef nodeRef = fileInfo.getNodeRef();
+ nodeService.setProperty(
+ nodeRef,
+ QName.createQName("{test}mv"),
+ (Serializable) largeCollection);
+ for (int m = 0; m < 30; m++)
+ {
+ nodeService.addAspect(
+ nodeRef,
+ QName.createQName("{test}aspect_"+m), null);
+ }
}
System.out.println("Created " + fileCount + " files in folder " + folderNodeRef);
+
}
// Done
return folderNodeRef;
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index fa742eff8d..0653d0724b 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -41,8 +41,10 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileFolderServiceType;
+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.model.SubFolderFilter;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader;
@@ -347,6 +349,24 @@ public class FileFolderServiceImpl implements FileFolderService
return results;
}
+ public List listDeepFolders(NodeRef contextNodeRef,
+ SubFolderFilter filter)
+ {
+ List nodeRefs = listSimpleDeep(contextNodeRef, true, false, filter);
+
+ List results = toFileInfo(nodeRefs);
+
+ // done
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Deep search for files: \n" +
+ " context: " + contextNodeRef + "\n" +
+ " results: " + results);
+ }
+ return results;
+
+ }
+
public NodeRef searchSimple(NodeRef contextNodeRef, String name)
{
NodeRef childNodeRef = nodeService.getChildByName(contextNodeRef, ContentModel.ASSOC_CONTAINS, name);
@@ -370,6 +390,7 @@ public class FileFolderServiceImpl implements FileFolderService
}
private static final String LUCENE_MULTI_CHAR_WILDCARD = "*";
+
/**
* Full search with all options
*/
@@ -443,7 +464,7 @@ public class FileFolderServiceImpl implements FileFolderService
// This is search for any name
if(includeSubFolders)
{
- nodeRefs = listSimpleDeep(contextNodeRef, folderSearch, fileSearch);
+ nodeRefs = listSimpleDeep(contextNodeRef, folderSearch, fileSearch, null);
}
else
{
@@ -552,20 +573,24 @@ public class FileFolderServiceImpl implements FileFolderService
}
/**
- * A deep version of listSimple. Which recursivly walks down the tree from a given starting point, returning
- * the node refs found along the way.
+ * A deep version of listSimple. Which recursively walks down the tree from a given starting point, returning
+ * the node refs of files or folders found along the way.
*
- * MER: I've added this rather than changeing listSimple to minimise the risk of breaking
- * the existing code. This is a quick performance improvent between using
+ * MER: I've added this rather than changing listSimple to minimise the risk of breaking
+ * the existing code. This is a quick performance improvement between using
* XPath which is awful or adding new methods to the NodeService/DB This is also a dangerous method in that it can return a
* lot of data and take a long time.
*
+ * The folder filter is called for each sub-folder to determine whether to search in that sub-folder, should a subfolder be excluded
+ * then all its chidren are excluded as well.
+ *
* @param contextNodeRef the starting point.
* @param folders return nodes of type folders.
* @param files return nodes of type files.
- * @return list of node refs
+ * @param subfolder filter controls which folders to search. If null then all subfolders are searched.
+ * @return list of node references
*/
- private List listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files)
+ private List listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files, SubFolderFilter folderFilter)
{
Set folderTypeQNames = new HashSet(10);
Set fileTypeQNames = new HashSet(10);
@@ -578,7 +603,7 @@ public class FileFolderServiceImpl implements FileFolderService
folderTypeQNames.addAll(qnames);
folderTypeQNames.add(ContentModel.TYPE_FOLDER);
- // Remove 'system' folders
+ // Remove 'system' folders and all descendants
Collection systemFolderQNames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
folderTypeQNames.removeAll(systemFolderQNames);
folderTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
@@ -617,10 +642,24 @@ public class FileFolderServiceImpl implements FileFolderService
for (ChildAssociationRef folderRef : folderAssocRefs)
{
- // Add the folders in the currentDir
- toSearch.push(folderRef.getChildRef());
+ // We have some child folders
+ boolean include = true;
+ if(folderFilter != null)
+ {
+ include = folderFilter.isEnterSubfolder(folderRef);
+ if(include)
+ {
+ // yes search in these subfolders
+ toSearch.push(folderRef.getChildRef());
+ }
+ }
+ else
+ {
+ // No filter - Add the folders in the currentDir
+ toSearch.push(folderRef.getChildRef());
+ }
- if(folders)
+ if(folders && include)
{
result.add(folderRef.getChildRef());
}
@@ -948,9 +987,38 @@ public class FileFolderServiceImpl implements FileFolderService
}
}
+ /**
+ * Checks for the presence of, and creates as necessary, the folder structure in the provided path.
+ *
+ * An empty path list is not allowed as it would be impossible to necessarily return file info
+ * for the parent node - it might not be a folder node.
+ * @param parentNodeRef the node under which the path will be created
+ * @param pathElements the folder name path to create - may not be empty
+ * @param folderTypeQName the types of nodes to create. This must be a valid subtype of
+ * {@link org.alfresco.model.ContentModel#TYPE_FOLDER they folder type}.
+ * @return Returns the info of the last folder in the path.
+ * @deprecated Use FileFolderUtil.makeFolders rather than directly accessing this implementation class.
+ */
public FileInfo makeFolders(NodeRef parentNodeRef, List