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

Merged V2.1 to HEAD

Browse Source 
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:
Derek Hulley
2007-09-11 03:03:50 +00:00
parent 19e1af2314
commit 57554088ae
33 changed files with 638 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/jcr/importer/JCRDocXMLHandler.java
View File

@@ -318,7 +318,7 @@ public class JCRDocXMLHandler implements ImportContentHandler
{
// ensure context matches parse
ElementContext context = (ElementContext)contextStack.pop();
QName elementName = QName.createQName(qName, importResolver);
QName elementName = decodeQName(QName.createQName(qName, importResolver));
if (!context.getElementName().equals(elementName))
{
throw new InvalidSerializedDataException("Expected element " + context.getElementName() + " but was " + elementName);

2
source/java/org/alfresco/repo/attributes/AttributeServiceTest.java
View File

@@ -280,7 +280,9 @@ public class AttributeServiceTest extends TestCase
assertEquals(27, fService.getKeys("map/submap").size());
fService.removeAttribute("map/submap/subsubmap", "b");
assertEquals(25, fService.getKeys("map/submap/subsubmap").size());
System.out.println("Before-------------------------------------------------------------");
fService.removeAttribute("map/submap", "subsubmap");
System.out.println("After--------------------------------------------------------------");
assertEquals(26, fService.getKeys("map/submap").size());
fService.removeEntries("map/submap", new AttrAndQuery(new AttrQueryGTE("a"),
new AttrQueryLTE("d")));

22
source/java/org/alfresco/repo/attributes/hibernate/AttributeDAOHibernate.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.repo.attributes.AttrQueryHelperImpl;
import org.alfresco.repo.attributes.Attribute;
import org.alfresco.repo.attributes.AttributeDAO;
import org.alfresco.repo.attributes.ListAttribute;
import org.alfresco.repo.attributes.ListEntry;
import org.alfresco.repo.attributes.ListEntryDAO;
import org.alfresco.repo.attributes.MapAttribute;
import org.alfresco.repo.attributes.MapEntry;
@@ -78,24 +79,23 @@ public class AttributeDAOHibernate extends HibernateDaoSupport implements
if (attr.getType() == Type.MAP)
{
MapAttribute map = (MapAttribute)attr;
Collection<Attribute> attrs = map.values();
fMapEntryDAO.delete(map);
for (Attribute subAttr : attrs)
List<MapEntry> mapEntries = fMapEntryDAO.get(map);
for (MapEntry entry : mapEntries)
{
Attribute subAttr = entry.getAttribute();
fMapEntryDAO.delete(entry);
delete(subAttr);
}
}
if (attr.getType() == Type.LIST)
{
List<Attribute> children = new ArrayList<Attribute>();
for (Attribute child : attr)
ListAttribute list = (ListAttribute)attr;
List<ListEntry> listEntries = fListEntryDAO.get(list);
for (ListEntry entry : listEntries)
{
children.add(child);
}
fListEntryDAO.delete((ListAttribute)attr);
for (Attribute child : children)
{
delete(child);
Attribute subAttr = entry.getAttribute();
fListEntryDAO.delete(entry);
delete(subAttr);
}
}
getSession().delete(attr);

17
source/java/org/alfresco/repo/avm/AVMLockingAwareService.java
View File

@@ -882,4 +882,21 @@ public class AVMLockingAwareService implements AVMService, ApplicationContextAwa
}
}
}
/* (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)
{
fService.createDirectory(path, name, aspects, properties);
}
/* (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)
{
grabLock(path + '/' + name);
fService.createFile(path, name, in, aspects, properties);
}
}

8
source/java/org/alfresco/repo/avm/AVMRepository.java
View File

@@ -254,7 +254,7 @@ public class AVMRepository
* @param name The name to give the file.
* @param data The file contents.
*/
public void createFile(String path, String name, File data)
public void createFile(String path, String name, File data, List<QName> aspects, Map<QName, PropertyValue> properties)
{
fLookupCount.set(1);
try
@@ -266,7 +266,7 @@ public class AVMRepository
throw new AVMNotFoundException("Store not found.");
}
fLookupCache.onWrite(pathParts[0]);
store.createFile(pathParts[1], name, data);
store.createFile(pathParts[1], name, data, aspects, properties);
}
finally
{
@@ -279,7 +279,7 @@ public class AVMRepository
* @param path The path to the containing directory.
* @param name The name to give the directory.
*/
public void createDirectory(String path, String name)
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties)
{
fLookupCount.set(1);
try
@@ -291,7 +291,7 @@ public class AVMRepository
throw new AVMNotFoundException("Store not found.");
}
fLookupCache.onWrite(pathParts[0]);
store.createDirectory(pathParts[1], name);
store.createDirectory(pathParts[1], name, aspects, properties);
}
finally
{

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

@@ -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);
}
/**

2
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -5043,6 +5043,8 @@ public class AVMServiceTest extends AVMServiceTestBase
AVMStoreDescriptor desc = fService.getStore("main");
assertNotNull(desc);
System.out.println(desc);
fService.purgeStore("main");
assertNull(fService.getStore("main"));
}
catch (Exception e)
{

4
source/java/org/alfresco/repo/avm/AVMStore.java
View File

@@ -87,7 +87,7 @@ public interface AVMStore
* @param path The path to the parent directory.
* @param name The name to give the new directory.
*/
public void createDirectory(String path, String name);
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties);
/**
* Create a new layered directory.
@@ -112,7 +112,7 @@ public interface AVMStore
* @param name The name to give the file.
* @param data The contents of the file.
*/
public void createFile(String path, String name, File data);
public void createFile(String path, String name, File data, List<QName> aspects, Map<QName, PropertyValue> properties);
/**
* Create a new layered file.

21
source/java/org/alfresco/repo/avm/AVMStoreImpl.java
View File

@@ -319,7 +319,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
* @param path The path to the containing directory.
* @param name The name of the new directory.
*/
public void createDirectory(String path, String name)
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties)
{
Lookup lPath = lookupDirectory(-1, path, true);
if (lPath == null)
@@ -353,6 +353,14 @@ public class AVMStoreImpl implements AVMStore, Serializable
}
dir.updateModTime();
dir.putChild(name, newDir);
if (aspects != null)
{
newDir.getAspects().addAll(aspects);
}
if (properties != null)
{
newDir.getProperties().putAll(properties);
}
}
/**
@@ -442,7 +450,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
* @param name The name to give the new file.
* @param data The contents.
*/
public void createFile(String path, String name, File data)
public void createFile(String path, String name, File data, List<QName> aspects, Map<QName, PropertyValue> properties)
{
Lookup lPath = lookupDirectory(-1, path, true);
if (lPath == null)
@@ -468,10 +476,19 @@ public class AVMStoreImpl implements AVMStore, Serializable
RawServices.Instance().getMimetypeService().guessMimetype(name),
-1,
"UTF-8"));
if (aspects != null)
{
file.getAspects().addAll(aspects);
}
if (properties != null)
{
file.getProperties().putAll(properties);
}
// Yet another flush.
AVMDAOs.Instance().fAVMNodeDAO.flush();
ContentWriter writer = createContentWriter(AVMNodeConverter.ExtendAVMPath(path, name));
writer.putContent(data);
}
/**

23
source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
View File

@@ -24,14 +24,13 @@
package org.alfresco.repo.avm.hibernate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.repo.avm.AVMNode;
import org.alfresco.repo.avm.AVMStore;
import org.alfresco.repo.avm.AVMStoreDAO;
import org.alfresco.repo.avm.AVMStoreImpl;
import org.alfresco.repo.cache.SimpleCache;
import org.hibernate.Query;
import org.hibernate.proxy.HibernateProxy;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -46,7 +45,7 @@ class AVMStoreDAOHibernate extends HibernateDaoSupport implements
/**
* An in memory cache of name to primary key mappings.
*/
private Map<String, Long> fNameCache;
private SimpleCache<String, Long> fNameCache;
/**
* Do nothing constructor.
@@ -54,7 +53,11 @@ class AVMStoreDAOHibernate extends HibernateDaoSupport implements
public AVMStoreDAOHibernate()
{
super();
fNameCache = new HashMap<String, Long>();
}
public void setCache(SimpleCache<String, Long> cache)
{
fNameCache = cache;
}
/**
@@ -100,10 +103,7 @@ class AVMStoreDAOHibernate extends HibernateDaoSupport implements
public AVMStore getByName(String name)
{
Long id = null;
synchronized (this)
{
id = fNameCache.get(name);
}
id = fNameCache.get(name);
if (id != null)
{
return forceNonLazy((AVMStore)getSession().get(AVMStoreImpl.class, id));
@@ -112,12 +112,9 @@ class AVMStoreDAOHibernate extends HibernateDaoSupport implements
"where st.name = :name");
query.setParameter("name", name);
AVMStore result = (AVMStore)query.uniqueResult();
synchronized (this)
if (result != null)
{
if (result != null)
{
fNameCache.put(name, result.getId());
}
fNameCache.put(name, result.getId());
}
return forceNonLazy(result);
}

2
source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java
View File

@@ -182,7 +182,9 @@ public class AVMLockingServiceTest extends TestCase
System.out.println(fAttributeService.getAttribute(".avm_lock_table"));
// assertEquals(2, fService.getUsersLocks("Buffy").size());
assertEquals(2, fService.getWebProjectLocks("alfresco").size());
System.out.println("Before----------------------------");
fService.removeLock("alfresco", "Revello Drive/1630");
System.out.println("After----------------------------");
System.out.println(fAttributeService.getAttribute(".avm_lock_table"));
// assertEquals(1, fService.getUsersLocks("Buffy").size());
assertEquals(1, fService.getWebProjectLocks("alfresco").size());

4
source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java
View File

@@ -108,7 +108,9 @@ public class AVMSubmitTransactionListener extends TransactionListenerAdapter
true
);
if (log.isDebugEnabled())
log.debug("JMX update to virt server called after commit");
log.debug("JMX update to virt server called after commit." +
" Version: " + requiresUpdate.getDestinationVersion() +
" Path: " + requiresUpdate.getDestinationPath());
}
// Remove virtual webapps from workflow sandbox prior to

3
source/java/org/alfresco/repo/deploy/FSDeploymentTest.java
View File

@@ -99,6 +99,7 @@ public class FSDeploymentTest extends AVMServiceTestBase
fService.removeNode("main:/d/e");
fService.createDirectory("main:/d", "e");
fService.createFile("main:/d/e", "Warren.txt").close();
fService.createFile("main:/d/e", "It's a silly name.txt").close();
report = service.deployDifferenceFS(-1, "main:/", "localhost", 44100, "Giles", "Watcher", "sampleTarget", matcher, false, false, false, null);
count = 0;
for (DeploymentEvent event : report)
@@ -106,7 +107,7 @@ public class FSDeploymentTest extends AVMServiceTestBase
System.out.println(event);
count++;
}
assertEquals(4, count);
assertEquals(5, count);
}
catch (Exception e)
{

203
source/java/org/alfresco/repo/jscript/AVM.java
View File

@@ -24,13 +24,21 @@
*/
package org.alfresco.repo.jscript;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.alfresco.config.JNDIConstants;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.NameMatcher;
import org.alfresco.util.ParameterCheck;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
@@ -44,6 +52,8 @@ public final class AVM extends BaseScopableProcessorExtension
{
/** Repository Service Registry */
private ServiceRegistry services;
private NameMatcher matcher;
/**
* Set the service registry
@@ -54,6 +64,11 @@ public final class AVM extends BaseScopableProcessorExtension
{
this.services = serviceRegistry;
}
public void setNameMatcher(NameMatcher matcher)
{
this.matcher = matcher;
}
/**
* @return a array of all AVM stores in the system
@@ -136,15 +151,201 @@ public final class AVM extends BaseScopableProcessorExtension
}
return node;
}
/**
* Return the list of modified items for the specified user sandbox against staging store id
* for a specific webapp.
*
* @param storeId Root Store ID
* @param username Username to get modified items for
* @param webapp Webapp name to filter by
*
* @return List of AVMNode objects representing the modified items
*/
public List<AVMNode> getModifiedItems(String storeId, String username, String webapp)
{
ParameterCheck.mandatoryString("Store ID", storeId);
ParameterCheck.mandatoryString("Username", username);
ParameterCheck.mandatoryString("Webapp", webapp);
List<AVMNode> items;
AVMService avmService = this.services.getAVMService();
// build the paths to the stores to compare - filter by current webapp
String userStore = userSandboxStore(storeId, username);
String userStorePath = getStoreRootWebappPath(userStore, webapp);
String stagingStore = stagingStore(storeId);
String stagingStorePath = getStoreRootWebappPath(stagingStore, webapp);
List<AVMDifference> diffs = this.services.getAVMSyncService().compare(
-1, userStorePath, -1, stagingStorePath, this.matcher);
items = new ArrayList<AVMNode>(diffs.size());
for (AVMDifference diff : diffs)
{
// convert each diff record into an AVM Node template wrapper
String sourcePath = diff.getSourcePath();
AVMNodeDescriptor node = avmService.lookup(-1, sourcePath);
if (node != null)
{
items.add(new AVMNode(node.getPath(), -1, this.services, getScope()));
}
}
return items;
}
/**
* @param storeId Store ID to build staging store name for
*
* @return the Staging Store name for the given store ID
*/
public static String stagingStore(String storeId)
{
ParameterCheck.mandatoryString("Store ID", storeId);
return storeId;
}
/**
* @param storeId Store ID to build sandbox store name for
* @param username Username of the sandbox user
*
* @return the Sandbox Store name for the given store ID and username
*/
public static String userSandboxStore(String storeId, String username)
{
ParameterCheck.mandatoryString("Store ID", storeId);
ParameterCheck.mandatoryString("Username", username);
return storeId + "--" + username;
}
/**
* @param storeId Store ID to build preview URL for
*
* @return the preview URL to the staging store for the specified store ID
*/
public String websiteStagingUrl(String storeId)
{
ParameterCheck.mandatoryString("Store ID", storeId);
return MessageFormat.format(JNDIConstants.PREVIEW_SANDBOX_URL,
lookupStoreDNS(storeId), getVServerDomain(), getVServerPort());
}
/**
* @param storeId Store ID to build preview URL for
* @param username Username to build sandbox preview URL for
*
* @return the preview URL to the user sandbox for the specified store ID and username
*/
public String websiteUserSandboxUrl(String storeId, String username)
{
ParameterCheck.mandatoryString("Store ID", storeId);
ParameterCheck.mandatoryString("Username", username);
return websiteStagingUrl(userSandboxStore(storeId, username));
}
/**
* @param store Store ID of the asset
* @param assetPath Store relative path to the asset
*
* @return the preview URL to the specified store asset
*/
public String assetUrl(String store, String assetPath)
{
ParameterCheck.mandatoryString("Store", store);
ParameterCheck.mandatoryString("Asset Path", assetPath);
if (assetPath.startsWith('/' + JNDIConstants.DIR_DEFAULT_WWW +
'/' + JNDIConstants.DIR_DEFAULT_APPBASE))
{
assetPath = assetPath.substring(('/' + JNDIConstants.DIR_DEFAULT_WWW +
'/' + JNDIConstants.DIR_DEFAULT_APPBASE).length());
}
if (assetPath.startsWith("/ROOT"))
{
assetPath = assetPath.substring(("/ROOT").length());
}
if (assetPath.length() == 0 || assetPath.charAt(0) != '/')
{
assetPath = '/' + assetPath;
}
return MessageFormat.format(JNDIConstants.PREVIEW_ASSET_URL,
lookupStoreDNS(store), getVServerDomain(), getVServerPort(), assetPath);
}
/**
* @param avmPath Fully qualified AVM path of the asset
*
* @return the preview URL to the specified asset
*/
public String assetUrl(String avmPath)
{
ParameterCheck.mandatoryString("AVM Path", avmPath);
String[] s = avmPath.split(":");
if (s.length != 2)
{
throw new IllegalArgumentException("Expected exactly one ':' in " + avmPath);
}
return assetUrl(s[0], s[1]);
}
/**
* @return VServer Port
*/
private String getVServerPort()
{
Integer port = this.services.getVirtServerRegistry().getVirtServerHttpPort();
if (port == null)
{
port = JNDIConstants.DEFAULT_VSERVER_PORT;
}
return port.toString();
}
/**
* @return VServer Domain
*/
private String getVServerDomain()
{
String domain = this.services.getVirtServerRegistry().getVirtServerFQDN();
if (domain == null)
{
domain = JNDIConstants.DEFAULT_VSERVER_IP;
}
return domain;
}
/**
* @return the path to the webapps folder in a standard web store.
*/
public static String getWebappsFolderPath()
{
return '/' + JNDIConstants.DIR_DEFAULT_WWW +
'/' + JNDIConstants.DIR_DEFAULT_APPBASE;
}
public static String jsGet_webappsFolderPath()
{
return getWebappsFolderPath();
}
private static String getStoreRootPath(String store)
{
return store + ":" + getWebappsFolderPath();
}
private static String getStoreRootWebappPath(String store, String webapp)
{
return getStoreRootPath(store) + '/' + webapp;
}
private String lookupStoreDNS(String store)
{
Map<QName, PropertyValue> props =
this.services.getAVMService().queryStorePropertyKey(store, QName.createQName(null, PROP_DNS + '%'));
return (props.size() == 1
? props.keySet().iterator().next().getLocalName().substring(PROP_DNS.length()) : null);
}
private final static String PROP_DNS = ".dns.";
}

86
source/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java Normal file
View File

@@ -0,0 +1,86 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.jscript;
import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.namespace.QName;
/**
* Specialised map class for supporting the initialisation of 'cm:content' properties for JavaScript API
* objects. The JavaScript needs supporting objects to be initialised for certain data-types. If the
* 'cm:content' property is not already initialised then it must be created on demand or it will not be
* available to the users of the API. See AR-1673.
*
* @author Kevin Roast
*/
public class ContentAwareScriptableQNameMap<K,V> extends ScriptableQNameMap<K,V>
{
private ServiceRegistry services;
private ScriptNode factory;
public ContentAwareScriptableQNameMap(ScriptNode factory, ServiceRegistry services)
{
super(services.getNamespaceService());
this.services = services;
this.factory = factory;
}
/* (non-Javadoc)
* @see org.alfresco.service.namespace.QNameMap#get(java.lang.Object)
*/
@Override
public Object get(Object name)
{
Object value = super.get(name);
if (value == null)
{
// convert the key to a qname and look up the data-type for the property
QName qname = QName.resolveToQName(this.resolver, name.toString());
PropertyDefinition propDef = this.services.getDictionaryService().getProperty(qname);
if (propDef != null && DataTypeDefinition.CONTENT.equals(propDef.getDataType().getName()))
{
// found a valid cm:content property that is not initialised
String mimetype = null;
String fileName = (String)get("cm:name");
if (fileName != null)
{
mimetype = this.services.getMimetypeService().guessMimetype(fileName);
}
ContentData cdata = new ContentData(null, mimetype, 0L, "UTF-8");
// create the JavaScript API object we need
value = factory.new ScriptContentData(cdata, ContentModel.PROP_CONTENT);
// and store it so it is available to the API user
put(name, value);
}
}
return value;
}
}

26
source/java/org/alfresco/repo/jscript/ScriptAction.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionDefinition;
import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.Wrapper;
@@ -153,6 +154,31 @@ public final class ScriptAction implements Serializable, Scopeable
// Reset the actioned upon node
node.reset();
}
/**
* Execute action
*
* @param nodeRef
* the node to execute action upon
*/
@SuppressWarnings("synthetic-access")
public void execute(NodeRef nodeRef)
{
if (this.parameters != null && this.parameters.isModified())
{
Map<String, Serializable> actionParams = action.getParameterValues();
actionParams.clear();
for (Map.Entry<String, Serializable> entry : this.parameters.entrySet())
{
// perform the conversion from script wrapper object to repo serializable values
String name = entry.getKey();
Serializable value = converter.convertActionParamForRepo(name, entry.getValue());
actionParams.put(name, value);
}
}
services.getActionService().executeAction(action, nodeRef);
}
/**
* Value converter with specific knowledge of action parameters

18
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -534,7 +534,9 @@ public class ScriptNode implements Serializable, Scopeable
if (this.properties == null)
{
// this Map implements the Scriptable interface for native JS syntax property access
this.properties = new ScriptableQNameMap<String, Serializable>(this.services.getNamespaceService());
// this impl of the QNameMap is capable of creating ScriptContentData on demand for 'cm:content'
// properties that have not been initialised - see AR-1673.
this.properties = new ContentAwareScriptableQNameMap<String, Serializable>(this, this.services);
Map<QName, Serializable> props = this.nodeService.getProperties(this.nodeRef);
for (QName qname : props.keySet())
@@ -542,7 +544,6 @@ public class ScriptNode implements Serializable, Scopeable
Serializable propValue = props.get(qname);
// perform the conversion to a script safe value and store
this.properties.put(qname.toString(), getValueConverter().convertValueForScript(qname, propValue));
}
}
@@ -774,7 +775,7 @@ public class ScriptNode implements Serializable, Scopeable
{
String content = "";
ScriptContentData contentData = (ScriptContentData) getProperties().get(ContentModel.PROP_CONTENT);
ScriptContentData contentData = (ScriptContentData)getProperties().get(ContentModel.PROP_CONTENT);
if (contentData != null)
{
content = contentData.getContent();
@@ -795,16 +796,11 @@ public class ScriptNode implements Serializable, Scopeable
*/
public void setContent(String content)
{
ScriptContentData contentData = (ScriptContentData) getProperties().get(ContentModel.PROP_CONTENT);
if (contentData == null)
ScriptContentData contentData = (ScriptContentData)getProperties().get(ContentModel.PROP_CONTENT);
if (contentData != null)
{
// guess a mimetype based on the filename
String mimetype = this.services.getMimetypeService().guessMimetype(getName());
ContentData cdata = new ContentData(null, mimetype, 0L, "UTF-8");
contentData = new ScriptContentData(cdata, ContentModel.PROP_CONTENT);
getProperties().put(ContentModel.PROP_CONTENT.toString(), contentData);
contentData.setContent(content);
}
contentData.setContent(content);
}
public void jsSet_content(String content)

3
source/java/org/alfresco/repo/node/index/AVMRemoteSnapshotTracker.java
View File

@@ -35,6 +35,9 @@ import org.apache.commons.logging.LogFactory;
/**
* Track and update when snapshots are created and indexed in a cluster
*
* @author Andy Hind
* @since 2.1.0
*/
public class AVMRemoteSnapshotTracker extends AbstractReindexComponent
{

38
source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
View File

@@ -589,10 +589,7 @@ public abstract class AlfrescoTransactionSupport
}
// These are still considered part of the transaction so are executed here
for (TransactionListener listener : getListenersIterable())
{
listener.beforeCommit(readOnly);
}
doBeforeCommit(readOnly);
// Check integrity
for (IntegrityChecker integrityChecker : integrityCheckers)
@@ -607,6 +604,39 @@ public abstract class AlfrescoTransactionSupport
}
}
/**
* Execute the beforeCommit event handlers for the registered listeners
*
* @param readOnly is read only
*/
private void doBeforeCommit(boolean readOnly)
{
doBeforeCommit(new HashSet<TransactionListener>(listeners.size()), readOnly);
}
/**
* Executes the beforeCommit event handlers for the outstanding listeners
*
* @param visitedListeners a set containing the already visited listeners
* @param readOnly is read only
*/
private void doBeforeCommit(Set<TransactionListener> visitedListeners, boolean readOnly)
{
Set<TransactionListener> pendingListeners = new HashSet<TransactionListener>(listeners);
pendingListeners.removeAll(visitedListeners);
if (pendingListeners.size() != 0)
{
for (TransactionListener listener : pendingListeners)
{
listener.beforeCommit(readOnly);
visitedListeners.add(listener);
}
doBeforeCommit(visitedListeners, readOnly);
}
}
@Override
public void beforeCompletion()
{

12
source/java/org/alfresco/repo/version/BaseVersionStoreTest.java
View File

@@ -29,6 +29,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.alfresco.model.ContentModel;
@@ -42,6 +43,7 @@ import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MLText;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -107,6 +109,9 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
protected static final String MULTI_VALUE_1 = "multi1";
protected static final String MULTI_VALUE_2 = "multi2";
protected MLText mlText;
protected static final QName MLTEXT_PROP = QName.createQName(TEST_NAMESPACE, "propMl");
/**
* Test content
*/
@@ -162,7 +167,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
this.versionProperties = new HashMap<String, Serializable>();
versionProperties.put(VERSION_PROP_1, VALUE_1);
versionProperties.put(VERSION_PROP_2, VALUE_2);
versionProperties.put(VERSION_PROP_3, VALUE_3);
versionProperties.put(VERSION_PROP_3, VALUE_3);
// Create the node properties
this.nodeProperties = new HashMap<QName, Serializable>();
@@ -172,6 +177,11 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
this.nodeProperties.put(MULTI_PROP, (Serializable)multiValue);
this.nodeProperties.put(ContentModel.PROP_CONTENT, new ContentData(null, "text/plain", 0L, "UTF-8"));
// Add mlText property
this.mlText = new MLText(Locale.UK, "UK value");
this.mlText.addValue(Locale.US, "Y'all US value");
this.nodeProperties.put(MLTEXT_PROP, this.mlText);
// Create a workspace that contains the 'live' nodes
this.testStoreRef = this.dbNodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());

3
source/java/org/alfresco/repo/version/NodeServiceImplTest.java
View File

@@ -146,6 +146,9 @@ public class NodeServiceImplTest extends BaseVersionStoreTest
PROP_1);
assertEquals(VALUE_1, value1);
// Check the mlText property
// TODO
// Check the multi values property specifically
Collection<String> multiValue = (Collection<String>)this.lightWeightVersionStoreNodeService.getProperty(version.getFrozenStateNodeRef(), MULTI_PROP);
assertNotNull(multiValue);

5
source/java/org/alfresco/repo/version/VersionStoreBaseTest_model.xml
View File

@@ -37,6 +37,11 @@
<protected>false</protected>
<default></default>
</property>
<property name="test:propMl">
<type>d:mltext</type>
<protected>false</protected>
<default></default>
</property>
<property name="test:multiProp">
<type>d:text</type>
<multiple>true</multiple>

21
source/java/org/alfresco/repo/version/common/AbstractVersionServiceImpl.java
View File

@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.repo.node.MLPropertyInterceptor;
import org.alfresco.repo.policy.ClassPolicyDelegate;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.policy.PolicyScope;
@@ -231,13 +232,21 @@ public abstract class AbstractVersionServiceImpl
ClassDefinition classDefinition = this.dictionaryService.getClass(classRef);
if (classDefinition != null)
{
// Copy the properties
Map<QName,PropertyDefinition> propertyDefinitions = classDefinition.getProperties();
for (QName propertyName : propertyDefinitions.keySet())
boolean wasMLAware = MLPropertyInterceptor.setMLAware(true);
try
{
Serializable propValue = this.nodeService.getProperty(nodeRef, propertyName);
nodeDetails.addProperty(classRef, propertyName, propValue);
}
// Copy the properties
Map<QName,PropertyDefinition> propertyDefinitions = classDefinition.getProperties();
for (QName propertyName : propertyDefinitions.keySet())
{
Serializable propValue = this.nodeService.getProperty(nodeRef, propertyName);
nodeDetails.addProperty(classRef, propertyName, propValue);
}
}
finally
{
MLPropertyInterceptor.setMLAware(wasMLAware);
}
// Version the associations (child and target)
Map<QName, AssociationDefinition> assocDefs = classDefinition.getAssociations();

35
source/java/org/alfresco/service/cmr/avm/AVMService.java
View File

@@ -324,8 +324,6 @@ public interface AVMService
*/
public OutputStream createFile(String path, String name);
/**
* Create a new "plain" (non-layered) file.
* Guarantees that the entire contents of the
@@ -341,7 +339,24 @@ public interface AVMService
*/
public void createFile(String path, String name, InputStream in);
/**
* Create a new "plain" (non-layered) file.
* Guarantees that the entire contents of the
* input stream will be loaded atomically.
* The directory identified by <code>path</code> must already exist.
*
* @param path The path of the directory containing the created file.
* @param name The name of the new file
* @param in An input stream with data for the file.
* @param aspect A list of aspects to give the file.
* @param properties A map of properties to give the file.
* @throws AVMNotFound
* @throws AVMExists
* @throws AVMWrongType
*/
public void createFile(String path, String name, InputStream in, List<QName> aspects, Map<QName, PropertyValue> properties);
/**
* Create a new directory.
* If <code>path</code> is within a layer, the new directory will be a layered directory;
@@ -355,6 +370,20 @@ public interface AVMService
*/
public void createDirectory(String path, String name);
/**
* Create a new directory.
* If <code>path</code> is within a layer, the new directory will be a layered directory;
* otherwise, the new directory will be a plain directory.
*
* @param path The simple absolute path to the parent.
* @param name The name to give the directory.
* @param aspects A list of aspects to add.
* @param properties A Map of properties to add.
* @throws AVMNotFound
* @throws AVMExists
* @throws AVMWrongType
*/
public void createDirectory(String path, String name, List<QName> aspects, Map<QName, PropertyValue> properties);
/**
* Create a new layered file.