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.4-BUG-FIX to HEAD

Browse Source 
30270: ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
   30306: Fixed ALF-7384: Xam: XamArchiveCleaner can delete files before retention period has passed
    - Keep the NOW upper limit to the query
    - Add a double-check using Java code to precisely check (down to the ms) that the retention time has passed
   30308: Merged V3.4 to V3.4-BUG-FIX
      30307: ALF-10186: Fix up all code that expects it can cast a WebScriptRequest directly into a WebScriptServletRequest
   30310: ALF-5830 show_audit.ftl template doesn't work any more
      - Changes to support new audit api
      - Works with high level content auditing
   30337: Merge DEV to V3.4-BUG-FIX
     30160 :  ALF-9257 - Renaming web project cause no trigger of the autodeploy process
   30362: ALF-10227 Add space after ''{0}'' in text
   30395: Removed deep svn:mergeinfo
   30433: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30424: ALF-8941: WCM: Virtual server setting lazyDeployExperimentalOnly ="true" (as per si3 fix) fails to load library under WEB-INF/lib directory (for HTTP filter).
         Walk up by hierarchy to the root and deploys a context if it wasn't deployed yet, through invocation of updateAllVirtualWebapps recursively. 
   30454: Fixed ALF-9158: Assignment of workflow task is not proper - out-of-the-box WCM workflow
   30466: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30460: ALF-9424 : Webform(XSD): xf:switch switch group does not work based on "complexContent with Base" element.
         Schema2XForms and SchemaUtil were modified to allow correctly process elements with namespace that differ from "http://www.w3.org/2001/XMLSchema"
   30476: Merged DEV to V3.4-BUG-FIX
      30474: ALF-10021: Get the last node in the resultset outside the timing loop to force prefetch.
   30483: Fixed ALF-9417: (pdf2swf) Share preview is blank with some pdf files.
   30514: ALF-240: Unfriendly error appears when trying to view details for created discussion for multilingual content   
      Webdav URLs were not valid for non-ML or ML discussion items, but were only stopping the details page for the ML items from being shown. Utils.generateURL now returns null for such items.   
   30517: Fixed ALF-5526: Component-Generator for d:noteref and other "system" types always disabled => breaks extensibility
   30519: FileFolderService moveFrom method was not supported by MLTranslationInterceptor
   30527: ALF-240: added missing exception message.
   30531: Fixed ALF-9599: Share forms do not allow edit of non-cm:content nodes
   30541: ALF-9424: Missed change, causing compilation error
   30552: Tests to accompany fix for ALF-240, ALF-10298: discussion topic webdav URLs causing error page in explorer.
   30565: Fixed ALF-10336 "Drag and Drop item in Customize Site Dashboard - text of item reverts to default font style and size during drag operation"
   30568: Fixed ALF-10342: ClassCastException on org.alfresco.repo.copy.AbstractCopyBehaviourCallback
   30570: ALF-3332: (circa 2008) Pagination inks rewritten incorrectly by opensearch proxy
   30574: ALF-9470: OwnableService cache not being updated for archived nodes - modified fix by Pavel
   30579: ALF-5607: Cancelling of install. Some directories are not deleted from disk.
   - Fixed provided by Bitrock for Mac and Windows
   30583: Merged HEAD to V3.4-BUG-FIX (Back ported 2 fixes for included resource handling when running unit tests)
      28711: Avoid a NPE on certain kinds missing included resources, and instead give a helpful error along the lines of other include issues
      28716: When loading JS includes with a full classpath reference, handle the Eclipse classloader behaving slightly differently on absolute paths compared to the JVM one
   30648: Fixed ALF-10401: No simple way to disable auto-versioning behaviour
    - Added property: version.store.enableAutoVersioning=true
    - When set to 'false', the VersionableAspect will not respond to any events;
      even if the aspect is present, it will not create versions.
   30657: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30590: ALF-7105: pdfbox returns errors in the logs but one cannot understand what file is affected (PDFBox)
         Level log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal was introduced in log4j.properties.
   30669: Fixes: ALF-6470 (Updates FR translation)
   30686: ALF-1017: Fixed compilation error in backport
   30696: Fix for ALF-8176
   30708: ALF-10040: Added missing ReferenceCountingReadOnlyIndexReaderFactory wrapper to IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader() to make it consistent with IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader(String, Set<String>, boolean) and allow SingleFieldSelectors to make it through from LeafScorer to the path caches! Affects ALL Lucene queries that run OUTSIDE of a transaction.
   30722: Fixed ALF-9465: Share: We can add category in Share, but the selected value will not be shown in U.I.
   30724: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_09_05 to BRANCHES/DEV/V3.4-BUG-FIX:
      30603: ALF-10165: Unexpected behaviour when title duplicated between web forms
   30754: Fix for ALF-9899 Huge share site migration, add group to site and user access site related performance issue.
   - generic performance improvements for PATH queries ending "..../*" - specifically to improve listing calendar items for users in many share sites
   30765: Fix for ALF-760 - import loses category association data  
   30779: Merged V3.4 to V3.4-BUG-FIX
      30716: ALF-10452 It's impossible to edit existing user details
         - Change for ALF-371 did not handle the simplest case - no change of home folder location
      30549: Fixes ALF-9534 - Location API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-09-26 18:24:09 +00:00
parent 22d1167ea1
commit babaa0b65c
16 changed files with 173 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ import java.util.regex.Pattern;
import javax.faces.context.FacesContext;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.Pair;
import org.alfresco.web.app.Application;
import org.alfresco.web.forms.XMLUtil;
@@ -1452,8 +1453,10 @@ public class Schema2XForms implements Serializable
LOGGER.debug("[addElementWithMultipleCompatibleTypes] Testing sub-bind with nodeset " + name);
}
if (!SchemaUtil.isElementDeclaredIn(name, (XSComplexTypeDefinition) type, false) &&
!SchemaUtil.isAttributeDeclaredIn(name, (XSComplexTypeDefinition) type, false))
Pair<String, String> parsed = parseName(name, xformsDocument);
if (!SchemaUtil.isElementDeclaredIn(parsed.getFirst(), parsed.getSecond(), (XSComplexTypeDefinition) type, false) &&
!SchemaUtil.isAttributeDeclaredIn(parsed.getFirst(), parsed.getSecond(), (XSComplexTypeDefinition) type, false))
{
continue;
}
@@ -1588,7 +1591,10 @@ public class Schema2XForms implements Serializable
{
Element bind = (Element)binds.item(i);
String nodeset = bind.getAttributeNS(NamespaceConstants.XFORMS_NS, "nodeset");
if (nodeset != null && nodeset.equals(element.getName()))
Pair<String, String> parsed = parseName(nodeset, xformsDocument);
if (nodeset != null && EqualsHelper.nullSafeEquals(parsed.getSecond(), element.getNamespace()) && parsed.getFirst().equals(element.getName()))
{
bindId = bind.getAttributeNS(null, "id");
}
@@ -3329,4 +3335,22 @@ public class Schema2XForms implements Serializable
return repeated;
}
/*
* split the name of element in two parts (localname, namespaceURI)
*/
private Pair<String, String> parseName(String name, Document resolver)
{
int pos = name.indexOf(':');
String localName = name;
String namespace = null;
if (pos != -1)
{
localName = name.substring(pos + 1);
namespace = resolver.lookupNamespaceURI(name.substring(0, pos));
}
return new Pair<String, String>(localName, namespace);
}
}

63
source/java/org/alfresco/web/forms/xforms/SchemaUtil.java
View File

@@ -17,17 +17,40 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. */
package org.alfresco.web.forms.xforms;
import java.util.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.TreeMap;
import java.util.TreeSet;
import org.alfresco.util.EqualsHelper;
import org.alfresco.web.forms.XMLUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xerces.xs.*;
import org.apache.xerces.xs.XSAttributeUse;
import org.apache.xerces.xs.XSComplexTypeDefinition;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSImplementation;
import org.apache.xerces.xs.XSLoader;
import org.apache.xerces.xs.XSModel;
import org.apache.xerces.xs.XSModelGroup;
import org.apache.xerces.xs.XSNamedMap;
import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSParticle;
import org.apache.xerces.xs.XSSimpleTypeDefinition;
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMError;
import org.w3c.dom.DOMErrorHandler;
import org.w3c.dom.DOMLocator;
import org.w3c.dom.Document;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.w3c.dom.ls.*;
import org.w3c.dom.*;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSInput;
/**
* Provides utility functions for xml schema parsing.
@@ -392,12 +415,12 @@ public class SchemaUtil
{
for (String typeName : result.keySet())
{
TreeSet descendents = result.get(typeName);
TreeSet<XSTypeDefinition> descendents = result.get(typeName);
LOGGER.debug(">>>> for " + typeName + " Descendants=\n ");
Iterator it = descendents.iterator();
Iterator<XSTypeDefinition> it = descendents.iterator();
while (it.hasNext())
{
XSTypeDefinition desc = (XSTypeDefinition) it.next();
XSTypeDefinition desc = it.next();
LOGGER.debug(" " + desc.getName());
}
}
@@ -488,7 +511,7 @@ public class SchemaUtil
/**
* check that the element defined by this name is declared directly in the type
*/
public static boolean isElementDeclaredIn(String name,
public static boolean isElementDeclaredIn(String name, String namespace,
XSComplexTypeDefinition type,
boolean recursive)
{
@@ -503,7 +526,7 @@ public class SchemaUtil
XSComplexTypeDefinition parent = (XSComplexTypeDefinition) type.getBaseType();
if (LOGGER.isDebugEnabled())
LOGGER.debug("testing if it is not on parent " + parent.getName());
if (SchemaUtil.isElementDeclaredIn(name, parent, true))
if (SchemaUtil.isElementDeclaredIn(name, namespace, parent, true))
return false;
}
@@ -515,7 +538,7 @@ public class SchemaUtil
if (term instanceof XSModelGroup)
{
XSModelGroup group = (XSModelGroup) term;
found = SchemaUtil.isElementDeclaredIn(name, group);
found = SchemaUtil.isElementDeclaredIn(name, namespace, group);
}
}
@@ -529,7 +552,7 @@ public class SchemaUtil
/**
* private recursive method called by isElementDeclaredIn(String name, XSComplexTypeDefinition type)
*/
public static boolean isElementDeclaredIn(String name, XSModelGroup group)
public static boolean isElementDeclaredIn(String name, String namespace, XSModelGroup group)
{
if (LOGGER.isDebugEnabled())
LOGGER.debug("isElement " + name + " declared in group " + group.getName());
@@ -543,12 +566,12 @@ public class SchemaUtil
if (subTerm instanceof XSElementDeclaration)
{
XSElementDeclaration elDecl = (XSElementDeclaration) subTerm;
if (name.equals(elDecl.getName()))
if (EqualsHelper.nullSafeEquals(namespace, elDecl.getNamespace()) && name.equals(elDecl.getName()))
found = true;
}
else if (subTerm instanceof XSModelGroup)
{
found = SchemaUtil.isElementDeclaredIn(name, (XSModelGroup) subTerm);
found = SchemaUtil.isElementDeclaredIn(name, namespace, (XSModelGroup) subTerm);
}
}
@@ -573,7 +596,7 @@ public class SchemaUtil
if (baseType.getTypeCategory() == XSTypeDefinition.COMPLEX_TYPE)
{
final XSComplexTypeDefinition complexType = (XSComplexTypeDefinition) baseType;
if (SchemaUtil.isElementDeclaredIn(element.getName(), complexType, true))
if (SchemaUtil.isElementDeclaredIn(element.getName(), element.getNamespace(), complexType, true))
{
if (LOGGER.isDebugEnabled())
{
@@ -642,7 +665,7 @@ public class SchemaUtil
* check that the element defined by this name is declared directly in the type
* -> idem with string
*/
public static boolean isAttributeDeclaredIn(String attrName, XSComplexTypeDefinition type, boolean recursive)
public static boolean isAttributeDeclaredIn(String attrName, String namespace, XSComplexTypeDefinition type, boolean recursive)
{
boolean found = false;
@@ -658,7 +681,7 @@ public class SchemaUtil
XSComplexTypeDefinition parent = (XSComplexTypeDefinition) type.getBaseType();
if (LOGGER.isDebugEnabled())
LOGGER.debug("testing if it is not on parent " + parent.getName());
if (SchemaUtil.isAttributeDeclaredIn(attrName, parent, true))
if (SchemaUtil.isAttributeDeclaredIn(attrName, namespace, parent, true))
return false;
}
@@ -672,7 +695,7 @@ public class SchemaUtil
String name = anAttr.getName();
if (name == null || name.length() == 0)
name = anAttr.getAttrDeclaration().getName();
if (attrName.equals(name))
if (EqualsHelper.nullSafeEquals(namespace, anAttr.getAttrDeclaration().getNamespace()) && attrName.equals(name))
found = true;
}
}