Merged V2.1 to HEAD

6486: Fix for AWC-1134 (Made minimum length for username and password configurable)
   6487: Added "copy.verbose" property to build script to list all files being copied in the 'deploy-tomcat-exploded' and 'deploy-webclient-changes' targets
   6488: Changed default CIFS server to remove underscore as it can cause problems with OpenOffice.
   6489: Fix for WCM-498 (Expired items that are deleted are not represented as such in the change request dialog or submit dialog)
   6490: Fix for WCM-446 and WCM-624. Multi-select and All operations in Modified Files list respect items in workflow and ignore them.
   6491: Fixes profoundly brain dead behavior in AVMLockingService.init().
   6492: Refactoring of LookupCache to be clustering compatible
   6493: Staging and locking changes
   6494: WCM Revert action moved to end of all action lists to avoid accidently clicking it (as it has no confirmation screen!)
   6496: Fixes for WCM-746 and WCM-747 - Edit File Properties and Edit Folder Properties working correctly again for AVM objects.
   6497: Enable virtualization server to be (re)started at any point prior or during the startup of the alfresco webapp (fixes WCM-750).
   6498: WCM-742 - moving locks from the preview sandbox to the main user sandbox.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:15:37 +00:00
parent 223934268c
commit cc218b118e
18 changed files with 248 additions and 49 deletions

View File

@@ -72,6 +72,8 @@ public class ClientConfigElement extends ConfigElementAdapter
private boolean pasteAllAndClear = true;
private boolean allowGuestConfig = false;
private List<QName> simpleSearchAdditionalAttributes = null;
private int minUsernameLength = 2;
private int minPasswordLength = 3;
/**
* Default Constructor
@@ -214,6 +216,16 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setSimpleSearchAdditionalAttributes(newElement.getSimpleSearchAdditionalAttributes());
}
if (newElement.getMinUsernameLength() != combinedElement.getMinUsernameLength())
{
combinedElement.setMinUsernameLength(newElement.getMinUsernameLength());
}
if (newElement.getMinPasswordLength() != combinedElement.getMinPasswordLength())
{
combinedElement.setMinPasswordLength(newElement.getMinPasswordLength());
}
return combinedElement;
}
@@ -573,4 +585,36 @@ public class ClientConfigElement extends ConfigElementAdapter
{
this.simpleSearchAdditionalAttributes = simpleSearchAdditionalAttributes;
}
/**
* @return Returns the minimum length for a username.
*/
public int getMinUsernameLength()
{
return this.minUsernameLength;
}
/**
* @param minUsernameLength The minimum length of a username
*/
/*package*/ void setMinUsernameLength(int minUsernameLength)
{
this.minUsernameLength = minUsernameLength;
}
/**
* @return Returns the minimum length for a password.
*/
public int getMinPasswordLength()
{
return this.minPasswordLength;
}
/**
* @param minPasswordLength The minimum length of a password
*/
/*package*/ void setMinPasswordLength(int minPasswordLength)
{
this.minPasswordLength = minPasswordLength;
}
}