mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
. Single web-app per Web Project changes implemented in Sandbox browsing view
- the web-app folder name specified at Web Project creation time is created by default and is the root folder for all sandbox operations - a mechanism for selecting a different root webapp (or creating new root folders) can be easily added later (when there is time…!) . Removal of two public workflow actions that have no params and therefore don't work as public actions in the UI . Fix to user sandboxes component to allow any user to always have action to delete a user sandbox git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -67,6 +67,11 @@ public final class AVMConstants
|
||||
return store + ":/" + DIR_APPBASE + '/' + DIR_WEBAPPS;
|
||||
}
|
||||
|
||||
public static String buildAVMStoreWebappPath(String store, String webapp)
|
||||
{
|
||||
return store + ":/" + DIR_APPBASE + '/' + DIR_WEBAPPS + '/' + webapp;
|
||||
}
|
||||
|
||||
public static String buildAVMStoreUrl(String store)
|
||||
{
|
||||
if (store.indexOf(':') != -1)
|
||||
@@ -144,12 +149,10 @@ public final class AVMConstants
|
||||
{
|
||||
return parent;
|
||||
}
|
||||
|
||||
|
||||
if (path.charAt(0) == '/')
|
||||
{
|
||||
final Pattern p = Pattern.compile("([^:]+:/" + AVMConstants.DIR_APPBASE +
|
||||
"/[^/]+/[^/]+).*");
|
||||
final Matcher m = p.matcher(parent);
|
||||
final Matcher m = absoluteAVMPath.matcher(parent);
|
||||
if (m.matches())
|
||||
{
|
||||
parent = m.group(1);
|
||||
@@ -189,4 +192,8 @@ public final class AVMConstants
|
||||
// URLs for preview of sandboxes and assets
|
||||
private final static String PREVIEW_SANDBOX_URL = "http://www-{0}.avm.{1}:{2}";
|
||||
private final static String PREVIEW_ASSET_URL = "http://www-{0}.avm.{1}:{2}{3}";
|
||||
|
||||
// patter for absolute AVM Path
|
||||
private final static Pattern absoluteAVMPath = Pattern.compile(
|
||||
"([^:]+:/" + AVMConstants.DIR_APPBASE + "/[^/]+/[^/]+).*");
|
||||
}
|
||||
|
Reference in New Issue
Block a user