From 41198893317f56f2fd855667b245e15e7e1dfe3e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 08:07:52 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    59855:
 Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)       59601: Merged
 DEV to V4.2-BUG-FIX          58003: Prevent QNameDAO from being used without
 a txn (MNT-9806)          58022: Fix bootstrap sequencing issues related to
 Content Publishing and Site models                 - I thought I had broken
 something but it's one of those random bean loading issues that we don't
 commonly see                 - Pulled models into core model lists so that we
 know and understand the ordering of the model loading                 -
 Removed QNameDAO transaction check, just in case (will reapply it with
 subsequent commit)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/content-publishing-context.xml   |  7 -------
 config/alfresco/core-services-context.xml        |  7 +++++++
 config/alfresco/dao/dao-context.xml              | 16 +++++++++++++++-
 config/alfresco/site-services-context.xml        | 14 --------------
 .../alfresco/repo/node/BaseNodeServiceTest.java  |  4 ++++
 .../repo/node/db/DbNodeServiceImplTest.java      | 11 +++++++++++
 6 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/config/alfresco/content-publishing-context.xml b/config/alfresco/content-publishing-context.xml
index c90e98088d..784e7fe281 100644
--- a/config/alfresco/content-publishing-context.xml
+++ b/config/alfresco/content-publishing-context.xml
@@ -2,13 +2,6 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-   <bean id="publishingService_dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
-        <property name="models">
-            <list>
-                <value>alfresco/model/publishingModel.xml</value>
-            </list>
-        </property>
-    </bean>
 
    <!-- Bootstrap the publishing process definition -->
     <bean parent="workflowDeployer">
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 3938582c2d..6270d63e22 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -821,6 +821,12 @@
                 
                 <!-- Share UI model -->
                 <value>alfresco/model/shareUiModel.xml</value>
+                
+                <!-- Site model -->
+                <value>alfresco/model/siteModel.xml</value>
+                
+                <!-- Content Publishing model -->
+                <value>alfresco/model/publishingModel.xml</value>
             </list>
         </property>
         <property name="labels">
@@ -836,6 +842,7 @@
                 <value>alfresco/messages/transfer-model</value>
                 <value>alfresco/messages/wcmapp-model</value>
                 <value>alfresco/messages/publishing-model</value>
+                <value>alfresco/messages/site-model</value>
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/dao/dao-context.xml b/config/alfresco/dao/dao-context.xml
index 6413b106da..ba566a5ddd 100644
--- a/config/alfresco/dao/dao-context.xml
+++ b/config/alfresco/dao/dao-context.xml
@@ -81,7 +81,21 @@
       <property name="sqlSessionTemplate" ref="repoSqlSessionTemplate"/>
    </bean>
    
-   <bean id="qnameDAO" class="org.alfresco.repo.domain.qname.ibatis.QNameDAOImpl">
+   <bean id="qnameDAO" class="org.springframework.aop.framework.ProxyFactoryBean" >
+      <property name="targetName">
+         <value>qnameDAOImpl</value>
+      </property>
+      <property name="proxyInterfaces">
+         <list>
+            <value>org.alfresco.repo.domain.qname.QNameDAO</value>
+         </list>
+      </property>
+      <property name="interceptorNames">
+         <list>
+         </list>
+      </property>
+   </bean>
+   <bean id="qnameDAOImpl" class="org.alfresco.repo.domain.qname.ibatis.QNameDAOImpl">
       <property name="sqlSessionTemplate" ref="repoSqlSessionTemplate"/>
       <property name="namespaceCache" ref="immutableEntityCache"/>
       <property name="qnameCache" ref="immutableEntityCache"/>
diff --git a/config/alfresco/site-services-context.xml b/config/alfresco/site-services-context.xml
index bfa78d0e92..06f6ab20f9 100644
--- a/config/alfresco/site-services-context.xml
+++ b/config/alfresco/site-services-context.xml
@@ -3,20 +3,6 @@
 
 <beans>
 
-	<bean id="siteService_dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
-        <property name="models">
-            <list>
-                <value>alfresco/model/siteModel.xml</value>
-            </list>
-        </property>
-        <property name="labels">
-           <list>
-              <!-- i18n strings for Site Service Model-->
-              <value>alfresco/messages/site-model</value>
-           </list>
-        </property>
-    </bean>
-       
     <!-- Bootstrap the permission model -->
     <bean id="siteService_permissionBootstrap" parent="permissionModelBootstrap">
     	<property name="model" value="alfresco/model/sitePermissionDefinitions.xml"/>
diff --git a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
index c83c90d716..d9f2fe4afd 100644
--- a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
+++ b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java
@@ -1094,6 +1094,8 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
         setComplete();
         endTransaction();
 
+        startNewTransaction();
+        
         assertFalse("n6 not directly deleted", nodeService.exists(n6Ref));
         assertFalse("n8 not cascade deleted", nodeService.exists(n8Ref));
         assertEquals("n6 primary parent association not removed from n3", 0, countChildrenOfNode(n3Ref));
@@ -1845,6 +1847,8 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
         setComplete();
         endTransaction();
         
+        startNewTransaction();
+        
         // get the properties back
         Map<QName, Serializable> checkProperties = nodeService.getProperties(nodeRef);
         checkProperty = checkProperties.get(PROP_QNAME_ENCRYPTED_VALUE);
diff --git a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
index c6af17892c..7bd9c2325b 100644
--- a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java
@@ -79,6 +79,17 @@ public class DbNodeServiceImplTest extends BaseNodeServiceTest
         nodeDAO = (NodeDAO) applicationContext.getBean("nodeDAO");
         dictionaryService = (DictionaryService) applicationContext.getBean("dictionaryService");
     }
+
+    /**
+     * Ensure that transactionless calls are handled
+     */
+    public void testCallWithoutTxn()
+    {
+        setComplete();
+        endTransaction();
+        
+        nodeService.getAllRootNodes(rootNodeRef.getStoreRef());
+    }
     
     /**
      * Manually trigger the cleanup registry