You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2011/02/18 21:34:31 UTC
svn commit: r1072131 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/contrib/dataimporthandler/
solr/contrib/dataimporthandler/src/main/webapp/admin/
solr/example/example-DIH/solr/db/conf/
solr/example/example-DIH/solr/mail/conf/ solr/exampl...
Author: yonik
Date: Fri Feb 18 20:34:30 2011
New Revision: 1072131
URL: http://svn.apache.org/viewvc?rev=1072131&view=rev
Log:
SOLR-2365: Move DIH jars out of solr.war
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Feb 18 20:34:30 2011
@@ -80,6 +80,11 @@ Upgrading from Solr 1.4
arbitrarily. Solr will now fail on any attempt to sort, or apply a
function to, multi-valued fields
+* The DataImportHandler jars are no longer included in the solr
+ WAR and should be added in Solr's lib directory, or referenced
+ via the <lib> directive in solrconfig.xml.
+
+
Detailed Change List
----------------------
@@ -630,6 +635,9 @@ Other Changes
(see SOLR-96) SimplePostTool (aka: post.jar) has been improved to
work with files of any mime-type or charset. (hossman)
+* SOLR-2365: Move DIH jars out of solr.war (David Smiley via yonik)
+
+
Build
----------------------
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/build.xml Fri Feb 18 20:34:30 2011
@@ -236,7 +236,7 @@
<fileset dir="src/main/webapp" includes="**" />
</copy>
<mkdir dir="../../build/web/WEB-INF/lib"/>
- <copy file="target/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"></copy>
+ <!--<copy file="target/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"></copy>-->
<copy file="target/${fullnamever}.jar" todir="${solr-path}/dist"></copy>
<copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${solr-path}/dist"></copy>
</target>
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp Fri Feb 18 20:34:30 2011
@@ -1,6 +1,5 @@
<%@ page import="org.apache.solr.request.SolrRequestHandler" %>
<%@ page import="java.util.Map" %>
-<%@ page import="org.apache.solr.handler.dataimport.DataImportHandler" %>
<%@ page contentType="text/html; charset=utf-8" pageEncoding="UTF-8"%>
<%--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,7 +35,7 @@ Select handler:
<ul>
<%
for (String key : handlers.keySet()) {
- if (handlers.get(key) instanceof DataImportHandler) { %>
+ if (handlers.get(key).getClass().getName().equals("org.apache.solr.handler.dataimport.DataImportHandler")) { %>
<li><a href="dataimport.jsp?handler=<%=key%>"><%=key%></a></li>
<%
}
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Fri Feb 18 20:34:30 2011
@@ -29,6 +29,8 @@
-->
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+ <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" />
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Fri Feb 18 20:34:30 2011
@@ -27,7 +27,7 @@
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
<lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" />
- <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-extras-\d.*\.jar" />
+ <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" />
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Fri Feb 18 20:34:30 2011
@@ -29,6 +29,8 @@
-->
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
+ <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" />
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1072131&r1=1072130&r2=1072131&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Fri Feb 18 20:34:30 2011
@@ -27,13 +27,7 @@
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
<lib dir="../../../../contrib/extraction/lib" />
- <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-extras-\d.*\.jar" />
-
- <!-- Used to specify an alternate directory to hold all index data
- other than the default ./data under the Solr home.
- If replication is in use, this should match the replication configuration. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
-
+ <lib dir="../../../../dist/" regex="apache-solr-dataimporthandler-.*\.jar" />
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->