You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/06/29 08:11:58 UTC
svn commit: r1688093 - in /jackrabbit/oak/branches/1.2: ./ oak-pojosr/
oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/
oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/os...
Author: chetanm
Date: Mon Jun 29 06:11:58 2015
New Revision: 1688093
URL: http://svn.apache.org/r1688093
Log:
OAK-2936 - PojoSR should use Felix Connect API instead of pojosr
Merging 1686162
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
jackrabbit/oak/branches/1.2/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 29 06:11:58 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857
,1686971,1687053-1687055,1687198,1687220,1687239-1687240,1687301,1687441,1687553
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854
,1686857,1686971,1687053-1687055,1687198,1687220,1687239-1687240,1687301,1687441,1687553
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/pom.xml?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/pom.xml Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/BundleDescriptorComparator.java Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/ServiceRegistryProvider.java Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/NodeStoreConfigTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TrackerSupportTest.groovy Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java Mon Jun 29 06:11:58 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/branches/1.2/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config?rev=1688093&r1=1688092&r2=1688093&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config (original)
+++ jackrabbit/oak/branches/1.2/oak-pojosr/src/test/resources/config-common/org.apache.jackrabbit.oak.jcr.osgi.RepositoryManager.config Mon Jun 29 06:11:58 2015
@@ -1 +1 @@
-#Empty config to trigger default setup
+