Author: tommaso
Date: Wed Mar 11 15:54:03 2015
New Revision: 1665910
URL: http://svn.apache.org/r1665910
Log:
OAK-2608 - added default ignored properties
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java?rev=1665910&r1=1665909&r2=1665910&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
Wed Mar 11 15:54:03 2015
@@ -46,7 +46,7 @@ public class SolrServerConfigurationDefa
public static final boolean PROPERTY_RESTRICTIONS = false;
public static final boolean PATH_RESTRICTIONS = false;
public static final boolean PRIMARY_TYPES = false;
- public static final String IGNORED_PROPERTIES = "";
+ public static final String[] IGNORED_PROPERTIES = {"rep:members",
"rep:authorizableId", "jcr:uuid", "rep:principalName", "rep:password"};
public static final String TYPE_MAPPINGS = "";
public static final String PROPERTY_MAPPINGS = "";
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1665910&r1=1665909&r2=1665910&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
Wed Mar 11 15:54:03 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
@@ -158,7 +159,7 @@ public class OakSolrNodeStateConfigurati
ignoredProperties.add(ignoredProperty);
}
} else {
- ignoredProperties = Collections.emptyList();
+ ignoredProperties =
Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES);
}
return ignoredProperties;
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1665910&r1=1665909&r2=1665910&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Wed Mar 11 15:54:03 2015
@@ -87,8 +87,8 @@ public class OakSolrConfigurationProvide
@Property(boolValue = SolrServerConfigurationDefaults.PRIMARY_TYPES, label
= "primary types restrictions")
private static final String PRIMARY_TYPES_RESTRICTIONS =
"primarytypes.restrictions";
- @Property(value = SolrServerConfigurationDefaults.IGNORED_PROPERTIES,
label = "ignored properties",
- unbounded = PropertyUnbounded.ARRAY)
+ @Property(value = {"rep:members", "rep:authorizableId", "jcr:uuid",
"rep:principalName", "rep:password"},
+ label = "ignored properties", unbounded = PropertyUnbounded.ARRAY)
private static final String IGNORED_PROPERTIES = "ignored.properties";
@Property(value = {}, label = "used properties", unbounded =
PropertyUnbounded.ARRAY)
