Author: chetanm
Date: Tue Jan 17 10:59:25 2017
New Revision: 1779167
URL: http://svn.apache.org/viewvc?rev=1779167&view=rev
Log:
OAK-5466 - Switch to oak-segment-tar in pojosr module
Added:
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config
(contents, props changed)
- copied, changed from r1779141,
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config
Removed:
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/config-templates/segmentmk-config.json
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/oak-tar-config.json
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/config-templates/segmentmk-config.json
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/config-templates/segmentmk-config.json?rev=1779167&r1=1779166&r2=1779167&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/config-templates/segmentmk-config.json
(original)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/config-templates/segmentmk-config.json
Tue Jan 17 10:59:25 2017
@@ -1,5 +1,5 @@
{
- "org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService" : {
+ "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService" : {
"customBlobStore" : true
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java?rev=1779167&r1=1779166&r2=1779167&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
Tue Jan 17 10:59:25 2017
@@ -133,15 +133,12 @@ public class OakOSGiRepositoryFactory im
public static final String REPOSITORY_ENV_SPRING_BOOT =
"org.apache.jackrabbit.oak.repository.springBootMode";
- public static final String REPOSITORY_BUNDLE_FILTER_DEFAULT = "(&" +
- "(|" +
+ public static final String REPOSITORY_BUNDLE_FILTER_DEFAULT = "(|" +
"(Bundle-SymbolicName=org.apache.jackrabbit*)" +
"(Bundle-SymbolicName=org.apache.sling*)" +
"(Bundle-SymbolicName=org.apache.felix*)" +
"(Bundle-SymbolicName=org.apache.aries*)" +
"(Bundle-SymbolicName=groovy-all)" +
- ")" +
- "(!(Bundle-SymbolicName=org.apache.jackrabbit.oak-segment-tar))" +
")";
/**
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy?rev=1779167&r1=1779166&r2=1779167&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
Tue Jan 17 10:59:25 2017
@@ -20,8 +20,7 @@
package org.apache.jackrabbit.oak.run.osgi
import org.apache.felix.connect.launch.PojoServiceRegistry
-import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
-import org.apache.jackrabbit.oak.plugins.segment.SegmentStore
+import org.apache.jackrabbit.oak.segment.SegmentNodeStore
import org.apache.jackrabbit.oak.spi.blob.BlobStore
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore
import org.apache.jackrabbit.oak.spi.state.NodeStore
@@ -35,13 +34,12 @@ class NodeStoreConfigTest extends Abstr
registry.registerService(BlobStore.class.name, new MemoryBlobStore(),
null)
createConfig([
-
'org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService' : [:]
+ 'org.apache.jackrabbit.oak.segment.SegmentNodeStoreService' :
[:]
])
- SegmentNodeStoreService ns = getServiceWithWait(NodeStore.class)
+ SegmentNodeStore ns = getServiceWithWait(NodeStore.class)
//NodeStore is of type SegmentNodeStoreService
- SegmentStore segStore = ns.getSegmentStore()
- assert segStore.blobStore == null , "BlobStore should not be picked up
unless 'customBlobStore " +
+ assert ns.blobStore == null , "BlobStore should not be picked up
unless 'customBlobStore " +
"is set to true"
}
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy?rev=1779167&r1=1779166&r2=1779167&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SegmentNodeStoreConfigTest.groovy
Tue Jan 17 10:59:25 2017
@@ -50,7 +50,7 @@ class SegmentNodeStoreConfigTest extends
//1. Get NodeStore created
createConfig([
-
'org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService': [
+ 'org.apache.jackrabbit.oak.segment.SegmentNodeStoreService': [
cache: 256,
"tarmk.mode": 32
]
@@ -65,7 +65,7 @@ class SegmentNodeStoreConfigTest extends
//3. Mutate the config. This results in NodeStore deactivate
//which first wait for nodeStoreLatch and then on NodeStoreTracker lock
createConfig([
-
'org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService': [
+ 'org.apache.jackrabbit.oak.segment.SegmentNodeStoreService': [
cache: 200,
"tarmk.mode": 32
]
Copied:
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config
(from r1779141,
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config?p2=jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config&p1=jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config&r1=1779141&r2=1779167&rev=1779167&view=diff
==============================================================================
(empty)
Propchange:
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-tar/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/resources/oak-tar-config.json
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/resources/oak-tar-config.json?rev=1779167&r1=1779166&r2=1779167&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/resources/oak-tar-config.json
(original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/resources/oak-tar-config.json Tue
Jan 17 10:59:25 2017
@@ -1,3 +1,3 @@
{
- "org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService" : {}
+ "org.apache.jackrabbit.oak.segment.SegmentNodeStoreService" : {}
}
\ No newline at end of file
