inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
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:
Dave Ward
2009-03-10 13:17:24 +00:00
parent 77f60cebb4
commit fd97d56645
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/web/bean/users/CreateUserWizard.java
View File

@@ -60,7 +60,8 @@ import org.alfresco.web.bean.spaces.CreateSpaceWizard;
import org.alfresco.web.bean.wizard.BaseWizardBean;
import org.alfresco.web.config.ClientConfigElement;
import org.alfresco.web.ui.common.Utils;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* @author Kevin Roast
@@ -69,7 +70,7 @@ public class CreateUserWizard extends BaseWizardBean
{
private static final long serialVersionUID = 8008464794715380019L;
private static Logger logger = Logger.getLogger(CreateUserWizard.class);
private static Log logger = LogFactory.getLog(BaseWizardBean.class);
protected static final String ERROR = "error_person";
protected static final String ERROR_DOMAIN_MISMATCH = "error_domain_mismatch";

5
source/java/org/alfresco/web/bean/users/DeleteUserDialog.java
View File

@@ -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";

5
source/java/org/alfresco/web/bean/users/EditUserWizard.java
View File

@@ -38,7 +38,8 @@ import org.alfresco.util.Pair;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.Utils;
import org.apache.log4j.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* @author YanO
@@ -48,7 +49,7 @@ public class EditUserWizard extends CreateUserWizard
{
private static final long serialVersionUID = 7529989488476324511L;
private static Logger logger = Logger.getLogger(EditUserWizard.class);
private static Log logger = LogFactory.getLog(EditUserWizard.class);
protected UsersBeanProperties properties;