Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:08:13 +00:00
parent d894798ee4
commit ae909e7413
45 changed files with 4443 additions and 2171 deletions

View File

@@ -52,6 +52,7 @@ import org.alfresco.repo.dictionary.DictionaryNamespaceComponent;
import org.alfresco.repo.dictionary.M2Model;
import org.alfresco.repo.dictionary.NamespaceDAOImpl;
import org.alfresco.repo.domain.hibernate.HibernateL1CacheBulkLoader;
import org.alfresco.repo.domain.hibernate.HibernateSessionHelper;
import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager;
import org.alfresco.repo.node.BaseNodeServiceTest;
import org.alfresco.repo.search.MLAnalysisMode;
@@ -546,7 +547,8 @@ public class ADMLuceneTest extends TestCase
private void doBulkTest(int n) throws Exception
{
SessionSizeResourceManager.setDisableInTransaction();
Map<QName, Serializable> testProperties = new HashMap<QName, Serializable>();
testProperties.put(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic"), "BULK");
for (int i = 0; i < n; i++)

View File

@@ -64,7 +64,7 @@ public class LuceneResultSet extends AbstractResultSet
private TenantService tenantService;
SearchParameters searchParameters;
private SearchParameters searchParameters;
private LuceneConfig config;