Author: tommaso
Date: Wed Jun 24 13:28:00 2015
New Revision: 1687262
URL: http://svn.apache.org/r1687262
Log:
OAK-3030 - added OakSolrConfigurationDefaults
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
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/DefaultSolrConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java?rev=1687262&r1=1687261&r2=1687262&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
Wed Jun 24 13:28:00 2015
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.que
*/
public class DefaultSolrConfiguration implements OakSolrConfiguration {
- private static final Collection<String> ignoredProperties =
SolrServerConfigurationDefaults.IGNORED_PROPERTIES;
+ private static final Collection<String> ignoredProperties =
OakSolrConfigurationDefaults.IGNORED_PROPERTIES;
private static final Collection<String> usedProperties =
Collections.emptyList();
@Override
@@ -41,7 +41,7 @@ public class DefaultSolrConfiguration im
@Nonnull
@Override
public String getPathField() {
- return SolrServerConfigurationDefaults.PATH_FIELD_NAME;
+ return OakSolrConfigurationDefaults.PATH_FIELD_NAME;
}
@CheckForNull
@@ -50,19 +50,19 @@ public class DefaultSolrConfiguration im
String fieldName = null;
switch (pathRestriction) {
case ALL_CHILDREN: {
- fieldName = SolrServerConfigurationDefaults.DESC_FIELD_NAME;
+ fieldName = OakSolrConfigurationDefaults.DESC_FIELD_NAME;
break;
}
case DIRECT_CHILDREN: {
- fieldName = SolrServerConfigurationDefaults.CHILD_FIELD_NAME;
+ fieldName = OakSolrConfigurationDefaults.CHILD_FIELD_NAME;
break;
}
case EXACT: {
- fieldName = SolrServerConfigurationDefaults.PATH_FIELD_NAME;
+ fieldName = OakSolrConfigurationDefaults.PATH_FIELD_NAME;
break;
}
case PARENT: {
- fieldName = SolrServerConfigurationDefaults.ANC_FIELD_NAME;
+ fieldName = OakSolrConfigurationDefaults.ANC_FIELD_NAME;
break;
}
case NO_RESTRICTION:
@@ -87,27 +87,27 @@ public class DefaultSolrConfiguration im
@Override
public String getCatchAllField() {
- return SolrServerConfigurationDefaults.CATCHALL_FIELD;
+ return OakSolrConfigurationDefaults.CATCHALL_FIELD;
}
@Override
public int getRows() {
- return SolrServerConfigurationDefaults.ROWS;
+ return OakSolrConfigurationDefaults.ROWS;
}
@Override
public boolean useForPropertyRestrictions() {
- return SolrServerConfigurationDefaults.PROPERTY_RESTRICTIONS;
+ return OakSolrConfigurationDefaults.PROPERTY_RESTRICTIONS;
}
@Override
public boolean useForPrimaryTypes() {
- return SolrServerConfigurationDefaults.PRIMARY_TYPES;
+ return OakSolrConfigurationDefaults.PRIMARY_TYPES;
}
@Override
public boolean useForPathRestrictions() {
- return SolrServerConfigurationDefaults.PATH_RESTRICTIONS;
+ return OakSolrConfigurationDefaults.PATH_RESTRICTIONS;
}
@Nonnull
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java?rev=1687262&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
(added)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
Wed Jun 24 13:28:00 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * Defaults for search / indexing configurations options.
+ */
+public class OakSolrConfigurationDefaults {
+
+ public static final String PATH_FIELD_NAME = "path_exact";
+ public static final String CHILD_FIELD_NAME = "path_child";
+ public static final String DESC_FIELD_NAME = "path_des";
+ public static final String ANC_FIELD_NAME = "path_anc";
+ public static final String CATCHALL_FIELD = "catch_all";
+ public static final int ROWS = Integer.MAX_VALUE;
+ public static final boolean PROPERTY_RESTRICTIONS = false;
+ public static final boolean PATH_RESTRICTIONS = false;
+ public static final boolean PRIMARY_TYPES = false;
+ public static final Collection<String> IGNORED_PROPERTIES =
Collections.unmodifiableCollection(
+ Arrays.asList("rep:members", "rep:authorizableId", "jcr:uuid",
"rep:principalName", "rep:password"));
+ public static final String TYPE_MAPPINGS = "";
+ public static final String PROPERTY_MAPPINGS = "";
+
+}
Propchange:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationDefaults.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java?rev=1687262&r1=1687261&r2=1687262&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
Wed Jun 24 13:28:00 2015
@@ -29,5 +29,5 @@ public interface OakSolrConfigurationPro
* @return a {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}
*/
@Nonnull
- public OakSolrConfiguration getConfiguration();
+ OakSolrConfiguration getConfiguration();
}
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=1687262&r1=1687261&r2=1687262&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 Jun 24 13:28:00 2015
@@ -16,12 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
/**
- * Defaults for Solr configurations.
+ * Defaults for Solr server configuration options.
*/
public class SolrServerConfigurationDefaults {
@@ -40,19 +36,4 @@ public class SolrServerConfigurationDefa
public static final int REPLICATION_FACTOR = 2;
public static final String CONFIGURATION_DIRECTORY = "";
- // --> default values for OakSolrConfiguration parameters <--
- public static final String PATH_FIELD_NAME = "path_exact";
- public static final String CHILD_FIELD_NAME = "path_child";
- public static final String DESC_FIELD_NAME = "path_des";
- public static final String ANC_FIELD_NAME = "path_anc";
- public static final String CATCHALL_FIELD = "catch_all";
- public static final int ROWS = Integer.MAX_VALUE;
- public static final boolean PROPERTY_RESTRICTIONS = false;
- public static final boolean PATH_RESTRICTIONS = false;
- public static final boolean PRIMARY_TYPES = false;
- public static final Collection<String> IGNORED_PROPERTIES =
Collections.unmodifiableCollection(
- Arrays.asList("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=1687262&r1=1687261&r2=1687262&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 Jun 24 13:28:00 2015
@@ -27,6 +27,7 @@ import com.google.common.collect.Iterabl
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
+import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex;
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -68,7 +69,7 @@ public class OakSolrNodeStateConfigurati
@Nonnull
@Override
public String getPathField() {
- return getStringValueFor(Properties.PATH_FIELD,
SolrServerConfigurationDefaults.PATH_FIELD_NAME);
+ return getStringValueFor(Properties.PATH_FIELD,
OakSolrConfigurationDefaults.PATH_FIELD_NAME);
}
@CheckForNull
@@ -77,19 +78,19 @@ public class OakSolrNodeStateConfigurati
String fieldName = null;
switch (pathRestriction) {
case ALL_CHILDREN: {
- fieldName = getStringValueFor(Properties.DESCENDANTS_FIELD,
SolrServerConfigurationDefaults.DESC_FIELD_NAME);
+ fieldName = getStringValueFor(Properties.DESCENDANTS_FIELD,
OakSolrConfigurationDefaults.DESC_FIELD_NAME);
break;
}
case DIRECT_CHILDREN: {
- fieldName = getStringValueFor(Properties.CHILDREN_FIELD,
SolrServerConfigurationDefaults.CHILD_FIELD_NAME);
+ fieldName = getStringValueFor(Properties.CHILDREN_FIELD,
OakSolrConfigurationDefaults.CHILD_FIELD_NAME);
break;
}
case EXACT: {
- fieldName = getStringValueFor(Properties.PATH_FIELD,
SolrServerConfigurationDefaults.PATH_FIELD_NAME);
+ fieldName = getStringValueFor(Properties.PATH_FIELD,
OakSolrConfigurationDefaults.PATH_FIELD_NAME);
break;
}
case PARENT: {
- fieldName = getStringValueFor(Properties.PARENT_FIELD,
SolrServerConfigurationDefaults.ANC_FIELD_NAME);
+ fieldName = getStringValueFor(Properties.PARENT_FIELD,
OakSolrConfigurationDefaults.ANC_FIELD_NAME);
break;
}
case NO_RESTRICTION:
@@ -103,7 +104,7 @@ public class OakSolrNodeStateConfigurati
@Override
public String getCatchAllField() {
- return getStringValueFor(Properties.CATCHALL_FIELD,
SolrServerConfigurationDefaults.CATCHALL_FIELD);
+ return getStringValueFor(Properties.CATCHALL_FIELD,
OakSolrConfigurationDefaults.CATCHALL_FIELD);
}
@Override
@@ -130,22 +131,22 @@ public class OakSolrNodeStateConfigurati
@Override
public int getRows() {
- return getIntValueFor(Properties.ROWS,
SolrServerConfigurationDefaults.ROWS);
+ return getIntValueFor(Properties.ROWS,
OakSolrConfigurationDefaults.ROWS);
}
@Override
public boolean useForPropertyRestrictions() {
- return getBooleanValueFor(Properties.PROPERTY_RESTRICIONS,
SolrServerConfigurationDefaults.PROPERTY_RESTRICTIONS);
+ return getBooleanValueFor(Properties.PROPERTY_RESTRICIONS,
OakSolrConfigurationDefaults.PROPERTY_RESTRICTIONS);
}
@Override
public boolean useForPrimaryTypes() {
- return getBooleanValueFor(Properties.PRIMARY_TYPES,
SolrServerConfigurationDefaults.PRIMARY_TYPES);
+ return getBooleanValueFor(Properties.PRIMARY_TYPES,
OakSolrConfigurationDefaults.PRIMARY_TYPES);
}
@Override
public boolean useForPathRestrictions() {
- return getBooleanValueFor(Properties.PATH_RESTRICTIONS,
SolrServerConfigurationDefaults.PATH_RESTRICTIONS);
+ return getBooleanValueFor(Properties.PATH_RESTRICTIONS,
OakSolrConfigurationDefaults.PATH_RESTRICTIONS);
}
@Nonnull
@@ -159,7 +160,7 @@ public class OakSolrNodeStateConfigurati
ignoredProperties.add(ignoredProperty);
}
} else {
- ignoredProperties =
SolrServerConfigurationDefaults.IGNORED_PROPERTIES;
+ ignoredProperties =
OakSolrConfigurationDefaults.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=1687262&r1=1687261&r2=1687262&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 Jun 24 13:28:00 2015
@@ -33,6 +33,7 @@ import org.apache.felix.scr.annotations.
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
+import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -45,19 +46,19 @@ import org.osgi.service.component.Compon
@Service(OakSolrConfigurationProvider.class)
public class OakSolrConfigurationProviderService implements
OakSolrConfigurationProvider {
- @Property(value = SolrServerConfigurationDefaults.DESC_FIELD_NAME, label =
"field for descendants search")
+ @Property(value = OakSolrConfigurationDefaults.DESC_FIELD_NAME, label =
"field for descendants search")
private static final String PATH_DESCENDANTS_FIELD = "path.desc.field";
- @Property(value = SolrServerConfigurationDefaults.CHILD_FIELD_NAME, label
= "field for children search")
+ @Property(value = OakSolrConfigurationDefaults.CHILD_FIELD_NAME, label =
"field for children search")
private static final String PATH_CHILDREN_FIELD = "path.child.field";
- @Property(value = SolrServerConfigurationDefaults.ANC_FIELD_NAME, label =
"field for parent search")
+ @Property(value = OakSolrConfigurationDefaults.ANC_FIELD_NAME, label =
"field for parent search")
private static final String PATH_PARENT_FIELD = "path.parent.field";
- @Property(value = SolrServerConfigurationDefaults.PATH_FIELD_NAME, label =
"field for path search")
+ @Property(value = OakSolrConfigurationDefaults.PATH_FIELD_NAME, label =
"field for path search")
private static final String PATH_EXACT_FIELD = "path.exact.field";
- @Property(value = SolrServerConfigurationDefaults.CATCHALL_FIELD, label =
"catch all field")
+ @Property(value = OakSolrConfigurationDefaults.CATCHALL_FIELD, label =
"catch all field")
private static final String CATCH_ALL_FIELD = "catch.all.field";
@Property(options = {
@@ -75,16 +76,16 @@ public class OakSolrConfigurationProvide
private static final String COMMIT_POLICY = "commit.policy";
- @Property(intValue = SolrServerConfigurationDefaults.ROWS, label = "rows")
+ @Property(intValue = OakSolrConfigurationDefaults.ROWS, label = "rows")
private static final String ROWS = "rows";
- @Property(boolValue = SolrServerConfigurationDefaults.PATH_RESTRICTIONS,
label = "path restrictions")
+ @Property(boolValue = OakSolrConfigurationDefaults.PATH_RESTRICTIONS,
label = "path restrictions")
private static final String PATH_RESTRICTIONS = "path.restrictions";
- @Property(boolValue =
SolrServerConfigurationDefaults.PROPERTY_RESTRICTIONS, label = "property
restrictions")
+ @Property(boolValue = OakSolrConfigurationDefaults.PROPERTY_RESTRICTIONS,
label = "property restrictions")
private static final String PROPERTY_RESTRICTIONS =
"property.restrictions";
- @Property(boolValue = SolrServerConfigurationDefaults.PRIMARY_TYPES, label
= "primary types restrictions")
+ @Property(boolValue = OakSolrConfigurationDefaults.PRIMARY_TYPES, label =
"primary types restrictions")
private static final String PRIMARY_TYPES_RESTRICTIONS =
"primarytypes.restrictions";
@Property(value = {"rep:members", "rep:authorizableId", "jcr:uuid",
"rep:principalName", "rep:password"},
@@ -94,12 +95,12 @@ public class OakSolrConfigurationProvide
@Property(value = {}, label = "used properties", unbounded =
PropertyUnbounded.ARRAY)
private static final String USED_PROPERTIES = "used.properties";
- @Property(value = SolrServerConfigurationDefaults.TYPE_MAPPINGS,
cardinality = 13, description =
+ @Property(value = OakSolrConfigurationDefaults.TYPE_MAPPINGS, cardinality
= 13, description =
"each item should be in the form TypeString=FieldName (e.g.
STRING=text_general)", label =
"mappings from Oak Types to Solr fields")
private static final String TYPE_MAPPINGS = "type.mappings";
- @Property(value = SolrServerConfigurationDefaults.PROPERTY_MAPPINGS,
unbounded = PropertyUnbounded.ARRAY, description =
+ @Property(value = OakSolrConfigurationDefaults.PROPERTY_MAPPINGS,
unbounded = PropertyUnbounded.ARRAY, description =
"each item should be in the form PropertyName=FieldName (e.g.
jcr:title=text_en)", label =
"mappings from JCR property names to Solr fields")
private static final String PROPERTY_MAPPINGS = "property.mappings";
