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:16:08 UTC
svn commit: r1072127 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/ contrib/dataimporthandler/src/main/webapp/admin/
example/example-DIH/solr/db/conf/ example/example-DIH/solr/mail/conf/
example/example-DIH/solr/rss/conf/ example/example-DI...
Author: yonik
Date: Fri Feb 18 20:16:07 2011
New Revision: 1072127
URL: http://svn.apache.org/viewvc?rev=1072127&view=rev
Log:
SOLR-2365: Move DIH jars out of solr.war
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Feb 18 20:16:07 2011
@@ -54,7 +54,6 @@ Upgrading from Solr 3.1-dev
their solrconfig.xml file.
-
Detailed Change List
----------------------
@@ -268,6 +267,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
----------------------
@@ -788,6 +792,8 @@ Other Changes
* SOLR-2340: Add version infos to message in JavaBinCodec when throwing
exception. (koji)
+* SOLR-2365: Move DIH jars out of solr.war (David Smiley via yonik)
+
Build
----------------------
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Fri Feb 18 20:16:07 2011
@@ -276,7 +276,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/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp Fri Feb 18 20:16:07 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/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
@@ -28,6 +28,8 @@
<jmx />
+ <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/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
@@ -27,7 +27,7 @@
<luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<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/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
@@ -28,6 +28,8 @@
<jmx />
+ <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/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
@@ -27,13 +27,7 @@
<luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<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. -->
Re: svn commit: r1072127 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/ contrib/dataimporthandler/src/main/webapp/admin/
example/example-DIH/solr/db/conf/ example/example-DIH/solr/mail/conf/
example/example-DIH/solr/rss/conf/ example/example-DI...
Posted by Chris Hostetter <ho...@fucit.org>.
: looks like apache-solr-dataimporthandler-extras-\d.*\.jar was removed
: from tika and mail samples in this commit. Is it correct?
I don't think so ... the pattern was just expanded to get all the DIH
jars (including the extras)...
: > <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"
-Hoss
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1072127 - in /lucene/dev/trunk/solr: ./ contrib/dataimporthandler/
contrib/dataimporthandler/src/main/webapp/admin/ example/example-DIH/solr/db/conf/
example/example-DIH/solr/mail/conf/ example/example-DIH/solr/rss/conf/ example/example-DI...
Posted by Koji Sekiguchi <ko...@r.email.ne.jp>.
looks like apache-solr-dataimporthandler-extras-\d.*\.jar was removed
from tika and mail samples in this commit. Is it correct?
Koji
--
http://www.rondhuit.com/en/
(11/02/19 5:16), yonik@apache.org wrote:
> Author: yonik
> Date: Fri Feb 18 20:16:07 2011
> New Revision: 1072127
>
> URL: http://svn.apache.org/viewvc?rev=1072127&view=rev
> Log:
> SOLR-2365: Move DIH jars out of solr.war
>
> Modified:
> lucene/dev/trunk/solr/CHANGES.txt
> lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
> lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
> lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
> lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
> lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
> lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
>
> Modified: lucene/dev/trunk/solr/CHANGES.txt
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/CHANGES.txt (original)
> +++ lucene/dev/trunk/solr/CHANGES.txt Fri Feb 18 20:16:07 2011
> @@ -54,7 +54,6 @@ Upgrading from Solr 3.1-dev
> their solrconfig.xml file.
>
>
> -
> Detailed Change List
> ----------------------
>
> @@ -268,6 +267,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
> ----------------------
>
> @@ -788,6 +792,8 @@ Other Changes
> * SOLR-2340: Add version infos to message in JavaBinCodec when throwing
> exception. (koji)
>
> +* SOLR-2365: Move DIH jars out of solr.war (David Smiley via yonik)
> +
>
> Build
> ----------------------
>
> Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
> +++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Fri Feb 18 20:16:07 2011
> @@ -276,7 +276,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/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp (original)
> +++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp Fri Feb 18 20:16:07 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/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
> +++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
> @@ -28,6 +28,8 @@
>
> <jmx />
>
> +<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/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
> +++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
> @@ -27,7 +27,7 @@
> <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
>
> <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/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
> +++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
> @@ -28,6 +28,8 @@
>
> <jmx />
>
> +<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/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1072127&r1=1072126&r2=1072127&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
> +++ lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Fri Feb 18 20:16:07 2011
> @@ -27,13 +27,7 @@
> <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
>
> <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. -->
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org