Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAK-47702 Add namespace to additional site archive .xml files #10849

Merged
merged 1 commit into from
Sep 8, 2022
Merged

SAK-47702 Add namespace to additional site archive .xml files #10849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/archive-api/src/main/java/org/sakaiproject/archive/api/ArchiveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public interface ArchiveService

static final String FROM_SAKAI = "Sakai 1.0";

static final String FROM_SAKAI_2_8 = "Sakai 2.8";
static final String FROM_SAKAI_2_8 = "Sakai 2.8";

static final String SAKAI_ARCHIVE_NS = "https://www.sakailms.org/xmlns/archive/";

// the list of boolean tells if the imported item needs to be set as draft
static final boolean SAKAI_msg_draft_import = true;
Expand Down
5 changes: 4 additions & 1 deletion common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
root.setAttribute("server", m_serverConfigurationService.getServerId());
root.setAttribute("date", now.toString());
root.setAttribute("system", fromSystem);
root.setAttribute("xmlns:sakai", ArchiveService.SAKAI_ARCHIVE_NS);

stack.push(root);

Expand Down Expand Up @@ -184,7 +185,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
root.setAttribute("server", m_serverConfigurationService.getServerId());
root.setAttribute("date", now.toString());
root.setAttribute("system", fromSystem);
root.setAttribute("xmlns:sakai", "https://www.sakailms.org/xmlns/archive/");
root.setAttribute("xmlns:sakai", ArchiveService.SAKAI_ARCHIVE_NS);

stack.push(root);

Expand All @@ -206,6 +207,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
root.setAttribute("site", siteId);
root.setAttribute("date", now.toString());
root.setAttribute("system", fromSystem);
root.setAttribute("xmlns:sakai", ArchiveService.SAKAI_ARCHIVE_NS);

stack.push(root);

Expand All @@ -223,6 +225,7 @@ public String archive(String siteId, String m_storagePath, String fromSystem)
root.setAttribute("site", siteId);
root.setAttribute("date", now.toString());
root.setAttribute("system", fromSystem);
root.setAttribute("xmlns:sakai", ArchiveService.SAKAI_ARCHIVE_NS);

stack.push(root);

Expand Down