[lucene-solr] 01/04: Switched the dependencies to tomcat7, libservlet3.0-java and jetty8
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 6 13:48:22 UTC 2014
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 6176f060dcbb7089325f7fdbce695cfe788d449a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 22 14:15:11 2014 +0200
Switched the dependencies to tomcat7, libservlet3.0-java and jetty8
---
debian/build-jars | 27 ++++--
debian/changelog | 7 ++
debian/control | 18 ++--
debian/jetty-web.xml | 4 +-
debian/maven.rules | 5 +-
debian/patches/jetty8-compatibility.patch | 145 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/solr-jetty.postinst | 2 +-
debian/solr-jetty.postrm | 2 +-
debian/solr-tomcat.links | 2 +-
debian/solr-tomcat.postinst | 8 +-
debian/solr-tomcat.postrm | 4 +-
debian/tomcat.policy | 6 +-
13 files changed, 195 insertions(+), 36 deletions(-)
diff --git a/debian/build-jars b/debian/build-jars
index b82d8c7..a7a2845 100644
--- a/debian/build-jars
+++ b/debian/build-jars
@@ -27,18 +27,27 @@
/usr/share/java/jcl-over-slf4j.jar:./solr/lib/jcl-over-slf4j.jar
/usr/share/java/junit4.jar:./solr/lib/junit4.jar
/usr/share/java/log4j-over-slf4j.jar:./solr/lib/log4j-over-slf4j.jar
-/usr/share/java/servlet-api-2.5.jar:./solr/lib/servlet-api-2.5.jar
+/usr/share/java/servlet-api-3.0.jar:./solr/lib/servlet-api-3.0.jar
/usr/share/java/slf4j-api.jar:./solr/lib/slf4j-api.jar
/usr/share/java/slf4j-jdk14.jar:./solr/lib/slf4j-jdk14.jar
/usr/share/java/wstx-lgpl.jar:./solr/lib/wstx-lgpl.jar
-/usr/share/java/jetty.jar:./solr/example/lib/jetty.jar
-/usr/share/java/jetty-util.jar:./solr/example/lib/jetty-util.jar
-/usr/share/java/jetty-start.jar:./solr/example/lib/start.jar
-/usr/share/java/servlet-api-2.5.jar:./solr/example/lib/servlet-api-2.5.jar
-/usr/share/java/jsp-api-2.1.jar:./solr/example/lib/jsp-api-2.1.jar
-/usr/share/java/el-api-2.1.jar:./solr/example/lib/el-api-2.1.jar
-/usr/share/java/jasper.jar:./solr/example/lib/jasper.jar
-/usr/share/java/jasper-el.jar:./solr/example/lib/jasper-el.jar
+/usr/share/java/jetty8-server.jar:./solr/example/lib/jetty-server.jar
+/usr/share/java/jetty8-servlet.jar:./solr/example/lib/jetty-servlet.jar
+/usr/share/java/jetty8-http.jar:./solr/example/lib/jetty-http.jar
+/usr/share/java/jetty8-continuation.jar:./solr/example/lib/jetty-continuation.jar
+/usr/share/java/jetty8-io.jar:./solr/example/lib/jetty-io.jar
+/usr/share/java/jetty8-util.jar:./solr/example/lib/jetty-util.jar
+/usr/share/java/jetty8-security.jar:./solr/example/lib/jetty-security.jar
+/usr/share/java/jetty8-webapp.jar:./solr/example/lib/jetty-webapp.jar
+/usr/share/java/jetty8-xml.jar:./solr/example/lib/jetty-xml.jar
+/usr/share/java/jetty8-start.jar:./solr/example/lib/start.jar
+/usr/share/java/servlet-api-3.0.jar:./solr/example/lib/servlet-api-3.0.jar
+/usr/share/java/jsp-api-2.2.jar:./solr/example/lib/jsp-api-2.2.jar
+/usr/share/java/el-api-2.2.jar:./solr/example/lib/el-api-2.2.jar
+/usr/share/tomcat7/lib/tomcat-api.jar:./solr/example/lib/tomcat-api.jar
+/usr/share/tomcat7/lib/tomcat-util.jar:./solr/example/lib/tomcat-util.jar
+/usr/share/tomcat7/lib/jasper.jar:./solr/example/lib/jasper.jar
+/usr/share/tomcat7/lib/jasper-el.jar:./solr/example/lib/jasper-el.jar
/usr/share/java/tomcat-juli.jar:./solr/example/lib/tomcat-juli.jar
/usr/share/java/tomcat-coyote.jar:./solr/example/lib/tomcat-coyote.jar
/usr/share/java/ecj.jar:./solr/example/lib/ecj.jar
diff --git a/debian/changelog b/debian/changelog
index 1e5f7a4..49b3d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene-solr (3.6.2+dfsg-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Switched the dependencies to tomcat7, libservlet3.0-java and jetty8
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 13 Mar 2014 16:26:17 +0100
+
lucene-solr (3.6.2+dfsg-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index fdf2f9f..2203ec1 100644
--- a/debian/control
+++ b/debian/control
@@ -31,13 +31,13 @@ Build-Depends:
libhttpclient-java (>= 4.1.1),
libhttpmime-java,
libicu4j-4.4-java,
- libjetty-java (>= 6.1.21),
+ libjetty8-java (>= 8.1.16-2~),
libjmock-java,
liblog4j1.2-java,
libregexp-java,
- libservlet2.5-java (>= 6.0.20),
+ libservlet3.0-java,
libslf4j-java (>= 1.6.1),
- libtomcat6-java,
+ libtomcat7-java,
libwoodstox-java,
libxerces2-java,
libxml-commons-external-java,
@@ -112,7 +112,7 @@ Depends:
libhttpmime-java,
liblucene3-contrib-java,
liblucene3-java,
- libservlet2.5-java (>= 6.0.20),
+ libservlet3.0-java,
libslf4j-java (>= 1.6.1),
libwoodstox-java,
${misc:Depends}
@@ -121,8 +121,8 @@ Replaces: solr-common (<< 3.6.0-1)
Suggests:
junit4,
libeasymock-java,
- libjetty-extras-java,
- libjetty-java,
+ libjetty8-extras-java (>= 8.1.16-2~),
+ libjetty8-java (>= 8.1.16-2~),
libsolr-java-doc
Description: Enterprise search server based on Lucene - Java libraries
Solr is an open source enterprise search server based on the Lucene
@@ -162,7 +162,7 @@ Description: Enterprise search server based on Lucene3 - common files
Package: solr-tomcat
Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat6, ${misc:Depends}
+Depends: solr-common (= ${binary:Version}), tomcat7, ${misc:Depends}
Conflicts: solr-jetty, solr-tomcat6
Description: Enterprise search server based on Lucene3 - Tomcat integration
Solr is an open source enterprise search server based on the Lucene
@@ -175,8 +175,8 @@ Description: Enterprise search server based on Lucene3 - Tomcat integration
Package: solr-jetty
Architecture: all
Depends:
- jetty (>= 6.1.22),
- libjetty-extra-java (>= 6.1.22),
+ jetty8 (>= 8.1.16-2~),
+ libjetty8-extra-java,
solr-common (= ${binary:Version}),
default-jdk | java5-sdk,
${misc:Depends}
diff --git a/debian/jetty-web.xml b/debian/jetty-web.xml
index 0b51466..9a9c3bc 100644
--- a/debian/jetty-web.xml
+++ b/debian/jetty-web.xml
@@ -3,11 +3,9 @@
"http://jetty.mortbay.org/configure.dtd">
<!-- Set the solr.solr.home system property -->
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+<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/maven.rules b/debian/maven.rules
index 224a773..9be585e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,9 +17,8 @@
# junit junit jar s/3\\..*/3.x/
commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
-javax.activation s/activation/gnujaf/ * s/.*/debian/ * *
org.apache.geronimo.specs s/geronimo-stax-api_1.0_spec/geronimo-activation_1.1_spec/ * s/.*/debian/ * *
org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * *
-javax.servlet servlet-api * s/2\..*/2.5/ * *
+javax.servlet servlet-api * s/.*/3.0/ * *
junit junit * s/4\..*/4.x/ * *
-org.mortbay.jetty * * s/6\..*/6.x/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/debian/ * *
diff --git a/debian/patches/jetty8-compatibility.patch b/debian/patches/jetty8-compatibility.patch
new file mode 100644
index 0000000..e959eb5
--- /dev/null
+++ b/debian/patches/jetty8-compatibility.patch
@@ -0,0 +1,145 @@
+Description: Update to Jetty 8
+Origin: backport, https://svn.apache.org/r1298108
+--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
++++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+@@ -22,19 +22,20 @@
+ import java.net.URL;
+ import java.util.Random;
+
++import javax.servlet.DispatcherType;
+ import javax.servlet.http.HttpServlet;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+
+ import org.apache.solr.servlet.SolrDispatchFilter;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.bio.SocketConnector;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.FilterHolder;
+-import org.mortbay.jetty.servlet.HashSessionIdManager;
+-import org.mortbay.log.Logger;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.FilterHolder;
++import org.eclipse.jetty.server.session.HashSessionIdManager;
++import org.eclipse.jetty.util.log.Logger;
+
+ /**
+ * Run solr using jetty
+@@ -90,11 +91,11 @@
+ server.setStopAtShutdown( true );
+
+ // Initialize the servlets
+- Context root = new Context( server, context, Context.SESSIONS );
++ ServletContextHandler root = new ServletContextHandler(server,context,ServletContextHandler.SESSIONS);
+
+ // for some reason, there must be a servlet for this to get applied
+ root.addServlet( Servlet404.class, "/*" );
+- dispatchFilter = root.addFilter( SolrDispatchFilter.class, "*", Handler.REQUEST );
++ dispatchFilter = root.addFilter(SolrDispatchFilter.class, "*", java.util.EnumSet.of(DispatcherType.REQUEST) );
+ }
+
+ //------------------------------------------------------------------------------------------------
+@@ -220,11 +221,48 @@
+ debug=enabled;
+ }
+
+- public void info(String msg,Object arg0, Object arg1) {}
+ public void debug(String msg,Throwable th){}
+- public void debug(String msg,Object arg0, Object arg1){}
+- public void warn(String msg,Object arg0, Object arg1){}
+- public void warn(String msg, Throwable th){}
++
++ @Override
++ public void debug(Throwable arg0) {
++ }
++
++ @Override
++ public void debug(String arg0, Object... arg1) {
++ }
++
++ @Override
++ public String getName() {
++ return toString();
++ }
++
++ @Override
++ public void ignore(Throwable arg0) {
++ }
++
++ @Override
++ public void info(Throwable arg0) {
++ }
++
++ @Override
++ public void info(String arg0, Object... arg1) {
++ }
++
++ @Override
++ public void info(String arg0, Throwable arg1) {
++ }
++
++ @Override
++ public void warn(Throwable arg0) {
++ }
++
++ @Override
++ public void warn(String arg0, Object... arg1) {
++ }
++
++ @Override
++ public void warn(String arg0, Throwable arg1) {
++ }
+
+ public Logger getLogger(String name)
+ {
+--- a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
++++ b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
+@@ -17,10 +17,10 @@
+
+ package org.apache.solr.client.solrj;
+
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.bio.SocketConnector;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ /**
+ * @since solr 1.3
+@@ -52,7 +52,7 @@
+ // mBeanContainer.start();
+ // }
+
+- server.addHandler(bb);
++ server.setHandler(bb);
+
+ try {
+ System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
+--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
++++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+@@ -29,11 +29,11 @@
+ import org.junit.Rule;
+ import org.junit.rules.RuleChain;
+ import org.junit.rules.TestRule;
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.bio.SocketConnector;
+-import org.mortbay.jetty.servlet.HashSessionIdManager;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.server.session.HashSessionIdManager;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ /**
+ * @version $Id$
diff --git a/debian/patches/series b/debian/patches/series
index 0a6edb8..ad076e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ regex-test-failure.patch
remove-prettify.patch
CVE-2013-6397.patch
CVE-2013-6407_CVE-2013-6408.patch
+jetty8-compatibility.patch
diff --git a/debian/solr-jetty.postinst b/debian/solr-jetty.postinst
index fd0c895..3357b58 100644
--- a/debian/solr-jetty.postinst
+++ b/debian/solr-jetty.postinst
@@ -19,7 +19,7 @@ case "$1" in
chown -R jetty:root /var/lib/solr/data
fi
- invoke-rc.d --quiet jetty restart || {
+ invoke-rc.d --quiet jetty8 restart || {
RESULT=$?
# Ignore if jetty init script does not exist (yet)
if [ $RESULT != 100 ]; then
diff --git a/debian/solr-jetty.postrm b/debian/solr-jetty.postrm
index 3edc322..9400cba 100644
--- a/debian/solr-jetty.postrm
+++ b/debian/solr-jetty.postrm
@@ -17,7 +17,7 @@ case "$1" in
fi
if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d jetty restart || true
+ invoke-rc.d jetty8 restart || true
fi
;;
upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/solr-tomcat.links b/debian/solr-tomcat.links
index 98b3a49..b32ab49 100644
--- a/debian/solr-tomcat.links
+++ b/debian/solr-tomcat.links
@@ -1 +1 @@
-/etc/solr/solr-tomcat.xml /etc/tomcat6/Catalina/localhost/solr.xml
+/etc/solr/solr-tomcat.xml /etc/tomcat7/Catalina/localhost/solr.xml
diff --git a/debian/solr-tomcat.postinst b/debian/solr-tomcat.postinst
index f81d51c..f08c7e0 100644
--- a/debian/solr-tomcat.postinst
+++ b/debian/solr-tomcat.postinst
@@ -11,10 +11,10 @@ case "$1" in
chown root:root /var/lib/solr
chmod 755 /var/lib/solr
- chown -R tomcat6:tomcat6 /var/lib/solr/data
+ chown -R tomcat7:tomcat7 /var/lib/solr/data
chmod -R 770 /var/lib/solr/data
- ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy
+ ln -sf /etc/solr/tomcat.policy /etc/tomcat7/policy.d/05solr.policy
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -28,9 +28,9 @@ case "$1" in
esac
-invoke-rc.d --quiet tomcat6 restart || {
+invoke-rc.d --quiet tomcat7 restart || {
RESULT=$?
- # Ignore if tomcat6 init script does not exist (yet)
+ # Ignore if tomcat7 init script does not exist (yet)
if [ $RESULT != 100 ]; then
exit $RESULT
fi
diff --git a/debian/solr-tomcat.postrm b/debian/solr-tomcat.postrm
index c31450b..cb4fe35 100644
--- a/debian/solr-tomcat.postrm
+++ b/debian/solr-tomcat.postrm
@@ -4,9 +4,9 @@ set -e
case "$1" in
remove)
- rm -f /etc/tomcat6/policy.d/05solr.policy
+ rm -f /etc/tomcat7/policy.d/05solr.policy
if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d tomcat6 restart || true
+ invoke-rc.d tomcat7 restart || true
fi
;;
upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/tomcat.policy b/debian/tomcat.policy
index 4f23ffb..9b62c43 100644
--- a/debian/tomcat.policy
+++ b/debian/tomcat.policy
@@ -10,9 +10,9 @@ grant codeBase "file:/usr/share/solr/-" {
permission java.io.FilePermission "/usr/share/java", "read";
permission java.io.FilePermission "/usr/share/java/-", "read";
permission java.io.FilePermission "/usr/share/maven-repo/-", "read";
- permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
- permission java.io.FilePermission "/var/lib/tomcat6/webapps/solr/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
+ permission java.io.FilePermission "/var/log/tomcat7/-", "read,write";
+ permission java.io.FilePermission "/var/lib/tomcat7/webapps/solr/-", "read";
+ permission java.io.FilePermission "/var/lib/tomcat7/temp/-", "read,write";
permission java.io.FilePermission "/etc/solr/-", "read";
permission java.io.FilePermission "/usr/share/solr/-", "read";
permission java.io.FilePermission "/usr/share/solr", "read";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git
More information about the pkg-java-commits
mailing list