From 3ff2ac73a1006e4513d31551f2de00201723093f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 8 Dec 2011 17:04:55 +0100
Subject: [PATCH] FXOLAT-391: backport mail, move mail box extension to its
package
---
.../org/olat/{user => core/util/mail}/MailBoxExtension.java | 6 +++---
src/main/resources/database/mysql/setupDatabase.sql | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
rename src/main/java/org/olat/{user => core/util/mail}/MailBoxExtension.java (98%)
diff --git a/src/main/java/org/olat/user/MailBoxExtension.java b/src/main/java/org/olat/core/util/mail/MailBoxExtension.java
similarity index 98%
rename from src/main/java/org/olat/user/MailBoxExtension.java
rename to src/main/java/org/olat/core/util/mail/MailBoxExtension.java
index ea0134b68c7..95f789ce58c 100644
--- a/src/main/java/org/olat/user/MailBoxExtension.java
+++ b/src/main/java/org/olat/core/util/mail/MailBoxExtension.java
@@ -18,7 +18,7 @@
* http://www.frentix.com<br>
* <p>
*/
-package org.olat.user;
+package org.olat.core.util.mail;
import java.util.Collections;
import java.util.List;
@@ -43,10 +43,10 @@ import org.olat.core.util.mail.model.DBMail;
import org.olat.core.util.mail.ui.MailContextResolver;
import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupManagerImpl;
+import org.olat.home.HomeSite;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager;
-
-import org.olat.home.HomeSite;
+import org.olat.user.UserDataDeletable;
/**
*
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index ab6f5cf167e..66c49d9b213 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -958,7 +958,6 @@ alter table o_ep_collect_restriction ENGINE = InnoDB;
alter table o_ep_struct_el ENGINE = InnoDB;
alter table o_ep_struct_struct_link ENGINE = InnoDB;
alter table o_ep_struct_artefact_link ENGINE = InnoDB;
-alter table o_co_db_entry ENGINE = InnoDB;
alter table o_mail ENGINE = InnoDB;
alter table o_mail_to_recipient ENGINE = InnoDB;
alter table o_mail_recipient ENGINE = InnoDB;
--
GitLab