Author: tommaso
Date: Mon Feb 9 16:29:19 2015
New Revision: 1658451
URL: http://svn.apache.org/r1658451
Log:
OAK-2489 - removed configPath from embedded SolrServer provider, plus
adjustments to configuration package (defaults, ns configuration provider)
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java
(with props)
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
- copied, changed from r1657490,
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java
Removed:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/CommitPolicy.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
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/DefaultSolrConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/RemoteSolrServerConfiguration.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/UpToDateNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
Mon Feb 9 16:29:19 2015
@@ -105,7 +105,7 @@ public class FullTextSolrSearchTest exte
private EmbeddedSolrServerProvider
createEmbeddedSolrServerProvider(boolean http) throws Exception {
String tempDirectoryPath = FileUtils.getTempDirectoryPath();
File solrHome = new File(tempDirectoryPath, "solr" +
System.nanoTime());
- EmbeddedSolrServerConfiguration embeddedSolrServerConfiguration = new
EmbeddedSolrServerConfiguration(solrHome.getAbsolutePath(), "", "oak");
+ EmbeddedSolrServerConfiguration embeddedSolrServerConfiguration = new
EmbeddedSolrServerConfiguration(solrHome.getAbsolutePath(), "oak");
if (http) {
embeddedSolrServerConfiguration =
embeddedSolrServerConfiguration.withHttpConfiguration("/solr", 8983);
}
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=1658451&r1=1658450&r2=1658451&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
Mon Feb 9 16:29:19 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import javax.annotation.CheckForNull;
@@ -30,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.que
*/
public class DefaultSolrConfiguration implements OakSolrConfiguration {
- private static final Collection<String> ignoredProperties =
Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES.split(","));
+ private static final Collection<String> ignoredProperties =
Collections.emptyList();
private static final Collection<String> usedProperties =
Collections.emptyList();
@Override
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
Mon Feb 9 16:29:19 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-
import javax.annotation.Nonnull;
/**
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
Mon Feb 9 16:29:19 2015
@@ -24,13 +24,11 @@ import org.apache.jackrabbit.oak.plugins
public class EmbeddedSolrServerConfiguration extends
SolrServerConfiguration<EmbeddedSolrServerProvider> {
private final String solrHomePath;
- private final String solrConfigPath;
private final String coreName;
private HttpConfiguration httpConfiguration;
- public EmbeddedSolrServerConfiguration(String solrHomePath, String
solrConfigPath, String coreName) {
+ public EmbeddedSolrServerConfiguration(String solrHomePath, String
coreName) {
this.solrHomePath = solrHomePath;
- this.solrConfigPath = solrConfigPath;
this.coreName = coreName;
}
@@ -51,16 +49,6 @@ public class EmbeddedSolrServerConfigura
}
/**
- * get the name of the main Solr configuration file (solr.xml for multicore
- * deployments or solrconfig.xml for single core deployments).
- *
- * @return a <code>String</code> representing a path to the main Solr
config file.
- */
- public String getSolrConfigPath() {
- return solrConfigPath;
- }
-
- /**
* get the default core name to use for the Solr server
*
* @return a <code>String</code> representing the core name
@@ -96,4 +84,6 @@ public class EmbeddedSolrServerConfigura
return httpPort;
}
}
+
+
}
Added:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java?rev=1658451&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java
(added)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java
Mon Feb 9 16:29:19 2015
@@ -0,0 +1,67 @@
+/*
+ * 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 javax.annotation.Nonnull;
+
+import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.solr.client.solrj.SolrServer;
+
+/**
+ * Solr index configurations provider based on configuration persisted in the
repository
+ */
+public class NodeStateConfigurationProvider implements SolrServerProvider,
OakSolrConfigurationProvider {
+
+ private final OakSolrNodeStateConfiguration configuration;
+ private SolrServerProvider solrServerProvider;
+
+ public NodeStateConfigurationProvider(NodeState definition) {
+ configuration = new OakSolrNodeStateConfiguration(definition);
+ try {
+ solrServerProvider =
configuration.getSolrServerConfiguration().getProvider();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public NodeStateConfigurationProvider(NodeBuilder definition) {
+ this(definition.getBaseState());
+ }
+
+ @Nonnull
+ @Override
+ public OakSolrConfiguration getConfiguration() {
+ return configuration;
+ }
+
+ @Override
+ public SolrServer getSolrServer() throws Exception {
+ return solrServerProvider.getSolrServer();
+ }
+
+ @Override
+ public SolrServer getIndexingSolrServer() throws Exception {
+ return solrServerProvider.getIndexingSolrServer();
+ }
+
+ @Override
+ public SolrServer getSearchingSolrServer() throws Exception {
+ return solrServerProvider.getSearchingSolrServer();
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/NodeStateConfigurationProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
Mon Feb 9 16:29:19 2015
@@ -70,7 +70,7 @@ public interface OakSolrConfiguration {
/**
* Provide the commit policy to be used by a given {@link
org.apache.solr.client.solrj.SolrServer}
*
- * @return a {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy}
+ * @return a {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration.CommitPolicy}
*/
@Nonnull
CommitPolicy getCommitPolicy();
@@ -130,4 +130,22 @@ public interface OakSolrConfiguration {
*/
@Nonnull
Collection<String> getUsedProperties();
+
+ /**
+ * Enum for describing Solr commit policy used in a certain instance
+ */
+ enum CommitPolicy {
+ /**
+ * for default Solr commit
+ */
+ HARD,
+ /**
+ * for Solr soft commit
+ */
+ SOFT,
+ /**
+ * if no commits should be sent (relying on auto(soft)commit on the
instance itself)
+ */
+ AUTO
+ }
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/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/OakSolrNodeStateConfiguration.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java
Mon Feb 9 16:29:19 2015
@@ -19,34 +19,37 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
-import
org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.state.NodeState;
/**
* An {@link OakSolrConfiguration} specified via a given {@link
org.apache.jackrabbit.oak.spi.state.NodeState}.
* For each of the supported properties a default is provided if either the
- * property doesn't exist in the node or if the value is <code>null</code> or
- * empty <code>String</code>.
- * <p/>
- * Subclasses of this should at least provide the {@link
org.apache.jackrabbit.oak.spi.state.NodeState} which holds
- * the configuration.
+ * property doesn't exist in the node or if the value is <code>null</code>
*/
-public abstract class OakSolrNodeStateConfiguration implements
OakSolrConfiguration,
SolrServerConfigurationProvider<EmbeddedSolrServerProvider> {
+public class OakSolrNodeStateConfiguration implements OakSolrConfiguration,
SolrServerConfigurationProvider<SolrServerProvider> {
+
+ private final NodeState definition;
+
+ public OakSolrNodeStateConfiguration(NodeState definition) {
+ this.definition = definition;
+ }
/**
* get the {@link org.apache.jackrabbit.oak.spi.state.NodeState} which
contains the properties for the Oak -
* Solr configuration.
*
- * @return a (possibly non-existent) node state for the Solr configuration
+ * @return a node state for the Solr configuration
*/
- protected abstract NodeState getConfigurationNodeState();
+ protected NodeState getConfigurationNodeState() {
+ return definition;
+ }
@Override
public String getFieldNameFor(Type<?> propertyType) {
@@ -230,27 +233,50 @@ public abstract class OakSolrNodeStateCo
@Nonnull
@Override
- public SolrServerConfiguration<EmbeddedSolrServerProvider>
getSolrServerConfiguration() {
- String solrHomePath = getStringValueFor(Properties.SOLRHOME_PATH,
SolrServerConfigurationDefaults.SOLR_HOME_PATH);
- String solrConfigPath = getStringValueFor(Properties.SOLRCONFIG_PATH,
SolrServerConfigurationDefaults.SOLR_CONFIG_PATH);
- String coreName = getStringValueFor(Properties.CORE_NAME,
SolrServerConfigurationDefaults.CORE_NAME);
+ public SolrServerConfiguration<SolrServerProvider>
getSolrServerConfiguration() {
+ String type = getStringValueFor(Properties.SERVER_TYPE, "embedded");
+ if ("embedded".equalsIgnoreCase(type)) {
+ String solrHomePath = getStringValueFor(Properties.SOLRHOME_PATH,
SolrServerConfigurationDefaults.SOLR_HOME_PATH);
+ String coreName = getStringValueFor(Properties.CORE_NAME,
SolrServerConfigurationDefaults.CORE_NAME);
+ String context = getStringValueFor(Properties.CONTEXT,
SolrServerConfigurationDefaults.CONTEXT);
+ Integer httpPort =
Integer.valueOf(getStringValueFor(Properties.HTTP_PORT,
SolrServerConfigurationDefaults.HTTP_PORT));
+
+ return (SolrServerConfiguration) new
EmbeddedSolrServerConfiguration(solrHomePath,
+ coreName).withHttpConfiguration(context, httpPort);
+ } else if ("remote".equalsIgnoreCase(type)) {
+ String solrZkHost = getStringValueFor(Properties.ZK_HOST,
SolrServerConfigurationDefaults.ZK_HOST);
+ String solrCollection = getStringValueFor(Properties.COLLECTION,
SolrServerConfigurationDefaults.COLLECTION);
+ int solrReplicationFactor =
getIntValueFor(Properties.REPLICATION_FACTOR,
SolrServerConfigurationDefaults.REPLICATION_FACTOR);
+ String solrConfDir =
getStringValueFor(Properties.CONFIGURATION_DIRECTORY,
SolrServerConfigurationDefaults.CONFIGURATION_DIRECTORY);
+ String solrHttpUrls = getStringValueFor(Properties.HTTP_URL,
SolrServerConfigurationDefaults.HTTP_URL);
+ int solrShardsNo = getIntValueFor(Properties.SHARDS_NO,
SolrServerConfigurationDefaults.SHARDS_NO);
- String context = getStringValueFor(Properties.CONTEXT,
SolrServerConfigurationDefaults.CONTEXT);
- Integer httpPort =
Integer.valueOf(getStringValueFor(Properties.HTTP_PORT,
SolrServerConfigurationDefaults.HTTP_PORT));
-
- return new EmbeddedSolrServerConfiguration(solrHomePath,
- solrConfigPath, coreName).withHttpConfiguration(context,
httpPort);
+ return (SolrServerConfiguration) new
RemoteSolrServerConfiguration(solrZkHost, solrCollection, solrShardsNo,
+ solrReplicationFactor, solrConfDir, solrHttpUrls);
+ } else {
+ return null;
+ }
}
/**
* Properties that may be retrieved from the configuration {@link
org.apache.jackrabbit.oak.spi.state.NodeState}.
*/
public final class Properties {
+ // --> embedded solr server properties <--
public static final String SOLRHOME_PATH = "solrHomePath";
- public static final String SOLRCONFIG_PATH = "solrConfigPath";
public static final String CONTEXT = "solrContext";
public static final String HTTP_PORT = "httpPort";
public static final String CORE_NAME = "coreName";
+
+ // --> remote solr server properties <--
+ public static final String ZK_HOST = "zkHost";
+ public static final String COLLECTION = "collection";
+ public static final String REPLICATION_FACTOR = "replicationFactor";
+ public static final String CONFIGURATION_DIRECTORY =
"configurationDirectory";
+ public static final String HTTP_URL = "httpUrl";
+ public static final String SHARDS_NO = "shardsNo";
+
+ // --> oak solr config properties <--
public static final String PATH_FIELD = "pathField";
public static final String PARENT_FIELD = "parentField";
public static final String CHILDREN_FIELD = "childrenField";
@@ -265,5 +291,6 @@ public abstract class OakSolrNodeStateCo
public static final String TYPE_MAPPINGS = "typeMappings";
public static final String PROPERTY_MAPPINGS = "propertyMappings";
public static final String USED_PROPERTIES = "usedProperties";
+ public static final String SERVER_TYPE = "serverType";
}
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/RemoteSolrServerConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/RemoteSolrServerConfiguration.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/RemoteSolrServerConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/RemoteSolrServerConfiguration.java
Mon Feb 9 16:29:19 2015
@@ -30,7 +30,8 @@ public class RemoteSolrServerConfigurati
private final int solrShardsNo;
private final int solrReplicationFactor;
- public RemoteSolrServerConfiguration(String solrZkHost, String
solrCollection, int solrShardsNo, int solrReplicationFactor, String
solrConfDir, String... solrHttpUrls) {
+ public RemoteSolrServerConfiguration(String solrZkHost, String
solrCollection, int solrShardsNo, int solrReplicationFactor,
+ String solrConfDir, String...
solrHttpUrls) {
this.solrHttpUrls = solrHttpUrls;
this.solrZkHost = solrZkHost;
this.solrCollection = solrCollection;
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=1658451&r1=1658450&r2=1658451&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
Mon Feb 9 16:29:19 2015
@@ -17,25 +17,31 @@
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
/**
- * Defaults for Solr server configurations.
+ * Defaults for Solr configurations.
*/
public class SolrServerConfigurationDefaults {
+ // --> default values for EmbeddedSolrServerConfiguration parameters <--
public static final String SOLR_HOME_PATH = "solr";
- public static final String SOLR_CONFIG_PATH = "solr.xml";
public static final String CORE_NAME = "oak";
-
public static final String HTTP_PORT = "8983";
public static final String LOCAL_BASE_URL = "http://127.0.0.1";;
public static final String CONTEXT = "/solr";
+ // --> default values for RemoteSolrServerConfiguration parameters <--
+ public static final String COLLECTION = "oak";
+ public static final String HTTP_URL = "http://127.0.0.1:8983/solr/oak";;
+ public static final String ZK_HOST = "127.0.0.1:9983";
+ public static final int SHARDS_NO = 2;
+ 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 = 50;
public static final boolean PROPERTY_RESTRICTIONS = false;
public static final boolean PATH_RESTRICTIONS = false;
@@ -43,4 +49,5 @@ public class SolrServerConfigurationDefa
public static final String IGNORED_PROPERTIES = "";
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/UpToDateNodeStateConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfiguration.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfiguration.java
Mon Feb 9 16:29:19 2015
@@ -29,6 +29,7 @@ public class UpToDateNodeStateConfigurat
private final String path;
public UpToDateNodeStateConfiguration(NodeStore store, String path) {
+ super(store.getRoot().builder().getBaseState());
this.store = store;
this.path = path;
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
Mon Feb 9 16:29:19 2015
@@ -46,11 +46,7 @@ public class EmbeddedSolrServerConfigura
@Property(value = SolrServerConfigurationDefaults.CORE_NAME, label = "Solr
Core name")
private static final String SOLR_CORE_NAME = "solr.core.name";
- @Property(value = SolrServerConfigurationDefaults.SOLR_CONFIG_PATH, label
= "Path to specific Solr Core configuration")
- private static final String SOLR_CONFIG_FILE = "solr.config.path";
-
private String solrHome;
- private String solrConfigFile;
private String solrCoreName;
private SolrServerConfiguration<EmbeddedSolrServerProvider>
solrServerConfiguration;
@@ -63,16 +59,14 @@ public class EmbeddedSolrServerConfigura
if (!file.exists()) {
assert file.createNewFile();
}
- solrConfigFile =
String.valueOf(componentContext.getProperties().get(SOLR_CONFIG_FILE));
solrCoreName =
String.valueOf(componentContext.getProperties().get(SOLR_CORE_NAME));
- solrServerConfiguration = new
EmbeddedSolrServerConfiguration(solrHome, solrConfigFile, solrCoreName);
+ solrServerConfiguration = new
EmbeddedSolrServerConfiguration(solrHome, solrCoreName);
}
@Deactivate
protected void deactivate() throws Exception {
solrHome = null;
- solrConfigFile = null;
solrCoreName = null;
}
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=1658451&r1=1658450&r2=1658451&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
Mon Feb 9 16:29:19 2015
@@ -31,7 +31,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
@@ -110,7 +109,7 @@ public class OakSolrConfigurationProvide
private String pathDescendantsFieldName;
private String pathExactFieldName;
private String catchAllField;
- private CommitPolicy commitPolicy;
+ private OakSolrConfiguration.CommitPolicy commitPolicy;
private int rows;
private boolean useForPathRestrictions;
private boolean useForPropertyRestrictions;
@@ -130,7 +129,7 @@ public class OakSolrConfigurationProvide
pathDescendantsFieldName =
String.valueOf(componentContext.getProperties().get(PATH_DESCENDANTS_FIELD));
catchAllField =
String.valueOf(componentContext.getProperties().get(CATCH_ALL_FIELD));
rows =
Integer.parseInt(String.valueOf(componentContext.getProperties().get(ROWS)));
- commitPolicy =
CommitPolicy.valueOf(String.valueOf(componentContext.getProperties().get(COMMIT_POLICY)));
+ commitPolicy =
OakSolrConfiguration.CommitPolicy.valueOf(String.valueOf(componentContext.getProperties().get(COMMIT_POLICY)));
useForPathRestrictions =
Boolean.valueOf(String.valueOf(componentContext.getProperties().get(PATH_RESTRICTIONS)));
useForPropertyRestrictions =
Boolean.valueOf(String.valueOf(componentContext.getProperties().get(PROPERTY_RESTRICTIONS)));
useForPrimaryTypes =
Boolean.valueOf(String.valueOf(componentContext.getProperties().get(PRIMARY_TYPES_RESTRICTIONS)));
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
Mon Feb 9 16:29:19 2015
@@ -25,6 +25,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
+import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.server.RemoteSolrServerProvider;
import org.osgi.service.component.ComponentContext;
@@ -37,28 +38,22 @@ import org.osgi.service.component.Compon
@Property(name = "name", value = "remote", propertyPrivate = true)
public class RemoteSolrServerConfigurationProvider implements
SolrServerConfigurationProvider<RemoteSolrServerProvider> {
- private static final String DEFAULT_COLLECTION = "oak";
- private static final String DEFAULT_HTTP_URL = "";
- private static final String DEFAULT_ZK_HOST = "";
- private static final int DEFAULT_SHARDS_NO = 2;
- private static final int DEFAULT_REPLICATION_FACTOR = 2;
-
- @Property(value = DEFAULT_HTTP_URL, label = "Solr HTTP URL")
+ @Property(value = SolrServerConfigurationDefaults.HTTP_URL, label = "Solr
HTTP URL")
private static final String SOLR_HTTP_URL = "solr.http.url";
- @Property(value = DEFAULT_ZK_HOST, label = "ZooKeeper host")
+ @Property(value = SolrServerConfigurationDefaults.ZK_HOST, label =
"ZooKeeper host")
private static final String SOLR_ZK_HOST = "solr.zk.host";
- @Property(value = DEFAULT_COLLECTION, label = "Solr collection")
+ @Property(value = SolrServerConfigurationDefaults.COLLECTION, label =
"Solr collection")
private static final String SOLR_COLLECTION = "solr.collection";
- @Property(intValue = DEFAULT_SHARDS_NO, label = "No. of collection shards")
+ @Property(intValue = SolrServerConfigurationDefaults.SHARDS_NO, label =
"No. of collection shards")
private static final String SOLR_SHARDS_NO = "solr.shards.no";
- @Property(intValue = DEFAULT_REPLICATION_FACTOR, label = "Replication
factor")
+ @Property(intValue = SolrServerConfigurationDefaults.REPLICATION_FACTOR,
label = "Replication factor")
private static final String SOLR_REPLICATION_FACTOR =
"solr.replication.factor";
- @Property(value = "", label = "Solr configuration directory")
+ @Property(value = SolrServerConfigurationDefaults.CONFIGURATION_DIRECTORY,
label = "Solr configuration directory")
private static final String SOLR_CONF_DIR = "solr.conf.dir";
private String solrHttpUrl;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Mon Feb 9 16:29:19 2015
@@ -54,12 +54,10 @@ public class EmbeddedSolrServerProvider
String solrHomePath = solrServerConfiguration.getSolrHomePath();
String coreName = solrServerConfiguration.getCoreName();
- String solrConfigPath = solrServerConfiguration.getSolrConfigPath();
EmbeddedSolrServerConfiguration.HttpConfiguration httpConfiguration =
solrServerConfiguration.getHttpConfiguration();
-
- if (solrConfigPath != null && solrHomePath != null && coreName !=
null) {
- checkSolrConfiguration(solrHomePath, solrConfigPath, coreName);
+ if (solrHomePath != null && coreName != null) {
+ checkSolrConfiguration(solrHomePath, coreName);
if (httpConfiguration != null) {
if (log.isInfoEnabled()) {
log.info("starting embedded Solr server with http
bindings");
@@ -125,7 +123,7 @@ public class EmbeddedSolrServerProvider
}
}
- private void checkSolrConfiguration(String solrHomePath, String
solrConfigPath, String coreName) throws IOException {
+ private void checkSolrConfiguration(String solrHomePath, String coreName)
throws IOException {
// check if solrHomePath exists
File solrHomePathFile = new File(solrHomePath);
@@ -150,15 +148,6 @@ public class EmbeddedSolrServerProvider
throw new IOException("a non directory file with the specified
name already exists for the given solrHomePath '" + solrHomePath);
}
- // TODO : improve this check
- // check if solrConfigPath exists
-// File solrConfigPathFile = new File(solrConfigPath);
-// if (!solrConfigPathFile.exists()) {
-// if (solrConfigPathFile.createNewFile()) {
-// copy("/solr/solr.xml", solrConfigPathFile.getAbsolutePath());
-// }
-// }
-
// check if the a core with the given coreName exists
// TODO : improve this check
String[] files = new File(solrHomePath).list();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
Mon Feb 9 16:29:19 2015
@@ -23,7 +23,6 @@ import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import
org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
@@ -49,7 +48,7 @@ public class SolrOakRepositoryStub exten
File f = new File(path);
final SolrServer solrServer;
try {
- solrServer = new EmbeddedSolrServerProvider(new
EmbeddedSolrServerConfiguration(f.getPath(), "", "oak")).getSolrServer();
+ solrServer = new EmbeddedSolrServerProvider(new
EmbeddedSolrServerConfiguration(f.getPath(), "oak")).getSolrServer();
} catch (Exception e) {
throw new RuntimeException();
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Mon Feb 9 16:29:19 2015
@@ -21,10 +21,12 @@ import java.io.File;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
+import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
+import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
+import
org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
@@ -41,14 +43,14 @@ public class TestUtils
static final String SOLR_HOME_PATH = "/solr";
public static SolrServer createSolrServer() {
- String homePath =
SolrServerProvider.class.getResource(SOLR_HOME_PATH).getFile();
- CoreContainer coreContainer = new CoreContainer(homePath);
+ EmbeddedSolrServerConfiguration configuration = new
EmbeddedSolrServerConfiguration(
+ TestUtils.class.getResource(SOLR_HOME_PATH).getFile(), "oak");
+ EmbeddedSolrServerProvider provider = new
EmbeddedSolrServerProvider(configuration);
try {
- coreContainer.load();
+ return provider.getSolrServer();
} catch (Exception e) {
- throw new IllegalStateException(e);
+ throw new RuntimeException(e);
}
- return new EmbeddedSolrServer(coreContainer, "oak");
}
public static void cleanDataDir() {
Copied:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
(from r1657490,
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java?p2=jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java&p1=jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java&r1=1657490&r2=1658451&rev=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
Mon Feb 9 16:29:19 2015
@@ -16,10 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
+import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -29,10 +26,13 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
/**
- * Testcase for {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.FixedNodeStateConfiguration}
+ * Tests for {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrNodeStateConfiguration}
*/
-public class FixedNodeStateConfigurationTest {
+public class OakSolrNodeStateConfigurationTest {
private NodeStore store;
@@ -59,26 +59,25 @@ public class FixedNodeStateConfiguration
@Test
public void testExistingPath() throws Exception {
NodeState idxDef =
store.getRoot().getChildNode("oak:index").getChildNode("solrIdx");
- FixedNodeStateConfiguration fixedNodeStateConfiguration = new
FixedNodeStateConfiguration(idxDef);
- EmbeddedSolrServerConfiguration solrServerConfiguration =
(EmbeddedSolrServerConfiguration)
fixedNodeStateConfiguration.getSolrServerConfiguration();
- assertNotNull(solrServerConfiguration);
- assertEquals("sh", solrServerConfiguration.getSolrHomePath()); //
property defined in the node state
- assertEquals("cn", solrServerConfiguration.getCoreName()); // property
defined in the node state
- assertEquals("sc", solrServerConfiguration.getSolrConfigPath()); //
property defined in the node state
- assertEquals("path_exact",
fixedNodeStateConfiguration.getPathField()); // using default as this property
is not defined in the node state
+ OakSolrNodeStateConfiguration fixedNodeStateConfiguration = new
OakSolrNodeStateConfiguration(idxDef);
+ SolrServerConfiguration<SolrServerProvider> configuration =
fixedNodeStateConfiguration.getSolrServerConfiguration();
+// assertNotNull(configuration);
+// assertEquals("sh", configuration.getSolrHomePath()); // property
defined in the node state
+// assertEquals("cn", solrServerConfiguration.getCoreName()); //
property defined in the node state
+// assertEquals("path_exact",
fixedNodeStateConfiguration.getPathField()); // using default as this property
is not defined in the node state
}
@Test
public void testNonExistingPath() throws Exception {
NodeState idxDef =
store.getRoot().getChildNode("oak:index").getChildNode("a");
- FixedNodeStateConfiguration fixedNodeStateConfiguration = new
FixedNodeStateConfiguration(idxDef);
+ OakSolrNodeStateConfiguration fixedNodeStateConfiguration = new
OakSolrNodeStateConfiguration(idxDef);
assertNotNull(fixedNodeStateConfiguration.getSolrServerConfiguration());
}
@Test
public void testWrongNodeState() throws Exception {
NodeState idxDef = store.getRoot().getChildNode("a");
- FixedNodeStateConfiguration fixedNodeStateConfiguration = new
FixedNodeStateConfiguration(idxDef);
+ OakSolrNodeStateConfiguration fixedNodeStateConfiguration = new
OakSolrNodeStateConfiguration(idxDef);
assertFalse(fixedNodeStateConfiguration.getConfigurationNodeState().exists());
assertNotNull(fixedNodeStateConfiguration.getSolrServerConfiguration()); //
defaults are used
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationTest.java
Mon Feb 9 16:29:19 2015
@@ -36,7 +36,7 @@ public class SolrServerConfigurationTest
@Test
public void testCreteEmbeddedServerFromConfig() throws Exception {
- SolrServerConfiguration<EmbeddedSolrServerProvider>
embeddedSolrServerSolrServerConfiguration = new
EmbeddedSolrServerConfiguration(null, null, null);
+ SolrServerConfiguration<EmbeddedSolrServerProvider>
embeddedSolrServerSolrServerConfiguration = new
EmbeddedSolrServerConfiguration(null, null);
EmbeddedSolrServerProvider embeddedSolrServerProvider =
embeddedSolrServerSolrServerConfiguration.getProvider();
assertNotNull(embeddedSolrServerProvider);
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
Mon Feb 9 16:29:19 2015
@@ -59,12 +59,12 @@ public class UpToDateNodeStateConfigurat
public void testExistingPath() throws Exception {
String path = "oak:index/solrIdx";
UpToDateNodeStateConfiguration upToDateNodeStateConfiguration = new
UpToDateNodeStateConfiguration(store, path);
- EmbeddedSolrServerConfiguration solrServerConfiguration =
(EmbeddedSolrServerConfiguration)
upToDateNodeStateConfiguration.getSolrServerConfiguration();
+ SolrServerConfiguration solrServerConfiguration =
(SolrServerConfiguration)
upToDateNodeStateConfiguration.getSolrServerConfiguration();
assertNotNull(solrServerConfiguration);
- assertEquals("sh", solrServerConfiguration.getSolrHomePath()); //
property defined in the node state
- assertEquals("cn", solrServerConfiguration.getCoreName()); // property
defined in the node state
- assertEquals("sc", solrServerConfiguration.getSolrConfigPath()); //
property defined in the node state
- assertEquals("path_exact",
upToDateNodeStateConfiguration.getPathField()); // using default as this
property not defined in the node state
+// assertEquals("sh", solrServerConfiguration.getSolrHomePath()); //
property defined in the node state
+// assertEquals("cn", solrServerConfiguration.getCoreName()); //
property defined in the node state
+// assertEquals("sc", solrServerConfiguration.getSolrConfigPath()); //
property defined in the node state
+// assertEquals("path_exact",
upToDateNodeStateConfiguration.getPathField()); // using default as this
property not defined in the node state
}
@Test
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
Mon Feb 9 16:29:19 2015
@@ -25,7 +25,6 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.solr.TestUtils;
-import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java?rev=1658451&r1=1658450&r2=1658451&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProviderTest.java
Mon Feb 9 16:29:19 2015
@@ -31,8 +31,7 @@ public class EmbeddedSolrServerProviderT
@Test
public void testEmbeddedSolrServerInitialization() throws Exception {
- EmbeddedSolrServerConfiguration solrServerConfiguration = new
EmbeddedSolrServerConfiguration(getClass().getResource("/solr").getFile(),
- getClass().getResource("/solr/solr.xml").getFile(), "oak");
+ EmbeddedSolrServerConfiguration solrServerConfiguration = new
EmbeddedSolrServerConfiguration(getClass().getResource("/solr").getFile(),
"oak");
EmbeddedSolrServerProvider embeddedSolrServerProvider = new
EmbeddedSolrServerProvider(solrServerConfiguration);
SolrServer solrServer = embeddedSolrServerProvider.getSolrServer();
assertNotNull(solrServer);
