From 037e5be9840c621a7f2dbe1c6570eefe3ea20169 Mon Sep 17 00:00:00 2001 From: Ariel Backenroth Date: Thu, 21 Dec 2006 20:34:00 +0000 Subject: [PATCH] - 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 --- config/alfresco/model/wcmAppModel.xml | 4 ++++ source/java/org/alfresco/model/WCMAppModel.java | 3 +++ .../java/org/alfresco/repo/avm/AVMNodeConverter.java | 11 ++++------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml index 1918a09e2b..bc62ac90b5 100644 --- a/config/alfresco/model/wcmAppModel.xml +++ b/config/alfresco/model/wcmAppModel.xml @@ -182,6 +182,10 @@ + + + Webapp + Filename Pattern diff --git a/source/java/org/alfresco/model/WCMAppModel.java b/source/java/org/alfresco/model/WCMAppModel.java index a6ff158a9e..a9fcf271df 100644 --- a/source/java/org/alfresco/model/WCMAppModel.java +++ b/source/java/org/alfresco/model/WCMAppModel.java @@ -55,6 +55,9 @@ public interface WCMAppModel // AVM web workflow defaults 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 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"); diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java index 0a273e6113..eb9035abf5 100644 --- a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java +++ b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java @@ -43,7 +43,7 @@ public class AVMNodeConverter String [] pathParts = avmPath.split(":"); 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) { @@ -79,7 +79,7 @@ public class AVMNodeConverter if (off == -1) { 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)); String path = translated.substring(off); @@ -119,15 +119,12 @@ public class AVMNodeConverter } if (path.endsWith(":/")) { - String [] res = new String[2]; - res[0] = null; - res[1] = ""; - return res; + return new String[] { null, "" }; } int off = path.lastIndexOf("/"); if (off == -1) { - throw new AVMException("Invalid Path."); + throw new AVMException("Invalid Path: " + path); } String [] decomposed = new String[2]; decomposed[0] = path.substring(0, off);