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 ea0134b68c73d266af8d8e04c1329e0a08ecbca5..95f789ce58c6c7eefefd4bf6eefd66122e700bd9 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 ab6f5cf167ecc6483653bee7c1722534e19ffa10..66c49d9b213bcbc0eb3621d1bfcfb30c8a1e4194 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;