mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged AVMService into the rest of Alfresco. It all comes up in
the same ApplicationContext. Some adjustments to tests needed, but everything is passing. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
@@ -24,6 +24,7 @@
|
||||
<import resource="classpath:alfresco/import-export-context.xml" />
|
||||
<import resource="classpath:alfresco/bootstrap-context.xml" />
|
||||
<import resource="classpath:alfresco/jcr-api-context.xml" />
|
||||
<import resource="classpath:alfresco/avm-services-context.xml" />
|
||||
<import resource="classpath*:alfresco/patch/*-context.xml" />
|
||||
<import resource="classpath*:alfresco/domain/*-context.xml" />
|
||||
|
||||
|
||||
228
config/alfresco/avm-services-context.xml
Normal file
228
config/alfresco/avm-services-context.xml
Normal file
@@ -0,0 +1,228 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
|
||||
"http://www.springframework.org/dtd/spring-beans.dtd">
|
||||
|
||||
<beans>
|
||||
|
||||
<!-- ID Issuers. -->
|
||||
|
||||
<bean id="nodeIssuer" class="org.alfresco.repo.avm.Issuer"
|
||||
depends-on="retryingTransaction,avmContext" init-method="init">
|
||||
<property name="name">
|
||||
<value>node</value>
|
||||
</property>
|
||||
<property name="retryingTransaction">
|
||||
<ref bean="retryingTransaction"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="contentIssuer" class="org.alfresco.repo.avm.Issuer"
|
||||
depends-on="retryingTransaction,avmContext" init-method="init">
|
||||
<property name="name">
|
||||
<value>content</value>
|
||||
</property>
|
||||
<property name="retryingTransaction">
|
||||
<ref bean="retryingTransaction"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="layerIssuer" class="org.alfresco.repo.avm.Issuer"
|
||||
depends-on="retryingTransaction,avmContext" init-method="init">
|
||||
<property name="name">
|
||||
<value>layer</value>
|
||||
</property>
|
||||
<property name="retryingTransaction">
|
||||
<ref bean="retryingTransaction"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- DAOs for persistent data types -->
|
||||
|
||||
<!-- Issuers are not actual entities. More like pseudo entities. -->
|
||||
|
||||
<bean id="issuerDAO" class="org.alfresco.repo.avm.IssuerDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="nodeDAO" class="org.alfresco.repo.avm.AVMNodeDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="avmStoreDAO" class="org.alfresco.repo.avm.AVMStoreDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="versionRootDAO" class="org.alfresco.repo.avm.VersionRootDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="fileContentDAO" class="org.alfresco.repo.avm.FileContentDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="childEntryDAO" class="org.alfresco.repo.avm.ChildEntryDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="historyLinkDAO" class="org.alfresco.repo.avm.HistoryLinkDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mergeLinkDAO" class="org.alfresco.repo.avm.MergeLinkDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="deletedChildDAO" class="org.alfresco.repo.avm.DeletedChildDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="newInAVMStoreDAO" class="org.alfresco.repo.avm.NewInAVMStoreDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="avmNodePropertyDAO" class="org.alfresco.repo.avm.AVMNodePropertyDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="avmStorePropertyDAO" class="org.alfresco.repo.avm.AVMStorePropertyDAOHibernate">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="avmContext" class="org.alfresco.repo.avm.AVMContext">
|
||||
<property name="issuerDAO">
|
||||
<ref bean="issuerDAO"/>
|
||||
</property>
|
||||
<property name="nodeDAO">
|
||||
<ref bean="nodeDAO"/>
|
||||
</property>
|
||||
<property name="avmStoreDAO">
|
||||
<ref bean="avmStoreDAO"/>
|
||||
</property>
|
||||
<property name="versionRootDAO">
|
||||
<ref bean="versionRootDAO"/>
|
||||
</property>
|
||||
<property name="fileContentDAO">
|
||||
<ref bean="fileContentDAO"/>
|
||||
</property>
|
||||
<property name="childEntryDAO">
|
||||
<ref bean="childEntryDAO"/>
|
||||
</property>
|
||||
<property name="historyLinkDAO">
|
||||
<ref bean="historyLinkDAO"/>
|
||||
</property>
|
||||
<property name="mergeLinkDAO">
|
||||
<ref bean="mergeLinkDAO"/>
|
||||
</property>
|
||||
<property name="deletedChildDAO">
|
||||
<ref bean="deletedChildDAO"/>
|
||||
</property>
|
||||
<property name="newInAVMStoreDAO">
|
||||
<ref bean="newInAVMStoreDAO"/>
|
||||
</property>
|
||||
<property name="avmNodePropertyDAO">
|
||||
<ref bean="avmNodePropertyDAO"/>
|
||||
</property>
|
||||
<property name="avmStorePropertyDAO">
|
||||
<ref bean="avmStorePropertyDAO"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- A read only DefaultTransactionDefinition -->
|
||||
<bean id="readTransactionDefinition"
|
||||
class="org.springframework.transaction.support.DefaultTransactionDefinition">
|
||||
<property name="propagationBehaviorName">
|
||||
<value>PROPAGATION_REQUIRED</value>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- A write DefaultTransactionDefinition -->
|
||||
<bean id="writeTransactionDefinition"
|
||||
class="org.springframework.transaction.support.DefaultTransactionDefinition">
|
||||
<property name="propagationBehaviorName">
|
||||
<value>PROPAGATION_REQUIRED</value>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<value>false</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The Retrying Transaction Helper. -->
|
||||
<bean id="retryingTransaction"
|
||||
class="org.alfresco.repo.avm.HibernateRetryingTransactionHelper">
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory"/>
|
||||
</property>
|
||||
<property name="transactionManager">
|
||||
<ref bean="transactionManager"/>
|
||||
</property>
|
||||
<property name="readTransactionDefinition">
|
||||
<ref bean="readTransactionDefinition"/>
|
||||
</property>
|
||||
<property name="writeTransactionDefinition">
|
||||
<ref bean="writeTransactionDefinition"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="orphanReaper" class="org.alfresco.repo.avm.OrphanReaper"
|
||||
init-method="init" destroy-method="shutDown" depends-on="AVMService">
|
||||
<property name="inactiveBaseSleep">
|
||||
<value>4000</value>
|
||||
</property>
|
||||
<property name="activeBaseSleep">
|
||||
<value>1000</value>
|
||||
</property>
|
||||
<property name="batchSize">
|
||||
<value>50</value>
|
||||
</property>
|
||||
<property name="retryingTransaction">
|
||||
<ref bean="retryingTransaction"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="avmRepository" class="org.alfresco.repo.avm.AVMRepository"
|
||||
init-method="init">
|
||||
<property name="storage">
|
||||
<value>${avm.storage}</value>
|
||||
</property>
|
||||
<property name="nodeIssuer">
|
||||
<ref bean="nodeIssuer"/>
|
||||
</property>
|
||||
<property name="contentIssuer">
|
||||
<ref bean="contentIssuer"/>
|
||||
</property>
|
||||
<property name="layerIssuer">
|
||||
<ref bean="layerIssuer"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<beans>
|
||||
|
||||
<!-- Use substitution values in this config. -->
|
||||
<!--
|
||||
<bean id="configurationProperties"
|
||||
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||
<property name="locations">
|
||||
@@ -12,7 +13,7 @@
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<import resource="file:config/alfresco/avm-base-context.xml"/>
|
||||
-->
|
||||
<import resource="file:config/alfresco/application-context.xml"/>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
<value>org/alfresco/repo/domain/hibernate/VersionCount.hbm.xml</value>
|
||||
<value>org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml</value>
|
||||
<value>org/alfresco/repo/domain/hibernate/Permission.hbm.xml</value>
|
||||
<value>org/alfresco/repo/avm/hibernate/AVM.hbm.xml</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="hibernateProperties" ref="hibernateConfigProperties" />
|
||||
|
||||
@@ -935,4 +935,21 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- The AVMService -->
|
||||
|
||||
<bean id="AVMService" class="org.alfresco.repo.avm.AVMServiceImpl" init-method="init">
|
||||
<property name="storage">
|
||||
<value>${avm.storage}</value>
|
||||
</property>
|
||||
<property name="initialize">
|
||||
<value>${avm.initialize}</value>
|
||||
</property>
|
||||
<property name="retryingTransaction">
|
||||
<ref bean="retryingTransaction"/>
|
||||
</property>
|
||||
<property name="avmRepository">
|
||||
<ref bean="avmRepository"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -108,4 +108,7 @@ system.people_container.childname=sys:people
|
||||
|
||||
user.name.caseSensitive=false
|
||||
|
||||
# AVM Specific properties.
|
||||
avm.storage=build/test-results/storage
|
||||
avm.initialize=true
|
||||
|
||||
|
||||
Reference in New Issue
Block a user