From bdd75588c22ee7bae89f21a570e217b6dbd2dfc7 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 30 May 2011 16:15:56 +0000 Subject: [PATCH] Merged DEV/SWIFT to HEAD 25834: ALF-7070: more tweaks to node properties serialization ALF-7071: initial checkin SOLR API client library: node metadata, node text content 25869: ALF-6862 - When performing XML Metadata Extraction on a file with a DTD, if the DTD cannot be found then re-try the extraction with a parser that ignores DTDs. Includes unit tests for a file with and without a DTD, showing we now correctly process both. 25892: OpenCMIS - add multi-filing support to CMIS getObjectParents() - update OpenCMIS libraries 25905: Push the DataList model namespace definition into a constant in NameSpaceService in the usual pattern, rather than being hard coded in a util class 25922: (RECORD ONLY) Fix version number git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../opencmis/AlfrescoCmisService.java | 69 +++++++++++---- .../AbstractMetadataExtracterTest.java | 10 +-- .../metadata/xml/XPathMetadataExtracter.java | 30 ++++++- .../xml/XmlMetadataExtracterTest.java | 85 ++++++++++++++++--- .../domain/solr/MetaDataResultsFilter.java | 11 ++- .../repo/domain/solr/ibatis/SOLRDAOImpl.java | 15 +++- .../test-resources/solr/solr-test-model.xml | 9 ++ .../dita-concept-quick-mappings.properties | 11 +++ ...ta-concept-quick-xpath-mappings.properties | 8 ++ .../xml-metadata/dita-concept-quick.xml | 11 +++ .../xml-metadata-test-context.xml | 23 ++++- 11 files changed, 241 insertions(+), 41 deletions(-) create mode 100644 source/test-resources/xml-metadata/dita-concept-quick-mappings.properties create mode 100644 source/test-resources/xml-metadata/dita-concept-quick-xpath-mappings.properties create mode 100644 source/test-resources/xml-metadata/dita-concept-quick.xml diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisService.java b/source/java/org/alfresco/opencmis/AlfrescoCmisService.java index d8e646a00a..0f7af2a772 100644 --- a/source/java/org/alfresco/opencmis/AlfrescoCmisService.java +++ b/source/java/org/alfresco/opencmis/AlfrescoCmisService.java @@ -148,7 +148,7 @@ public class AlfrescoCmisService extends AbstractCmisService this.context = context; AuthenticationUtil.pushAuthentication(); - + try { String currentUser = connector.getAuthenticationService().getCurrentUserName(); @@ -694,30 +694,63 @@ public class AlfrescoCmisService extends AbstractCmisService // versions are filed in the same folder -> cut off version suffix String currentVersionId = connector.getCurrentVersionId(objectId); NodeRef nodeRef = connector.getNodeRef(currentVersionId); - NodeRef rootNodeRef = connector.getRootNodeRef(); - if (!nodeRef.equals(rootNodeRef)) + TypeDefinitionWrapper type = connector.getType(nodeRef); + + if (type instanceof FolderTypeDefintionWrapper) { - ChildAssociationRef parent = connector.getNodeService().getPrimaryParent(nodeRef); - if (parent != null) + NodeRef rootNodeRef = connector.getRootNodeRef(); + + if (!nodeRef.equals(rootNodeRef)) { - ObjectData object = connector.createCMISObject(parent.getParentRef(), filter, - includeAllowableActions, includeRelationships, renditionFilter, false, false); - if (context.isObjectInfoRequired()) + ChildAssociationRef parent = connector.getNodeService().getPrimaryParent(nodeRef); + if (parent != null) { - getObjectInfo(repositoryId, object.getId()); + ObjectData object = connector.createCMISObject(parent.getParentRef(), filter, + includeAllowableActions, includeRelationships, renditionFilter, false, false); + if (context.isObjectInfoRequired()) + { + getObjectInfo(repositoryId, object.getId()); + } + + ObjectParentDataImpl objectParent = new ObjectParentDataImpl(); + objectParent.setObject(object); + + // include relative path segment + if (includeRelativePathSegment) + { + objectParent.setRelativePathSegment(connector.getName(nodeRef)); + } + + result.add(objectParent); } - - ObjectParentDataImpl objectParent = new ObjectParentDataImpl(); - objectParent.setObject(object); - - // include relative path segment - if (includeRelativePathSegment) + } + } else + { + List parents = connector.getNodeService().getParentAssocs(nodeRef, + ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); + if (parents != null) + { + for (ChildAssociationRef parent : parents) { - objectParent.setRelativePathSegment(connector.getName(nodeRef)); - } + ObjectData object = connector.createCMISObject(parent.getParentRef(), filter, + includeAllowableActions, includeRelationships, renditionFilter, false, false); + if (context.isObjectInfoRequired()) + { + getObjectInfo(repositoryId, object.getId()); + } - result.add(objectParent); + ObjectParentDataImpl objectParent = new ObjectParentDataImpl(); + objectParent.setObject(object); + + // include relative path segment + if (includeRelativePathSegment) + { + objectParent.setRelativePathSegment(connector.getName(nodeRef)); + } + + result.add(objectParent); + } } } } diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java b/source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java index f9a2a2dcfc..1460f27e00 100644 --- a/source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java +++ b/source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java @@ -57,11 +57,11 @@ public abstract class AbstractMetadataExtracterTest extends TestCase */ protected ApplicationContext ctx; - protected static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog"; - protected static final String QUICK_DESCRIPTION = "Gym class featuring a brown fox and lazy dog"; - protected static final String QUICK_CREATOR = "Nevin Nollop"; - protected static final String QUICK_CREATOR_EMAIL = "nevin.nollop@alfresco.com"; - protected static final String QUICK_PREVIOUS_AUTHOR = "Derek Hulley"; + public static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog"; + public static final String QUICK_DESCRIPTION = "Gym class featuring a brown fox and lazy dog"; + public static final String QUICK_CREATOR = "Nevin Nollop"; + public static final String QUICK_CREATOR_EMAIL = "nevin.nollop@alfresco.com"; + public static final String QUICK_PREVIOUS_AUTHOR = "Derek Hulley"; protected MimetypeMap mimetypeMap; protected DictionaryService dictionaryService; diff --git a/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java index d74d0a6e3d..e7aee2bcd9 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XPathMetadataExtracter.java @@ -18,6 +18,7 @@ */ package org.alfresco.repo.content.metadata.xml; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -46,10 +47,10 @@ import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.surf.util.ParameterCheck; import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.surf.util.ParameterCheck; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -92,6 +93,7 @@ public class XPathMetadataExtracter extends AbstractMappingMetadataExtracter imp private static Log logger = LogFactory.getLog(XPathMetadataExtracter.class); private DocumentBuilder documentBuilder; + private DocumentBuilder dtdIgnoringDocumentBuilder; private XPathFactory xpathFactory; private Map namespacesByPrefix; private Map xpathExpressionMapping; @@ -104,7 +106,14 @@ public class XPathMetadataExtracter extends AbstractMappingMetadataExtracter imp super(new HashSet(Arrays.asList(SUPPORTED_MIMETYPES))); try { - documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + DocumentBuilderFactory normalFactory = DocumentBuilderFactory.newInstance(); + documentBuilder = normalFactory.newDocumentBuilder(); + + DocumentBuilderFactory dtdIgnoringFactory = DocumentBuilderFactory.newInstance(); + dtdIgnoringFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); + dtdIgnoringFactory.setFeature("http://xml.org/sax/features/validation", false); + dtdIgnoringDocumentBuilder = dtdIgnoringFactory.newDocumentBuilder(); + xpathFactory = XPathFactory.newInstance(); } catch (Throwable e) @@ -211,7 +220,22 @@ public class XPathMetadataExtracter extends AbstractMappingMetadataExtracter imp try { is = reader.getContentInputStream(); - Document doc = documentBuilder.parse(is); + + Document doc; + try + { + // Try with the default settings + doc = documentBuilder.parse(is); + } + catch(FileNotFoundException e) + { + // The XML depends on a DTD we don't have available + // Try to parse it without using DTDs. (This may mean we miss + // out on some entities, but it's better than nothing!) + is = reader.getReader().getContentInputStream(); + doc = dtdIgnoringDocumentBuilder.parse(is); + } + Map rawProperties = processDocument(doc); if (logger.isDebugEnabled()) { diff --git a/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java b/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java index 48f1e99a1d..620576262f 100644 --- a/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java +++ b/source/java/org/alfresco/repo/content/metadata/xml/XmlMetadataExtracterTest.java @@ -18,6 +18,9 @@ */ package org.alfresco.repo.content.metadata.xml; +import static org.alfresco.repo.content.metadata.AbstractMetadataExtracterTest.QUICK_DESCRIPTION; +import static org.alfresco.repo.content.metadata.AbstractMetadataExtracterTest.QUICK_TITLE; + import java.io.File; import java.io.FileNotFoundException; import java.net.URL; @@ -30,6 +33,7 @@ import org.alfresco.repo.action.executer.ActionExecuter; import org.alfresco.repo.action.executer.SetPropertyValueActionExecuter; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.filestore.FileContentReader; +import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.repo.content.metadata.MetadataExtracter; import org.alfresco.repo.content.selector.RootElementNameContentWorkerSelector; import org.alfresco.repo.content.selector.XPathContentWorkerSelector; @@ -40,6 +44,7 @@ import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.service.cmr.repository.MLText; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; @@ -60,6 +65,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class XmlMetadataExtracterTest extends TestCase { private static final String FILE_ALFRESCO_MODEL = "xml-metadata/alfresco-model-sample.xml"; + private static final String FILE_DITA_FILE = "xml-metadata/dita-concept-quick.xml"; private static final String FILE_ECLIPSE_PROJECT = "xml-metadata/eclipse-project-sample.xml"; private static final String FILE_EMPTY = "xml-metadata/empty-sample.xml"; private static final String FILE_MALFORMED = "xml-metadata/malformed-sample.xml"; @@ -71,6 +77,7 @@ public class XmlMetadataExtracterTest extends TestCase private AuthenticationComponent authenticationComponent; private XPathMetadataExtracter alfrescoModelMetadataExtracter; private XPathMetadataExtracter eclipseProjectMetadataExtracter; + private XPathMetadataExtracter ditaConceptMetadataExtracter; private RootElementNameContentWorkerSelector rootElementNameMetadataExtracterSelector; private XPathContentWorkerSelector xpathMetadataExtracterSelector; private XmlMetadataExtracter xmlMetadataExtracter; @@ -103,6 +110,7 @@ public class XmlMetadataExtracterTest extends TestCase authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); alfrescoModelMetadataExtracter = (XPathMetadataExtracter) ctx.getBean("extracter.xml.AlfrescoModelMetadataExtracter"); eclipseProjectMetadataExtracter = (XPathMetadataExtracter) ctx.getBean("extracter.xml.EclipseProjectMetadataExtracter"); + ditaConceptMetadataExtracter = (XPathMetadataExtracter) ctx.getBean("extracter.xml.DITAConceptMetadataExtracter"); rootElementNameMetadataExtracterSelector = (RootElementNameContentWorkerSelector) ctx.getBean("extracter.xml.selector.RootElementSelector"); xpathMetadataExtracterSelector = (XPathContentWorkerSelector) ctx.getBean("extracter.xml.selector.XPathSelector"); xmlMetadataExtracter = (XmlMetadataExtracter) ctx.getBean("extracter.xml.XMLMetadataExtracter"); @@ -133,9 +141,9 @@ public class XmlMetadataExtracterTest extends TestCase alfrescoModelMetadataExtracter.extract(reader, checkProperties); // Check the values - assertEquals("Gavin Cornwell", checkProperties.get(ContentModel.PROP_AUTHOR)); - assertEquals("fm:forummodel", checkProperties.get(ContentModel.PROP_TITLE)); - assertEquals("Forum Model", checkProperties.get(ContentModel.PROP_DESCRIPTION)); + assertEquals("Gavin Cornwell", getPropertyValue(checkProperties, ContentModel.PROP_AUTHOR)); + assertEquals("fm:forummodel", getPropertyValue(checkProperties, ContentModel.PROP_TITLE)); + assertEquals("Forum Model", getPropertyValue(checkProperties, ContentModel.PROP_DESCRIPTION)); } public void testExtractEclipseProject() throws Exception @@ -149,8 +157,53 @@ public class XmlMetadataExtracterTest extends TestCase eclipseProjectMetadataExtracter.extract(reader, checkProperties); // Check the values - assertEquals("Repository", checkProperties.get(ContentModel.PROP_TITLE)); - assertEquals("JavaCC Nature", checkProperties.get(ContentModel.PROP_DESCRIPTION)); + assertEquals("Repository", getPropertyValue(checkProperties, ContentModel.PROP_TITLE)); + assertEquals("JavaCC Nature", getPropertyValue(checkProperties, ContentModel.PROP_DESCRIPTION)); + } + + public void testDITAFileWithDoctype() throws Exception + { + // Load the file as-is, with it's doctype + ContentReader reader = getReader(FILE_DITA_FILE); + assertTrue(reader.exists()); + + // Check we have the doctype + String contents = reader.getContentString(); + assertTrue("DOCTYPE should be present but wasn't", contents.indexOf(" -1); + + // Reset ready for the extraction test + reader = reader.getReader(); + + // Now test extraction + doTestDITAFile(reader); + } + public void testDITAFileWithoutDoctype() throws Exception + { + // Munge the file to skip the doctype + ContentReader reader = getReader(FILE_DITA_FILE); + assertTrue(reader.exists()); + String contents = reader.getContentString(); + String noDocType = contents.replaceAll("", ""); + + File tmp = File.createTempFile("alfresco", ".xml"); + tmp.deleteOnExit(); + ContentWriter w = new FileContentWriter(tmp); + w.setEncoding(reader.getEncoding()); + w.setMimetype(reader.getMimetype()); + w.putContent(noDocType); + + // Now test extraction + doTestDITAFile(w.getReader()); + } + private void doTestDITAFile(ContentReader reader) throws Exception + { + // Pass it to the extracter + PropertyMap checkProperties = new PropertyMap(); + ditaConceptMetadataExtracter.extract(reader, checkProperties); + + // Check the values + assertEquals(QUICK_TITLE, getPropertyValue(checkProperties, ContentModel.PROP_TITLE)); + assertEquals(QUICK_DESCRIPTION, getPropertyValue(checkProperties, ContentModel.PROP_DESCRIPTION)); } public void testEmptyFile() throws Exception @@ -239,16 +292,16 @@ public class XmlMetadataExtracterTest extends TestCase PropertyMap checkAlfrescoModelProperties = new PropertyMap(); xmlMetadataExtracter.extract(alfrescoModelReader, checkAlfrescoModelProperties); // Check the values - assertEquals("Gavin Cornwell", checkAlfrescoModelProperties.get(ContentModel.PROP_AUTHOR)); - assertEquals("fm:forummodel", checkAlfrescoModelProperties.get(ContentModel.PROP_TITLE)); - assertEquals("Forum Model", checkAlfrescoModelProperties.get(ContentModel.PROP_DESCRIPTION)); + assertEquals("Gavin Cornwell", getPropertyValue(checkAlfrescoModelProperties, ContentModel.PROP_AUTHOR)); + assertEquals("fm:forummodel", getPropertyValue(checkAlfrescoModelProperties, ContentModel.PROP_TITLE)); + assertEquals("Forum Model", getPropertyValue(checkAlfrescoModelProperties, ContentModel.PROP_DESCRIPTION)); // Pass the Eclipse Project xml to the extractor PropertyMap checkEclipseProjectProperties = new PropertyMap(); xmlMetadataExtracter.extract(eclipseProjectReader, checkEclipseProjectProperties); // Check the values - assertEquals("Repository", checkEclipseProjectProperties.get(ContentModel.PROP_TITLE)); - assertEquals("JavaCC Nature", checkEclipseProjectProperties.get(ContentModel.PROP_DESCRIPTION)); + assertEquals("Repository", getPropertyValue(checkEclipseProjectProperties, ContentModel.PROP_TITLE)); + assertEquals("JavaCC Nature", getPropertyValue(checkEclipseProjectProperties, ContentModel.PROP_DESCRIPTION)); } /** @@ -302,4 +355,16 @@ public class XmlMetadataExtracterTest extends TestCase assertEquals("fm:forummodel", checkTitle); assertEquals("Forum Model", checkDescription); } + + private String getPropertyValue(PropertyMap properties, QName qname) + { + Object val = properties.get(qname); + assertNotNull("Property " + qname + " missing, properties are " + properties.keySet(), val); + + if(val instanceof String) + return (String)val; + if(val instanceof MLText) + return ((MLText)val).getDefaultValue(); + return val.toString(); + } } diff --git a/source/java/org/alfresco/repo/domain/solr/MetaDataResultsFilter.java b/source/java/org/alfresco/repo/domain/solr/MetaDataResultsFilter.java index 0be543aa94..58b7e194e0 100644 --- a/source/java/org/alfresco/repo/domain/solr/MetaDataResultsFilter.java +++ b/source/java/org/alfresco/repo/domain/solr/MetaDataResultsFilter.java @@ -14,9 +14,18 @@ public class MetaDataResultsFilter private boolean includeAclId = true; private boolean includeOwner = true; private boolean includePaths = true; - private boolean includeAssociations = true; + private boolean includeAssociations = false; + private boolean includeChildAssociations = true; private boolean includeNodeRef = true; + public boolean getIncludeChildAssociations() + { + return includeChildAssociations; + } + public void setIncludeChildAssociations(boolean includeChildAssociations) + { + this.includeChildAssociations = includeChildAssociations; + } public boolean getIncludeNodeRef() { return includeNodeRef; diff --git a/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java b/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java index 1faabf9d62..6ef37b2a0a 100644 --- a/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java @@ -2,6 +2,7 @@ package org.alfresco.repo.domain.solr.ibatis; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -21,6 +22,7 @@ import org.alfresco.repo.domain.solr.SOLRDAO; import org.alfresco.repo.domain.solr.SOLRTransactionParameters; import org.alfresco.repo.domain.solr.Transaction; import org.alfresco.service.cmr.dictionary.DictionaryService; +import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.Path; @@ -226,6 +228,7 @@ public class SOLRDAOImpl implements SOLRDAO boolean includePaths = (resultFilter == null ? true : resultFilter.getIncludePaths()); boolean includeNodeRef = (resultFilter == null ? true : resultFilter.getIncludeNodeRef()); boolean includeAssociations = (resultFilter == null ? true : resultFilter.getIncludeAssociations()); + boolean includeChildAssociations = (resultFilter == null ? true : resultFilter.getIncludeChildAssociations()); boolean includeOwner = (resultFilter == null ? true : resultFilter.getIncludeOwner()); Iterable iterable = null; @@ -316,7 +319,7 @@ public class SOLRDAOImpl implements SOLRDAO nodeMetaData.setNodeRef(pair.getSecond()); } - if(includeAssociations) + if(includeChildAssociations) { final List childAssocs = new ArrayList(100); nodeDAO.getChildAssocs(nodeId, null, null, null, false, false, new ChildAssocRefQueryCallback() @@ -342,9 +345,15 @@ public class SOLRDAOImpl implements SOLRDAO } }); nodeMetaData.setChildAssocs(childAssocs); - + } + + if(includeAssociations) + { // TODO non-child associations -// Collection> sourceAssocs = nodeDAO.getSourceNodeAssocs(nodeId); +// Collection> sourceAssocs = nodeDAO.getSourceNodeAssocs(nodeId); +// Collection> targetAssocs = nodeDAO.getTargetNodeAssocs(nodeId); +// +// nodeMetaData.setAssocs(); } if(includeOwner) diff --git a/source/test-resources/solr/solr-test-model.xml b/source/test-resources/solr/solr-test-model.xml index b2cecff0bc..a5a9543bbe 100644 --- a/source/test-resources/solr/solr-test-model.xml +++ b/source/test-resources/solr/solr-test-model.xml @@ -27,6 +27,15 @@ SOLR Object cm:content + + contentProp + d:content + true + + + + + mlTextProp d:mltext diff --git a/source/test-resources/xml-metadata/dita-concept-quick-mappings.properties b/source/test-resources/xml-metadata/dita-concept-quick-mappings.properties new file mode 100644 index 0000000000..c2a77bd498 --- /dev/null +++ b/source/test-resources/xml-metadata/dita-concept-quick-mappings.properties @@ -0,0 +1,11 @@ +# +# XmlMetadataExtracter - mapping for DITA concept files +# +# author: Nick Burch + +# Namespaces +namespace.prefix.cm=http://www.alfresco.org/model/content/1.0 + +# Mappings +title=cm:title +shortdesc=cm:description diff --git a/source/test-resources/xml-metadata/dita-concept-quick-xpath-mappings.properties b/source/test-resources/xml-metadata/dita-concept-quick-xpath-mappings.properties new file mode 100644 index 0000000000..f3536c8f59 --- /dev/null +++ b/source/test-resources/xml-metadata/dita-concept-quick-xpath-mappings.properties @@ -0,0 +1,8 @@ +# +# Maps document properties to the required XPaths for DITA concept files +# +# author: Nick Burch + +# Mappings +title=/concept/title/text() +shortdesc=/concept/shortdesc/text() diff --git a/source/test-resources/xml-metadata/dita-concept-quick.xml b/source/test-resources/xml-metadata/dita-concept-quick.xml new file mode 100644 index 0000000000..38765d4b85 --- /dev/null +++ b/source/test-resources/xml-metadata/dita-concept-quick.xml @@ -0,0 +1,11 @@ + + + + + +The quick brown fox jumps over the lazy dog +Gym class featuring a brown fox and lazy dog + +

The quick brown fox jumps over the lazy dog.

+ + diff --git a/source/test-resources/xml-metadata/xml-metadata-test-context.xml b/source/test-resources/xml-metadata/xml-metadata-test-context.xml index 919964db03..804c878de4 100644 --- a/source/test-resources/xml-metadata/xml-metadata-test-context.xml +++ b/source/test-resources/xml-metadata/xml-metadata-test-context.xml @@ -26,6 +26,27 @@ + + + + + + classpath:xml-metadata/dita-concept-quick-mappings.properties + + + + + + + classpath:xml-metadata/dita-concept-quick-xpath-mappings.properties + + + + + - \ No newline at end of file +