From 335f9a97ffec250cff26cb7cf9bba669da8c3abd Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 1 Jul 2010 08:25:06 +0000 Subject: [PATCH] Merged DEV/V3.3-BUG-FIX to HEAD 20884: Merged V3.3 to V3.3-BUG-FIX 20883: ALF-3604: Fix PersonTest 20881: Merged PATCHES/V3.2.r to V3.3 20880: ALF-3264: Fix up handling of default namespace. Workaround to JXPATH-61 20878: Merged V2.2 to V3.3 20474: Fix for ALF-1362 - encode group identifiers when used inside embedded param tags 20621: Fix for reopened ALF-1362 - UnknownAuthorityException when viewing/editing/deleting a user group with html entities in it's name 20874: Merged HEAD to V3.3 20873: ALF-3604: Correct case-sensitivity issues in LDAP sync - User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive) - User names are now compared according to Alfresco's case sensitivity setting - Group name comparisions are still case sensitive - Added unit test to ensure correct behaviour 20868: Merged PATCHES/V3.2.r to V3.3 20832: ALF-3264: XForms 'schema evolution': Remove nodes from XForms instance document with XPaths that don't occur in prototype document 20867: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY) 20833: Incremented version label 20688: Incremented version label 20687: Merged V3.3 to PATCHES/V3.2.r 20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary. - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch. - Removes the ALF-558 changes around ContentData.reference() 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400) 20686: ALF-3259: Merged HEAD to PATCHES/V3.2.r 19784: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. 20866: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20840: Incremented version label 20839: ALF-3691: Merged V3.3-BUG-FIX to PATCHES/V3.2.1 20307: VersionStore - minor fixes if running deprecated V1 - warn in startup log - do not execute migration cleanup 20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch 20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x) - this is only supported upgrading direct to 3.2.1.x 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20738:ALF-3617: Merged V3.3-BUG-FIX to PATCHES/V3.2.1 20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX 18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests The changes listed in the bug comments have been made (and corrected). 20728: Incremented version label 20727: ALF-3617: Merged HEAD to PATCHES/V3.2.1 20616: ALF-2265: Share 'Uber Filter' part 2 - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter - Now the filter simply chains to the downstream authentication filter rather than call its superclass - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml - Configured webscriptAuthenticationFilter for Kerberos subsystem 20612: Incremented version label 20610: Merged V3.3 to PATCHES/V3.2.1 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3501) 20403: Merged V3.3 to PATCHES/V3.2.1 20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary. - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch. - Removes the ALF-558 changes around ContentData.reference() 20391: Incremented version label 20390: ALF-2966: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1 20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791) 20371: ALF-2861: Merged V3.2 to PATCHES/V3.2.1 20028: Reverted (and fixed line endings) of log4j.properties 20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2: 19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle 20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7 20362: ALF-2883: Merged HEAD to V3.2.1 19750: Fix for ALF-2310: alfresco-mmt-3.3dev.jar shows NoClassDefFoundError: org/safehaus/uuid/UUIDGenerator 20359: Merged PATCHES/V3.2.0 to PATCHES/V3.2.1 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows - Split Criteria query to retrieve properties and aspects separately 20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows Merged BRANCHES/V3.2 to PATCHES/V3.2.0: 18490: Added cache for alf_content_data Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20358: Increment version label 20343: Incremented version label 20342: Merged V3.3 to PATCHES/V3.2.1 20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection - Fixed queries to check for dereferencing AND use the indexed orphan_time column - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted - Added optimistic lock checks on updates and deletes of alf_content_url 20864: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20750: Merged V3.3 to PATCHES/V3.2.0 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400) 20748: Incremented version label 20745: ALF-3639: Merged V3.2 to PATCHES/V3.2.0 18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry) 20863: Merged PATCHES/V3.1.2 to V3.3 20830: ALF-934: Another go at making External Access Servlet reset JSF view state for the document it is requesting 20701: ALF-3203: Guarantee a deterministic initialization sequence for WebClientConfigBootstrap (PARTIAL - Needs Surf fix) 20861: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20831: Incremented version label 20702: Incremented version label 20681: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 16933: Fix ETHREEOH-1788 - Bootstrap fails due to disabled-avm-indexing-context.xml 20680: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 16714: WCM/AVM fixes - ETHREEOH-2697 - file system likely to get full with avm lucene directories for unindexed WCM store - ETHREEOH-1847 - re-starting cluster node may show non-staging WCM store indexes out-of-date (although not indexed) 20611: Incremented version label 20538: ALF-3117: Merged HEAD to PATCHES/V3.1.2 17099: Build Fix for failing permission test (missing flush in DAO) 20535: ALF-3141: Merged V3.2 to PATCHES/V3.1.2 17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component 20534: Incremented version label 20533: ALF-3117: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.1.2 20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x) - this is only supported upgrading direct to 3.3.1 20532: ALF-3117: Merged V3.2 to PATCHES/V3.1.2 17076: Improvements for ETHREEOH-2153: patch.updateDmPermissions takes too long to complete 20531: ALF-3141: Merged V3.2 to PATCHES/V3.1.2 17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder 20516: Incremented version label 20515: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry) 20860: Merged V3.1 to V3.3 19424: Fix bug in permission evaluation time reporting 20859: Merged V3.1 to V3.3 (RECORD ONLY) 20599: Incremented version label 20596: ALF-3184: Merged V3.3-BUGFIX to V3.1A 20307: VersionStore - minor fixes if running deprecated V1 - warn in startup log - do not execute migration cleanup 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20591: ALF-3184: Merged V3.2 to V3.1A (partial) 19507: ALF-955: deletion of dynamic custom model - ignore policies/behaviours for node archive store (reviewed w/ DH) 19553: Follow-on to r19507 (ALF-955) - fix testAutoRemovalOfVersionHistory 20577: ALF-3184: Ported BatchProcessor to V3.1A in preparation for VersionMigrator port 19426: Fix for eclipse build path: Part 2 19425: Fix for eclipse build path 19305: Merged V3.2 to V3.1 ('cause you never know!) 19304: Removed static (singleton) usage of CacheFactory 18996: MOB-388: Fixed copying of properties 18919: CopyServiceChildAssocsFix on 3.1 18566: Removed svn:mergeinfo 18428: Backport of r14260: fixed code typo which cased a ClassCastException with multiple pooled actors. 18424: Updated version label to 3.1.2.1 17861: Merge 2.2 to 3.1: 17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only) 17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250. 17842: Missing file from previous checkin. 17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951. 17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225. 17193: ETHREEOH-3112: Issue for adding / deleting non-English files Appropriate encoding for non English symbols was added. Ported from V3.2. 17181: Fixed typo on --record-only 17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115. 20858: Merged V2.2 to V3.3 18568: (RECORD ONLY) Fix for CIFS SendTo->Compressed Folder 'not enough space' error. ETWOTWO-596. Ported latest v3 repo filesystem rename logic to v2, should fix a few other issues too. 17803: (RECORD ONLY) Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. 20857: Merged V2.2 to V3.3 20504: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 19346: ALF-1358: Deleting space with "execute a script" rule fails - The invocation of the RuleServiceImpl.getRule() was added on the ruleNodeRef to get updated associations of the last one. (???) 20476: Fix for ALF-1863: Advanced Search does not work with custom type of type d:int with a constraint of type LIST 20475: Merged DEV/TEMPORARY to V2.2 20375: ALF-1830: Manage Task UI for Pooled Tasks: don't show Reject/Accept if user hasn't taken ownership 20472: (RECORD ONLY) ALF-1841: Merged DEV/BELARUS/V2.2-2009_12_01 to V2.2 (with corrections) 17865: ETWOTWO-935: Regression: readOnly settings do not work in 2.2 causing bootstrap to fail The check on current mode is read only was added into AbstractLuceneIndexerAndSearcherFactory and AlfrescoJobExecutorThread classes. 20068: Merged BRANCHES/DEV/BELARUS/V2.2-2010_02_03 to BRANCHES/V2.2: 19326: ALF-1932: ALF-1358 Deleting space with "execute a script" rule fails: Unit Test move to RuleServiceImplTest. 19670: Fix for ALF-1788: Renamed Category not usable in Query - renaming a category in the admin console now also renames the association and changes the PATH by which the category is known. 19093: Fix ALF-1791 - added unit test 19055: Fix compile error introduced during pervious merge 19048: Merge DEV/BELARUS/V2.2-2010_02_03 to V2.2 19014 : ALF-883: Rule is not triggered for a item which is restored from the bin 19045: Merge DEV/V2.1SP7 to V2.2 12225 : ETWOONE-74 (Authentication tickets expire after set time, but would be more useful to have them expire after an inactivity timeout.) 18958: Merged BELARUS/V2.2-2010_02_03 18850 Fixed ALF-1358: Deleting space with "execute a script" rule fails - Merged the fix only. The unit test belongs to the RuleService. 18918: (RECORD ONLY) Fixed backward compatibility of CopyServiceChildAssocsFix module 18759: (RECORD ONLY) Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 18553: ResultSet closing was added to methods This was fixed separately in V3.2; port forward selectively 18561: (RECORD ONLY) Merged DEV to V2.2 18552: Fix ETWOTWO-1389: Issues with ACL upgrade script for Oracle (DH: Removed commented-out SQL statements) 16304: (RECORD ONLY) ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation 1. Appropriate changes have been made in parallelreview_group_processdefinition.xml and parallelreview_processdefinition.xml files. 2. Redeploy flag is kept with false value by default in the workflow-context.xml.sample file. 3. A sorting of the list of workflow definitions by name has been already applied in all branches according to ETWOTWO-302 issue fix. 20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder. This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService. 20853: Merged V2.2 to V3.3 (RECORD ONLY) 20459: Build fix - don't try to delete the guest user in PersonTest 20411: Merged BRANCHES/V3.1 to BRANCHES/V2.2: (for ALF-2628) 14863: (RECORD ONLY) Fixed ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 20383: Merged V3.2 to V2.2 (Fixes duplicate ALF-1359) 16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description 19303: Updated version to 2.2.7 17811: Updated version to 2.2.6 17433: Merged V3.1 to V2.2 15894: Fix ETHREEOH-2416 and ALFCOM-3300: Duplicate name exceptions not being trapped correctly Fixes ETWOTWO-1261 15869: Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374. 20849: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3 20847: Fixes Recent Documents and My Tasks localisation issues: ALF-2021 & adds an FTL friendly medium length date format property 20828: Missed svn:mergeinfo git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../app/servlet/ExternalAccessServlet.java | 12 +- .../bean/categories/EditCategoryDialog.java | 11 ++ .../web/bean/groups/GroupsDialog.java | 2 +- .../web/bean/search/AdvancedSearchDialog.java | 25 ++--- .../web/bean/workflow/ManageTaskDialog.java | 5 +- .../web/config/WebClientConfigBootstrap.java | 26 ++++- .../web/forms/xforms/Schema2XForms.java | 105 +++++++++++++++--- source/web/jsp/groups/groups.jsp | 5 +- 8 files changed, 147 insertions(+), 44 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java index 8b9e15aa72..f297ee26a4 100644 --- a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java @@ -42,6 +42,7 @@ import org.alfresco.web.bean.NavigationBean; import org.alfresco.web.bean.dashboard.DashboardManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.myfaces.shared_impl.renderkit.ViewSequenceUtils; /** * Servlet allowing external URL access to various global JSF views in the Web Client. @@ -171,11 +172,6 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS); - - // Do not forward via faces context when AlfrescoNavigationHandler has already called render response phase - String viewId = fc.getViewRoot().getViewId(); - getServletContext().getRequestDispatcher(viewId).forward(req, res); - return; } else if (OUTCOME_SPACEDETAILS.equals(outcome)) { @@ -209,11 +205,6 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS); - - // Do not forward via faces context when AlfrescoNavigationHandler has already called render response phase - String viewId = fc.getViewRoot().getViewId(); - getServletContext().getRequestDispatcher(viewId).forward(req, res); - return; } else if (OUTCOME_BROWSE.equals(outcome)) { @@ -343,6 +334,7 @@ public class ExternalAccessServlet extends BaseServlet // perform the forward to the page processed by the Faces servlet String viewId = fc.getViewRoot().getViewId(); + ViewSequenceUtils.nextViewSequence(fc); getServletContext().getRequestDispatcher(FACES_SERVLET + viewId).forward(req, res); } diff --git a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java index fe1626c1fc..3002ba1c2c 100644 --- a/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java +++ b/source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java @@ -253,6 +253,17 @@ public class EditCategoryDialog extends BaseDialogBean NodeRef nodeRef = getActionCategory().getNodeRef(); getNodeService().setProperty(nodeRef, ContentModel.PROP_NAME, getName()); + // ALF-1788 Need to rename the association + ChildAssociationRef assocRef = getNodeService().getPrimaryParent(nodeRef); + QName qname = QName.createQName( + assocRef.getQName().getNamespaceURI(), + QName.createValidLocalName(name)); + getNodeService().moveNode( + assocRef.getChildRef(), + assocRef.getParentRef(), + assocRef.getTypeQName(), + qname); + // apply the titled aspect - for description if (getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_TITLED) == false) { diff --git a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java index c9120af3d6..c45a06fe2e 100644 --- a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java +++ b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java @@ -490,7 +490,7 @@ public class GroupsDialog extends BaseDialogBean final String userName = this.getAuthorityService().getShortName(authority); authMap.put("userName", userName); - authMap.put("id", authority); + authMap.put("id", Utils.encode(authority)); authMap.put("name", new AuthorityNamePropertyResolver(userName)); authMap.put("firstName", new AuthorityPropertyResolver(userName, ContentModel.PROP_FIRSTNAME)); authMap.put("lastName", new AuthorityPropertyResolver(userName, ContentModel.PROP_LASTNAME)); diff --git a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java index be5385b387..da5cf6e891 100644 --- a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java +++ b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java @@ -421,33 +421,30 @@ public class AdvancedSearchDialog extends BaseDialogBean search.addFixedValueQuery(QName.createQName(qname), value.toString()); } } - else if (DataTypeDefinition.INT.equals(typeName) || DataTypeDefinition.LONG.equals(typeName) || - DataTypeDefinition.FLOAT.equals(typeName) || DataTypeDefinition.DOUBLE.equals(typeName)) - { - String strVal = value.toString(); - if (strVal != null && strVal.length() != 0) - { - search.addFixedValueQuery(QName.createQName(qname), strVal); - } - } else if (value != null) { + // is the value from a list? + String strVal = value.toString(); Object item = properties.getCustomProperties().get( UISearchCustomProperties.PREFIX_LOV_ITEM + qname); if (item != null) { - // ListOfValues + // ListOfValues custom property - use a fixed value query if set if (((Boolean)value) == true) { search.addFixedValueQuery(QName.createQName(qname), item.toString()); } } - else + else if (strVal != null && strVal.length() != 0) { - // by default use toString() value - this is for text fields and unknown types - String strVal = value.toString(); - if (strVal != null && strVal.length() != 0) + if (DataTypeDefinition.INT.equals(typeName) || DataTypeDefinition.LONG.equals(typeName) || + DataTypeDefinition.FLOAT.equals(typeName) || DataTypeDefinition.DOUBLE.equals(typeName)) { + search.addFixedValueQuery(QName.createQName(qname), strVal); + } + else + { + // by default use toString() value - this is for text fields and unknown types search.addAttributeQuery(QName.createQName(qname), strVal); } } diff --git a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java index 073d031bf1..b0c369bf3b 100644 --- a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java @@ -233,8 +233,11 @@ public class ManageTaskDialog extends BaseDialogBean .equals(trans.id)) || (hiddenTransitions instanceof List) && !((List) hiddenTransitions).contains(trans.id)) { - buttons.add(new DialogButtonConfig(ID_PREFIX + trans.title, trans.title, null, + if (this.taskNode.getProperties().get(ContentModel.PROP_OWNER) != null) + { + buttons.add(new DialogButtonConfig(ID_PREFIX + trans.title, trans.title, null, "#{DialogManager.bean.transition}", "false", null)); + } } } } diff --git a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java index c88266068f..b8065765f9 100644 --- a/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java +++ b/source/java/org/alfresco/web/config/WebClientConfigBootstrap.java @@ -14,6 +14,7 @@ * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License + * FLOSS exception. You should have recieved a copy of the text describing * along with Alfresco. If not, see . */ package org.alfresco.web.config; @@ -26,6 +27,7 @@ import org.springframework.extensions.config.ConfigService; import org.springframework.extensions.config.source.UrlConfigSource; import org.alfresco.error.AlfrescoRuntimeException; import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanNameAware; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -35,8 +37,12 @@ import org.springframework.context.ApplicationContextAware; * * @author Roy Wetherall */ -public class WebClientConfigBootstrap implements ApplicationContextAware, ConfigDeployer +public class WebClientConfigBootstrap implements ApplicationContextAware, BeanNameAware, ConfigDeployer { + + /** The bean name. */ + private String beanName; + /** The application context */ private ApplicationContext applicationContext; @@ -76,6 +82,15 @@ public class WebClientConfigBootstrap implements ApplicationContextAware, Config } } + + /* (non-Javadoc) + * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) + */ + public void setBeanName(String name) + { + this.beanName = name; + } + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; @@ -86,6 +101,14 @@ public class WebClientConfigBootstrap implements ApplicationContextAware, Config this.configService = configService; } + /* (non-Javadoc) + * @see org.alfresco.config.ConfigDeployer#getSortKey() + */ + public String getSortKey() + { + return this.beanName; + } + public void register() { if (configService == null) @@ -109,4 +132,5 @@ public class WebClientConfigBootstrap implements ApplicationContextAware, Config return null; } + } diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java index 0d2e46eb88..e3d80434f2 100644 --- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java +++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java @@ -234,16 +234,15 @@ public class Schema2XForms implements Serializable { continue; } - final String prefix = schemaDocument.lookupPrefix(schemaNamespaces.item(i)); + final String prefix = this.addNamespace(xformsDocument.getDocumentElement(), + schemaDocument.lookupPrefix(schemaNamespaces.item(i)), + schemaNamespaces.item(i)); if (LOGGER.isDebugEnabled()) { LOGGER.debug("[buildXForm] adding namespace " + schemaNamespaces.item(i) + " with prefix " + prefix + " to xform and default instance element"); } - this.addNamespace(xformsDocument.getDocumentElement(), - prefix, - schemaNamespaces.item(i)); schemaNamespacesMap.put(prefix, schemaNamespaces.item(i)); } } @@ -352,6 +351,9 @@ public class Schema2XForms implements Serializable if (importedInstanceDocumentElement != null) { + Schema2XForms.removeRemovedNodes(importedInstanceDocumentElement, + defaultInstanceDocumentElement, + schemaNamespacesMap); Schema2XForms.insertUpdatedNodes(importedInstanceDocumentElement, defaultInstanceDocumentElement, schemaNamespacesMap); @@ -507,6 +509,65 @@ public class Schema2XForms implements Serializable } } + @SuppressWarnings("unchecked") + public static void removeRemovedNodes(final Element instanceDocumentElement, final Element prototypeDocumentElement, + final HashMap schemaNamespaces) + { + if (LOGGER.isDebugEnabled()) + LOGGER.debug("[removeRemovedNodes] updating imported instance document"); + + final JXPathContext prototypeContext = JXPathContext.newContext(prototypeDocumentElement); + prototypeContext.registerNamespace(NamespaceService.ALFRESCO_PREFIX, NamespaceService.ALFRESCO_URI); + final JXPathContext instanceContext = JXPathContext.newContext(instanceDocumentElement); + instanceContext.registerNamespace(NamespaceService.ALFRESCO_PREFIX, NamespaceService.ALFRESCO_URI); + + for (final String prefix : schemaNamespaces.keySet()) + { + prototypeContext.registerNamespace(prefix, schemaNamespaces.get(prefix)); + instanceContext.registerNamespace(prefix, schemaNamespaces.get(prefix)); + } + + // Check all elements and attributes in the instance document + OUTER: for (;;) + { + final Iterator it = instanceContext.iteratePointers("//* | //@*"); + while (it.hasNext()) + { + final Pointer p = it.next(); + String path = p.asPath().replaceAll("\\[\\d+\\]", ""); + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("[removeRemovedNodes] evaluating instance node " + p.asPath() + " normalized " + + path + " in prototype document"); + } + + final List l = (List) prototypeContext.selectNodes(path); + if (l.isEmpty()) + { + final Node node = (Node) p.getNode(); + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("[removeRemovedNodes] removing instance node " + node.getNodeName() +" with no prototype nodes matching path " + path); + } + if (node instanceof Attr) + { + ((Attr) node).getOwnerElement().removeAttributeNode((Attr) node); + } + else + { + node.getParentNode().removeChild(node); + } + + // We have removed a node and potentially an entire sub-tree of paths. Restart the search + continue OUTER; + } + } + // We completed the search + break OUTER; + } + + } + /** * Inserts prototype nodes into the provided instance document by aggregating insertion * points from the generated prototype instance docment. @@ -3103,20 +3164,34 @@ public class Schema2XForms implements Serializable return elementName; } - private void addNamespace(final Element e, - final String nsPrefix, - final String ns) + private String addNamespace(final Element e, + String nsPrefix, + final String ns) { - - if (!e.hasAttributeNS(NamespaceConstants.XMLNS_NS, nsPrefix)) + String prefix; + if ((prefix = NamespaceResolver.getPrefix(e, ns)) != null) { - if (LOGGER.isDebugEnabled()) - LOGGER.debug("[addNamespace] adding namespace " + ns + " with prefix " + nsPrefix + " to " + e.getNodeName()); - - e.setAttributeNS(NamespaceConstants.XMLNS_NS, - NamespaceConstants.XMLNS_PREFIX + ':' + nsPrefix, - ns); + return prefix; } + + if (nsPrefix == null || e.hasAttributeNS(NamespaceConstants.XMLNS_NS, nsPrefix)) + { + // Generate a unique prefix + int suffix = 1; + while (e.hasAttributeNS(NamespaceConstants.XMLNS_NS, nsPrefix = "ns" + suffix)) + { + suffix++; + } + } + + if (LOGGER.isDebugEnabled()) + LOGGER.debug("[addNamespace] adding namespace " + ns + " with prefix " + nsPrefix + " to " + e.getNodeName()); + + e.setAttributeNS(NamespaceConstants.XMLNS_NS, + NamespaceConstants.XMLNS_PREFIX + ':' + nsPrefix, + ns); + + return nsPrefix; } private void createTriggersForRepeats(final Document xformsDocument, final Element rootGroup) diff --git a/source/web/jsp/groups/groups.jsp b/source/web/jsp/groups/groups.jsp index 9b401ca675..145dc2a85d 100644 --- a/source/web/jsp/groups/groups.jsp +++ b/source/web/jsp/groups/groups.jsp @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . ---%><%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +--%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> @@ -47,7 +48,7 @@ - + <%-- Group Path Breadcrumb --%>