Author: tommaso
Date: Mon Oct 30 15:33:31 2017
New Revision: 1813780
URL: http://svn.apache.org/viewvc?rev=1813780&view=rev
Log:
OAK-6885 fix bad commit.
Modified:
jackrabbit/oak/trunk/oak-search-mt/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
Modified: jackrabbit/oak/trunk/oak-search-mt/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/pom.xml?rev=1813780&r1=1813779&r2=1813780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-mt/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-mt/pom.xml Mon Oct 30 15:33:31 2017
@@ -89,10 +89,6 @@
</plugins>
</build>
- <properties>
- <dl4j.version>0.9.1</dl4j.version>
- </properties>
-
<dependencies>
<!-- Optional OSGi dependencies, used only when running within OSGi -->
<dependency>
@@ -102,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>s
<scope>provided</scope>
</dependency>
<dependency>
@@ -128,28 +124,6 @@
<version>6.1</version>
</dependency>
- <!-- DL -->
- <dependency>
- <groupId>org.deeplearning4j</groupId>
- <artifactId>deeplearning4j-core</artifactId>
- <version>${dl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.deeplearning4j</groupId>
- <artifactId>deeplearning4j-nlp</artifactId>
- <version>${dl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-native-platform</artifactId>
- <version>${dl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.tteofili</groupId>
- <artifactId>par2hier</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java?rev=1813780&r1=1813779&r2=1813780&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
Mon Oct 30 15:33:31 2017
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.IOException;
import javax.annotation.CheckForNull;
-import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
@@ -108,6 +107,7 @@ public class RemoteSolrServerProvider im
} else {
throw new IOException("the found HTTP Solr server is not alive");
}
+
}
private SolrServer initializeWithCloudSolrServer() throws IOException {
@@ -115,7 +115,6 @@ public class RemoteSolrServerProvider im
CloudSolrServer cloudSolrServer = new
CloudSolrServer(remoteSolrServerConfiguration.getSolrZkHost());
cloudSolrServer.setZkConnectTimeout(remoteSolrServerConfiguration.getConnectionTimeout());
cloudSolrServer.setZkClientTimeout(remoteSolrServerConfiguration.getSocketTimeout());
-
cloudSolrServer.setIdField(OakSolrConfigurationDefaults.PATH_FIELD_NAME);
if (connectToZK(cloudSolrServer)) {
cloudSolrServer.setDefaultCollection("collection1"); // workaround
for first request when the needed collection may not exist
@@ -158,6 +157,7 @@ public class RemoteSolrServerProvider im
} else {
throw new IOException("could not connect to Zookeeper hosted at "
+ remoteSolrServerConfiguration.getSolrZkHost());
}
+
}
private boolean connectToZK(CloudSolrServer cloudSolrServer) {
