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 
12923: New Enterprise Examples project containing hyperic plugin and README.txt
   12908: A few fixes to improve consistency in JMX object naming
   12889: Fix failing unit tests. Include linkvalidation in unit test classpath.
   12885: Merged DEV/DAVEW_POST3D to V3.1
      12881: Changes to allow monitoring of authentication configuration
      12862: Merged DEV/3.1_ENTERPRISE_ONLY to DEV/DAVEW_POST3D
         12797: Changes to allow persistence of changes made by JMX.
      12852: Review comment from Derek: remove dependencies of descriptor service (serverDescriptorDAO, currentRepoDescriptorDAO and installedRepoDescriptorDAO) out of bootstrap-context.xml
      12849: Correction to JAWS-221: dbscripts directory must be directly under config/alfresco in enterprise project.
      12847: JAWS-221: Move proprietary DB create/upgrade scripts into Enterprise Only project
      12845: Avoid NullPointerExceptions in status templates when no codeName or description exists for the status code

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-03-10 12:16:12 +00:00
parent 8491c4942b
commit 6641fd64fc
32 changed files with 224 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/security/authentication/ldap/LDAPAuthenticationComponentImpl.java
View File

@@ -29,6 +29,7 @@ import javax.naming.directory.InitialDirContext;
import org.alfresco.repo.security.authentication.AbstractAuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.service.Managed;
/**
* Currently expects the cn name of the user which is in a fixed location.
@@ -50,21 +51,25 @@ public class LDAPAuthenticationComponentImpl extends AbstractAuthenticationCompo
super();
}
@Managed(category="Security")
public void setLDAPInitialDirContextFactory(LDAPInitialDirContextFactory ldapInitialDirContextFactory)
{
this.ldapInitialContextFactory = ldapInitialDirContextFactory;
}
@Managed(category="Security")
public void setUserNameFormat(String userNameFormat)
{
this.userNameFormat = userNameFormat;
}
@Managed(category="Security")
public void setEscapeCommasInBind(boolean escapeCommasInBind)
{
this.escapeCommasInBind = escapeCommasInBind;
}
@Managed(category="Security")
public void setEscapeCommasInUid(boolean escapeCommasInUid)
{
this.escapeCommasInUid = escapeCommasInUid;

6
source/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactoryImpl.java
View File

@@ -38,6 +38,7 @@ import javax.naming.directory.BasicAttributes;
import javax.naming.directory.InitialDirContext;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.service.Managed;
import org.alfresco.util.ApplicationContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -60,8 +61,8 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
super();
}
@Managed(category="Security")
public void setInitialDirContextEnvironment(Map<String, String> initialDirContextEnvironment)
{
this.initialDirContextEnvironment = initialDirContextEnvironment;
}
@@ -236,7 +237,8 @@ public class LDAPInitialDirContextFactoryImpl implements LDAPInitialDirContextFa
}
catch (NamingException nx)
{
throw new AuthenticationException("Unable to connect to LDAP Server; check LDAP configuration", nx);
logger.error("Unable to connect to LDAP Server; check LDAP configuration", nx);
return;
}
// Simple DN and password

8
source/java/org/alfresco/repo/security/authentication/ldap/LDAPPersonExportSource.java
View File

@@ -44,6 +44,7 @@ import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.importer.ExportSource;
import org.alfresco.repo.importer.ExportSourceImporterException;
import org.alfresco.service.Managed;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -84,21 +85,25 @@ public class LDAPPersonExportSource implements ExportSource
super();
}
@Managed(category="Security")
public void setPersonQuery(String personQuery)
{
this.personQuery = personQuery;
}
@Managed(category="Security")
public void setSearchBase(String searchBase)
{
this.searchBase = searchBase;
}
@Managed(category="Security")
public void setUserIdAttributeName(String userIdAttributeName)
{
this.userIdAttributeName = userIdAttributeName;
}
@Managed(category="Security")
public void setLDAPInitialDirContextFactory(LDAPInitialDirContextFactory ldapInitialDirContextFactory)
{
this.ldapInitialContextFactory = ldapInitialDirContextFactory;
@@ -109,6 +114,7 @@ public class LDAPPersonExportSource implements ExportSource
this.personService = personService;
}
@Managed(category="Security")
public void setAttributeDefaults(Map<String, String> attributeDefaults)
{
this.attributeDefaults = attributeDefaults;
@@ -119,11 +125,13 @@ public class LDAPPersonExportSource implements ExportSource
this.namespaceService = namespaceService;
}
@Managed(category="Security")
public void setAttributeMapping(Map<String, String> attributeMapping)
{
this.attributeMapping = attributeMapping;
}
@Managed(category="Security")
public void setErrorOnMissingUID(boolean errorOnMissingUID)
{
this.errorOnMissingUID = errorOnMissingUID;