Attachment 864562 Details for Bug 1054396 – Fix for revision f0be04eeff638eee843c9a13956d7e493278dcb2 in dist-git

[patch] Fix for revision f0be04eeff638eee843c9a13956d7e493278dcb2 in dist-git

0001-Make-webapp-s-tomcat-listen-on-non-conflicting-port.patch (text/plain), 4.19 KB, created by Severin Gehwolf on 2014-02-18 13:43:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2014-02-18 13:43:40 UTC

Size: 4.19 KB

patch

obsolete

>From c6c0da020366f1f75b00bdf21e686991c4e12dab Mon Sep 17 00:00:00 2001
>From: Severin Gehwolf <sgehwolf@redhat.com>
>Date: Mon, 17 Feb 2014 15:38:18 +0100
>Subject: [PATCH] Make webapp's tomcat listen on non-conflicting port.
>
>- Fixes RHBZ#1054396.
>- Require exact core version in -webapp subpackage.
>---
> thermostat.spec | 44 ++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 40 insertions(+), 4 deletions(-)
>
>diff --git a/thermostat.spec b/thermostat.spec
>index 5fbaf95..e1d5e18 100644
>--- a/thermostat.spec
>+++ b/thermostat.spec
>@@ -70,6 +70,8 @@
> %else
>   %global thermostat_catalina_base %{_localstatedir}/lib/tomcats/%{pkg_name}
> %endif
>+# The port tomcat will be listening on
>+%global thermostat_catalina_port 8999
> 
> # Uncomment to build from snapshot out of hg.  See also Release and Source0
> #%global hgrev b7c6db90e034
>@@ -78,7 +80,7 @@ Name:       %{?scl_prefix}thermostat
> Version:    %{major}.%{minor}.%{patchlevel}
> # If building from snapshot out of hg, uncomment and adjust below value as appropriate
> #Release:    0.1.20131122hg%{hgrev}%{?dist}
>-Release:    1%{?dist}
>+Release:    2%{?dist}
> Summary:    A monitoring and serviceability tool for OpenJDK
> License:    GPLv2+ with exceptions and OFL
> URL:        http://icedtea.classpath.org/thermostat/
>@@ -148,6 +150,8 @@ BuildRequires: jansi
> # lucene 3.6.0-6 has fixed osgi metadata
> BuildRequires: lucene >= 3.6.0-6
> BuildRequires: apache-commons-fileupload
>+# Required for webapp sub-package
>+BuildRequires: tomcat
> 
> ###################################################
> # The following BRs are specified via osgi's
>@@ -241,7 +245,7 @@ BuildArch:  noarch
> # we do it.
> Requires:   tomcat >= 7.0.42-3
> Requires:   apache-commons-fileupload
>-Requires:   %{name} = %{version}
>+Requires:   %{name} = %{version}-%{release}
> 
> %description webapp
> This package contains the exploded web archive. This web application
>@@ -695,11 +699,27 @@ popd
> sed 's#__jaas_config__#%{_sysconfdir}/%{pkg_name}/%{pkg_name}_jaas.conf#g' %{SOURCE3} > tomcat_service_thermostat.txt
> cp tomcat_service_thermostat.txt %{buildroot}%{system_confdir}/sysconfig/tomcat@%{pkg_name}
> # Create a symlinked CATALINA_BASE in order to make tomcat deploy
>-# the scl-ized tomcat web-app.
>+# the scl-ized tomcat web-app. We use our own copy of conf/server.xml in order
>+# to not port-conflict with system tomcat. See RHBZ#1054396
> pushd %{buildroot}/%{thermostat_catalina_base}
>-  for i in conf lib logs work temp; do
>+  for i in lib logs work temp; do
>     ln -s %{system_root_datadir}/tomcat/$i $i
>   done
>+  mkdir conf
>+popd
>+# Symlink everything other than server.xml
>+pushd %{system_root_datadir}/tomcat/conf
>+  for i in *; do
>+    ln -s %{system_root_datadir}/tomcat/conf/$i %{buildroot}/%{thermostat_catalina_base}/conf/$i
>+  done
>+  rm %{buildroot}/%{thermostat_catalina_base}/conf/server.xml
>+  cp -p server.xml %{buildroot}/%{thermostat_catalina_base}/conf/server.xml
>+popd
>+pushd %{buildroot}/%{thermostat_catalina_base}/conf
>+  # Fix the connector port, use a different access log file name
>+  sed -i -e 's/<Connector port="8080"/<Connector port="%{thermostat_catalina_port}"/g' \
>+         -e 's/prefix="localhost_access_log."/prefix="localhost_thermostat_access_log."/g' server.xml
>+  ls -l -R
> popd
> 
> %check
>@@ -742,6 +762,17 @@ fi
> # Required for icon cache (i.e. Thermostat icon)
> /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> 
>+# The 1.0.2-2 update changed the conf symlink in CATALINA_BASE with
>+# a directory. This is necessary in order for the update using rpm
>+# to work. YUM based updates are still broken with this. See:
>+# RHBZ#447156 and RHBZ#975909
>+%pretrans webapp -p <lua>
>+src = "%{thermostat_catalina_base}/conf"
>+if posix.stat(src, "type") == "link" then
>+  os.remove(src)
>+  posix.mkdir(src)
>+end
>+
> %files -f .mfiles
> %doc COPYING
> %doc LICENSE
>@@ -797,6 +828,11 @@ fi
> %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
> 
> %changelog
>+* Mon Feb 17 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.0.2-2
>+- Make thermostat-webapp's tomcat listen on non-conflicting
>+  tomcat port. Fixes RHBZ#1054396.
>+- Require exact core version in -webapp subpackage.
>+
> * Fri Feb 14 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.0.2-1
> - Update to latest upstream release.
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1054396: 864129 | 864562