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

AVMSyncService now retries it's operations.

Browse Source 
Removed an unnecessary import.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-17 18:35:00 +00:00
parent 87b5690fc2
commit 5d738bdf42
2 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
config/alfresco/public-services-context.xml
View File

@@ -1124,49 +1124,6 @@
</property>
</bean>
<!--
<bean id="AVMService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.cmr.avm.AVMService</value>
</property>
<property name="target">
<ref bean="avmService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="AVMService_transaction"/>
<idref local="AVMService_descriptor"/>
</list>
</property>
</bean>
-->
<bean id="AVMService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.avm.AVMService</value>
</property>
<property name="description">
<value>AVM Service</value>
</property>
</bean>
<bean id="AVMService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="hasAspect">${server.transaction.mode.readOnly}</prop>
<prop key="getContentDataForWrite">${server.transaction.mode.default}</prop>
<prop key="getFileOutputStream">${server.transaction.mode.default}</prop>
<prop key="getAVMSystemStore">${server.transaction.mode.default}</prop>
<prop key="get*">${server.transaction.mode.readOnly}</prop>
<prop key="lookup">${server.transaction.mode.readOnly}</prop>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<!-- The AVMSyncService -->
<bean id="avmSyncService" class="org.alfresco.repo.avm.AVMSyncServiceImpl">
@@ -1178,29 +1135,50 @@
</property>
</bean>
<bean id="AVMSyncService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.avmsync.AVMSyncService</value>
<!-- Read transaction advisor for sync service. -->
<bean id="avmSyncServiceReadTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
<property name="advice">
<ref bean="retryingReadTxnAdvice"/>
</property>
<property name="description">
<value>AVM Tree Synchronization Service</value>
<property name="mappedNames">
<list>
<value>compare</value>
</list>
</property>
</bean>
<bean id="AVMSyncService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
<!-- Write transaction advisor for sync service. -->
<bean id="avmSyncServiceWriteTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
<property name="advice">
<ref bean="retryingWriteTxnAdvice"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="compare">${server.transaction.mode.readOnly}</prop>
<prop key="update">${server.transaction.mode.default}</prop>
<prop key="flatten">${server.transaction.mode.default}</prop>
<prop key="resetLayer">${server.transaction.mode.default}</prop>
</props>
<property name="mappedNames">
<list>
<value>update</value>
<value>flatten</value>
<value>resetLayer</value>
</list>
</property>
</bean>
<bean id="AVMSyncService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<list>
<value>org.alfresco.service.cmr.avmsync.AVMSyncService</value>
</list>
</property>
<property name="targetName">
<value>avmSyncService</value>
</property>
<property name="interceptorNames">
<list>
<value>avmSyncServiceWriteTxnAdvisor</value>
<value>avmSyncServiceReadTxnAdvisor</value>
</list>
</property>
</bean>
<!--
<bean id="AVMSyncService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.cmr.avmsync.AVMSyncService</value>
@@ -1215,7 +1193,8 @@
</list>
</property>
</bean>
-->
<!-- Workflow Service -->
<bean id="WorkflowService" class="org.springframework.aop.framework.ProxyFactoryBean">

1
source/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java
View File

@@ -8,7 +8,6 @@ import org.alfresco.service.cmr.security.AuthenticationService;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.springframework.aop.framework.ReflectiveMethodInvocation;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* This is an interceptor that continuosly tries to reauthenticate when