Author: joern
Date: Thu Feb 10 12:38:33 2011
New Revision: 1069362
URL: http://svn.apache.org/viewvc?rev=1069362&view=rev
Log:
UIMA-2046 Removed support for embedded solr server from SolrCASConsumer. Added
an EmbeddedSolrCASConsumer which is only used for testing. Solr dependency has
now test scope.
Added:
uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
(with props)
Modified:
uima/sandbox/trunk/Solrcas/pom.xml
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml
Modified: uima/sandbox/trunk/Solrcas/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/pom.xml?rev=1069362&r1=1069361&r2=1069362&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/pom.xml (original)
+++ uima/sandbox/trunk/Solrcas/pom.xml Thu Feb 10 12:38:33 2011
@@ -82,6 +82,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>1.4.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Modified:
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java?rev=1069362&r1=1069361&r2=1069362&view=diff
==============================================================================
---
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
(original)
+++
uima/sandbox/trunk/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
Thu Feb 10 12:38:33 2011
@@ -24,10 +24,8 @@ import java.net.URL;
import java.util.Map;
import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.core.CoreContainer;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_component.CasAnnotator_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -84,19 +82,8 @@ public class SolrCASConsumer extends Cas
if (solrInstanceTypeParam.equalsIgnoreCase("http")) {
URL solrURL = URI.create(solrPathParam).toURL();
solrServer = new CommonsHttpSolrServer(solrURL);
- } else if (solrInstanceTypeParam.equals("embedded")) {
- URL solrURL;
- if (solrPathParam.startsWith("classpath:")) {
- solrPathParam = solrPathParam.replaceFirst("classpath:", "");
- solrURL = this.getClass().getResource(solrPathParam);
- } else {
- solrURL = URI.create(solrPathParam).toURL();
- }
- System.setProperty("solr.solr.home", solrURL.getFile());
- CoreContainer.Initializer initializer = new CoreContainer.Initializer();
- CoreContainer coreContainer = initializer.initialize();
- solrServer = new EmbeddedSolrServer(coreContainer, "");
- }
+ }
+
return solrServer;
}
Added:
uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java?rev=1069362&view=auto
==============================================================================
---
uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
(added)
+++
uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
Thu Feb 10 12:38:33 2011
@@ -0,0 +1,52 @@
+/*
+ * 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.uima.solrcas;
+
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.core.CoreContainer;
+
+public class EmbeddedSolrCASConsumer extends SolrCASConsumer {
+
+ @Override
+ protected SolrServer createServer(String solrInstanceTypeParam,
+ String solrPathParam) throws Exception {
+ SolrServer solrServer = null;
+
+ if (solrInstanceTypeParam.equals("embedded")) {
+ URL solrURL;
+ if (solrPathParam.startsWith("classpath:")) {
+ solrPathParam = solrPathParam.replaceFirst("classpath:", "");
+ solrURL = this.getClass().getResource(solrPathParam);
+ } else {
+ solrURL = URI.create(solrPathParam).toURL();
+ }
+ System.setProperty("solr.solr.home", solrURL.getFile());
+ CoreContainer.Initializer initializer = new CoreContainer.Initializer();
+ CoreContainer coreContainer = initializer.initialize();
+ solrServer = new EmbeddedSolrServer(coreContainer, "");
+ }
+
+ return solrServer;
+ }
+}
Propchange:
uima/sandbox/trunk/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml?rev=1069362&r1=1069361&r2=1069362&view=diff
==============================================================================
--- uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml (original)
+++ uima/sandbox/trunk/Solrcas/src/test/resources/TestSolrcasAE.xml Thu Feb 10
12:38:33 2011
@@ -22,7 +22,7 @@
<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier";>
<primitive>true</primitive>
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-
<annotatorImplementationName>org.apache.uima.solrcas.SolrCASConsumer</annotatorImplementationName>
+
<annotatorImplementationName>org.apache.uima.solrcas.EmbeddedSolrCASConsumer</annotatorImplementationName>
<processingResourceMetaData>
<name>SolrcasAE</name>
<description/>
