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:
@@ -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.";
|
||||
}
|
||||
|
Reference in New Issue
Block a user