[packages/solr] deploy slf jars to solr dir (tomcat is not required)

[glen]

commit bfb52d4dc4384b0d0eb7140f4550c99fd972e0f6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 5 15:21:42 2014 +0200

    deploy slf jars to solr dir (tomcat is not required)

 solr-context.xml |  2 +-
 solr.spec        | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 694e7fe..e51601d 100644
--- a/solr.spec
+++ b/solr.spec
@@ -35,7 +35,6 @@ BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		webappdir	%{_datadir}/%{name}
-%define		_tomcatdir	%{_datadir}/tomcat
 
 %description
 Solr is an open source enterprise search server based on the Lucene
@@ -100,17 +99,16 @@ for a in dist/solr-*.jar; do
 	ln -s $jar $RPM_BUILD_ROOT%{_javadir}/${jar%%-%{version}.jar}.jar
 done
 
+# install webapp
+install -d $RPM_BUILD_ROOT%{webappdir}
+cp -a war/* $RPM_BUILD_ROOT%{webappdir}
+
 # 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
+	ln -s %{_javadir}/$jar $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
 done
 
-# install webapp
-install -d $RPM_BUILD_ROOT%{webappdir}
-cp -a war/* $RPM_BUILD_ROOT%{webappdir}
-
 # install tomcat context descriptor
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_tomcatconfdir}}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
@@ -153,11 +151,6 @@ 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
 
diff --git a/solr-context.xml b/solr-context.xml
index 91fffc9..5538456 100644
--- a/solr-context.xml
+++ b/solr-context.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context path="/solr" docBase="/usr/share/solr" crossContext="true">
+<Context path="/solr" docBase="/usr/share/solr" crossContext="true" allowLinking="true">
 	<Environment name="solr/home" type="java.lang.String" value="/var/lib/solr" override="true"/>
 </Context>
================================================================

---- gitweb:

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