Revision: 45726
Author: uhommes
Date: 2014-07-28 17:35:42 +0200 (Mon, 28 Jul 2014)
Log Message:
-----------
REPO-1010 upgrade to jackrabbit 2.8.0
Modified Paths:
--------------
hippo-cms7/repository/trunk/engine/pom.xml
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoObservationManager.java
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSearchManager.java
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingIndexingConfigurationImpl.java
hippo-cms7/repository/trunk/engine/src/test/java/org/hippoecm/repository/FreeTextSearchTest.java
hippo-cms7/repository/trunk/pom.xml
Modified: hippo-cms7/repository/trunk/engine/pom.xml
===================================================================
--- hippo-cms7/repository/trunk/engine/pom.xml 2014-07-28 15:34:56 UTC (rev
45725)
+++ hippo-cms7/repository/trunk/engine/pom.xml 2014-07-28 15:35:42 UTC (rev
45726)
@@ -45,6 +45,10 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
</dependency>
<dependency>
Modified:
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoObservationManager.java
===================================================================
---
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoObservationManager.java
2014-07-28 15:34:56 UTC (rev 45725)
+++
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoObservationManager.java
2014-07-28 15:35:42 UTC (rev 45726)
@@ -15,6 +15,8 @@
*/
package org.hippoecm.repository.jackrabbit;
+import java.util.Collections;
+
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
@@ -48,7 +50,7 @@
}
EventFilter filter = createEventFilter(
- eventTypes, absPath, isDeep, uuid, nodeTypeName, false);
+ eventTypes, Collections.singletonList(absPath), isDeep, uuid,
nodeTypeName, false, false, false);
return new RevisionEventJournalImpl(
filter, clusterNode.getJournal(), clusterNode.getId(),
session);
}
Modified:
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSearchManager.java
===================================================================
---
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSearchManager.java
2014-07-28 15:34:56 UTC (rev 45725)
+++
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/jackrabbit/HippoSearchManager.java
2014-07-28 15:35:42 UTC (rev 45726)
@@ -47,12 +47,12 @@
import org.apache.jackrabbit.core.query.lucene.join.QueryEngine;
import org.apache.jackrabbit.core.session.SessionContext;
import org.apache.jackrabbit.core.state.SharedItemStateManager;
-import org.apache.jackrabbit.core.stats.RepositoryStatisticsImpl;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.query.qom.ConstraintImpl;
import org.apache.jackrabbit.spi.commons.query.qom.QOMTreeVisitor;
import org.apache.jackrabbit.spi.commons.query.qom.QueryObjectModelFactoryImpl;
import org.apache.jackrabbit.spi.commons.query.qom.QueryObjectModelTree;
+import org.apache.jackrabbit.stats.RepositoryStatisticsImpl;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.slf4j.Logger;
Modified:
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingIndexingConfigurationImpl.java
===================================================================
---
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingIndexingConfigurationImpl.java
2014-07-28 15:34:56 UTC (rev 45725)
+++
hippo-cms7/repository/trunk/engine/src/main/java/org/hippoecm/repository/query/lucene/ServicingIndexingConfigurationImpl.java
2014-07-28 15:35:42 UTC (rev 45726)
@@ -26,6 +26,7 @@
import javax.jcr.NamespaceException;
import org.apache.jackrabbit.core.query.QueryHandlerContext;
+import org.apache.jackrabbit.core.query.lucene.AggregateRule;
import org.apache.jackrabbit.core.query.lucene.IndexingConfigurationImpl;
import org.apache.jackrabbit.core.query.lucene.NamespaceMappings;
import org.apache.jackrabbit.spi.Name;
@@ -85,6 +86,8 @@
*/
private Name[] hippoAggregates;
+ private AggregateRule[] aggregateRules;
+
/**
* The child node types which properties should be indexed within the
parent lucene document,
* but which will not be actual part of the document (i.e they still get
their relative path
@@ -198,8 +201,13 @@
skipIndex = nameResolver.getQName(HippoNodeType.NT_SKIPINDEX);
hippoAggregates = idxHippoAggregates.toArray(new
Name[idxHippoAggregates.size()]);
translationMessageFieldName =
nameResolver.getJCRName(hippoTranslation) + "/" +
nameResolver.getJCRName(hippoMessage);
+ aggregateRules = super.getAggregateRules();
+ if (aggregateRules == null) {
+ aggregateRules = new AggregateRule[0];
}
+ }
+
public boolean isChildAggregate(Name childType) {
return childAggregates.contains(childType);
}
@@ -336,4 +344,9 @@
return skipIndex;
}
+ @Override
+ public AggregateRule[] getAggregateRules() {
+ return aggregateRules;
}
+
+}
Modified:
hippo-cms7/repository/trunk/engine/src/test/java/org/hippoecm/repository/FreeTextSearchTest.java
===================================================================
---
hippo-cms7/repository/trunk/engine/src/test/java/org/hippoecm/repository/FreeTextSearchTest.java
2014-07-28 15:34:56 UTC (rev 45725)
+++
hippo-cms7/repository/trunk/engine/src/test/java/org/hippoecm/repository/FreeTextSearchTest.java
2014-07-28 15:35:42 UTC (rev 45726)
@@ -197,10 +197,7 @@
NodeIterator nodes = queryResult.getNodes();
assertEquals(1L, nodes.getSize());
- while(nodes.hasNext()) {
- Node doc = nodes.nextNode();
- assertTrue(doc.getName().equals("Document1"));
- }
+ assertTrue(nodes.nextNode().getName().equals("Document1"));
Node n = session.getNode("/test/Document1/Document1");
n.getNode("compoundchild").remove();
@@ -236,10 +233,8 @@
NodeIterator nodes = queryResult.getNodes();
assertEquals(1L, nodes.getSize());
- while(nodes.hasNext()) {
Node doc = nodes.nextNode();
assertTrue(doc.getName().equals("Document1"));
- }
Node n = session.getNode("/test/Document1/Document1/compoundchild");
n.getNode("hippo:testhtml").remove();
Modified: hippo-cms7/repository/trunk/pom.xml
===================================================================
--- hippo-cms7/repository/trunk/pom.xml 2014-07-28 15:34:56 UTC (rev 45725)
+++ hippo-cms7/repository/trunk/pom.xml 2014-07-28 15:35:42 UTC (rev 45726)
@@ -85,8 +85,7 @@
<xmlbeans-java6.version>2.3.0</xmlbeans-java6.version>
<pdfbox.version>1.7.1</pdfbox.version>
<quartz.version>2.2.1</quartz.version>
- <jackrabbit.patched.version>2.6.5-h1</jackrabbit.patched.version>
- <jackrabbit.version>2.6.5</jackrabbit.version>
+
<jackrabbit.patched.version>${jackrabbit.version}-h1</jackrabbit.patched.version>
<json-lib.version>2.2.2</json-lib.version>
<easymock.version>3.2</easymock.version>
<decentxml.version>1.4</decentxml.version>
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
