From 41519858dfc2a97869d5781cc0d57b1edbd77ab5 Mon Sep 17 00:00:00 2001 From: Ariel Backenroth Date: Fri, 4 May 2007 01:09:26 +0000 Subject: [PATCH] fix misalignment between property wca:xmlschema of aspect wca:form in java constants and in xml model config. the property value was xmlschema in xml but simply schema in java. still unsure as to why this would be causing problems now - and not causing problems on my machine, but this is most likely the cause of the stacktraces we are seeing. thanks much to derek for helping track this down. i've created issue WCM-477 to track any patch consequences of this realignment. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/bean/wcm/EditFormWizard.java | 20 ++++++++++++++++++- .../java/org/alfresco/web/forms/FormImpl.java | 13 +++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java index 8635c61d41..ae62bddab6 100644 --- a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java @@ -89,8 +89,26 @@ public class EditFormWizard this.setFormTitle(form.getTitle()); this.setFormDescription(form.getDescription()); this.setSchemaRootElementName(form.getSchemaRootElementName()); - final NodeRef schemaNodeRef = (NodeRef) + NodeRef schemaNodeRef = (NodeRef) this.nodeService.getProperty(formNodeRef, WCMAppModel.PROP_XML_SCHEMA); + if (schemaNodeRef == null) + { + LOGGER.debug(WCMAppModel.PROP_XML_SCHEMA + " not set on " + formNodeRef + + ", checking " + WCMAppModel.PROP_XML_SCHEMA_OLD); + schemaNodeRef = (NodeRef) + nodeService.getProperty(formNodeRef, WCMAppModel.PROP_XML_SCHEMA_OLD); + if (schemaNodeRef != null) + { + nodeService.setProperty(formNodeRef, WCMAppModel.PROP_XML_SCHEMA, schemaNodeRef); + } + } + if (schemaNodeRef == null) + { + throw new NullPointerException("expected property " + WCMAppModel.PROP_XML_SCHEMA + + " of " + formNodeRef + + " for form " + form.getName() + + " not to be null."); + } this.setSchemaFileName((String)this.nodeService.getProperty(schemaNodeRef, ContentModel.PROP_NAME)); try diff --git a/source/java/org/alfresco/web/forms/FormImpl.java b/source/java/org/alfresco/web/forms/FormImpl.java index f3f068f64a..b95222741d 100644 --- a/source/java/org/alfresco/web/forms/FormImpl.java +++ b/source/java/org/alfresco/web/forms/FormImpl.java @@ -201,9 +201,20 @@ public class FormImpl SAXException { final NodeService nodeService = this.getServiceRegistry().getNodeService(); - final NodeRef schemaNodeRef = (NodeRef) + NodeRef schemaNodeRef = (NodeRef) nodeService.getProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA); if (schemaNodeRef == null) + { + LOGGER.debug(WCMAppModel.PROP_XML_SCHEMA + " not set on " + folderNodeRef + + ", checking " + WCMAppModel.PROP_XML_SCHEMA_OLD); + schemaNodeRef = (NodeRef) + nodeService.getProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA_OLD); + if (schemaNodeRef != null) + { + nodeService.setProperty(folderNodeRef, WCMAppModel.PROP_XML_SCHEMA, schemaNodeRef); + } + } + if (schemaNodeRef == null) { throw new NullPointerException("expected property " + WCMAppModel.PROP_XML_SCHEMA + " of " + folderNodeRef +