Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

60616: Correct compile error after bad merge.
      - Part of 58257: Added missing transaction(s) in SOLRDAOTest. (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:26:20 +00:00
parent 38efc4c619
commit a67d74a6da

View File

@@ -36,6 +36,7 @@ import org.alfresco.repo.solr.Transaction;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.junit.experimental.categories.Category;
import org.springframework.context.ConfigurableApplicationContext;