Applying code review comment. I added an 'mr' prefix to the spring beans, which we hope will make our lives easier if this Metadata Referral stuff ever makes it into core.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/classified_renditions@111855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2015-09-10 13:03:45 +00:00
parent 57d21e594e
commit 6c09d951d2
2 changed files with 24 additions and 24 deletions

View File

@@ -125,7 +125,7 @@
<constructor-arg ref="classificationServiceDAO"/> <constructor-arg ref="classificationServiceDAO"/>
</bean> </bean>
<bean name="classifiedRenditionAssoc" parent="baseReferralAssoc"> <bean name="classifiedRenditionAssoc" parent="mr.baseReferralAssoc">
<property name="assocType" value="clf:classifiedRendition" /> <property name="assocType" value="clf:classifiedRendition" />
<property name="aspects"> <property name="aspects">
<set> <set>
@@ -195,7 +195,7 @@
<property name="securityClearanceService" ref="SecurityClearanceService"/> <property name="securityClearanceService" ref="SecurityClearanceService"/>
<property name="classificationServiceBootstrap" ref="classificationServiceBootstrap"/> <property name="classificationServiceBootstrap" ref="classificationServiceBootstrap"/>
<property name="freezeService" ref="FreezeService"/> <property name="freezeService" ref="FreezeService"/>
<property name="referredMetadataService" ref="ReferredMetadataService" /> <property name="referredMetadataService" ref="mr.ReferredMetadataService" />
</bean> </bean>
<bean id="ContentClassificationService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="ContentClassificationService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -243,7 +243,7 @@
class="org.alfresco.module.org_alfresco_module_rm.model.clf.aspect.ClassifiedAspect" class="org.alfresco.module.org_alfresco_module_rm.model.clf.aspect.ClassifiedAspect"
parent="rm.baseBehaviour"> parent="rm.baseBehaviour">
<property name="classificationSchemeService" ref="ClassificationSchemeService" /> <property name="classificationSchemeService" ref="ClassificationSchemeService" />
<property name="referralAdminService" ref="ReferralAdminService" /> <property name="referralAdminService" ref="mr.ReferralAdminService" />
<property name="renditionService" ref="RenditionService" /> <property name="renditionService" ref="RenditionService" />
</bean> </bean>
@@ -251,7 +251,7 @@
class="org.alfresco.module.org_alfresco_module_rm.model.clf.ClassifiedRenditions" class="org.alfresco.module.org_alfresco_module_rm.model.clf.ClassifiedRenditions"
parent="rm.baseBehaviour"> parent="rm.baseBehaviour">
<property name="contentClassificationService" ref="ContentClassificationService" /> <property name="contentClassificationService" ref="ContentClassificationService" />
<property name="referralAdminService" ref="ReferralAdminService" /> <property name="referralAdminService" ref="mr.ReferralAdminService" />
<property name="renditionService" ref="RenditionService" /> <property name="renditionService" ref="RenditionService" />
</bean> </bean>
</beans> </beans>

View File

@@ -12,29 +12,29 @@
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd "> http://www.springframework.org/schema/aop/spring-aop-3.0.xsd ">
<!-- Metadata Referral Admin Service --> <!-- Metadata Referral Admin Service -->
<bean id="referralAdminService" <bean id="mr.referralAdminService"
class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminServiceImpl" > class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminServiceImpl" >
<property name="referralRegistry" ref="referralRegistry" /> <property name="referralRegistry" ref="mr.referralRegistry" />
<property name="nodeService" ref="NodeService" /> <property name="nodeService" ref="NodeService" />
</bean> </bean>
<bean id="ReferralAdminService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="mr.ReferralAdminService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService</value> <value>org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService</value>
</property> </property>
<property name="target"> <property name="target">
<ref bean="referralAdminService"/> <ref bean="mr.referralAdminService"/>
</property> </property>
<property name="interceptorNames"> <property name="interceptorNames">
<list> <list>
<idref local="ReferralAdminService_transaction"/> <idref local="mr.ReferralAdminService_transaction"/>
<idref bean="exceptionTranslator"/> <idref bean="exceptionTranslator"/>
<idref local="ReferralAdminService_security"/> <idref local="mr.ReferralAdminService_security"/>
</list> </list>
</property> </property>
</bean> </bean>
<bean id="ReferralAdminService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor"> <bean id="mr.ReferralAdminService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager"> <property name="transactionManager">
<ref bean="transactionManager"/> <ref bean="transactionManager"/>
</property> </property>
@@ -45,7 +45,7 @@
</property> </property>
</bean> </bean>
<bean id="ReferralAdminService_security" parent="baseSecurity"> <bean id="mr.ReferralAdminService_security" parent="baseSecurity">
<property name="objectDefinitionSource"> <property name="objectDefinitionSource">
<value> <value>
org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService.attachReferrer=ACL_ALLOW org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService.attachReferrer=ACL_ALLOW
@@ -60,31 +60,31 @@
<!-- Referred Metadata Service --> <!-- Referred Metadata Service -->
<bean id="referredMetadataService" <bean id="mr.referredMetadataService"
class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataServiceImpl" > class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataServiceImpl" >
<property name="referralAdminService" ref="ReferralAdminService" /> <property name="referralAdminService" ref="mr.ReferralAdminService" />
<property name="referralRegistry" ref="referralRegistry" /> <property name="referralRegistry" ref="mr.referralRegistry" />
<property name="dictionaryService" ref="dictionaryService" /> <property name="dictionaryService" ref="dictionaryService" />
<property name="nodeService" ref="NodeService" /> <property name="nodeService" ref="NodeService" />
</bean> </bean>
<bean id="ReferredMetadataService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="mr.ReferredMetadataService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataService</value> <value>org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataService</value>
</property> </property>
<property name="target"> <property name="target">
<ref bean="referredMetadataService"/> <ref bean="mr.referredMetadataService"/>
</property> </property>
<property name="interceptorNames"> <property name="interceptorNames">
<list> <list>
<idref local="ReferredMetadataService_transaction"/> <idref local="mr.ReferredMetadataService_transaction"/>
<idref bean="exceptionTranslator"/> <idref bean="exceptionTranslator"/>
<idref local="ReferredMetadataService_security"/> <idref local="mr.ReferredMetadataService_security"/>
</list> </list>
</property> </property>
</bean> </bean>
<bean id="ReferredMetadataService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor"> <bean id="mr.ReferredMetadataService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager"> <property name="transactionManager">
<ref bean="transactionManager"/> <ref bean="transactionManager"/>
</property> </property>
@@ -95,7 +95,7 @@
</property> </property>
</bean> </bean>
<bean id="ReferredMetadataService_security" parent="baseSecurity"> <bean id="mr.ReferredMetadataService_security" parent="baseSecurity">
<property name="objectDefinitionSource"> <property name="objectDefinitionSource">
<value> <value>
org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataService.isReferringMetadata=ACL_ALLOW org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataService.isReferringMetadata=ACL_ALLOW
@@ -109,15 +109,15 @@
</property> </property>
</bean> </bean>
<bean name="referralRegistry" <bean name="mr.referralRegistry"
class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralRegistry"> class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralRegistry">
</bean> </bean>
<bean name="baseReferralAssoc" <bean name="mr.baseReferralAssoc"
abstract="true" abstract="true"
class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.MetadataReferral" class="org.alfresco.module.org_alfresco_module_rm.referredmetadata.MetadataReferral"
init-method="validateAndRegister"> init-method="validateAndRegister">
<property name="referralRegistry" ref="referralRegistry" /> <property name="referralRegistry" ref="mr.referralRegistry" />
<property name="dictionaryService" ref="dictionaryService" /> <property name="dictionaryService" ref="dictionaryService" />
</bean> </bean>
</beans> </beans>