From 9b5365672b118c52f354e9f6448894bc4153393f Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Mon, 1 Oct 2012 12:17:53 +0000 Subject: [PATCH] Merged BRANCHES/DEV/mward/clustering_p1 to HEAD: 41454: ALF-15881: Disabling clustering in community 41500: ALF-15883: Move configuration files 41503: ALF-15884: Move cluster package to enterprise repository project 41504: ALF-15884: Move cluster package to enterprise repository project 41519: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only 41523: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only 41525: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only 41527: ALF-15886: References/definition for "hazelcastInstanceFactory" must be in enterprise repo only 41530: ALF-15886: remove import for class no longer in project. 41532: ALF-15887: LockStoreFactoryImpl must be separated into community and enterprise versions 41535: ALF-15883: Move configuration files 41561: ALF-15886: factory class to create key fileserver config beans. 41578: ALF-15888: separate transactional and shared cache bean definitions. 41623: ALF-15888: first pass at DefaultSimpleCache implementation. 41646: ALF-15888: move ehcache-default.xml 41651: ALF-15888: update javadoc to reflect changes 41762: ALF-15888: improve cache test to prove that null values are stored correctly. 41812: ALF-15888: added new cache provider for use by hibernate: DefaultCacheProvider. 41830: ALF-15888: make DefaultSimpleCache BeanNameAware to help with debugging etc. 41831: ALF-15888: missing file from commit - adds enterprise override capability for hibernate-cfg.properties 41850: ALF-15888: move tickets cache to cache-context.xml 41857: ALF-15888: make RemoteAlfrescoTicketServiceImpl cache implementation agnostic. 41866: ALF-15888: extract caches from fileservers and web-client and provide enterprise overrides 41881: ALF-15888: replace use of EhCacheAdapter with DefaultSimpleCache and SimpleCache interface. 41884: ALF-15888: added DefaultSimpleCache configuration to CachingContentStore sample XML. 41885: ALF-15888: move EhCacheAdapter to new package. 41886: ALF-15888: correct absolute class names in config for EhCacheAdapter. 41892: ALF-15888: fix CachingContentStore tests. 41897: ALF-15888: move CacheTest and config to new package. 41898: ALF-15888: remove redundant directory 41899: ALF-15889: move EhCacheManagerFactoryBean to new package. 41902: ALF-15889: moved EhCacheTracerJob to new package. 41913: ALF-15889: move InternalEhCacheManagerFactoryBean to new package. 41916: ALF-15889: move AlfrescoCacheManagerPeerProviderFactory to new package. 41937: ALF-15889: decouple TransactionalCache from EhCache 41966: ALF-15889: decouple RetryingTransactionHelper from ehcache. 41989: ALF-15889: added ContextListener test. 41996: ALF-15889: moved cache test to its own class. 41998: ALF-15889: move ehcache jars. 41999: ALF-15889: modify .classpath to reflect jar moves. 42037: ALF-15889: update poms to reflect lib moves. 42038: ALF-15889: add eclipse library reference to enterprise projects. 42093: ALF-15916: moved core properties to enterprise 42114: ALF-15888: externalized cache sizes to repository.properties. 42127: ALF-16136: move re-indexing configuration 42140: ALF-16136: move cluster check property. 42186: ALF-15889: removing seemingly redundant test config file. 42187: ALF-15888: tidy up config changes. 42189: ALF-15888: cleanup config 42190: ALF-15888: config cleanup 42191: ALF-15888: config cleanup 42198: ALF-16136: restored lost property git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../RemoteAlfrescoTicketServiceTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java index 4ce134ba5f..7d2cfadb99 100644 --- a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java +++ b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java @@ -18,13 +18,9 @@ */ package org.alfresco.repo.remoteticket; -import org.alfresco.service.cmr.remoteticket.NoCredentialsFoundException; -import org.alfresco.service.cmr.remoteticket.NoSuchSystemException; -import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketInfo; -import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketService; -import org.alfresco.repo.remoteconnector.LocalWebScriptConnectorServiceImpl; import org.alfresco.model.ContentModel; -import org.alfresco.repo.cache.EhCacheAdapter; +import org.alfresco.repo.cache.SimpleCache; +import org.alfresco.repo.remoteconnector.LocalWebScriptConnectorServiceImpl; import org.alfresco.repo.remotecredentials.PasswordCredentialsInfoImpl; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -33,6 +29,10 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.service.cmr.remotecredentials.BaseCredentialsInfo; import org.alfresco.service.cmr.remotecredentials.RemoteCredentialsService; +import org.alfresco.service.cmr.remoteticket.NoCredentialsFoundException; +import org.alfresco.service.cmr.remoteticket.NoSuchSystemException; +import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketInfo; +import org.alfresco.service.cmr.remoteticket.RemoteAlfrescoTicketService; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.util.PropertyMap; @@ -58,7 +58,7 @@ public class RemoteAlfrescoTicketServiceTest extends BaseWebScriptTest private RemoteAlfrescoTicketService remoteAlfrescoTicketService; private RemoteCredentialsService remoteCredentialsService; - private EhCacheAdapter ticketsCache; + private SimpleCache ticketsCache; private static final String USER_ONE = "UserOneSecondToo"; private static final String USER_TWO = "UserTwoSecondToo"; @@ -78,7 +78,7 @@ public class RemoteAlfrescoTicketServiceTest extends BaseWebScriptTest this.remoteAlfrescoTicketService = (RemoteAlfrescoTicketService)getServer().getApplicationContext().getBean("remoteAlfrescoTicketService"); this.remoteCredentialsService = (RemoteCredentialsService)getServer().getApplicationContext().getBean("RemoteCredentialsService"); - this.ticketsCache = (EhCacheAdapter)getServer().getApplicationContext().getBean("remoteAlfrescoTicketService.ticketsCache"); + this.ticketsCache = (SimpleCache)getServer().getApplicationContext().getBean("remoteAlfrescoTicketService.ticketsCache"); // Do the setup as admin AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser();