You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/10/01 22:03:55 UTC
git commit: CAMEL-6613: upgrade camel-solr to use SolrJ 4.4.0. Thanks
Marios Trivizas for the patch.
Updated Branches:
refs/heads/master e0ad0c08b -> 8d73838a4
CAMEL-6613: upgrade camel-solr to use SolrJ 4.4.0. Thanks Marios Trivizas for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d73838a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d73838a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d73838a
Branch: refs/heads/master
Commit: 8d73838a47c1d11ccbf4031915290407b9ba1cae
Parents: e0ad0c0
Author: cmueller <cm...@apache.org>
Authored: Tue Oct 1 22:03:46 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Tue Oct 1 22:03:46 2013 +0200
----------------------------------------------------------------------
components/camel-solr/pom.xml | 20 ++++++++++++++++----
.../camel/component/solr/SolrProducer.java | 10 ++++++----
.../solr/SolrComponentTestSupport.java | 2 +-
.../camel/component/solr/SolrSpringTest.java | 4 ++--
.../camel/component/solr/SolrUpdateTest.java | 3 ++-
parent/pom.xml | 4 ++--
.../features/src/main/resources/features.xml | 1 +
7 files changed, 30 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/components/camel-solr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index d23598c..cde8e22 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -105,12 +105,24 @@
<artifactId>httpmime</artifactId>
<version>${httpclient4-version}</version>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty6-version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
index 56193e1..f71f637 100644
--- a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
+++ b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.solr;
import java.io.File;
import java.util.Map;
+import javax.activation.MimetypesFileTypeMap;
+
import org.apache.camel.Exchange;
import org.apache.camel.WrappedFile;
import org.apache.camel.impl.DefaultProducer;
@@ -45,7 +47,7 @@ public class SolrProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
-
+
String operation = (String) exchange.getIn().getHeader(SolrConstants.OPERATION);
if (operation == null) {
@@ -74,16 +76,16 @@ public class SolrProducer extends DefaultProducer {
}
private void insert(Exchange exchange, boolean isStreaming) throws Exception {
-
Object body = exchange.getIn().getBody();
if (body instanceof WrappedFile) {
body = ((WrappedFile<?>)body).getFile();
}
if (body instanceof File) {
-
+ MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
+ String mimeType = mimeTypesMap.getContentType((File)body);
ContentStreamUpdateRequest updateRequest = new ContentStreamUpdateRequest(getRequestHandler());
- updateRequest.addFile((File) body);
+ updateRequest.addFile((File) body, null);
for (Map.Entry<String, Object> entry : exchange.getIn().getHeaders().entrySet()) {
if (entry.getKey().startsWith(SolrConstants.PARAM)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index a63cc6e..4e0366c 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -71,7 +71,7 @@ public class SolrComponentTestSupport extends CamelTestSupport {
System.setProperty("solr.directoryFactory", "solr.RAMDirectoryFactory");
// Start a Solr instance.
- solrRunner = new JettySolrRunner("/solr", PORT);
+ solrRunner = new JettySolrRunner("src/test/resources/solr", "/solr", PORT);
solrRunner.start();
solrServer = new HttpSolrServer("http://localhost:" + PORT + "/solr");
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
index 239ed1a..6022f25 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
@@ -76,7 +76,7 @@ public class SolrSpringTest extends AbstractJUnit4SpringContextTests {
assertEquals(0, response.getStatus());
assertEquals(1, response.getResults().getNumFound());
}
-
+
@DirtiesContext
@Test
public void endToEndIndexXMLDocuments() throws Exception {
@@ -158,7 +158,7 @@ public class SolrSpringTest extends AbstractJUnit4SpringContextTests {
System.setProperty("solr.directoryFactory", "solr.RAMDirectoryFactory");
// Start a Solr instance.
- solrRunner = new JettySolrRunner("/solr", SolrComponentTestSupport.PORT);
+ solrRunner = new JettySolrRunner("src/test/resources/solr", "/solr", SolrComponentTestSupport.PORT);
solrRunner.start();
solrServer = new HttpSolrServer("http://localhost:" + SolrComponentTestSupport.PORT + "/solr");
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
index af14f78..eb9118c 100644
--- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
+++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.camel.Exchange;
import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrDocument;
@@ -123,7 +124,7 @@ public class SolrUpdateTest extends SolrComponentTestSupport {
template.send("direct:start", exchange);
- assertEquals(SolrServerException.class, exchange.getException().getClass());
+ assertEquals(HttpSolrServer.RemoteSolrException.class, exchange.getException().getClass());
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4e63b7d..0699463 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -355,8 +355,8 @@
<smack-version>3.2.1</smack-version>
<snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
<snmp4j-version>2.2.2_1</snmp4j-version>
- <solr-bundle-version>3.6.0_1</solr-bundle-version> <!-- FIXME cmueller: not in sync! -->
- <solr-version>3.6.2</solr-version>
+ <solr-bundle-version>4.4.0_1</solr-bundle-version>
+ <solr-version>4.4.0</solr-version>
<spring-batch-version>2.2.1.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/8d73838a/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b1bb554..558b935 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -898,6 +898,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-io/commons-io/1.4</bundle>
<bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle>
</feature>
<feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>