inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
17620: Merged DEV_TEMPORARY to V3.2
      17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
   17634: Put back AVM concurrency checks (reverse r17405)
   17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
   17647: Fixed read-only detection of ContentStoreCleaner
   17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
   17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
   17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
   17658: Removed failing concurrency test for split person cleanup
   17659: Merged V3.1 to V3.2
      17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
             Fixes ETHREEOH-3606 (same as CHK-10454)
   17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
   17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
   17678: Follow-on to r17666 (for RM custom model)
   17685: Merged DEV_TEMPORARY to V3.2
      17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
   17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
   Merged /alfresco/BRANCHES/V3.1:r17308
   Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-20 11:30:46 +00:00
parent f387d887f0
commit 419606be51
2 changed files with 164 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
View File

@@ -39,6 +39,7 @@ import java.util.ResourceBundle;
import java.util.Stack;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.regex.Pattern;
import org.alfresco.service.namespace.NamespaceService;
import org.springframework.extensions.surf.util.Pair;
@@ -115,6 +116,8 @@ public class Schema2XForms implements Serializable
private final static Log LOGGER = LogFactory.getLog(Schema2XForms.class);
private static final Pattern repeatableNamePattern = Pattern.compile("\\[.+\\]");
private final static int LONG_LIST_SIZE = 5;
private final String action;
@@ -1000,7 +1003,8 @@ public class Schema2XForms implements Serializable
//copy it
if (control == null)
{
LOGGER.warn("Corresponding control not found");
if (LOGGER.isDebugEnabled())
LOGGER.debug("Corresponding control not found");
}
else
{
@@ -1554,7 +1558,16 @@ public class Schema2XForms implements Serializable
for (int i = 0; i < binds.getLength(); i++)
{
final Element subBind = (Element) binds.item(i);
final String name = subBind.getAttributeNS(NamespaceConstants.XFORMS_NS, "nodeset");
String name = subBind.getAttributeNS(NamespaceConstants.XFORMS_NS, "nodeset");
// ETHREEOH-3308 fix
name = repeatableNamePattern.matcher(name).replaceAll("");
if (!subBind.getParentNode().getAttributes().getNamedItem("id").getNodeValue().equals(
bindElement2.getAttribute("id")))
{
continue;
}
if (LOGGER.isDebugEnabled())
{
@@ -1744,7 +1757,9 @@ public class Schema2XForms implements Serializable
//copy it
if (control == null)
{
LOGGER.warn("Corresponding control not found");
if (LOGGER.isDebugEnabled())
LOGGER.debug("Corresponding control not found");
this.addElementToGroup(xformsDocument,
modelSection,
defaultInstanceElement,