SAK-29456 - Site archive import does not process attachment.xml

axxter99 · Jun 30, 2015 · d65e485 · d65e485
1 parent 2ac4324
commit d65e485
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteMerger.java b/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteMerger.java
@@ -271,8 +271,16 @@ else if (element.getTagName().equals(UserDirectoryService.APPLICATION_ID))
 					return;
 				}
 
+				String serviceName;
+				//Support for attachment.xml created prior to SAK-29456 
+				if (element.getTagName().equals(ContentHostingService.APPLICATION_ID)) 
+				{
+				    serviceName = "org.sakaiproject.content.api.ContentHostingService";
+				}
+				else {
 				// get the service name
-				String serviceName = translateServiceName(element.getTagName());
+				    serviceName = translateServiceName(element.getTagName());
+				}
 
 				// get the service
 				try

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
@@ -7634,7 +7634,7 @@ public String archiveResources(List attachments, Document doc, Stack stack, Stri
 		StringBuilder results = new StringBuilder();
 
 		// start with an element with our very own name
-		Element element = doc.createElement(APPLICATION_ID);
+		Element element = doc.createElement(ContentHostingService.class.getName());
 		((Element) stack.peek()).appendChild(element);
 		stack.push(element);