This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository lucene-solr.
commit 3e6108952f04588f87c4994150848ab80fa030cf Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 31 19:19:18 2014 +0100 Fixed the integration with jetty8 (Closes: #752547, #701876) --- debian/changelog | 8 ++++++++ debian/jetty-web.xml | 11 ----------- debian/solr-jetty.install | 2 +- debian/solr-jetty.links | 2 +- debian/solr-jetty.xml | 22 ++++++++++++++++++++++ 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98b8ba9..7bc519e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lucene-solr (3.6.2+dfsg-5) UNRELEASED; urgency=medium + + * Team upload. + * Fixed the deployment with Jetty 8 (Closes: #752547) + * Enable the symbolic links with Jetty (Closes: #701876) + + -- Emmanuel Bourg <[email protected]> Fri, 31 Oct 2014 12:20:12 +0100 + lucene-solr (3.6.2+dfsg-4) unstable; urgency=medium * Team upload. diff --git a/debian/jetty-web.xml b/debian/jetty-web.xml deleted file mode 100644 index 9a9c3bc..0000000 --- a/debian/jetty-web.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" -"http://jetty.mortbay.org/configure.dtd";> - -<!-- Set the solr.solr.home system property --> -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setProperty" class="java.lang.System"> - <Arg type="String">solr.solr.home</Arg> - <Arg type="String">/usr/share/solr</Arg> - </Call> -</Configure> diff --git a/debian/solr-jetty.install b/debian/solr-jetty.install index 6328a46..730c165 100644 --- a/debian/solr-jetty.install +++ b/debian/solr-jetty.install @@ -1 +1 @@ -debian/jetty-web.xml /usr/share/solr/web/WEB-INF/ +debian/solr-jetty.xml /etc/solr/ diff --git a/debian/solr-jetty.links b/debian/solr-jetty.links index b27a931..c752f00 100644 --- a/debian/solr-jetty.links +++ b/debian/solr-jetty.links @@ -1 +1 @@ -/usr/share/solr/web /var/lib/jetty/webapps/solr +/etc/solr/solr-jetty.xml /etc/jetty8/contexts/solr.xml diff --git a/debian/solr-jetty.xml b/debian/solr-jetty.xml new file mode 100644 index 0000000..edf7576 --- /dev/null +++ b/debian/solr-jetty.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> + +<!-- Context configuration file for the Solr web application in Jetty --> + +<Configure class="org.eclipse.jetty.webapp.WebAppContext"> + <Set name="contextPath">/solr</Set> + <Set name="war">/usr/share/solr/web</Set> + + <!-- Set the solr.solr.home system property --> + <Call name="setProperty" class="java.lang.System"> + <Arg type="String">solr.solr.home</Arg> + <Arg type="String">/usr/share/solr</Arg> + </Call> + + <!-- Enable symlinks --> + <Call name="addAliasCheck"> + <Arg> + <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/> + </Arg> + </Call> +</Configure> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
