Author: chetanm
Date: Thu Jun 18 09:57:26 2015
New Revision: 1686162
URL: http://svn.apache.org/r1686162
Log:
OAK-2936 - PojoSR should use Felix Connect API instead of pojosr
Modified:
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
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/TrackerSupportTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Thu Jun 18 09:57:26 2015
@@ -158,19 +158,9 @@
<!-- Pojo SR -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.pojosr</groupId>
- <artifactId>de.kalpatec.pojosr.framework.bare</artifactId>
- <version>0.2.1</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.connect</artifactId>
+ <version>0.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -180,7 +170,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.0</version>
+ <version>1.8.6</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
Thu Jun 18 09:57:26 2015
@@ -24,7 +24,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
+import org.apache.felix.connect.launch.BundleDescriptor;
import org.osgi.framework.Constants;
/**
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=1686162&r1=1686161&r2=1686162&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
Thu Jun 18 09:57:26 2015
@@ -38,10 +38,10 @@ import javax.jcr.RepositoryFactory;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
-import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
-import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
+import org.apache.felix.connect.launch.BundleDescriptor;
+import org.apache.felix.connect.launch.ClasspathScanner;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.osgi.framework.BundleException;
@@ -198,7 +198,7 @@ public class OakOSGiRepositoryFactory im
config.put(Constants.FRAMEWORK_STORAGE, bundleDir);
//FIXME Pojo SR currently reads this from system property instead of
Framework Property
- System.setProperty(Constants.FRAMEWORK_STORAGE, bundleDir);
+ config.put(Constants.FRAMEWORK_STORAGE, bundleDir);
//Directory used by Felix File Install to watch for configs
config.put("felix.fileinstall.dir", FilenameUtils.concat(home,
"config"));
@@ -212,21 +212,6 @@ public class OakOSGiRepositoryFactory im
config.put("repository.home", FilenameUtils.concat(home,
"repository"));
- copyConfigToSystemProps(config);
- }
-
- @SuppressWarnings("unchecked")
- private static void copyConfigToSystemProps(Map config) {
- //TODO This is a temporary workaround as the current release version
- //of PojoSR reads value from System properties. Trunk version reads
from
- //initial map. This should be removed when we move to version which
has the fix
- Iterator<Map.Entry> itr = config.entrySet().iterator();
- while (itr.hasNext()) {
- Map.Entry e = itr.next();
- if (e.getValue() instanceof String) {
- System.setProperty((String) e.getKey(), (String) e.getValue());
- }
- }
}
private PojoServiceRegistry createServiceRegistry(Map<String, Object>
config) {
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
Thu Jun 18 09:57:26 2015
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
/**
* Provides access to the underlying ServiceRegistry. For example repository
instance returned by
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=1686162&r1=1686161&r2=1686162&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
Thu Jun 18 09:57:26 2015
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
+import org.apache.felix.connect.launch.PojoServiceRegistry
import org.apache.commons.io.FileUtils
import org.apache.commons.io.FilenameUtils
import org.apache.jackrabbit.api.JackrabbitRepository
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
Thu Jun 18 09:57:26 2015
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.BundleDescriptor
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
+import org.apache.felix.connect.launch.BundleDescriptor
+import org.apache.felix.connect.launch.PojoServiceRegistry
import groovy.json.JsonOutput
import org.apache.commons.io.FileUtils
import org.junit.After
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
Thu Jun 18 09:57:26 2015
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
+import org.apache.felix.connect.launch.PojoServiceRegistry
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
Thu Jun 18 09:57:26 2015
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
+import org.apache.felix.connect.launch.PojoServiceRegistry
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator
import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexFormatVersion
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=1686162&r1=1686161&r2=1686162&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
Thu Jun 18 09:57:26 2015
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
+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.spi.blob.BlobStore
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
Thu Jun 18 09:57:26 2015
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.run.osgi
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory
+import org.apache.felix.connect.launch.PojoServiceRegistry
+import org.apache.felix.connect.launch.PojoServiceRegistryFactory
import org.junit.After
import org.junit.Test
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
Thu Jun 18 09:57:26 2015
@@ -36,7 +36,7 @@ import javax.jcr.RepositoryFactory;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
+import org.apache.felix.connect.launch.PojoServiceRegistry;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.api.JackrabbitSession;
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config?rev=1686162&r1=1686161&r2=1686162&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
(original)
+++
jackrabbit/oak/trunk/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
Thu Jun 18 09:57:26 2015
@@ -1 +1 @@
-#Empty config to trigger default setup
+
