You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2019/03/20 09:21:03 UTC
svn commit: r1855891 - in /jackrabbit/oak/branches/1.8: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/
oak-sol...
Author: tommaso
Date: Wed Mar 20 09:21:02 2019
New Revision: 1855891
URL: http://svn.apache.org/viewvc?rev=1855891&view=rev
Log:
OAK-8072 - aggregate jcr:content result nodes as their parent (branch 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 20 09:21:02 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850
221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854034,1854044,1854455,1854461-1854462,1854466,1854515,1854701,1854773,1854827,1854848,1854859,1854930,1855032
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239
,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850
221,1850837,1850874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1852601,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854455,1854461-1854462,1854466,1854515,1854701,1854773,1854827,1854848,1854859,1854930,1855032
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java Wed Mar 20 09:21:02 2019
@@ -125,6 +125,11 @@ public class DefaultSolrConfiguration im
return OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES;
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS;
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java Wed Mar 20 09:21:02 2019
@@ -141,6 +141,14 @@ public interface OakSolrConfiguration {
boolean collapseJcrContentNodes();
/**
+ * Make all nodes / documents matching a query having name equals to 'jcr:content' collapse into their respective
+ * parent.
+ * @return {@code true} if only the parent of 'jcr:content' nodes should be returned,
+ * {@code false} otherwise
+ */
+ boolean collapseJcrContentParents();
+
+ /**
* Provide the name of the field to be used for indexing the collapsed path of each node when {@link #collapseJcrContentNodes()}
* is set to {@code true}.
*
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java Wed Mar 20 09:21:02 2019
@@ -41,4 +41,5 @@ public class OakSolrConfigurationDefault
public static final boolean COLLAPSE_JCR_CONTENT_NODES = false;
public static final String COLLAPSED_PATH_FIELD = "path_collapsed";
public static final String PATH_DEPTH_FIELD = "path_depth";
+ public static final boolean COLLAPSE_JCR_CONTENT_PARENTS = true;
}
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java Wed Mar 20 09:21:02 2019
@@ -183,6 +183,11 @@ public class OakSolrNodeStateConfigurati
return getBooleanValueFor(Properties.COLLAPSE_JCR_CONTENT_NODES, OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES);
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return getBooleanValueFor(Properties.COLLAPSE_JCR_CONTENT_PARENTS, OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS);
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
@@ -260,5 +265,6 @@ public class OakSolrNodeStateConfigurati
public static final String USED_PROPERTIES = "usedProperties";
public static final String COLLAPSE_JCR_CONTENT_NODES = "collapseJcrContentNodes";
public static final String DEPTH_FIELD= "depthField";
+ public static final String COLLAPSE_JCR_CONTENT_PARENTS = "collapseJcrContentParents";
}
}
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java Wed Mar 20 09:21:02 2019
@@ -110,6 +110,9 @@ public class OakSolrConfigurationProvide
@Property(boolValue = OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES, label = "collapse jcr:content nodes")
private static final String COLLAPSE_JCR_CONTENT_NODES = "collapse.jcrcontent.nodes";
+ @Property(boolValue = OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_PARENTS, label = "collapse jcr:content parents")
+ private static final String COLLAPSE_JCR_CONTENT_PARENTS = "collapse.jcrcontent.parents";
+
private String pathChildrenFieldName;
private String pathParentFieldName;
private String pathDescendantsFieldName;
@@ -126,6 +129,7 @@ public class OakSolrConfigurationProvide
private String[] typeMappings;
private String[] propertyMappings;
private boolean collapseJcrContentNodes;
+ private boolean collapseJcrContentParents;
private String depthField;
private OakSolrConfiguration oakSolrConfiguration;
@@ -149,6 +153,7 @@ public class OakSolrConfigurationProvide
usedProperties = PropertiesUtil.toStringArray(componentContext.getProperties().get(USED_PROPERTIES));
propertyMappings = PropertiesUtil.toStringArray(componentContext.getProperties().get(PROPERTY_MAPPINGS));
collapseJcrContentNodes = Boolean.valueOf(String.valueOf(componentContext.getProperties().get(COLLAPSE_JCR_CONTENT_NODES)));
+ collapseJcrContentParents = Boolean.valueOf(String.valueOf(componentContext.getProperties().get(COLLAPSE_JCR_CONTENT_PARENTS)));
}
@Deactivate
@@ -281,6 +286,11 @@ public class OakSolrConfigurationProvide
return collapseJcrContentNodes;
}
+ @Override
+ public boolean collapseJcrContentParents() {
+ return collapseJcrContentParents;
+ }
+
@NotNull
@Override
public String getCollapsedPathField() {
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java Wed Mar 20 09:21:02 2019
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
@Component(metatype = true, immediate = true, label = "Apache Jackrabbit Oak Solr Query index provider configuration")
public class SolrQueryIndexProviderService {
- private static final boolean QUERY_TIME_AGGREGATION_DEFAULT = false;
+ private static final boolean QUERY_TIME_AGGREGATION_DEFAULT = true;
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Mar 20 09:21:02 2019
@@ -33,6 +33,7 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
+import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -691,7 +692,12 @@ public class SolrQueryIndex implements F
@Override
public String next() {
currentRow = it.next();
- return currentRow.path;
+ String path = currentRow.path;
+ if (configuration.collapseJcrContentParents() && path.endsWith(JcrConstants.JCR_CONTENT)) {
+ return PathUtils.getParentPath(path);
+ } else {
+ return path;
+ }
}
@Override
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/resources/solr/oak/conf/schema.xml Wed Mar 20 09:21:02 2019
@@ -123,7 +123,7 @@
<field name=":suggest-weight" type="tint" indexed="false" stored="false" default="1" docValues="true"/>
<field name=":suggest" type="string" indexed="true" stored="true" multiValued="true" />
<field name=":spellcheck" type="spellcheck" indexed="true" stored="false" multiValued="true" />
- <field name="path_collapsed" type="string" indexed="true" stored="false"/>
+ <field name="path_collapsed" type="string" indexed="true" stored="false" docValues="true"/>
<field name="path_depth" type="tint" indexed="true" stored="false"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java?rev=1855891&r1=1855890&r2=1855891&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java Wed Mar 20 09:21:02 2019
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.DefaultSolrServerProvider;
@@ -41,7 +42,6 @@ import org.junit.rules.TestName;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
/**
* General query extensive testcase for {@link SolrQueryIndex}
@@ -73,7 +73,7 @@ public class SolrIndexIT extends Abstrac
DefaultSolrConfigurationProvider oakSolrConfigurationProvider = new DefaultSolrConfigurationProvider();
return new Oak().with(new InitialContent())
.with(new OpenSecurityProvider())
- .with(new SolrQueryIndexProvider(solrServerProvider, oakSolrConfigurationProvider))
+ .with(new SolrQueryIndexProvider(solrServerProvider, oakSolrConfigurationProvider, new SimpleNodeAggregator()))
.with(new SolrIndexEditorProvider(solrServerProvider, oakSolrConfigurationProvider))
.createContentRepository();
} catch (Exception e) {
@@ -634,9 +634,33 @@ public class SolrIndexIT extends Abstrac
Iterator<String> result = executeQuery(xpath, XPATH).iterator();
assertTrue(result.hasNext());
- assertEquals("/test/content/sample1/jcr:content", result.next());
+ assertEquals("/test/content/sample1", result.next());
assertTrue(result.hasNext());
- assertEquals("/test/content/sample2/jcr:content", result.next());
+ assertEquals("/test/content/sample2", result.next());
+ assertFalse(result.hasNext());
+ }
+
+ @Test
+ public void testJcrContentNodeChild() throws Exception {
+
+ Tree index = root.getTree("/oak:index/" + TEST_INDEX_NAME);
+ assertTrue(index.exists());
+
+ Tree test = root.getTree("/").addChild("test");
+ Tree content = test.addChild("content");
+ Tree content1 = content.addChild("sample1").addChild("jcr:content");
+ content1.setProperty("text", "bar");
+ Tree content2 = content.addChild("sample2").addChild("jcr:content");
+ content2.setProperty("foo", "bar");
+ root.commit();
+
+ String xpath = "/jcr:root/test/content//element(*, nt:base)[jcr:contains(., 'bar')]";
+
+ Iterator<String> result = executeQuery(xpath, XPATH).iterator();
+ assertTrue(result.hasNext());
+ assertEquals("/test/content/sample1", result.next());
+ assertTrue(result.hasNext());
+ assertEquals("/test/content/sample2", result.next());
assertFalse(result.hasNext());
}