mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.1 to HEAD
6580: AVM bulk import performance tweaks. 6582: WCM-767, WCM-768 6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer) 6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect) 6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully 6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa) 6587: Fix for AWC-1390 (Paste all doesn't work for forum items) 6588: AR-1701 Script getDocument call doesn't check for non-existent content 6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint 6591: Improvement for submit speed. 6592: Removed obsolete tests. 6594: Index tracking sample to include AVM index tracking 6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API 6597: Rationalize post commit execution hooks for deployment receiver 6598: Properly escape path names for ProgramRunnable. 6599: AVM store name lookup cache is (theoretically) clusterable. 6600: Some or other gramatically incorrect stuff about Chiba. 6601: Fix for AR-1121 and AR-1673 6602: AR-1655: Versioning is not MLText aware 6603: Updated messages from lang packs 6604: Fixed AR-1476: JCR import end element escaping 6605: Updated Japanese lang messages git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -357,6 +357,14 @@ public class AVMServiceImpl implements AVMService
|
||||
* @param in An InputStream containing data for file.
|
||||
*/
|
||||
public void createFile(String path, String name, InputStream in)
|
||||
{
|
||||
createFile(path, name, in, null, null);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.cmr.avm.AVMService#createFile(java.lang.String, java.lang.String, java.io.InputStream, java.util.List, java.util.Map)
|
||||
*/
|
||||
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))
|
||||
{
|
||||
@@ -383,7 +391,7 @@ public class AVMServiceImpl implements AVMService
|
||||
}
|
||||
try
|
||||
{
|
||||
fAVMRepository.createFile(path, name, temp);
|
||||
fAVMRepository.createFile(path, name, temp, aspects, properties);
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -397,12 +405,20 @@ public class AVMServiceImpl implements AVMService
|
||||
* @param name The name of the new directory.
|
||||
*/
|
||||
public void createDirectory(String path, String name)
|
||||
{
|
||||
createDirectory(path, name, null, null);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.cmr.avm.AVMService#createDirectory(java.lang.String, java.lang.String, java.util.List, java.util.Map)
|
||||
*/
|
||||
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties)
|
||||
{
|
||||
if (path == null || name == null || !FileNameValidator.IsValid(name))
|
||||
{
|
||||
throw new AVMBadArgumentException("Illegal argument.");
|
||||
}
|
||||
fAVMRepository.createDirectory(path, name);
|
||||
fAVMRepository.createDirectory(path, name, aspects, properties);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user