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

58520: Upped the memory for the sameVM tests and categorised the AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:46:49 +00:00
parent 6aac29b931
commit c0de7292bc
32 changed files with 120 additions and 2 deletions

View File

@@ -38,10 +38,12 @@ import org.alfresco.service.cmr.avm.deploy.DeploymentReport;
import org.alfresco.service.cmr.avm.deploy.DeploymentReportCallback;
import org.alfresco.service.cmr.avm.deploy.DeploymentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.test_category.LegacyCategory;
import org.alfresco.util.Deleter;
import org.alfresco.util.NameMatcher;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.experimental.categories.Category;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -49,6 +51,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
* @author britt
* @author mrogers
*/
@Category(LegacyCategory.class)
public class DeploymentServiceImplFSTest extends AVMServiceTestBase
{
private File log = null;