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.2 to HEAD

Browse Source 
15579: Merged V3.1 to V3.2
      14048: Fixed ETHREEOH-1612: Unable to modify the 'guest' username(s)
      14093: Build/test fix - fallout from recent guest changes
   15581: Removed reference to 'alfresco.messages.portlets' resource bundle
   15582: Fixed merge errors after guest user changes
   15583: Merged V3.1 to V3.2
      14049: Minor addition to ETHREEOH-1612 fix: Guest and Admin usernames should not be changed AFTER INSTALLATION
      14060: Handle null username in calls to authenticate
      14086: Removed references to non-existent GROUP_ALFRESCO_GUESTS.
   15584: Merged V3.1 to V3.2
      14103: Build/test fix - fallout from recent guest changes (revert previous change + move makeHomeFolderIfRequired out of getPersonOrNull)
   15585: Merged V3.1 to V3.2
      14110: Build/test fix (CMISTest) - fallout from recent guest changes (test server ctx must be init'ed before calling runAs)
      14166: Fixed ETHREEOH-2016: Usernames with domain-name separators lead to "bad filename" errors
      14184: *RECORD ONLY* Fixed ETHREEOH-2018: NTLM SSO fails with NPE
      14495: *RECORD ONLY*
      14511: *RECORD ONLY*
      14516: ETHREEOH-2162 (DB2 script key rename)
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.0:r14494
   Merged /alfresco/BRANCHES/V3.1:r14048-14049,14060,14086,14093,14103,14110,14166,14184,14495,14511,14516
   Merged /alfresco/BRANCHES/V3.2:r15579,15581-15585


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-10-13 11:51:40 +00:00
parent 2eeefe0a72
commit 69249332d3
38 changed files with 472 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/avm/AVMServiceImpl.java
View File

@@ -53,6 +53,7 @@ import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.FileNameValidator;
import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
@@ -361,7 +362,7 @@ public class AVMServiceImpl implements AVMService
*/
public OutputStream createFile(String path, String name)
{
if (path == null || name == null || !FileNameValidator.IsValid(name))
if (path == null || name == null || !FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -385,7 +386,7 @@ public class AVMServiceImpl implements AVMService
*/
public void createFile(String path, String name, InputStream in, List<QName> aspects, Map<QName, PropertyValue> properties)
{
if (path == null || name == null || in == null || !FileNameValidator.IsValid(name))
if (path == null || name == null || in == null || !FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -433,7 +434,7 @@ public class AVMServiceImpl implements AVMService
*/
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties)
{
if (path == null || name == null || !FileNameValidator.IsValid(name))
if (path == null || name == null || !FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -449,7 +450,7 @@ public class AVMServiceImpl implements AVMService
public void createLayeredFile(String srcPath, String parent, String name)
{
if (srcPath == null || parent == null || name == null ||
!FileNameValidator.IsValid(name))
!FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -465,7 +466,7 @@ public class AVMServiceImpl implements AVMService
public void createLayeredDirectory(String srcPath, String parent, String name)
{
if (srcPath == null || parent == null || name == null ||
!FileNameValidator.IsValid(name))
!FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -478,7 +479,7 @@ public class AVMServiceImpl implements AVMService
*/
public void createStore(String name)
{
if (name == null || !FileNameValidator.IsValid(name))
if (name == null || !FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Bad Name.");
}
@@ -496,7 +497,7 @@ public class AVMServiceImpl implements AVMService
String name)
{
if (srcPath == null || dstPath == null || name == null ||
!FileNameValidator.IsValid(name))
!FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -547,7 +548,7 @@ public class AVMServiceImpl implements AVMService
String dstName)
{
if (srcParent == null || srcName == null || dstParent == null || dstName == null ||
!FileNameValidator.IsValid(dstName))
!FileNameValidator.isValid(dstName))
{
throw new AVMBadArgumentException("Illegal argument.");
}
@@ -1431,7 +1432,7 @@ public class AVMServiceImpl implements AVMService
throw new AVMBadArgumentException("Infinite Copy.");
}
}
if (!FileNameValidator.IsValid(name))
if (!FileNameValidator.isValid(name))
{
throw new AVMBadArgumentException("Illegal name.");
}