[packages/solr] load slf4j jars into Tomcat

[glen]

commit e80ed4c1c57548fbb4e6d5326861240635e3b011
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 26 19:41:42 2013 +0300

    load slf4j jars into Tomcat
    
    SEVERE: Exception starting filter SolrRequestFilter
    org.apache.solr.common.SolrException: Could not find necessary SLF4j logging jars. If using Jetty, the SLF4j logging jars need to go in the jetty lib/ext directory. For other containers, the corresponding directory should be used. For more information, see: http://wiki.apache.org/solr/SolrLogging

 solr.spec | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index d733d95..9d7aea4 100644
--- a/solr.spec
+++ b/solr.spec
@@ -13,7 +13,7 @@ Summary:	Solr - open source enterprise search server
 Summary(pl.UTF-8):	Solr - profesjonalny serwer wyszukiwarki o otwartych źródłach
 Name:		solr
 Version:	4.5.0
-Release:	0.1
+Release:	0.2
 License:	Apache v2.0
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/lucene/solr/%{version}/%{name}-%{version}.tgz
@@ -27,13 +27,15 @@ BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java-%{name} = %{version}-%{release}
+Requires:	java-slf4j >= 1.6
 Requires:	jpackage-utils
 Requires:	tomcat
 Obsoletes:	apache-solr < 3.6.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		webappdir %{_datadir}/%{name}
+%define		webappdir	%{_datadir}/%{name}
+%define		_tomcatdir	%{_datadir}/tomcat
 
 %description
 Solr is an open source enterprise search server based on the Lucene
@@ -98,6 +100,13 @@ for a in dist/solr-*.jar; do
 	ln -s $jar $RPM_BUILD_ROOT%{_javadir}/${jar%%-%{version}.jar}.jar
 done
 
+# get logging jars to tomcat to load
+# http://wiki.apache.org/solr/SolrLogging
+install -d $RPM_BUILD_ROOT%{_tomcatdir}/lib
+for jar in slf4j-api.jar jcl-over-slf4j.jar; do
+	ln -s %{_javadir}/$jar $RPM_BUILD_ROOT%{_tomcatdir}/lib
+done
+
 # install webapp
 install -d $RPM_BUILD_ROOT%{webappdir}
 cp -a war/* $RPM_BUILD_ROOT%{webappdir}
@@ -144,6 +153,11 @@ rm -rf $RPM_BUILD_ROOT
 %{webappdir}/js
 %{webappdir}/tpl
 
+# make tomcat load these jars
+# FIXME: how to do this "properly"
+%{_tomcatdir}/lib/jcl-over-slf4j.jar
+%{_tomcatdir}/lib/slf4j-api.jar
+
 %dir %{_sharedstatedir}/%{name}
 %{_sharedstatedir}/%{name}/solr.xml
 
@@ -154,8 +168,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(750,root,servlet) %dir %{_sharedstatedir}/%{name}/example
 %attr(2775,root,servlet) %dir %{_sharedstatedir}/%{name}/example/data
 
-   /var/lib/solr/example/example
-
 %files -n java-%{name}
 %defattr(644,root,root,755)
 %{_javadir}/solr-*.jar
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/solr.git/commitdiff/bd628ad413e151e4676688bedbf59b6bf95e2115