From 6de35bcb3626b629a852fe5916f646e4e1d9e2c6 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 30 Apr 2013 09:56:19 +0200
Subject: [PATCH] OO-592: remove the implicit dependency of DeletionModule to
UserManager
---
.../EfficiencyStatementStatEntry.hbm.xml | 2 +-
.../delete/service/DeletionModule.java | 38 ++++++++++---------
.../service/_spring/repoDeletionContext.xml | 7 ++--
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/olat/modules/coach/model/EfficiencyStatementStatEntry.hbm.xml b/src/main/java/org/olat/modules/coach/model/EfficiencyStatementStatEntry.hbm.xml
index 40a9c34054a..4d0a1107c0b 100644
--- a/src/main/java/org/olat/modules/coach/model/EfficiencyStatementStatEntry.hbm.xml
+++ b/src/main/java/org/olat/modules/coach/model/EfficiencyStatementStatEntry.hbm.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping default-lazy="false">
<class name="org.olat.modules.coach.model.EfficiencyStatementGroupStatEntry" table="o_as_eff_statement_groups_v" mutable="false">
diff --git a/src/main/java/org/olat/repository/delete/service/DeletionModule.java b/src/main/java/org/olat/repository/delete/service/DeletionModule.java
index 1751f9e17ea..8eb821ca0af 100644
--- a/src/main/java/org/olat/repository/delete/service/DeletionModule.java
+++ b/src/main/java/org/olat/repository/delete/service/DeletionModule.java
@@ -27,13 +27,15 @@ package org.olat.repository.delete.service;
import java.io.File;
import java.text.SimpleDateFormat;
+import java.util.Collections;
import java.util.Date;
+import java.util.List;
import org.olat.basesecurity.BaseSecurity;
+import org.olat.basesecurity.IdentityShort;
import org.olat.core.configuration.AbstractOLATModule;
import org.olat.core.configuration.PersistedProperties;
import org.olat.core.id.Identity;
-import org.olat.core.id.UserConstants;
import org.olat.core.util.WebappHelper;
/**
@@ -70,8 +72,12 @@ public class DeletionModule extends AbstractOLATModule {
@Override
protected void initDefaultProperties() {
- // TODO Auto-generated method stub
-
+ //
+ }
+
+ @Override
+ protected void initFromChangedProperties() {
+ //
}
/**
@@ -82,9 +88,9 @@ public class DeletionModule extends AbstractOLATModule {
emailResponseTo = getStringConfigParameter(CONF_DELETE_EMAIL_RESPONSE_TO_USER_NAME, WebappHelper.getMailConfig("mailDeleteUser"), false);
if (!emailResponseTo.contains("@")) {
- Identity identity = baseSecurityManager.findIdentityByName(emailResponseTo);
- if (identity != null) {
- emailResponseTo = identity.getUser().getProperty(UserConstants.EMAIL, null);
+ List<IdentityShort> identities = baseSecurityManager.findShortIdentitiesByName(Collections.singletonList(emailResponseTo));
+ if (identities != null && identities.size() == 1) {
+ emailResponseTo = identities.get(0).getEmail();
} else {
logWarn("Could not find: " + CONF_DELETE_EMAIL_RESPONSE_TO_USER_NAME + " with name: " + emailResponseTo, null);
emailResponseTo = WebappHelper.getMailConfig("mailFrom");
@@ -98,10 +104,12 @@ public class DeletionModule extends AbstractOLATModule {
} else {
adminUserIdentity = baseSecurityManager.findIdentityByName(DEFAULT_ADMIN_USERNAME);
}
- logDebug("archiveRootPath=" + archiveRootPath);
- logDebug("emailResponseTo=" + emailResponseTo);
- logDebug("adminUserIdentity=" + adminUserIdentity);
+ if(isLogDebugEnabled()) {
+ logDebug("archiveRootPath=" + archiveRootPath);
+ logDebug("emailResponseTo=" + emailResponseTo);
+ logDebug("adminUserIdentity=" + adminUserIdentity);
+ }
}
/**
@@ -127,17 +135,11 @@ public class DeletionModule extends AbstractOLATModule {
return adminUserIdentity;
}
-
- @Override
- protected void initFromChangedProperties() {
- // TODO Auto-generated method stub
-
- }
-
+ /**
+ * [used by Spring]
+ */
@Override
public void setPersistedProperties(PersistedProperties persistedProperties) {
this.moduleConfigProperties = persistedProperties;
}
-
-
}
diff --git a/src/main/java/org/olat/repository/delete/service/_spring/repoDeletionContext.xml b/src/main/java/org/olat/repository/delete/service/_spring/repoDeletionContext.xml
index 56e43a38bea..e7cdff82633 100644
--- a/src/main/java/org/olat/repository/delete/service/_spring/repoDeletionContext.xml
+++ b/src/main/java/org/olat/repository/delete/service/_spring/repoDeletionContext.xml
@@ -3,11 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="deletionModule" class="org.olat.repository.delete.service.DeletionModule"
- depends-on="userManager">
+ <bean id="deletionModule" class="org.olat.repository.delete.service.DeletionModule">
<property name="baseSecurityManager" ref="baseSecurityManager" />
<property name="persistedProperties">
<bean class="org.olat.core.configuration.PersistedProperties"
@@ -27,7 +26,7 @@
archiveRootPath=${archive.dir}
deleteEmailResponseToUserName=administrator
adminUserName=${deletionModule.adminUserName}
- </value>
+ </value>
</property>
</bean>
--
GitLab