inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-9045 Upgrade to Spring Framework 6.2.x (#3143)

Browse Source
This commit is contained in:
Piotr Żurek
2025-01-14 09:39:18 +01:00
committed by GitHub
parent 35c01f78c3
commit d11a0deacc
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repository/src/main/resources/alfresco/public-services-security-context.xml
View File

@@ -37,7 +37,7 @@
<!-- Support for permissions --> <!-- Support for permissions -->
<!-- ========================--> <!-- ========================-->
<bean id="permissionService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" depends-on="transactionManager, permissionServiceImpl"> <bean id='permissionService' class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.repo.security.permissions.PermissionServiceSPI</value> <value>org.alfresco.repo.security.permissions.PermissionServiceSPI</value>
</property> </property>

2
repository/src/test/java/org/alfresco/util/BaseSpringTest.java
View File

@@ -32,6 +32,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextCustomizerFactories;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
/** /**
@@ -46,6 +47,7 @@ import org.springframework.test.context.junit4.SpringRunner;
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration({"classpath:alfresco/application-context.xml"}) @ContextConfiguration({"classpath:alfresco/application-context.xml"})
@ContextCustomizerFactories(factories = {}, mergeMode = ContextCustomizerFactories.MergeMode.REPLACE_DEFAULTS)
public abstract class BaseSpringTest extends TestCase public abstract class BaseSpringTest extends TestCase
{ {
public Log logger = LogFactory.getLog(getClass().getName()); public Log logger = LogFactory.getLog(getClass().getName());