Author: olli
Date: Sun Oct 23 15:03:34 2016
New Revision: 1766294
URL: http://svn.apache.org/viewvc?rev=1766294&view=rev
Log:
SLING-5796 Make Oak Lucene optional
embed LuceneIndexHelper
Modified:
sling/trunk/bundles/jcr/oak-server/pom.xml
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1766294&r1=1766293&r2=1766294&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sun Oct 23 15:03:34 2016
@@ -65,6 +65,14 @@
org.apache.felix.jaas.boot,
*
</Import-Package>
+ <Embed-Dependency>
+
oak-lucene;inline="org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.*"
+ </Embed-Dependency>
+ <_removeheaders>
+ Embed-Dependency,
+ Private-Package,
+ Include-Resource
+ </_removeheaders>
</instructions>
</configuration>
</plugin>
Modified:
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1766294&r1=1766293&r2=1766294&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
(original)
+++
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
Sun Oct 23 15:03:34 2016
@@ -182,7 +182,6 @@ public abstract class OakServerTestSuppo
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jcr").version(SlingOptions.versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(SlingOptions.versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(SlingOptions.versionResolver),
-
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(SlingOptions.versionResolver),
// TODO make Oak Lucene optional
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(SlingOptions.versionResolver),
// repoinit (temp)
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.repoinit").version("1.0.3-SNAPSHOT"),
@@ -192,9 +191,6 @@ public abstract class OakServerTestSuppo
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
.asOption(),
-
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
- .put("localIndexDir", localIndexDir)
- .asOption(),
newConfiguration("org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge")
.put("enabled", true)
.asOption(),
