mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
- adding aspect to webapp nodes to differentiate them from ordinary folders in the avm_webapps directory
- refactoring of generate and regenerate calls to take a FormInstanceData object - adding in support for overriding step title and description properties in wizards so as to be able to format them with parameters - making the step descriptions in create form wizard reiterate the form name so as to give the user better context - displaying avm task resources in the manage task screen. still need to get actions working and clean this up a bit. - making output path patterns sandbox relative - refactored utility method for combining avm paths sensitive to webapp vs sandbox relative paths. - adding a default description for generated renditions todo: - cleanup some usage of AVMNode from ManageTaskBean - get actions to appear in manage task screen - add a multi value property to the web project for all its webapps - properly use overridden values for forms from the web project settings git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -183,6 +183,10 @@
|
|||||||
|
|
||||||
<aspects>
|
<aspects>
|
||||||
|
|
||||||
|
<aspect name="wca:webapp">
|
||||||
|
<title>Webapp</title>
|
||||||
|
</aspect>
|
||||||
|
|
||||||
<aspect name="wca:filenamepattern">
|
<aspect name="wca:filenamepattern">
|
||||||
<title>Filename Pattern</title>
|
<title>Filename Pattern</title>
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -55,6 +55,9 @@ public interface WCMAppModel
|
|||||||
// AVM web workflow defaults
|
// AVM web workflow defaults
|
||||||
static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults");
|
static final QName TYPE_WEBWORKFLOWDEFAULTS = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webworkflowdefaults");
|
||||||
|
|
||||||
|
// AVM webapp aspect
|
||||||
|
static final QName ASPECT_WEBAPP = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "webapp");
|
||||||
|
|
||||||
// AVM filename pattern aspect
|
// AVM filename pattern aspect
|
||||||
static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
|
static final QName ASPECT_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
|
||||||
static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
|
static final QName PROP_FILENAMEPATTERN = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "filenamepattern");
|
||||||
|
@@ -43,7 +43,7 @@ public class AVMNodeConverter
|
|||||||
String [] pathParts = avmPath.split(":");
|
String [] pathParts = avmPath.split(":");
|
||||||
if (pathParts.length != 2)
|
if (pathParts.length != 2)
|
||||||
{
|
{
|
||||||
throw new AVMException("Malformed AVM Path.");
|
throw new AVMException("Malformed AVM Path: " + avmPath);
|
||||||
}
|
}
|
||||||
while (pathParts[1].endsWith("/") && pathParts[1].length() > 1)
|
while (pathParts[1].endsWith("/") && pathParts[1].length() > 1)
|
||||||
{
|
{
|
||||||
@@ -79,7 +79,7 @@ public class AVMNodeConverter
|
|||||||
if (off == -1)
|
if (off == -1)
|
||||||
{
|
{
|
||||||
fgLogger.error(translated);
|
fgLogger.error(translated);
|
||||||
throw new AVMException("Bad Node Reference.");
|
throw new AVMException("Bad Node Reference: " + nodeRef.getId());
|
||||||
}
|
}
|
||||||
int version = Integer.parseInt(translated.substring(0, off));
|
int version = Integer.parseInt(translated.substring(0, off));
|
||||||
String path = translated.substring(off);
|
String path = translated.substring(off);
|
||||||
@@ -119,15 +119,12 @@ public class AVMNodeConverter
|
|||||||
}
|
}
|
||||||
if (path.endsWith(":/"))
|
if (path.endsWith(":/"))
|
||||||
{
|
{
|
||||||
String [] res = new String[2];
|
return new String[] { null, "" };
|
||||||
res[0] = null;
|
|
||||||
res[1] = "";
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
int off = path.lastIndexOf("/");
|
int off = path.lastIndexOf("/");
|
||||||
if (off == -1)
|
if (off == -1)
|
||||||
{
|
{
|
||||||
throw new AVMException("Invalid Path.");
|
throw new AVMException("Invalid Path: " + path);
|
||||||
}
|
}
|
||||||
String [] decomposed = new String[2];
|
String [] decomposed = new String[2];
|
||||||
decomposed[0] = path.substring(0, off);
|
decomposed[0] = path.substring(0, off);
|
||||||
|
Reference in New Issue
Block a user