Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2019-02-06 15:47:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat"
Wed Feb 6 15:47:42 2019 rev:49 rq:671958 version:9.0.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2019-01-15
09:14:44.338326752 +0100
+++ /work/SRC/openSUSE:Factory/.tomcat.new.28833/tomcat.changes 2019-02-06
15:47:46.627246124 +0100
@@ -1,0 +2,28 @@
+Tue Feb 5 09:50:35 UTC 2019 - ma...@suse.com
+
+- Move webapps bundled with Tomcat to /usr/share/tomcat/tomcat-webapps
+ (bsc#1092341). Affected packages:
+ - tomcat-webapps
+ - tomcat-admin-webapps
+ - tomcat-docs-webapp
+- Remove %doc directive from tomcat-docs-webapps files section so that
+ zypper installs files even if rpm.install.excludedocs is set to yes.
+
+-------------------------------------------------------------------
+Mon Feb 4 15:35:43 UTC 2019 - ma...@suse.com
+
+- Require Java 1.8 or later (bsc#1123407)
+
+-------------------------------------------------------------------
+Sat Jan 26 08:07:36 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Clean up OSGi manifest injection
+- Put embed maven metadata into embed subpackage
+- Use the .mfiles* lists generated by %%add_maven_depmap macro
+
+-------------------------------------------------------------------
+Wed Jan 16 17:05:36 UTC 2019 - ma...@suse.com
+
+- Fix tomcat-tool-wrapper classpath error (bsc#1120745)
+
+-------------------------------------------------------------------
New:
----
tomcat-serverxml-tool.sh
tomcat-serverxml-tool.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.623245521 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.623245521 +0100
@@ -35,6 +35,8 @@
%define cachedir %{_localstatedir}/cache/%{name}
%define tempdir %{cachedir}/temp
%define workdir %{cachedir}/work
+%define tomcatappdir %{_datadir}/%{name}/tomcat-webapps
+%define serverxmltool %{_libexecdir}/%{name}/serverxml-tool.sh
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -68,6 +70,8 @@
Source30: tomcat-preamble
Source31: tomcat-server
Source32: tomcat-named.service
+Source33: tomcat-serverxml-tool.tar.gz
+Source34: tomcat-serverxml-tool.sh
Source1000: tomcat-rpmlintrc
Source1001:
https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
Source1002: %{name}.keyring
@@ -85,6 +89,7 @@
Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch
# PATCH-FIX-OPENSUSE: disable adding OSGi metadata to JAR files because
bndtools is not avalable in SLES/OpenSUSE
Patch5: tomcat-9.0-disable-osgi-build.patch
+
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr
BuildRequires: apache-commons-collections
@@ -115,6 +120,7 @@
Requires: apache-commons-dbcp
Requires: apache-commons-logging
Requires: apache-commons-pool2
+Requires: java >= 1.8
Requires: log4j
Requires(post): %fillup_prereq
Requires(pre): %{_sbindir}/groupadd
@@ -184,7 +190,8 @@
%package jsp-2_3-api
Summary: Apache Tomcat JSP API implementation classes
Group: Productivity/Networking/Web/Servers
-Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
+Requires: mvn(org.apache.tomcat:tomcat-el-api)
+Requires: mvn(org.apache.tomcat:tomcat-servlet-api)
Requires(post): update-alternatives
Requires(postun): update-alternatives
Provides: %{name}-jsp-%{jspspec}-api
@@ -248,6 +255,8 @@
%prep
%setup -q -n %{packdname}
+%setup -q -D -T -n %{packdname} -b 33
+
# remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name
"*.gz" -o \
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f
@@ -311,28 +320,18 @@
popd
# inject OSGi manifests
-mkdir -p META-INF
-cp -p %{SOURCE8} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE9} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE12} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/el-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE13} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jasper-el.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE14} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/jasper.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE15} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/lib/tomcat-api.jar META-INF/MANIFEST.MF
-cp -p %{SOURCE16} META-INF/MANIFEST.MF
-touch META-INF/MANIFEST.MF
-zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
+jar ufm output/build/lib/servlet-api.jar %{SOURCE8}
+jar ufm output/build/lib/jsp-api.jar %{SOURCE9}
+jar ufm output/build/lib/el-api.jar %{SOURCE12}
+jar ufm output/build/lib/jasper-el.jar %{SOURCE13}
+jar ufm output/build/lib/jasper.jar %{SOURCE14}
+jar ufm output/build/lib/tomcat-api.jar %{SOURCE15}
+jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16}
+
+pushd %{_builddir}/tomcat-serverxml-tool
+javac com/suse/tcserverxml/ApplyStylesheet.java
+jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet
com/suse/tcserverxml/ApplyStylesheet.class
com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt
+popd
%install
%if 0%{?suse_version} == 1110
@@ -347,6 +346,7 @@
install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
install -d -m 0755 %{buildroot}%{appdir}
+install -d -m 0755 %{buildroot}%{tomcatappdir}
install -d -m 0755 %{buildroot}%{bindir}
install -d -m 0775 %{buildroot}%{confdir}
install -d -m 0755 %{buildroot}%{cachedir}/Catalina/localhost
@@ -371,7 +371,7 @@
cp %{SOURCE10} conf/log4j.properties
cp -a conf/*.{policy,properties,xml} %{buildroot}%{confdir}
cp -a lib/*.jar %{buildroot}%{libdir}
- cp -a webapps/* %{buildroot}%{appdir}
+ cp -a webapps/* %{buildroot}%{tomcatappdir}
popd
# tomcat embedded
pushd output/embed
@@ -469,26 +469,26 @@
popd
# install sample webapp
-mkdir -p %{buildroot}%{appdir}/sample
-pushd %{buildroot}%{appdir}/sample
-%jar xf %{buildroot}%{appdir}/docs/appdev/sample/sample.war
+mkdir -p %{buildroot}%{tomcatappdir}/sample
+pushd %{buildroot}%{tomcatappdir}/sample
+%jar xf %{buildroot}%{tomcatappdir}/docs/appdev/sample/sample.war
popd
# Allow linking for example webapp
-mkdir -p %{buildroot}%{appdir}/examples/META-INF
-pushd %{buildroot}%{appdir}/examples/META-INF
+mkdir -p %{buildroot}%{tomcatappdir}/examples/META-INF
+pushd %{buildroot}%{tomcatappdir}/examples/META-INF
echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
echo '<Context>'>>context.xml
echo ' <Resources allowLinking="true" />'>>context.xml
echo '</Context>'>>context.xml
popd
-pushd %{buildroot}%{appdir}/examples/WEB-INF/lib
+pushd %{buildroot}%{tomcatappdir}/examples/WEB-INF/lib
ln -s -f $(build-classpath jakarta-taglibs-core) jstl.jar
ln -s -f $(build-classpath jakarta-taglibs-standard) standard.jar
popd
-rm %{buildroot}%{appdir}/docs/appdev/sample/sample.war
+rm %{buildroot}%{tomcatappdir}/docs/appdev/sample/sample.war
# Install the maven metadata
install -d -m 0755 %{buildroot}%{_mavenpomdir}
@@ -506,16 +506,16 @@
# servlet-api jsp-api and el-api are not in tomcat subdir, since they are
widely re-used elsewhere
cp -a tomcat-jsp-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f
"tomcat-jsp-api" -a
"javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f jsp-api -a
"org.eclipse.jetty.orbit:javax.servlet.jsp"
cp -a tomcat-el-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api"
-a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el"
+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f el-api -a
"org.eclipse.jetty.orbit:javax.el"
cp -a tomcat-servlet-api.pom
%{buildroot}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
# Generate a depmap fragment javax.servlet:servlet-api pointing to
# tomcat-servlet-3.0-api for backwards compatibility
# also provide jetty depmap (originally in jetty package, but it's cleaner to
have it here
-%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f
"tomcat-servlet-api" -a
"javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api"
+%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f
servlet-api -a "org.mortbay.jetty:servlet-api"
# two special pom where jar files have different names
cp -a tomcat-tribes.pom
%{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
@@ -546,18 +546,18 @@
%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar
cp -a tomcat-embed-core.pom
%{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom
%{name}/tomcat-embed-core.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-core.pom
%{name}/tomcat-embed-core.jar -f embed
cp -a tomcat-embed-el.pom
%{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-el.pom %{name}/tomcat-embed-el.jar
-f embed
cp -a tomcat-embed-jasper.pom
%{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom
%{name}/tomcat-embed-jasper.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom
%{name}/tomcat-embed-jasper.jar -f embed
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
cp -a tomcat-embed-websocket.pom
%{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom
%{name}/tomcat-embed-websocket.jar
+%add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom
%{name}/tomcat-embed-websocket.jar -f embed
# replace temporary copy with link
ln -s -f %{bindir}/tomcat-juli.jar %{buildroot}%{libdir}/
@@ -586,6 +586,13 @@
f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
EOF
+# Install tool used to edit server.xml
+pushd %{_builddir}/tomcat-serverxml-tool
+install -m 0755 %{SOURCE34} \
+ %{buildroot}%{_libexecdir}/%{name}/serverxml-tool.sh
+cp serverxmltool.jar %{buildroot}%{_libexecdir}/%{name}/
+popd
+
%pre
# add the tomcat user and group
%{_sbindir}/groupadd -r tomcat 2>/dev/null || :
@@ -654,6 +661,36 @@
%{libdir}/\[commons-pool-tomcat5\].jar \
%{libdir}/\[ecj\].jar >/dev/null 2>&1
+%post webapps
+%{serverxmltool} add %{tomcatappdir}/ROOT /
+%{serverxmltool} add %{tomcatappdir}/sample /sample
+%{serverxmltool} add %{tomcatappdir}/examples /examples
+
+%postun webapps
+if [ $1 -eq 0 ]; then # uninstall only
+ %{serverxmltool} remove %{tomcatappdir}/ROOT /
+ %{serverxmltool} remove %{tomcatappdir}/sample /sample
+ %{serverxmltool} remove %{tomcatappdir}/examples /example
+fi
+
+%post admin-webapps
+%{serverxmltool} add %{tomcatappdir}/host-manager /host-manager
%{tomcatappdir}/host-manager/META-INF/context.xml
+%{serverxmltool} add %{tomcatappdir}/manager /manager
%{tomcatappdir}/manager/META-INF/context.xml
+
+%postun admin-webapps
+if [ $1 -eq 0 ]; then # uninstall only
+ %{serverxmltool} remove %{tomcatappdir}/host-manager /host-manager
+ %{serverxmltool} remove %{tomcatappdir}/manager /manager
+fi
+
+%post docs-webapp
+%{serverxmltool} add %{tomcatappdir}/docs /docs
+
+%postun docs-webapp
+if [ $1 -eq 0 ]; then # uninstall only
+ %{serverxmltool} remove %{tomcatappdir}/docs /docs
+fi
+
%files
%defattr(0664,root,tomcat,0755)
%doc {LICENSE,NOTICE,RELEASE*}
@@ -668,6 +705,8 @@
%attr(0755,root,root) %{_libexecdir}/%{name}/functions
%attr(0755,root,root) %{_libexecdir}/%{name}/preamble
%attr(0755,root,root) %{_libexecdir}/%{name}/server
+%attr(0755,root,root) %{_libexecdir}/%{name}/serverxml-tool.sh
+%attr(0644,root,root) %{_libexecdir}/%{name}/serverxmltool.jar
#bnc#565901
%{bindir}/catalina.sh
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -681,6 +720,7 @@
%defattr(0664,root,tomcat,0770)
%attr(0770,root,tomcat) %dir %{tempdir}
%attr(0770,root,tomcat) %dir %{workdir}
+%attr(0775,root,tomcat) %dir %{tomcatappdir}
# tomcat group writtable dirs - bnc#625415
%defattr(0664,root,tomcat,0775)
%{confdir}/Catalina
@@ -707,24 +747,18 @@
%{_fillupdir}/sysconfig.%{name}
%files admin-webapps
-%{appdir}/host-manager
-%config(noreplace) %{appdir}/host-manager/META-INF/context.xml
-%{appdir}/manager
-%config(noreplace) %{appdir}/manager/META-INF/context.xml
+%{tomcatappdir}/host-manager
+%config(noreplace) %{tomcatappdir}/host-manager/META-INF/context.xml
+%{tomcatappdir}/manager
+%config(noreplace) %{tomcatappdir}/manager/META-INF/context.xml
%files docs-webapp
-%doc %{appdir}/docs
+%{tomcatappdir}/docs
-%files el-3_0-api
+%files el-3_0-api -f output/dist/src/res/maven/.mfiles-el-api
%{_javadir}/%{name}-el-%{elspec}-api.jar
%{_javadir}/%{name}-el-api.jar
%{libdir}/%{name}-el-%{elspec}-api.jar
-%{_mavenpomdir}/JPP-%{name}-el-api.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-el-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
-%endif
%{_javadir}/%{name}-el_1_0_api.jar
%{_javadir}/%{name}-el_api.jar
%ghost %{_sysconfdir}/alternatives/el_1_0_api
@@ -733,73 +767,37 @@
%files javadoc
%doc %{_javadocdir}/%{name}
-%files jsp-2_3-api
+%files jsp-2_3-api -f output/dist/src/res/maven/.mfiles-jsp-api
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
%{_javadir}/%{name}-jsp-api.jar
%{_javadir}/%{name}-jsp.jar
%ghost %{_sysconfdir}/alternatives/jsp
-%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-jsp-api.xml
-%endif
-%files lib
+%files lib -f output/dist/src/res/maven/.mfiles
%{libdir}
%dir %{bindir}
%{bindir}/tomcat-juli.jar
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml
-%endif
-%{_mavenpomdir}/JPP.%{name}-annotations-api.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
-%{_mavenpomdir}/JPP.%{name}-catalina.pom
-%{_mavenpomdir}/JPP.%{name}-jasper-el.pom
-%{_mavenpomdir}/JPP.%{name}-jasper.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-dbcp.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
-%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%exclude %{libdir}/%{name}*-embed-*.jar
# bnc#418664
%dir %{_sysconfdir}/ant.d
%config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
-%files embed
+%files embed -f output/dist/src/res/maven/.mfiles-embed
%dir %{libdir}
-%{libdir}/%{name}*-embed-*.jar
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
-%files servlet-4_0-api
+%files servlet-4_0-api -f output/dist/src/res/maven/.mfiles-servlet-api
%license LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
%{_javadir}/%{name}-servlet-api.jar
%{_javadir}/%{name}-servlet.jar
%ghost %{_sysconfdir}/alternatives/servlet
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
-%else
-%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml
-%endif
-%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files webapps
#bnc#520532
-%config(noreplace) %{appdir}/ROOT
-%{appdir}/examples
-%{appdir}/sample
+%config(noreplace) %{tomcatappdir}/ROOT
+%{tomcatappdir}/examples
+%{tomcatappdir}/sample
%files jsvc
%defattr(755,root,root,0755)
++++++ el-api-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.671245492 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.671245492 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Export-Package: javax.el;version="2.2.0"
Bundle-Vendor: %bundleProvider
Bundle-ClassPath: .
++++++ jasper-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.695245477 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.699245475 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
++++++ jasper-el-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.715245466 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.719245463 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Export-Package: org.apache.el;version="7.0.21"
Bundle-Vendor: %bundleProvider
Bundle-ClassPath: .
++++++ jsp-api-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.735245453 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.739245451 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
++++++ servlet-api-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.751245444 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.755245441 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
Bundle-SymbolicName: javax.servlet
Bundle-ManifestVersion: 2
++++++ tomcat-9.0-tool-wrapper.script ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.815245405 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.815245405 +0100
@@ -34,7 +34,7 @@
MAIN_CLASS="org.apache.catalina.startup.Tool"
BASE_OPTIONS=""
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
-BASE_JARS="commons-daemon tomcat/catalina servlet"
+BASE_JARS="commons-daemon tomcat/catalina tomcat/servlet"
# Set parameters
set_classpath $BASE_JARS
++++++ tomcat-api-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.883245363 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.883245363 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Export-Package: org.apache.tomcat;version="7.0.21"
Bundle-Vendor: %bundleProvider
Bundle-ClassPath: .
++++++ tomcat-juli-OSGi-MANIFEST.MF ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.907245349 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.907245349 +0100
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Export-Package: org.apache.juli;version="7.0.21",org.apache.juli.loggi
ng;version="7.0.21"
Bundle-Vendor: %bundleProvider
++++++ tomcat-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.rzSnfv/_old 2019-02-06 15:47:47.935245332 +0100
+++ /var/tmp/diff_new_pack.rzSnfv/_new 2019-02-06 15:47:47.935245332 +0100
@@ -1,4 +1,2 @@
#fix of bnc#520532
-addFilter(".*non-etc-or-var-file-marked-as-conffile
/srv/tomcat/webapps/ROOT.*")
-addFilter(".*non-etc-or-var-file-marked-as-conffile
/srv/tomcat/webapps/host-manager/META-INF/context.xml")
-addFilter(".*non-etc-or-var-file-marked-as-conffile
/srv/tomcat/webapps/manager/META-INF/context.xml")
+addFilter(".*non-etc-or-var-file-marked-as-conffile
/usr/share/tomcat/tomcat-webapps/ROOT.*")
++++++ tomcat-serverxml-tool.sh ++++++
#!/bin/bash
JAR=/usr/lib/tomcat/serverxmltool.jar
SERVERXML=/etc/tomcat/server.xml
function usage {
echo "Usage: <script> add|remove docBase path [contextXmlFile]"
}
if [[ -z "$1" || -z "$2" ]]; then
usage
exit 1
fi
CMD="$1"
DOCBASE="$2"
CTXPATH="$3"
CONTEXTXML=${4:-''}
if [ "$CMD" = "add" ]; then
XSLT="add-context.xslt"
elif [ "$CMD" = "remove" ]; then
XSLT="remove-context.xslt"
else
usage
exit 1;
fi
SUFIX=$(date +%H%M%S%N)
rm -f ${SERVERXML}.new${SUFIX} ${SERVERXML}.old${SUFIX}
/usr/bin/java -jar $JAR $XSLT $SERVERXML $DOCBASE $CTXPATH $CONTEXTXML >
${SERVERXML}.new${SUFIX}
if [ $? -eq 0 ]; then
mv $SERVERXML ${SERVERXML}.old${SUFIX}
mv ${SERVERXML}.new${SUFIX} $SERVERXML
rm ${SERVERXML}.old${SUFIX}
if [ "$CMD" = "add" ]; then
echo "Added webapp $CTXPATH from $DOCBASE to $SERVERXML."
else
echo "Removed webapp $CTXPATH from $SERVERXML."
fi
else
echo "$SERVERXML was not modified."
rm ${SERVERXML}.new${SUFIX}
exit 2
fi
