This changes the AVM service to use ContentService for storage. This gives us,

in theory, AVM working underneath (more or less) NodeService and ContentService.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/avm-base-context.xml

@@ -109,12 +109,6 @@
 		</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"/>
@@ -194,6 +188,9 @@
 		<property name="avmStorePropertyDAO">
 			<ref bean="avmStorePropertyDAO"/>
 		</property>
+		<property name="contentService">
+			<ref bean="ContentService"/>
+		</property>
 	</bean>
 	
 	<!-- The HibernateTransactionManager -->

config/alfresco/avm-services-context.xml

@@ -16,16 +16,6 @@
 		</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">
@@ -64,12 +54,6 @@
 		</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"/>
@@ -125,9 +109,6 @@
 		<property name="versionRootDAO">
 			<ref bean="versionRootDAO"/>
 		</property>
-		<property name="fileContentDAO">
-			<ref bean="fileContentDAO"/>
-		</property>
 		<property name="childEntryDAO">
 			<ref bean="childEntryDAO"/>
 		</property>
@@ -217,9 +198,6 @@
 		<property name="nodeIssuer">
 			<ref bean="nodeIssuer"/>
 		</property>
-		<property name="contentIssuer">
-			<ref bean="contentIssuer"/>
-		</property>
 		<property name="layerIssuer">
 			<ref bean="layerIssuer"/>
 		</property>

config/alfresco/content-services-context.xml

@@ -66,6 +66,9 @@
       <property name="policyComponent">
           <ref bean="policyComponent" />
       </property>
+      <property name="avmService">
+          <ref bean="AVMService"/>
+      </property>
    </bean>
     
     <bean id="mimetypeConfigService" class="org.alfresco.config.xml.XMLConfigService" init-method="init">

config/alfresco/model/contentModel.xml

@@ -81,6 +81,10 @@
                   <tokenised>true</tokenised>
                </index>
             </property>
+            <property name="cm:readonly">
+            	<type>d:boolean</type>
+            	<mandatory>false</mandatory>
+            </property>
          </properties>
       </type>
       

config/alfresco/node-services-context.xml

@@ -15,6 +15,7 @@
          <map>
             <entry key="workspace"><ref bean="dbNodeService"></ref></entry>
             <entry key="versionStore"><ref bean="versionNodeService"></ref></entry>
+            <entry key="avm"><ref bean="avmNodeService"/></entry>
          </map>
       </property>
    </bean>
@@ -58,6 +59,16 @@
       </property>
    </bean>
    
+   <!-- AVMNodeService -->
+   <bean id="avmNodeService" class="org.alfresco.repo.avm.AVMNodeService">
+		<property name="dictionaryService">
+			<ref bean="dictionaryService"/>
+		</property>
+		<property name="avmService">
+			<ref bean="AVMService"/>
+		</property>
+	</bean>
+		
    <!-- Handles policy callbacks to ensure that node hierarchy gets indexed -->
    <bean id="nodeIndexer" class="org.alfresco.repo.node.index.NodeIndexer" init-method="init">
       <property name="policyComponent">