mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13037: PostgreSQL upgrade scripts from 2.1.6, 2.2.0, and 2.2.1 12995: Fix build: account for change of path to log4j jar in 3rd party project 12981: Added support for monitoring of installed modules via JMX 12971: Correction to 12970 - better handle case when log4j not available. 12970: Work around log4j bug to allow editing of the "threshold" property of HierarchyDynamicBean through JMX 12926: Merged V3.0 to V3.1 Merged V2.2 to V3.0 12861: ETHREEOH-19, ETHREEOH-24, ETHREEOH-113, ETHREEOH-115, ETHREEOH-449, ETHREEOH-537, ETHREEOH-561, ETHREEOH-566, ETHREEOH-572, ETHREEOH-1072: Retry failed transactions from MS SQL Server in snapshot mode 12924: Avoid direct log4j dependencies 12918: Avoided Log4J imports by using introspection git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -51,14 +51,15 @@ import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.ui.common.Utils;
|
||||
import org.alfresco.web.ui.common.component.UIActionLink;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
public class DeleteUserDialog extends BaseDialogBean
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = -4977064287365766306L;
|
||||
|
||||
private static Logger logger = Logger.getLogger(DeleteUserDialog.class);
|
||||
private static Log logger = LogFactory.getLog(DeleteUserDialog.class);
|
||||
|
||||
private static final String ERROR_DELETE = "error_delete_user";
|
||||
|
||||
|
Reference in New Issue
Block a user