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 2016/03/31 13:12:48 UTC

svn commit: r1737225 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java

Author: chetanm
Date: Thu Mar 31 11:12:48 2016
New Revision: 1737225

URL: http://svn.apache.org/viewvc?rev=1737225&view=rev
Log:
OAK-4160 - Expose type property for ReferenceEditorProvider

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java?rev=1737225&r1=1737224&r2=1737225&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditorProvider.java Thu Mar 31 11:12:48 2016
@@ -21,7 +21,9 @@ import javax.annotation.Nonnull;
 import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.TYPE;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
 import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
 import org.apache.jackrabbit.oak.spi.commit.Editor;
@@ -30,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.sta
 
 @Component
 @Service(IndexEditorProvider.class)
+@Property(name = IndexConstants.TYPE_PROPERTY_NAME , value = NodeReferenceConstants.TYPE, propertyPrivate = true)
 public class ReferenceEditorProvider implements IndexEditorProvider {
 
     @Override

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java?rev=1737225&r1=1737224&r2=1737225&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java Thu Mar 31 11:12:48 2016
@@ -60,7 +60,13 @@ import org.osgi.framework.ServiceRegistr
 @References({
         @Reference(referenceInterface = IndexEditorProvider.class,
                 target = "(type=property)",
-                strategy = ReferenceStrategy.LOOKUP
+                strategy = ReferenceStrategy.LOOKUP,
+                name = "propertyIndexEditor"
+        ),
+        @Reference(referenceInterface = IndexEditorProvider.class,
+                target = "(type=reference)",
+                strategy = ReferenceStrategy.LOOKUP,
+                name = "referenceIndexEditor"
         ),
         @Reference(referenceInterface = StatisticsProvider.class,
                 strategy = ReferenceStrategy.LOOKUP