SAK-47126 SiteArchive add tx template during archive (sakaiproject#10403

) https://sakaiproject.atlassian.net/browse/SAK-47126
jbbadano · Apr 6, 2022 · 1119a85 · 1119a85
1 parent 07d1bd8
commit 1119a85
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/common/archive-impl/impl2/pom.xml b/common/archive-impl/impl2/pom.xml
@@ -47,6 +47,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <resources />

diff --git a/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteArchiver.java b/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteArchiver.java
@@ -29,8 +29,10 @@
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.transaction.support.TransactionTemplate;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -97,6 +99,8 @@ public void setContentHostingService(ContentHostingService service) {
 		m_contentHostingService = service;
 	}
 
+	@Setter private TransactionTemplate transactionTemplate;
+
 	public String archive(String siteId, String m_storagePath, String fromSystem)
 	{
 		StringBuilder results = new StringBuilder();
@@ -147,8 +151,16 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
 			stack.push(root);
 
 			try {
-				String msg = service.archive(siteId, doc, stack, storagePath, attachments);
-				results.append(msg);
+				final String serviceName = service.getClass().getCanonicalName();
+				transactionTemplate.executeWithoutResult(
+						transactionStatus -> results
+								.append("<===== Start ")
+								.append(serviceName)
+								.append(" =====>\n")
+								.append(service.archive(siteId, doc, stack, storagePath, attachments))
+								.append("<===== End ")
+								.append(serviceName)
+								.append(" =====>\n"));
 			}
 			catch (Throwable t)
 			{
@@ -175,8 +187,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
 
 			stack.push(root);
 
-			String msg = m_contentHostingService.archiveResources(attachments, doc, stack, storagePath);
-			results.append(msg);
+			results.append(m_contentHostingService.archiveResources(attachments, doc, stack, storagePath));
 
 			stack.pop();
 
@@ -197,8 +208,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
 
 		stack.push(root);
 
-		String msg = archiveSite(theSite, doc, stack, fromSystem);
-		results.append(msg);
+		results.append(archiveSite(theSite, doc, stack, fromSystem));
 
 		stack.pop();
 		Xml.writeDocument(doc, m_storagePath + siteId + "-archive/site.xml");
@@ -215,8 +225,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
 
 		stack.push(root);
 
-		msg = archiveUsers(theSite, doc, stack);
-		results.append(msg);
+		results.append(archiveUsers(theSite, doc, stack));
 
 		stack.pop();
 		Xml.writeDocument(doc, m_storagePath + siteId + "-archive/user.xml");

diff --git a/common/archive-impl/impl2/src/webapp/WEB-INF/components.xml b/common/archive-impl/impl2/src/webapp/WEB-INF/components.xml
@@ -56,6 +56,11 @@
 		<property name="userDirectoryService" ref="org.sakaiproject.user.api.UserDirectoryService" />
 		<property name="timeService" ref="org.sakaiproject.time.api.TimeService" />
 		<property name="contentHostingService" ref="org.sakaiproject.content.api.ContentHostingService" />
+		<property name="transactionTemplate">
+			<bean class="org.springframework.transaction.support.TransactionTemplate">
+				<property name="transactionManager" ref="org.sakaiproject.springframework.orm.hibernate.GlobalTransactionManager"/>
+			</bean>
+		</property>
 	</bean>
 
 	<bean id="org_sakaiproject_archive_impl_SiteMerger"

diff --git a/...nel-private/src/main/java/org/sakaiproject/serialization/BasicSerializableRepository.java b/...nel-private/src/main/java/org/sakaiproject/serialization/BasicSerializableRepository.java
@@ -31,6 +31,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -120,6 +121,7 @@ private XmlMapper createXMLMapper() {
 
         final XmlMapper mapper = new XmlMapper(xf);
         mapper.registerModules(new JavaTimeModule());
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
         return mapper;
     }
 }