From d7994db69e1997ff3e435a3358e1917f804986f276821ae34c61cfb68afbfff0 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Thu, 14 Feb 2019 15:16:41 +0000 Subject: [PATCH 1/7] Accepting request 674514 from home:ecsos:server - Add tomcat-9.0-tomcat-webapps.patch to fix missing context for manager and host-mamanger. OBS-URL: https://build.opensuse.org/request/show/674514 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=151 --- tomcat-9.0-tomcat-webapps.patch | 23 +++++++++++++++++++++++ tomcat.changes | 6 ++++++ tomcat.spec | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 tomcat-9.0-tomcat-webapps.patch diff --git a/tomcat-9.0-tomcat-webapps.patch b/tomcat-9.0-tomcat-webapps.patch new file mode 100644 index 0000000..d8323e3 --- /dev/null +++ b/tomcat-9.0-tomcat-webapps.patch @@ -0,0 +1,23 @@ +Index: apache-tomcat-9.0.14-src/conf/server.xml +=================================================================== +--- apache-tomcat-9.0.14-src.orig/conf/server.xml ++++ apache-tomcat-9.0.14-src/conf/server.xml +@@ -161,7 +161,18 @@ + prefix="localhost_access_log" suffix=".txt" + pattern="%h %l %u %t "%r" %s %b" /> + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + ++ diff --git a/tomcat.changes b/tomcat.changes index b2d654b..6d0df9a 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 13 09:11:49 UTC 2019 - ecsos@opensuse.org + +- Add tomcat-9.0-tomcat-webapps.patch to fix missing context for + manager and host-mamanger. + ------------------------------------------------------------------- Tue Feb 5 09:50:35 UTC 2019 - malbu@suse.com diff --git a/tomcat.spec b/tomcat.spec index 1d49355..9578aa3 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -89,6 +89,8 @@ Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.pa 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 +# PATCH-FIX-OPENSUSE: insert missing context for manager and host-manager +Patch6: tomcat-9.0-tomcat-webapps.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr @@ -266,6 +268,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl From f1bb9c0f852d518e50ab82f811deeb0c43547bd31b223940095d8570ddcf4d69 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Thu, 14 Feb 2019 15:24:42 +0000 Subject: [PATCH 2/7] Rollback request 674514 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=152 --- tomcat.changes | 6 ------ tomcat.spec | 3 --- 2 files changed, 9 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 6d0df9a..b2d654b 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 13 09:11:49 UTC 2019 - ecsos@opensuse.org - -- Add tomcat-9.0-tomcat-webapps.patch to fix missing context for - manager and host-mamanger. - ------------------------------------------------------------------- Tue Feb 5 09:50:35 UTC 2019 - malbu@suse.com diff --git a/tomcat.spec b/tomcat.spec index 9578aa3..1d49355 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -89,8 +89,6 @@ Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.pa 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 -# PATCH-FIX-OPENSUSE: insert missing context for manager and host-manager -Patch6: tomcat-9.0-tomcat-webapps.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr @@ -268,7 +266,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch3 %patch4 -p1 %patch5 -p1 -%patch6 -p1 # remove date from docs sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl From 1dd79e98f1d441b5315534f165207def16db88a36e760d79c106b35cc7938133 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Mon, 18 Feb 2019 16:00:05 +0000 Subject: [PATCH 3/7] Accepting request 677168 from home:mateialbu:branches:Java:packages - Set javac target to 1.8 when building docs samples and serverxmltool OBS-URL: https://build.opensuse.org/request/show/677168 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=153 --- tomcat.changes | 5 +++++ tomcat.spec | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index b2d654b..39acbf9 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 18 15:55:12 UTC 2019 - malbu@suse.com + +- Set javac target to 1.8 when building docs samples and serverxmltool + ------------------------------------------------------------------- Tue Feb 5 09:50:35 UTC 2019 - malbu@suse.com diff --git a/tomcat.spec b/tomcat.spec index 1d49355..f773e63 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -37,6 +37,7 @@ %define workdir %{cachedir}/work %define tomcatappdir %{_datadir}/%{name}/tomcat-webapps %define serverxmltool %{_libexecdir}/%{name}/serverxml-tool.sh +%define javac_target 1.8 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -79,8 +80,6 @@ Source1002: %{name}.keyring Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch #PATCH-FIX-UPSTREAM: from jpackage.org package Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -#PATCH-FIX-OPENSUSE: skip few windows specific parts of build -#Patch2: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 @@ -104,7 +103,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 1.8.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit @@ -313,7 +312,7 @@ rm output/build/bin/commons-daemon.jar \ pushd output/dist/src/webapps/docs/appdev/sample/src mkdir -p ../web/WEB-INF/classes -javac -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java +javac -source %{javac_target} -target %{javac_target} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java pushd ../web jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war * popd @@ -329,7 +328,7 @@ 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 +javac -source %{javac_target} -target %{javac_target} 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 From 261e38ecae9266e74db9a223007603949002281e6d944d01e0e42d77e99dd035 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Mon, 18 Feb 2019 16:27:16 +0000 Subject: [PATCH 4/7] remove patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=154 --- tomcat-9.0-tomcat-webapps.patch | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 tomcat-9.0-tomcat-webapps.patch diff --git a/tomcat-9.0-tomcat-webapps.patch b/tomcat-9.0-tomcat-webapps.patch deleted file mode 100644 index d8323e3..0000000 --- a/tomcat-9.0-tomcat-webapps.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: apache-tomcat-9.0.14-src/conf/server.xml -=================================================================== ---- apache-tomcat-9.0.14-src.orig/conf/server.xml -+++ apache-tomcat-9.0.14-src/conf/server.xml -@@ -161,7 +161,18 @@ - prefix="localhost_access_log" suffix=".txt" - pattern="%h %l %u %t "%r" %s %b" /> - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - -+ From 5239f21dd2cb1b3454f916715b09c2f74095f98688208f6f2becc9857160e41c Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Thu, 21 Feb 2019 10:44:05 +0000 Subject: [PATCH 5/7] Accepting request 677954 from home:mateialbu:branches:Java:packages - Don't overwrite changes made to server.xml contexts when updating bundleded webapps. OBS-URL: https://build.opensuse.org/request/show/677954 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=155 --- tomcat-serverxml-tool.tar.gz | 4 ++-- tomcat.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tomcat-serverxml-tool.tar.gz b/tomcat-serverxml-tool.tar.gz index d151cd3..45b7610 100644 --- a/tomcat-serverxml-tool.tar.gz +++ b/tomcat-serverxml-tool.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c28653dcbbfbd98ea22f58ac537d5ca3667dcad0897321129d10ff7869affc63 -size 2352 +oid sha256:345bbc4b2ab711d90c9c182fc1d09d0664f1421499d741f1ae1c6ad602ce2f67 +size 1969 diff --git a/tomcat.changes b/tomcat.changes index 39acbf9..1499dd4 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 19 17:22:16 UTC 2019 - malbu@suse.com + +- Don't overwrite changes made to server.xml contexts when updating + bundleded webapps. + ------------------------------------------------------------------- Mon Feb 18 15:55:12 UTC 2019 - malbu@suse.com From 8be94dcc738c2005602656aa936e6562ec0171aecb04cf052a4029639d8df1a0 Mon Sep 17 00:00:00 2001 From: Matei Albu Date: Thu, 21 Feb 2019 11:17:26 +0000 Subject: [PATCH 6/7] fix typo in changelog OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=156 --- tomcat.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat.changes b/tomcat.changes index 1499dd4..9b605ac 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -2,7 +2,7 @@ Tue Feb 19 17:22:16 UTC 2019 - malbu@suse.com - Don't overwrite changes made to server.xml contexts when updating - bundleded webapps. + bundled webapps. ------------------------------------------------------------------- Mon Feb 18 15:55:12 UTC 2019 - malbu@suse.com From 2ca43c37585c07cbfe194230469f7a35bc6c7b4d59ab7015b809a9222aa5170b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Feb 2019 23:01:00 +0000 Subject: [PATCH 7/7] Accepting request 671990 from home:jengelh:branches:Java:packages use a single %setup and solve grammar violations OBS-URL: https://build.opensuse.org/request/show/671990 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=157 --- tomcat.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index f773e63..a82a600 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -140,25 +140,25 @@ released under the Apache Software License version 2.0. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. -ATTENTION-> This tomcat is build with java 1.8.0 +ATTENTION: This tomcat is built with java 1.8.0. %package admin-webapps -Summary: The host-manager and manager web applications for Apache Tomcat +Summary: The host manager and manager web applications for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} %description admin-webapps -The host-manager and manager web based applications for Apache Tomcat. +The host manager and manager web-based applications for Apache Tomcat. %package embed Summary: Libraries for Embedding Apache Tomcat Group: Productivity/Networking/Web/Servers %description embed -Embedded support (various Libraries) for Apache Tomcat +Embeddeding support (various libraries) for Apache Tomcat. %package docs-webapp -Summary: The docs web application for Apache Tomcat +Summary: The "docs" web application for Apache Tomcat Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version}-%{release} @@ -181,7 +181,7 @@ Expression Language API version 3.0. %package javadoc Summary: Javadoc generated documentation for Apache Tomcat -Group: Productivity/Networking/Web/Servers +Group: Documentation/HTML %description javadoc Javadoc generated documentation files for Apache Tomcat. @@ -253,12 +253,11 @@ Requires: jakarta-taglibs-standard >= 1.1 The ROOT and examples web applications for Apache Tomcat %prep -%setup -q -n %{packdname} -%setup -q -D -T -n %{packdname} -b 33 +%setup -q -n %{packdname} -b33 # 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 + -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 %patch2