From 5e6d266b3e315a352eb825ead13d3fb63a9f2b7d Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Wed, 1 Jun 2011 09:22:18 +0000 Subject: [PATCH] Merged V3.4-BUG-FIX to HEAD 27967: Fixes: ALF-8696. L10N updates 27969: Fixes: ALF-8698 - FR L10N string updates 28011: Fixes: ALF-8776 - IT L10N updates 28035: Fix for ALF-2711 - Spring Surf contrib: Unable to upload files over 2GB 28052: Fixes: ALF-8724 28054: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX 27765: ALF-8607: Detect and invalidate stale cached nodes during transaction tracking - Also increased debug logging around IndexTransactionTracker 27953: ALF-8607: Store FTSSTATUS on a supplementary document in the index for each transaction, so that we don't forget to FTS reindex the document if it has already been updated by a later transaction. 27965: ALF-8607: Complete query parsers' handling of new FTSREF field 28033: ALF-8811: Removed invalid caching of permissions from Invite wizards. Finish off ALF-4597 28053: ALF-8815: Make it possible to copy a node with the cm:storeSelector aspect - The copied node's content will already be in the target store when its properties (including storeName) are first applied 28055: Merged PATCHES/V3.3.4 to V3.4-BUG-FIX (RECORD ONLY) 27830: ALF-8476: Possible fix to StackOverflowError when searching a transaction with a huge number of deletions 27854: Merged V3.3 to PATCHES/V3.3.4 27851: Fix for ALF-8476: CLONE - Query consuming all heap and receiving an OOM exception - actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings) 28060: ALF-8779: I18N Fix from Bitrock. 28065: ALF-8105: Correction to ETWOTWO-1384 fix: do not embed schema in XForm definition if it references externals to avoid performance issues - Previous fix embedded a partial, invalid schema that caused XML parser warnings 28070: Suggested fix for ALF-8852. Upgrading pdfbox,fontbox,jempbox from 1.3.1 to 1.5.0. 28071: Fix for symptom raised in ALF-8780: Forms system does not show control for associations of cm:person type This hides the rn:rendition association from default forms as it should never be edited by a user. The proper fix for the bug is to supply form config for the custom type. 28072: Fixed ALF-8050: Inconsistency in validation of webforms with maxOccurs="*" 28077: ALF-6293: Fix from Bitrock - Installing the tomcat service logs more stuff on Linux and Windows 28084: ALF-8877: Upgraded freemarker to 2.3.18 28090: Fix failing forms related tests 28118: ALF-8557 Added NullScope object used by JbpmNode. 28123: Fix for ALF-8207 28124: ALF-7708 The JavaScript expressions in workflows should no longer be re-formatted. 28134: Incremented version revision for 3.4.3 28135: Merged V3.4 to V3.4-BUG-FIX 27962: Update to Bitrock 7.1.1 + use absolute path to Bitrock license under protected build-classpath directory 27971: Fix for ALF-8704 - RM search doesn't work 27984: ALF-8771: Installer now uses cmd /C start /MIN /WAIT to run minimized commands synchronously rather than asynchronously! - Also uses -w flag when registering postgres service to make its startup synchronous - Should mean that the install waits for postgres to start before issuing commands to it! 27987: ALF-8666: Bitrock service run and install scripts now execute commands sequentially - start /MIN /WAIT cmd /C used instead of start /MIN 27993: ALF-8761: getWindowsACL fix from Bitrock 27996: ALF-8710: Run servicerun.bat as admin user 27998: ALF-7164: NFS: User with editor role cannot edit content 28021: ALF-8823: PostgreSQL Windows service is registered under SYSTEM user. Therefore initial initdb must be done as this user for service to start. 28022: ALF-8823: Additional fix from Bitrock 28041: Another try at fixing ALF-8704 - RM search doesn't work 28119: ALF-8853: I18N fallout from ALF-6469. TransferService default group must be looked up by QName rather than cm:name git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient_it.properties | 2 +- .../web/bean/spaces/InviteSpaceUsersWizard.java | 11 ++--------- .../web/bean/wcm/InviteWebsiteUsersWizard.java | 12 ++---------- .../org/alfresco/web/forms/xforms/Schema2XForms.java | 10 ++++++++-- source/web/scripts/ajax/xforms.js | 4 ---- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/config/alfresco/messages/webclient_it.properties b/config/alfresco/messages/webclient_it.properties index 9b1ecbeb22..2bb0c6854d 100755 --- a/config/alfresco/messages/webclient_it.properties +++ b/config/alfresco/messages/webclient_it.properties @@ -1821,7 +1821,7 @@ current_repo_people=Persone Alfresco attuali toggle_options=Opzioni di toggle no_results=Nessun risultato of=di -failed_gen_url=Impossibile generare l'URL per il motore di ricerca '{0}'.\\n\\n\u00c8 probabile che manchino alcuni parametri richiesti. Verificare l'URL modello per il motore di ricerca. +failed_gen_url=Impossibile generare l''URL per il motore di ricerca '{0}'.\\n\\n\u00c8 probabile che manchino alcuni parametri richiesti. Verificare l''URL modello per il motore di ricerca. failed_search=Impossibile recuperare i risultati della ricerca per '{0}' # UI Page Titles diff --git a/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java b/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java index 5239da1cbe..ae4bb049b0 100644 --- a/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java +++ b/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java @@ -35,18 +35,11 @@ public class InviteSpaceUsersWizard extends BaseInviteUsersWizard { private static final long serialVersionUID = -1584891656721183347L; - /** Cache of available folder permissions */ - Set folderPermissions = null; - @Override protected Set getPermissionsForType() { - if (this.folderPermissions == null) - { - this.folderPermissions = this.permissionService.getSettablePermissions(getNode().getType()); - } - - return this.folderPermissions; + // Let the permission service do the caching to allow for dynamic model updates, etc. + return this.permissionService.getSettablePermissions(getNode().getType()); } @Override diff --git a/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java b/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java index ce87287f33..679dc216be 100644 --- a/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java @@ -42,9 +42,6 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard { private static final long serialVersionUID = -8128781845465773847L; - /** Cache of available folder permissions */ - Set folderPermissions = null; - /** the node representing the website */ private Node website; @@ -147,13 +144,8 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard @Override protected Set getPermissionsForType() { - if (this.folderPermissions == null) - { - // get permissions and roles for a website folder type - this.folderPermissions = this.getPermissionService().getSettablePermissions(WCMAppModel.TYPE_AVMWEBFOLDER); - } - - return this.folderPermissions; + // Let the permission service do the caching to allow for dynamic model updates, etc. + return this.permissionService.getSettablePermissions(WCMAppModel.TYPE_AVMWEBFOLDER); } protected void setNode(Node node) diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java index 422a59f441..4ee997dccf 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java @@ -203,6 +203,7 @@ public class Schema2XForms implements Serializable importedSchemaDocumentElement.setAttributeNS(null, "id", "schema-1"); NodeList nl = importedSchemaDocumentElement.getChildNodes(); + boolean hasExternalSchema = false; for (int i = 0; i < nl.getLength(); i++) { @@ -212,12 +213,17 @@ public class Schema2XForms implements Serializable String localName = current.getLocalName(); if (localName.equals("include") || localName.equals("import")) { - importedSchemaDocumentElement.removeChild(current); + hasExternalSchema = true; + break; } } } - modelSection.appendChild(importedSchemaDocumentElement); + // ALF-8105 / ETWOTWO-1384: Only embed the schema if it does not reference externals + if (!hasExternalSchema) + { + modelSection.appendChild(importedSchemaDocumentElement); + } //check if target namespace final StringList schemaNamespaces = schema.getNamespaces(); diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js index 567479d70c..5d41b6ef58 100644 --- a/source/web/scripts/ajax/xforms.js +++ b/source/web/scripts/ajax/xforms.js @@ -127,10 +127,6 @@ alfresco.xforms.Widget = new Class({ { this.hideAlert(); } - else - { - this.showAlert(); - } }, /** Sets the widget's valid state, as indicated by an XFormsEvent */