Author: chetanm
Date: Fri Nov 27 11:27:13 2015
New Revision: 1716835
URL: http://svn.apache.org/viewvc?rev=1716835&view=rev
Log:
OAK-3688 - Provide and use a default set of bundle filters
Modified:
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/AbstractRepositoryFactoryTest.groovy
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=1716835&r1=1716834&r2=1716835&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
Fri Nov 27 11:27:13 2015
@@ -132,6 +132,14 @@ 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 = "(|" +
+ "(Bundle-SymbolicName=org.apache.jackrabbit*)" +
+ "(Bundle-SymbolicName=org.apache.sling*)" +
+ "(Bundle-SymbolicName=org.apache.felix*)" +
+ "(Bundle-SymbolicName=org.apache.aries*)" +
+ "(Bundle-SymbolicName=groovy-all)" +
+ ")";
+
/**
* Default timeout for repository creation
*/
@@ -330,6 +338,9 @@ public class OakOSGiRepositoryFactory im
private void startBundles(PojoServiceRegistry registry, String
bundleFilter, Map config) {
try {
+ if (bundleFilter == null){
+ bundleFilter = REPOSITORY_BUNDLE_FILTER_DEFAULT;
+ }
List<BundleDescriptor> descriptors = new
ClasspathScanner().scanForBundles(bundleFilter);
descriptors = Lists.newArrayList(descriptors);
if
(PropertiesUtil.toBoolean(config.get(REPOSITORY_ENV_SPRING_BOOT), false)){
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1716835&r1=1716834&r2=1716835&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
Fri Nov 27 11:27:13 2015
@@ -36,7 +36,6 @@ import java.util.concurrent.TimeUnit
import static
org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_HOME
import static
org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_TIMEOUT_IN_SECS
-import static
org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_BUNDLE_FILTER
abstract class AbstractRepositoryFactoryTest{
static final int SVC_WAIT_TIME = Integer.getInteger("pojosr.waitTime", 10)
@@ -54,13 +53,6 @@ abstract class AbstractRepositoryFactory
config = [
(REPOSITORY_HOME): workDir.absolutePath,
(REPOSITORY_TIMEOUT_IN_SECS) : 60,
- (REPOSITORY_BUNDLE_FILTER) : '''
- (|
- (Bundle-SymbolicName=org.apache.jackrabbit*)
- (Bundle-SymbolicName=org.apache.sling*)
- (Bundle-SymbolicName=org.apache.felix*)
- (Bundle-SymbolicName=org.apache.aries*)
- )''',
]
}
